From b7a4ef2e8def5424f6d9bb4c1e2c4fca6e133ed4 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 17 Mar 2025 15:06:21 +0000 Subject: [PATCH] import CS plexus-interpolation-1.27-10.module_el9+1180+96ab3331 --- .gitignore | 2 +- .plexus-interpolation.metadata | 2 +- ...TH-env-variable-instead-of-JAVA_HOME.patch | 39 ++++++ SPECS/plexus-interpolation.spec | 116 ++++++++++++++++-- 4 files changed, 148 insertions(+), 11 deletions(-) create mode 100644 SOURCES/0001-Use-PATH-env-variable-instead-of-JAVA_HOME.patch diff --git a/.gitignore b/.gitignore index b3fd3cc..893d675 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/plexus-interpolation-1.26.tar.gz +SOURCES/plexus-interpolation-1.27.tar.gz diff --git a/.plexus-interpolation.metadata b/.plexus-interpolation.metadata index d6e360f..2b3a28f 100644 --- a/.plexus-interpolation.metadata +++ b/.plexus-interpolation.metadata @@ -1 +1 @@ -a790bb4bb94a888c61f696477133c27e7e952b61 SOURCES/plexus-interpolation-1.26.tar.gz +2f08fb5b54f6b9691cb3efb00680167ce05d4262 SOURCES/plexus-interpolation-1.27.tar.gz diff --git a/SOURCES/0001-Use-PATH-env-variable-instead-of-JAVA_HOME.patch b/SOURCES/0001-Use-PATH-env-variable-instead-of-JAVA_HOME.patch new file mode 100644 index 0000000..8e0fd4e --- /dev/null +++ b/SOURCES/0001-Use-PATH-env-variable-instead-of-JAVA_HOME.patch @@ -0,0 +1,39 @@ +From 9f4eedf194102b9bcc1fb9885463a47dd3ca9ec8 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Wed, 25 Mar 2020 06:58:13 +0100 +Subject: [PATCH] Use PATH env variable instead of JAVA_HOME + +--- + .../plexus/interpolation/EnvarBasedValueSourceTest.java | 2 +- + .../plexus/interpolation/fixed/EnvarBasedValueSourceTest.java | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/test/java/org/codehaus/plexus/interpolation/EnvarBasedValueSourceTest.java b/src/test/java/org/codehaus/plexus/interpolation/EnvarBasedValueSourceTest.java +index 8a3c76c..4bcff96 100644 +--- a/src/test/java/org/codehaus/plexus/interpolation/EnvarBasedValueSourceTest.java ++++ b/src/test/java/org/codehaus/plexus/interpolation/EnvarBasedValueSourceTest.java +@@ -77,7 +77,7 @@ public class EnvarBasedValueSourceTest { + + EnvarBasedValueSource source = new EnvarBasedValueSource(); + +- String realEnvVar = "JAVA_HOME"; ++ String realEnvVar = "PATH"; + + String realValue = System.getenv().get(realEnvVar); + assertNotNull(realValue, "Can't run this test until " + realEnvVar + " env variable is set"); +diff --git a/src/test/java/org/codehaus/plexus/interpolation/fixed/EnvarBasedValueSourceTest.java b/src/test/java/org/codehaus/plexus/interpolation/fixed/EnvarBasedValueSourceTest.java +index b6ff638..42c601c 100644 +--- a/src/test/java/org/codehaus/plexus/interpolation/fixed/EnvarBasedValueSourceTest.java ++++ b/src/test/java/org/codehaus/plexus/interpolation/fixed/EnvarBasedValueSourceTest.java +@@ -77,7 +77,7 @@ public class EnvarBasedValueSourceTest { + + EnvarBasedValueSource source = new EnvarBasedValueSource(); + +- String realEnvVar = "JAVA_HOME"; ++ String realEnvVar = "PATH"; + + String realValue = System.getenv().get(realEnvVar); + assertNotNull(realValue, "Can't run this test until " + realEnvVar + " env variable is set"); +-- +2.41.0 + diff --git a/SPECS/plexus-interpolation.spec b/SPECS/plexus-interpolation.spec index 5878d8f..d40122d 100644 --- a/SPECS/plexus-interpolation.spec +++ b/SPECS/plexus-interpolation.spec @@ -1,18 +1,28 @@ +%bcond_with bootstrap + Name: plexus-interpolation -Version: 1.26 -Release: 3%{?dist} +Version: 1.27 +Release: 10%{?dist} Summary: Plexus Interpolation API # Most of the code is ASL 2.0, a few source files are ASL 1.1 and some tests are MIT -License: ASL 2.0 and ASL 1.1 and MIT +License: Apache-2.0 AND Apache-1.1 AND MIT URL: https://github.com/codehaus-plexus/plexus-interpolation BuildArch: noarch +ExclusiveArch: %{java_arches} noarch Source0: https://github.com/codehaus-plexus/plexus-interpolation/archive/plexus-interpolation-%{version}.tar.gz -BuildRequires: maven-local-openjdk8 +Patch: 0001-Use-PATH-env-variable-instead-of-JAVA_HOME.patch + +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else +BuildRequires: maven-local BuildRequires: mvn(junit:junit) -BuildRequires: mvn(org.codehaus.plexus:plexus-components:pom:) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter) +%endif %description Plexus interpolator is the outgrowth of multiple iterations of development @@ -20,11 +30,15 @@ focused on providing a more modular, flexible interpolation framework for the expression language style commonly seen in Maven, Plexus, and other related projects. -%{?module_package} -%{?javadoc_package} +%package javadoc +Summary: API documentation for %{name} + +%description javadoc +API documentation for %{name}. %prep -%setup -q -n plexus-interpolation-plexus-interpolation-%{version} +%autosetup -p1 -n plexus-interpolation-plexus-interpolation-%{version} +%pom_add_dep junit:junit:4.13.1:test %pom_remove_plugin :maven-release-plugin %pom_remove_plugin :maven-scm-publish-plugin @@ -35,21 +49,105 @@ related projects. %install %mvn_install -%files -n %{?module_prefix}%{name} -f .mfiles +%files -f .mfiles + +%files javadoc -f .mfiles-javadoc %changelog +* Fri Nov 29 2024 Mikolaj Izdebski - 1.27-9 +- Update javapackages test plan to f42 + +* Fri Jul 19 2024 Fedora Release Engineering - 1.27-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 1.27-3 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 1.27-2 +- bump of release for for java-21-openjdk as system jdk + +* Thu Feb 01 2024 Mikolaj Izdebski - 1.27-1 +- Update to upstream version 1.27 + +* Thu Jan 25 2024 Fedora Release Engineering - 1.26-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.26-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Sep 20 2023 Mikolaj Izdebski - 1.26-17 +- Rebuild to regenerate auto-Requires on java + +* Fri Sep 01 2023 Mikolaj Izdebski - 1.26-16 +- Rebuild + +* Thu Aug 10 2023 Marian Koncek - 1.26-15 +- Use implicit maven toolchains + +* Fri Jul 21 2023 Fedora Release Engineering - 1.26-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jan 20 2023 Fedora Release Engineering - 1.26-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 1.26-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Apr 29 2022 Mikolaj Izdebski - 1.26-11 +- Add missing test dependency on JUnit 4 + +* Sat Feb 05 2022 Jiri Vanek - 1.26-10 +- Rebuilt for java-17-openjdk as system jdk + +* Fri Jan 21 2022 Fedora Release Engineering - 1.26-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.26-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 1.26-7 +- Bootstrap build +- Non-bootstrap build + +* Wed Jan 27 2021 Fedora Release Engineering - 1.26-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 1.26-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jul 11 2020 Jiri Vanek - 1.26-4 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Thu Jan 30 2020 Fedora Release Engineering - 1.26-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jan 25 2020 Mikolaj Izdebski - 1.26-3 - Build with OpenJDK 8 * Tue Nov 05 2019 Mikolaj Izdebski - 1.26-2 - Mass rebuild for javapackages-tools 201902 +* Fri Jul 26 2019 Fedora Release Engineering - 1.26-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Wed Jul 17 2019 Marian Koncek - 1.26-1 - Update to upstream version 1.26 +* Wed Jul 03 2019 Filipe Rosset - 1.26-1 +- Update to version 1.26, fixes rhbz#1724390 + +* Sat Jun 08 2019 Fabio Valentini - 1.25-1 +- Update to version 1.25. + * Fri May 24 2019 Mikolaj Izdebski - 1.22-10 - Mass rebuild for javapackages-tools 201901 +* Sat Feb 02 2019 Fedora Release Engineering - 1.22-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1.22-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 1.22-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild