diff --git a/0001-Use-PATH-env-variable-instead-of-JAVA_HOME.patch b/0001-Use-PATH-env-variable-instead-of-JAVA_HOME.patch index daf4babfd62190b93e6264da8182e00315a24d73..8e0fd4e590c9c1c306e23f52f9918eaf27031f8b 100644 --- a/0001-Use-PATH-env-variable-instead-of-JAVA_HOME.patch +++ b/0001-Use-PATH-env-variable-instead-of-JAVA_HOME.patch @@ -1,4 +1,4 @@ -From d6623bd636d7f07aa8c73234375bdd11ccd6ee95 Mon Sep 17 00:00:00 2001 +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 @@ -9,31 +9,31 @@ Subject: [PATCH] Use PATH env variable instead of JAVA_HOME 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 bc88e8b..6fc4c13 100644 +index 8a3c76c..4bcff96 100644 --- a/src/test/java/org/codehaus/plexus/interpolation/EnvarBasedValueSourceTest.java +++ b/src/test/java/org/codehaus/plexus/interpolation/EnvarBasedValueSourceTest.java -@@ -87,7 +87,7 @@ public class EnvarBasedValueSourceTest +@@ -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( "Can't run this test until " + realEnvVar + " env variable is set", realValue ); + 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 beaf014..94899d7 100644 +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 -@@ -87,7 +87,7 @@ public class EnvarBasedValueSourceTest +@@ -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( "Can't run this test until " + realEnvVar + " env variable is set", realValue ); + String realValue = System.getenv().get(realEnvVar); + assertNotNull(realValue, "Can't run this test until " + realEnvVar + " env variable is set"); -- -2.21.0 +2.41.0 diff --git a/plexus-interpolation-1.26.tar.gz b/plexus-interpolation-1.26.tar.gz deleted file mode 100644 index b3dd6939f905e1f11f5a28edbb1fbda4c60a926c..0000000000000000000000000000000000000000 Binary files a/plexus-interpolation-1.26.tar.gz and /dev/null differ diff --git a/plexus-interpolation-1.27.tar.gz b/plexus-interpolation-1.27.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..c6dca19222643185f5a5658b2f472f7bfa67d1ce Binary files /dev/null and b/plexus-interpolation-1.27.tar.gz differ diff --git a/plexus-interpolation.spec b/plexus-interpolation.spec index 72d568d2bc8d59e3c866f75811cc912657cc6ae6..ea9ac0d7d724a122bc5b787c5d651fc306fa0d25 100644 --- a/plexus-interpolation.spec +++ b/plexus-interpolation.spec @@ -1,8 +1,8 @@ -%define anolis_release 4 +%define anolis_release 1 %bcond_without bootstrap Name: plexus-interpolation -Version: 1.26 +Version: 1.27 Release: %{anolis_release}%{?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 @@ -16,12 +16,13 @@ Source0: https://github.com/codehaus-plexus/plexus-interpolation/archive/ Patch0: 0001-Use-PATH-env-variable-instead-of-JAVA_HOME.patch %if %{with bootstrap} -BuildRequires: javapackages-bootstrap-openjdk8 +BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local-openjdk8 +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 @@ -48,5 +49,12 @@ related projects. %files -f .mfiles %changelog +* Tue Mar 4 2025 Chang Gao - 1.27-1 +- Update to 1.27 +- Stop using openjdk8 bootstrap +- Add patch to use PATH env variable instead of JAVA_HOME + [Patches cherry-picked from c10s. Original changelog: + - Update to upstream version 1.27 (1.27-1)] + * Sun Apr 16 2023 Funda Wang - 1.26-4 - Import package for anolis 23