.apache-resource-bundles.metadata

@@ -1,3 +1,4 @@
-1b81c0751b2131074eebce60c86289824c98615c SOURCES/apache-incubator-disclaimer-resource-bundle-1.1-sources.jar
-392dfe3fd871d56d1edc48479fdff65013c801d9 SOURCES/apache-jar-resource-bundle-1.4-sources.jar
-2b61357efc85d89ac1e96b6ac6309a6872819116 SOURCES/apache-license-header-resource-bundle-1.1-sources.jar
+75eee91d1539148ba35d269222fb86aece12ed57 apache-resource-bundles-36.pom
+392dfe3fd871d56d1edc48479fdff65013c801d9 apache-jar-resource-bundle-1.4-sources.jar
+2b61357efc85d89ac1e96b6ac6309a6872819116 apache-license-header-resource-bundle-1.1-sources.jar
+1b81c0751b2131074eebce60c86289824c98615c apache-incubator-disclaimer-resource-bundle-1.1-sources.jar

.gitignore

@@ -1,3 +1,4 @@
-SOURCES/apache-incubator-disclaimer-resource-bundle-1.1-sources.jar
-SOURCES/apache-jar-resource-bundle-1.4-sources.jar
-SOURCES/apache-license-header-resource-bundle-1.1-sources.jar
+apache-incubator-disclaimer-resource-bundle-1.1-sources.jar
+apache-jar-resource-bundle-1.4-sources.jar
+apache-license-header-resource-bundle-1.1-sources.jar
+/apache-resource-bundles-36.pom

SOURCES/apache-resource-bundles-2.pom

@@ -1,52 +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.maven</groupId>
-    <artifactId>maven-parent</artifactId>
-    <version>5</version>
-    <relativePath>../pom/maven/pom.xml</relativePath>
-  </parent>
-  <packaging>pom</packaging>
-  <groupId>org.apache</groupId>
-  <artifactId>apache-resource-bundles</artifactId>
-  <name>Apache Resource Bundles</name>
-  <version>2</version>
-  <inceptionYear>2006</inceptionYear>
-  <modules>
-    <module>apache-jar-resource-bundle</module>
-    <module>apache-license-header-resource-bundle</module>
-    <module>apache-incubator-disclaimer-resource-bundle</module>         
-  </modules>
-  <scm>
-    <connection>scm:svn:https://svn.apache.org/repos/asf/maven/resources/tags/apache-resource-bundles-2</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/resources/tags/apache-resource-bundles-2</developerConnection>
-    <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>      
-        <artifactId>maven-remote-resources-plugin</artifactId>        
-        <executions>
-          <execution>
-            <goals>
-              <goal>bundle</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>

apache-resource-bundles-cleanup-poms.patch

@@ -0,0 +1,20 @@
+--- 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>      

apache-resource-bundles.spec

@@ -1,26 +1,33 @@
+%bcond_with bootstrap
+
 %global jar_version 1.4
 %global lh_version 1.1
 %global id_version 1.1
 
 Name:           apache-resource-bundles
-Version:        2
-Release:        22%{?dist}
+Version:        36
+Release:        3%{?dist}
 Summary:        Apache Resource Bundles
 License:        ASL 2.0
-URL:            http://repo1.maven.org/maven2/org/apache/apache-resource-bundles/
+URL:            https://repo1.maven.org/maven2/org/apache/apache-resource-bundles/
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
 
-Source0:        http://repo1.maven.org/maven2/org/apache/%{name}/%{version}/%{name}-%{version}.pom
-Source1:        http://repo1.maven.org/maven2/org/apache/apache-jar-resource-bundle/%{jar_version}/apache-jar-resource-bundle-%{jar_version}-sources.jar
-Source2:        http://repo1.maven.org/maven2/org/apache/apache-jar-resource-bundle/%{jar_version}/apache-jar-resource-bundle-%{jar_version}.pom
-Source3:        http://repo1.maven.org/maven2/org/apache/apache-license-header-resource-bundle/%{lh_version}/apache-license-header-resource-bundle-%{lh_version}-sources.jar
-Source4:        http://repo1.maven.org/maven2/org/apache/apache-license-header-resource-bundle/%{lh_version}/apache-license-header-resource-bundle-%{lh_version}.pom
-Source5:        http://repo1.maven.org/maven2/org/apache/apache-incubator-disclaimer-resource-bundle/%{id_version}/apache-incubator-disclaimer-resource-bundle-%{id_version}-sources.jar
-Source6:        http://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/%{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
 
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  maven-local
 BuildRequires:  mvn(org.apache.maven:maven-parent:pom:)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-remote-resources-plugin)
+%endif
 
 %description
 An archive which contains templates for generating the necessary license files
@@ -29,12 +36,22 @@ 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
@@ -44,6 +61,7 @@ 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
@@ -53,6 +71,7 @@ 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
@@ -70,12 +89,58 @@ popd
 %files -f .mfiles
 
 %changelog
+* Mon Feb 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 36-3
+- Rebuild to regenerate auto-requires
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 36-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed May 04 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 36-1
+- Update to upstream version 36
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 30-5
+- Rebuilt for java-17-openjdk as system jdk
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 30-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 30-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 30-2
+- Bootstrap build
+- Non-bootstrap build
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 2-25
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Wed Mar 04 2020 Marian Koncek <mkoncek@redhat.com> - 30-1
+- Update to upstream version 30
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2-22
 - Mass rebuild for javapackages-tools 201902
 
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2-21
 - Mass rebuild for javapackages-tools 201901
 
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

sources

@@ -0,0 +1,4 @@
+SHA512 (apache-resource-bundles-36.pom) = ac7b1a8f9105302fee725d6049aae18b006565b8b0013982dba1278d60f9b7cdced1925c31ba11bf8a9e4413032539be9cdcf3c8cf9ac05288febc68c1366745
+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