Compare commits
No commits in common. "stream-javapackages-bootstrap-202201-rhel-8.9.0" and "c8-stream-3.6" have entirely different histories.
stream-jav
...
c8-stream-
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
|||||||
/plexus-interpolation-1.26.tar.gz
|
SOURCES/plexus-interpolation-1.26.tar.gz
|
||||||
|
1
.plexus-interpolation.metadata
Normal file
1
.plexus-interpolation.metadata
Normal file
@ -0,0 +1 @@
|
|||||||
|
a790bb4bb94a888c61f696477133c27e7e952b61 SOURCES/plexus-interpolation-1.26.tar.gz
|
@ -1,39 +0,0 @@
|
|||||||
From d6623bd636d7f07aa8c73234375bdd11ccd6ee95 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
|
|
||||||
|
|
||||||
---
|
|
||||||
.../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 bc88e8b..6fc4c13 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
|
|
||||||
|
|
||||||
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 );
|
|
||||||
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
|
|
||||||
--- 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
|
|
||||||
|
|
||||||
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 );
|
|
||||||
--
|
|
||||||
2.21.0
|
|
||||||
|
|
@ -1,27 +1,18 @@
|
|||||||
%bcond_with bootstrap
|
|
||||||
|
|
||||||
Name: plexus-interpolation
|
Name: plexus-interpolation
|
||||||
Version: 1.26
|
Version: 1.26
|
||||||
Release: 12%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: Plexus Interpolation API
|
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
|
# 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: ASL 2.0 and ASL 1.1 and MIT
|
||||||
URL: https://github.com/codehaus-plexus/plexus-interpolation
|
URL: https://github.com/codehaus-plexus/plexus-interpolation
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
ExclusiveArch: %{java_arches} noarch
|
|
||||||
|
|
||||||
Source0: https://github.com/codehaus-plexus/plexus-interpolation/archive/plexus-interpolation-%{version}.tar.gz
|
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
|
|
||||||
|
|
||||||
%if %{with bootstrap}
|
|
||||||
BuildRequires: javapackages-bootstrap-openjdk8
|
|
||||||
%else
|
|
||||||
BuildRequires: maven-local-openjdk8
|
BuildRequires: maven-local-openjdk8
|
||||||
BuildRequires: mvn(junit:junit)
|
BuildRequires: mvn(junit:junit)
|
||||||
BuildRequires: mvn(org.codehaus.plexus:plexus-components:pom:)
|
BuildRequires: mvn(org.codehaus.plexus:plexus-components:pom:)
|
||||||
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
||||||
%endif
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Plexus interpolator is the outgrowth of multiple iterations of development
|
Plexus interpolator is the outgrowth of multiple iterations of development
|
||||||
@ -29,12 +20,11 @@ focused on providing a more modular, flexible interpolation framework for
|
|||||||
the expression language style commonly seen in Maven, Plexus, and other
|
the expression language style commonly seen in Maven, Plexus, and other
|
||||||
related projects.
|
related projects.
|
||||||
|
|
||||||
|
%{?module_package}
|
||||||
%{?javadoc_package}
|
%{?javadoc_package}
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n plexus-interpolation-plexus-interpolation-%{version}
|
%setup -q -n plexus-interpolation-plexus-interpolation-%{version}
|
||||||
%patch0 -p1
|
|
||||||
%pom_add_dep junit:junit:4.13.1:test
|
|
||||||
%pom_remove_plugin :maven-release-plugin
|
%pom_remove_plugin :maven-release-plugin
|
||||||
%pom_remove_plugin :maven-scm-publish-plugin
|
%pom_remove_plugin :maven-scm-publish-plugin
|
||||||
|
|
||||||
@ -45,67 +35,21 @@ related projects.
|
|||||||
%install
|
%install
|
||||||
%mvn_install
|
%mvn_install
|
||||||
|
|
||||||
%files -f .mfiles
|
%files -n %{?module_prefix}%{name} -f .mfiles
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* 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
|
|
||||||
- Non-bootstrap build
|
|
||||||
|
|
||||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.26-6
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.26-5
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 1.26-4
|
|
||||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
|
||||||
|
|
||||||
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.26-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.26-3
|
* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.26-3
|
||||||
- Build with OpenJDK 8
|
- Build with OpenJDK 8
|
||||||
|
|
||||||
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.26-2
|
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.26-2
|
||||||
- Mass rebuild for javapackages-tools 201902
|
- Mass rebuild for javapackages-tools 201902
|
||||||
|
|
||||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.26-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 17 2019 Marian Koncek <mkoncek@redhat.com> - 1.26-1
|
* Wed Jul 17 2019 Marian Koncek <mkoncek@redhat.com> - 1.26-1
|
||||||
- Update to upstream version 1.26
|
- Update to upstream version 1.26
|
||||||
|
|
||||||
* Wed Jul 03 2019 Filipe Rosset <rosset.filipe@gmail.com> - 1.26-1
|
|
||||||
- Update to version 1.26, fixes rhbz#1724390
|
|
||||||
|
|
||||||
* Sat Jun 08 2019 Fabio Valentini <decathorpe@gmail.com> - 1.25-1
|
|
||||||
- Update to version 1.25.
|
|
||||||
|
|
||||||
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.22-10
|
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.22-10
|
||||||
- Mass rebuild for javapackages-tools 201901
|
- Mass rebuild for javapackages-tools 201901
|
||||||
|
|
||||||
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.22-11
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.22-10
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.22-9
|
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.22-9
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
|
|
Loading…
Reference in New Issue
Block a user