diff --git a/.apache-resource-bundles.metadata b/.apache-resource-bundles.metadata index 90edb08..9bc43c5 100644 --- a/.apache-resource-bundles.metadata +++ b/.apache-resource-bundles.metadata @@ -1,3 +1 @@ -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 +34faeab949c9cff2a647f54c19a4e59ddb909237 SOURCES/apache-resource-bundles-1.5-source-release.zip diff --git a/.gitignore b/.gitignore index 0df6d11..b3b03fe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -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 +SOURCES/apache-resource-bundles-1.5-source-release.zip diff --git a/SOURCES/0001-Port-ITs-to-Maven-Verifier-2.0.0-M1.patch b/SOURCES/0001-Port-ITs-to-Maven-Verifier-2.0.0-M1.patch new file mode 100644 index 0000000..3adcbc9 --- /dev/null +++ b/SOURCES/0001-Port-ITs-to-Maven-Verifier-2.0.0-M1.patch @@ -0,0 +1,171 @@ +From af8542b406e06808ee416c93f2b2c550c688e9f5 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Wed, 23 Aug 2023 20:19:06 +0200 +Subject: [PATCH] Port ITs to Maven Verifier 2.0.0~M1 + +--- + .../test/java/org/apache/its/IT_000_BasicArchiveCreation.java | 4 ++-- + .../org/apache/its/IT_001_ExcludeBuildOutputDirectory.java | 4 ++-- + .../its/IT_002_IncludeSrcDirWithBuildOutputDirName.java | 4 ++-- + .../java/org/apache/its/IT_003_SharedResourceInclusion.java | 4 ++-- + .../src/test/java/org/apache/its/IT_004_IdeExcludes.java | 4 ++-- + .../java/org/apache/its/IT_005_MiscellaneousExcludes.java | 4 ++-- + .../src/test/java/org/apache/its/IT_006_CiExcludes.java | 4 ++-- + .../org/apache/its/IT_ExcludeSrcDirWithinBuildOutputDir.java | 4 ++-- + .../java/org/apache/its/IT_IncludeIdeFilesWithinSrcDir.java | 4 ++-- + .../src/test/java/org/apache/its/IT_ZipAndTarCreation.java | 4 ++-- + 10 files changed, 20 insertions(+), 20 deletions(-) + +diff --git a/source-release/src/test/java/org/apache/its/IT_000_BasicArchiveCreation.java b/source-release/src/test/java/org/apache/its/IT_000_BasicArchiveCreation.java +index effd007..d2bf3d4 100644 +--- a/source-release/src/test/java/org/apache/its/IT_000_BasicArchiveCreation.java ++++ b/source-release/src/test/java/org/apache/its/IT_000_BasicArchiveCreation.java +@@ -26,8 +26,8 @@ import java.util.HashSet; + import java.util.Set; + + import junit.framework.Assert; +-import org.apache.maven.it.VerificationException; +-import org.apache.maven.it.Verifier; ++import org.apache.maven.shared.verifier.VerificationException; ++import org.apache.maven.shared.verifier.Verifier; + import org.junit.Test; + + import static org.apache.its.util.TestUtils.archivePathFromChild; +diff --git a/source-release/src/test/java/org/apache/its/IT_001_ExcludeBuildOutputDirectory.java b/source-release/src/test/java/org/apache/its/IT_001_ExcludeBuildOutputDirectory.java +index 966a8bc..b1353ff 100644 +--- a/source-release/src/test/java/org/apache/its/IT_001_ExcludeBuildOutputDirectory.java ++++ b/source-release/src/test/java/org/apache/its/IT_001_ExcludeBuildOutputDirectory.java +@@ -24,8 +24,8 @@ import java.net.URISyntaxException; + import java.util.HashSet; + import java.util.Set; + +-import org.apache.maven.it.VerificationException; +-import org.apache.maven.it.Verifier; ++import org.apache.maven.shared.verifier.VerificationException; ++import org.apache.maven.shared.verifier.Verifier; + import org.junit.Test; + + import static org.apache.its.util.TestUtils.archivePathFromChild; +diff --git a/source-release/src/test/java/org/apache/its/IT_002_IncludeSrcDirWithBuildOutputDirName.java b/source-release/src/test/java/org/apache/its/IT_002_IncludeSrcDirWithBuildOutputDirName.java +index 3adbdab..0c9af50 100644 +--- a/source-release/src/test/java/org/apache/its/IT_002_IncludeSrcDirWithBuildOutputDirName.java ++++ b/source-release/src/test/java/org/apache/its/IT_002_IncludeSrcDirWithBuildOutputDirName.java +@@ -24,8 +24,8 @@ import java.net.URISyntaxException; + import java.util.HashSet; + import java.util.Set; + +-import org.apache.maven.it.VerificationException; +-import org.apache.maven.it.Verifier; ++import org.apache.maven.shared.verifier.VerificationException; ++import org.apache.maven.shared.verifier.Verifier; + import org.junit.Test; + + import static org.apache.its.util.TestUtils.archivePathFromChild; +diff --git a/source-release/src/test/java/org/apache/its/IT_003_SharedResourceInclusion.java b/source-release/src/test/java/org/apache/its/IT_003_SharedResourceInclusion.java +index 3e90d5b..de54608 100644 +--- a/source-release/src/test/java/org/apache/its/IT_003_SharedResourceInclusion.java ++++ b/source-release/src/test/java/org/apache/its/IT_003_SharedResourceInclusion.java +@@ -24,8 +24,8 @@ import java.net.URISyntaxException; + import java.util.HashSet; + import java.util.Set; + +-import org.apache.maven.it.VerificationException; +-import org.apache.maven.it.Verifier; ++import org.apache.maven.shared.verifier.VerificationException; ++import org.apache.maven.shared.verifier.Verifier; + import org.junit.Test; + + import static org.apache.its.util.TestUtils.archivePathFromChild; +diff --git a/source-release/src/test/java/org/apache/its/IT_004_IdeExcludes.java b/source-release/src/test/java/org/apache/its/IT_004_IdeExcludes.java +index 760899a..e5b780f 100644 +--- a/source-release/src/test/java/org/apache/its/IT_004_IdeExcludes.java ++++ b/source-release/src/test/java/org/apache/its/IT_004_IdeExcludes.java +@@ -25,8 +25,8 @@ import java.util.Collections; + import java.util.HashSet; + import java.util.Set; + +-import org.apache.maven.it.VerificationException; +-import org.apache.maven.it.Verifier; ++import org.apache.maven.shared.verifier.VerificationException; ++import org.apache.maven.shared.verifier.Verifier; + import org.junit.Test; + + import static org.apache.its.util.TestUtils.archivePathFromChild; +diff --git a/source-release/src/test/java/org/apache/its/IT_005_MiscellaneousExcludes.java b/source-release/src/test/java/org/apache/its/IT_005_MiscellaneousExcludes.java +index cb584c1..e692a95 100644 +--- a/source-release/src/test/java/org/apache/its/IT_005_MiscellaneousExcludes.java ++++ b/source-release/src/test/java/org/apache/its/IT_005_MiscellaneousExcludes.java +@@ -25,8 +25,8 @@ import java.util.Collections; + import java.util.HashSet; + import java.util.Set; + +-import org.apache.maven.it.VerificationException; +-import org.apache.maven.it.Verifier; ++import org.apache.maven.shared.verifier.VerificationException; ++import org.apache.maven.shared.verifier.Verifier; + import org.junit.Test; + + import static org.apache.its.util.TestUtils.archivePathFromChild; +diff --git a/source-release/src/test/java/org/apache/its/IT_006_CiExcludes.java b/source-release/src/test/java/org/apache/its/IT_006_CiExcludes.java +index 5a5d0bd..9c5f406 100644 +--- a/source-release/src/test/java/org/apache/its/IT_006_CiExcludes.java ++++ b/source-release/src/test/java/org/apache/its/IT_006_CiExcludes.java +@@ -25,8 +25,8 @@ import java.util.Collections; + import java.util.HashSet; + import java.util.Set; + +-import org.apache.maven.it.VerificationException; +-import org.apache.maven.it.Verifier; ++import org.apache.maven.shared.verifier.VerificationException; ++import org.apache.maven.shared.verifier.Verifier; + import org.junit.Test; + + import static org.apache.its.util.TestUtils.archivePathFromProject; +diff --git a/source-release/src/test/java/org/apache/its/IT_ExcludeSrcDirWithinBuildOutputDir.java b/source-release/src/test/java/org/apache/its/IT_ExcludeSrcDirWithinBuildOutputDir.java +index 3e0f7c5..2762372 100644 +--- a/source-release/src/test/java/org/apache/its/IT_ExcludeSrcDirWithinBuildOutputDir.java ++++ b/source-release/src/test/java/org/apache/its/IT_ExcludeSrcDirWithinBuildOutputDir.java +@@ -24,8 +24,8 @@ import java.net.URISyntaxException; + import java.util.HashSet; + import java.util.Set; + +-import org.apache.maven.it.VerificationException; +-import org.apache.maven.it.Verifier; ++import org.apache.maven.shared.verifier.VerificationException; ++import org.apache.maven.shared.verifier.Verifier; + import org.junit.Test; + + import static org.apache.its.util.TestUtils.archivePathFromChild; +diff --git a/source-release/src/test/java/org/apache/its/IT_IncludeIdeFilesWithinSrcDir.java b/source-release/src/test/java/org/apache/its/IT_IncludeIdeFilesWithinSrcDir.java +index bc86d6f..77729e9 100644 +--- a/source-release/src/test/java/org/apache/its/IT_IncludeIdeFilesWithinSrcDir.java ++++ b/source-release/src/test/java/org/apache/its/IT_IncludeIdeFilesWithinSrcDir.java +@@ -24,8 +24,8 @@ import java.net.URISyntaxException; + import java.util.HashSet; + import java.util.Set; + +-import org.apache.maven.it.VerificationException; +-import org.apache.maven.it.Verifier; ++import org.apache.maven.shared.verifier.VerificationException; ++import org.apache.maven.shared.verifier.Verifier; + import org.junit.Test; + + import static org.apache.its.util.TestUtils.archivePathFromChild; +diff --git a/source-release/src/test/java/org/apache/its/IT_ZipAndTarCreation.java b/source-release/src/test/java/org/apache/its/IT_ZipAndTarCreation.java +index 040beee..9ae94cd 100644 +--- a/source-release/src/test/java/org/apache/its/IT_ZipAndTarCreation.java ++++ b/source-release/src/test/java/org/apache/its/IT_ZipAndTarCreation.java +@@ -26,8 +26,8 @@ import java.util.HashSet; + import java.util.Set; + + import junit.framework.Assert; +-import org.apache.maven.it.VerificationException; +-import org.apache.maven.it.Verifier; ++import org.apache.maven.shared.verifier.VerificationException; ++import org.apache.maven.shared.verifier.Verifier; + import org.junit.Test; + + import static org.apache.its.util.TestUtils.archivePathFromChild; +-- +2.41.0 + diff --git a/SOURCES/apache-incubator-disclaimer-resource-bundle-1.1.pom b/SOURCES/apache-incubator-disclaimer-resource-bundle-1.1.pom deleted file mode 100644 index 2495577..0000000 --- a/SOURCES/apache-incubator-disclaimer-resource-bundle-1.1.pom +++ /dev/null @@ -1,16 +0,0 @@ - - - 4.0.0 - - org.apache - apache-resource-bundles - 2 - - apache-incubator-disclaimer-resource-bundle - Apache Incubator Disclaimer Resource Bundle - 1.1 - 2006 - - An archive which contains the standard Apache Incubator disclaimer. - - diff --git a/SOURCES/apache-jar-resource-bundle-1.4.pom b/SOURCES/apache-jar-resource-bundle-1.4.pom deleted file mode 100644 index 0e32dae..0000000 --- a/SOURCES/apache-jar-resource-bundle-1.4.pom +++ /dev/null @@ -1,22 +0,0 @@ - - - 4.0.0 - - org.apache - apache-resource-bundles - 2 - - apache-jar-resource-bundle - Apache JAR Resource Bundle - 1.4 - 2006 - - An archive which contains templates for generating the necessary license files and notices for all Apache releases. - - - - scm:svn:https://svn.apache.org/repos/asf/maven/resources/tags/apache-jar-resource-bundle-1.4 - scm:svn:https://svn.apache.org/repos/asf/maven/resources/tags/apache-jar-resource-bundle-1.4 - https://svn.apache.org/repos/asf/maven/resources/tags/apache-jar-resource-bundle-1.4 - - diff --git a/SOURCES/apache-license-header-resource-bundle-1.1.pom b/SOURCES/apache-license-header-resource-bundle-1.1.pom deleted file mode 100644 index e595bac..0000000 --- a/SOURCES/apache-license-header-resource-bundle-1.1.pom +++ /dev/null @@ -1,16 +0,0 @@ - - - 4.0.0 - - org.apache - apache-resource-bundles - 2 - - apache-license-header-resource-bundle - Apache License Header Resource Bundle - 1.1 - 2006 - - An archive which contains the notice file template. - - diff --git a/SOURCES/apache-resource-bundles-2.pom b/SOURCES/apache-resource-bundles-2.pom deleted file mode 100644 index 470cfc3..0000000 --- a/SOURCES/apache-resource-bundles-2.pom +++ /dev/null @@ -1,52 +0,0 @@ - - - 4.0.0 - - org.apache.maven - maven-parent - 5 - ../pom/maven/pom.xml - - pom - org.apache - apache-resource-bundles - Apache Resource Bundles - 2 - 2006 - - apache-jar-resource-bundle - apache-license-header-resource-bundle - apache-incubator-disclaimer-resource-bundle - - - scm:svn:https://svn.apache.org/repos/asf/maven/resources/tags/apache-resource-bundles-2 - scm:svn:https://svn.apache.org/repos/asf/maven/resources/tags/apache-resource-bundles-2 - https://svn.apache.org/repos/asf/maven/resources/tags/apache-resource-bundles-2 - - - - - - maven-release-plugin - 2.0-beta-4 - - https://svn.apache.org/repos/asf/maven/resources/tags - - - - - - - - maven-remote-resources-plugin - - - - bundle - - - - - - - diff --git a/SPECS/apache-resource-bundles.spec b/SPECS/apache-resource-bundles.spec index 34b807f..c4b2275 100644 --- a/SPECS/apache-resource-bundles.spec +++ b/SPECS/apache-resource-bundles.spec @@ -1,81 +1,139 @@ -%global jar_version 1.4 -%global lh_version 1.1 -%global id_version 1.1 +%bcond_with bootstrap Name: apache-resource-bundles -Version: 2 -Release: 22%{?dist} +Epoch: 1 +Version: 1.5 +Release: 18%{?dist} Summary: Apache Resource Bundles -License: ASL 2.0 -URL: http://repo1.maven.org/maven2/org/apache/apache-resource-bundles/ +License: Apache-2.0 +URL: https://maven.apache.org/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/apache-resource-bundles/%{version}/apache-resource-bundles-%{version}-source-release.zip +Patch: 0001-Port-ITs-to-Maven-Verifier-2.0.0-M1.patch + +%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 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 - -# jar -mkdir -p apache-jar-resource-bundle -pushd apache-jar-resource-bundle -jar xvf %{SOURCE1} -cp -p %{SOURCE2} ./pom.xml -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 -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 -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 +%autosetup -p1 +%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 Nov 29 2024 Mikolaj Izdebski - 1:1.5-18 +- Update javapackages test plan to f42 + +* Wed Jul 17 2024 Fedora Release Engineering - 1:1.5-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri May 31 2024 Mikolaj Izdebski - 1:1.5-8 +- Switch to a newer patch macro syntax + +* Tue Feb 27 2024 Jiri Vanek - 1:1.5-7 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 1:1.5-6 +- bump of release for for java-21-openjdk as system jdk + +* Mon Jan 22 2024 Fedora Release Engineering - 1:1.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1:1.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 1:1.5-3 +- Convert License tag to SPDX format + +* Wed Aug 23 2023 Mikolaj Izdebski - 1:1.5-2 +- Port to maven-verifier 2.0.0~M1 + +* Fri Aug 11 2023 Mikolaj Izdebski - 1:1.5-1 +- Update to upstream version 1.5 + +* Wed Jul 19 2023 Fedora Release Engineering - 37-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jan 18 2023 Fedora Release Engineering - 37-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Sep 07 2022 Marian Koncek - 37-1 +- Update to upstream version 37 + +* Wed Jul 20 2022 Fedora Release Engineering - 36-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed May 04 2022 Mikolaj Izdebski - 36-1 +- Update to upstream version 36 + +* Sat Feb 05 2022 Jiri Vanek - 30-5 +- Rebuilt for java-17-openjdk as system jdk + +* Wed Jan 19 2022 Fedora Release Engineering - 30-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 30-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 30-2 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 2-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 2-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 2-25 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Mar 04 2020 Marian Koncek - 30-1 +- Update to upstream version 30 + +* Tue Jan 28 2020 Fedora Release Engineering - 2-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Nov 05 2019 Mikolaj Izdebski - 2-22 - Mass rebuild for javapackages-tools 201902 +* Wed Jul 24 2019 Fedora Release Engineering - 2-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri May 24 2019 Mikolaj Izdebski - 2-21 - Mass rebuild for javapackages-tools 201901 +* Thu Jan 31 2019 Fedora Release Engineering - 2-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 2-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 2-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild @@ -130,7 +188,7 @@ popd - Use newer names of maven plugins. * Mon Feb 1 2010 Mary Ellen Foster 2-3 -- Fix license +- Fix license * Tue Jan 19 2010 Mary Ellen Foster 2-2 - Add plugin dependencies from POMs