From 6c37687bae5d178aff1d29c4bd157859584b4b72 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 1 Feb 2024 11:13:00 +0100 Subject: [PATCH] Update to upstream version 1.27 --- .gitignore | 1 + ...TH-env-variable-instead-of-JAVA_HOME.patch | 20 +++++++++---------- plexus-interpolation.spec | 10 +++++++--- sources | 2 +- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 98d771a..a2294ff 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /plexus-interpolation-1.22.tar.gz /plexus-interpolation-1.25.tar.gz /plexus-interpolation-1.26.tar.gz +/plexus-interpolation-1.27.tar.gz 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 daf4bab..8e0fd4e 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.spec b/plexus-interpolation.spec index f265bbe..14e0e81 100644 --- a/plexus-interpolation.spec +++ b/plexus-interpolation.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: plexus-interpolation -Version: 1.26 -Release: 19%{?dist} +Version: 1.27 +Release: 1%{?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: Apache-2.0 AND Apache-1.1 AND MIT @@ -19,8 +19,9 @@ 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 @@ -48,6 +49,9 @@ related projects. %files -f .mfiles %changelog +* 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 diff --git a/sources b/sources index 90eb77e..4317d16 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (plexus-interpolation-1.26.tar.gz) = 3503cb2b8d9331b9cc1effe271317c69dc8969775dac59b61b82e72a7924b63bae7414b61d9f2693e6a539863a10d53177603979c2529b01052f00e65891dc54 +SHA512 (plexus-interpolation-1.27.tar.gz) = bf67f564312b238d4608ef827ca808a60b77006f12127089afe9ae4691ded994ec0fa626ebc65fde14b56223bbb18cc1c0204a1371eacf18acaf6d9a4b2c2a28