Update to upstream version 1.5
This commit is contained in:
Mikolaj Izdebski
parent
534e3087a6
commit
b1d31e42ec
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,3 +3,4 @@ apache-jar-resource-bundle-1.4-sources.jar
|
||||
apache-license-header-resource-bundle-1.1-sources.jar
|
||||
/apache-resource-bundles-36.pom
|
||||
/apache-resource-bundles-37.pom
|
||||
/apache-resource-bundles-1.5-source-release.zip
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.apache</groupId>
|
||||
<artifactId>apache-resource-bundles</artifactId>
|
||||
<version>2</version>
|
||||
</parent>
|
||||
<artifactId>apache-incubator-disclaimer-resource-bundle</artifactId>
|
||||
<name>Apache Incubator Disclaimer Resource Bundle</name>
|
||||
<version>1.1</version>
|
||||
<inceptionYear>2006</inceptionYear>
|
||||
<description>
|
||||
An archive which contains the standard Apache Incubator disclaimer.
|
||||
</description>
|
||||
</project>
|
||||
@ -1,22 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.apache</groupId>
|
||||
<artifactId>apache-resource-bundles</artifactId>
|
||||
<version>2</version>
|
||||
</parent>
|
||||
<artifactId>apache-jar-resource-bundle</artifactId>
|
||||
<name>Apache JAR Resource Bundle</name>
|
||||
<version>1.4</version>
|
||||
<inceptionYear>2006</inceptionYear>
|
||||
<description>
|
||||
An archive which contains templates for generating the necessary license files and notices for all Apache releases.
|
||||
</description>
|
||||
|
||||
<scm>
|
||||
<connection>scm:svn:https://svn.apache.org/repos/asf/maven/resources/tags/apache-jar-resource-bundle-1.4</connection>
|
||||
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/resources/tags/apache-jar-resource-bundle-1.4</developerConnection>
|
||||
<url>https://svn.apache.org/repos/asf/maven/resources/tags/apache-jar-resource-bundle-1.4</url>
|
||||
</scm>
|
||||
</project>
|
||||
@ -1,16 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.apache</groupId>
|
||||
<artifactId>apache-resource-bundles</artifactId>
|
||||
<version>2</version>
|
||||
</parent>
|
||||
<artifactId>apache-license-header-resource-bundle</artifactId>
|
||||
<name>Apache License Header Resource Bundle</name>
|
||||
<version>1.1</version>
|
||||
<inceptionYear>2006</inceptionYear>
|
||||
<description>
|
||||
An archive which contains the notice file template.
|
||||
</description>
|
||||
</project>
|
||||
@ -1,20 +0,0 @@
|
||||
--- apache-resource-bundles-2/pom.xml.orig 2010-01-19 10:29:54.688919029 +0000
|
||||
+++ apache-resource-bundles-2/pom.xml 2010-01-19 10:30:08.671919266 +0000
|
||||
@@ -24,17 +24,6 @@
|
||||
<url>https://svn.apache.org/repos/asf/maven/resources/tags/apache-resource-bundles-2</url>
|
||||
</scm>
|
||||
<build>
|
||||
- <pluginManagement>
|
||||
- <plugins>
|
||||
- <plugin>
|
||||
- <artifactId>maven-release-plugin</artifactId>
|
||||
- <version>2.0-beta-4</version>
|
||||
- <configuration>
|
||||
- <tagBase>https://svn.apache.org/repos/asf/maven/resources/tags</tagBase>
|
||||
- </configuration>
|
||||
- </plugin>
|
||||
- </plugins>
|
||||
- </pluginManagement>
|
||||
<plugins>
|
||||
<!-- Turn this into a lifecycle -->
|
||||
<plugin>
|
||||
@ -1,32 +1,27 @@
|
||||
%bcond_with bootstrap
|
||||
|
||||
%global jar_version 1.4
|
||||
%global lh_version 1.1
|
||||
%global id_version 1.1
|
||||
|
||||
Name: apache-resource-bundles
|
||||
Version: 37
|
||||
Release: 3%{?dist}
|
||||
Epoch: 1
|
||||
Version: 1.5
|
||||
Release: 1%{?dist}
|
||||
Summary: Apache Resource Bundles
|
||||
License: ASL 2.0
|
||||
URL: https://repo1.maven.org/maven2/org/apache/apache-resource-bundles/
|
||||
URL: https://maven.apache.org/apache-resource-bundles/
|
||||
BuildArch: noarch
|
||||
ExclusiveArch: %{java_arches} noarch
|
||||
|
||||
Source0: https://repo1.maven.org/maven2/org/apache/apache/resources/%{name}/%{version}/%{name}-%{version}.pom
|
||||
Source1: https://repo1.maven.org/maven2/org/apache/apache-jar-resource-bundle/%{jar_version}/apache-jar-resource-bundle-%{jar_version}-sources.jar
|
||||
Source2: https://repo1.maven.org/maven2/org/apache/apache-jar-resource-bundle/%{jar_version}/apache-jar-resource-bundle-%{jar_version}.pom
|
||||
Source3: https://repo1.maven.org/maven2/org/apache/apache-license-header-resource-bundle/%{lh_version}/apache-license-header-resource-bundle-%{lh_version}-sources.jar
|
||||
Source4: https://repo1.maven.org/maven2/org/apache/apache-license-header-resource-bundle/%{lh_version}/apache-license-header-resource-bundle-%{lh_version}.pom
|
||||
Source5: https://repo1.maven.org/maven2/org/apache/apache-incubator-disclaimer-resource-bundle/%{id_version}/apache-incubator-disclaimer-resource-bundle-%{id_version}-sources.jar
|
||||
Source6: https://repo1.maven.org/maven2/org/apache/apache-incubator-disclaimer-resource-bundle/%{id_version}/apache-incubator-disclaimer-resource-bundle-%{id_version}.pom
|
||||
Source0: https://repo1.maven.org/maven2/org/apache/apache/resources/apache-resource-bundles/%{version}/apache-resource-bundles-%{version}-source-release.zip
|
||||
|
||||
%if %{with bootstrap}
|
||||
BuildRequires: javapackages-bootstrap
|
||||
%else
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(org.apache.maven:maven-parent:pom:)
|
||||
BuildRequires: mvn(junit:junit)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin)
|
||||
BuildRequires: mvn(org.apache.maven.shared:maven-verifier)
|
||||
BuildRequires: mvn(org.apache.maven:maven-parent:pom:)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-archiver)
|
||||
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
|
||||
%endif
|
||||
|
||||
%description
|
||||
@ -34,61 +29,24 @@ An archive which contains templates for generating the necessary license files
|
||||
and notices for all Apache releases.
|
||||
|
||||
%prep
|
||||
%setup -cT
|
||||
cp -p %{SOURCE0} ./pom.xml
|
||||
%pom_xpath_inject 'pom:project' '
|
||||
<modules>
|
||||
<module>apache-jar-resource-bundle</module>
|
||||
<module>apache-license-header-resource-bundle</module>
|
||||
<module>apache-incubator-disclaimer-resource-bundle</module>
|
||||
</modules>'
|
||||
|
||||
%pom_xpath_set 'pom:project/pom:parent/pom:relativePath' '../pom/maven/pom.xml'
|
||||
%pom_xpath_set 'pom:project/pom:groupId' 'org.apache'
|
||||
|
||||
# jar
|
||||
mkdir -p apache-jar-resource-bundle
|
||||
pushd apache-jar-resource-bundle
|
||||
jar xvf %{SOURCE1}
|
||||
cp -p %{SOURCE2} ./pom.xml
|
||||
%pom_xpath_set 'pom:project/pom:parent/pom:version' %{version}
|
||||
mkdir -p src/main/resources
|
||||
mv META-INF src/main/resources
|
||||
popd
|
||||
|
||||
# license-header
|
||||
mkdir -p apache-license-header-resource-bundle
|
||||
pushd apache-license-header-resource-bundle
|
||||
jar xvf %{SOURCE3}
|
||||
cp -p %{SOURCE4} ./pom.xml
|
||||
%pom_xpath_set 'pom:project/pom:parent/pom:version' %{version}
|
||||
mkdir -p src/main/resources
|
||||
mv META-INF src/main/resources
|
||||
popd
|
||||
|
||||
# incubator-disclaimer
|
||||
mkdir -p apache-incubator-disclaimer-resource-bundle
|
||||
pushd apache-incubator-disclaimer-resource-bundle
|
||||
jar xvf %{SOURCE5}
|
||||
cp -p %{SOURCE6} ./pom.xml
|
||||
%pom_xpath_set 'pom:project/pom:parent/pom:version' %{version}
|
||||
mkdir -p src/main/resources
|
||||
mv META-INF src/main/resources
|
||||
popd
|
||||
|
||||
%mvn_file :apache-jar-resource-bundle apache-resource-bundles/jar
|
||||
%mvn_file :apache-license-header-resource-bundle apache-resource-bundles/license-header
|
||||
%mvn_file :apache-incubator-disclaimer-resource-bundle apache-resource-bundles/incubator-disclaimer
|
||||
%setup -q
|
||||
%pom_disable_module resources-bundles-sample
|
||||
%mvn_alias :apache-jar-resource-bundle org.apache:
|
||||
|
||||
%build
|
||||
%mvn_build
|
||||
# Use system version of apache-resource-bundles instead of reactor version
|
||||
%mvn_build -- -Dversion.apache-resource-bundles=SYSTEM
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
|
||||
%files -f .mfiles
|
||||
%license LICENSE NOTICE
|
||||
|
||||
%changelog
|
||||
* Fri Aug 11 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:1.5-1
|
||||
- Update to upstream version 1.5
|
||||
|
||||
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 37-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
|
||||
5
sources
5
sources
@ -1,4 +1 @@
|
||||
SHA512 (apache-resource-bundles-37.pom) = 0aa325f2e0c0d814678485e53cb26198c226058b9e42dcd74b12d62b2e50a120b415e6c53208d17b72747ae8e07f8720e708f7ae4f8ce769b107b29e9dab6bd4
|
||||
SHA512 (apache-jar-resource-bundle-1.4-sources.jar) = 55dae4fb13624f083e049c5e9b1556f325c392f734ba034763091261f19239a13c5e2497fcaba190582d820074be0ee8d1ba91e8509bf5a0c91eb8c509b980b3
|
||||
SHA512 (apache-license-header-resource-bundle-1.1-sources.jar) = 055ebd253138231c96388ee51b1b0c4013c20b5a16fb124ceb404ae466535e3303d0d07b8fa6794889d9159755d18e40518d5b07c142cdd6cee74d78aca0befc
|
||||
SHA512 (apache-incubator-disclaimer-resource-bundle-1.1-sources.jar) = 4095b22b344a2e0e44a04cdb26f89db16e6b11e57fb5584caf7ecef0f9d2bb40fb188832d371c375ab917ea2d72445ac7a7387f6353d3b3c1d93266c71c3d4e9
|
||||
SHA512 (apache-resource-bundles-1.5-source-release.zip) = ba10e36f8f20b54676b78a1fb5ff20f570f18daa6fe314e7372824ecda72f4c94c85d5c172b79716cc9b79ef4a65b06dbd5f7e83305e4aac0734fa351f3691f1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user