Compare commits

...

No commits in common. 'c9' and 'c10-beta' have entirely different histories.
c9 ... c10-beta

2
.gitignore vendored

@ -1 +1 @@
SOURCES/plexus-interpolation-1.26.tar.gz
SOURCES/plexus-interpolation-1.27.tar.gz

@ -1 +1 @@
a790bb4bb94a888c61f696477133c27e7e952b61 SOURCES/plexus-interpolation-1.26.tar.gz
2f08fb5b54f6b9691cb3efb00680167ce05d4262 SOURCES/plexus-interpolation-1.27.tar.gz

@ -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 <mizdebsk@redhat.com>
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

@ -1,25 +1,27 @@
%bcond_with bootstrap
Name: plexus-interpolation
Version: 1.26
Release: 13%{?dist}
Version: 1.27
Release: 3%{?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
Patch0: 0001-Use-PATH-env-variable-instead-of-JAVA_HOME.patch
BuildRequires: maven-local-openjdk8
%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
@ -32,7 +34,8 @@ related projects.
%prep
%setup -q -n plexus-interpolation-plexus-interpolation-%{version}
%patch -P 0 -p1
%patch 0 -p1
%pom_add_dep junit:junit:4.13.1:test
%pom_remove_plugin :maven-release-plugin
%pom_remove_plugin :maven-scm-publish-plugin
@ -46,24 +49,50 @@ related projects.
%files -f .mfiles
%changelog
* Thu Nov 21 2024 Marián Konček <mkoncek@redhat.com> - 1.26-13
- Fix patch usage
* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 1.27-3
- Bump release for Aug 2024 java mass rebuild
* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 1.26-12
- Rebuild with regenerated Requires on Java
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.27-2
- Bump release for June 2024 mass rebuild
* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.26-11
- Rebuild to regenerate auto-requires
* Thu Feb 01 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.27-1
- Update to upstream version 1.27
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.26-10
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.26-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.26-9
- Rebuild to workaround DistroBaker issue
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.26-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.26-8
- Bootstrap Maven for CentOS Stream 9
* Wed Sep 20 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.26-17
- Rebuild to regenerate auto-Requires on java
* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.26-16
- Rebuild
* Thu Aug 10 2023 Marian Koncek <mkoncek@redhat.com> - 1.26-15
- Use implicit maven toolchains
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.26-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.26-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.26-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri Apr 29 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.26-11
- Add missing test dependency on JUnit 4
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.26-10
- Rebuilt for java-17-openjdk as system jdk
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.26-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.26-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.26-7
- Bootstrap build

Loading…
Cancel
Save