Merge modular branch

0001-Use-PATH-env-variable-instead-of-JAVA_HOME.patch

@@ -0,0 +1,39 @@
+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
+

plexus-interpolation.spec

@@ -1,17 +1,26 @@
+%bcond_with bootstrap
+
 Name:           plexus-interpolation
 Version:        1.26
 Release:        6%{?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
-URL:            https://github.com/codehaus-plexus/%{name}
+URL:            https://github.com/codehaus-plexus/plexus-interpolation
 BuildArch:      noarch
 
-Source0:        %{url}/archive/%{name}-%{version}/%{name}-%{version}.tar.gz
+Source0:        https://github.com/codehaus-plexus/plexus-interpolation/archive/plexus-interpolation-%{version}.tar.gz
 
-BuildRequires:  maven-local
+Patch0:         0001-Use-PATH-env-variable-instead-of-JAVA_HOME.patch
+
+BuildRequires:  maven-local-openjdk8
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(junit:junit)
-BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-components:pom:)
+BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+%endif
 
 %description
 Plexus interpolator is the outgrowth of multiple iterations of development
@@ -19,15 +28,13 @@ focused on providing a more modular, flexible interpolation framework for
 the expression language style commonly seen in Maven, Plexus, and other
 related projects.
 
-%package javadoc
+%{?javadoc_package}
-Summary:        Javadoc for %{name}
-
-%description javadoc
-API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-%{name}-%{version}
+%setup -q -n plexus-interpolation-plexus-interpolation-%{version}
+%patch0 -p1
 %pom_remove_plugin :maven-release-plugin
+%pom_remove_plugin :maven-scm-publish-plugin
 
 %build
 %mvn_file : plexus/interpolation
@@ -38,8 +45,6 @@ API documentation for %{name}.
 
 %files -f .mfiles
 
-%files javadoc -f .mfiles-javadoc
-
 %changelog
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.26-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
@@ -53,15 +58,27 @@ API documentation for %{name}.
 * 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
+- Build with OpenJDK 8
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.26-2
+- 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
+- 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
+- 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