From be4776631d8befa4d63d1d3aa02f9495cce02558 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:06:44 +0000 Subject: [PATCH 01/10] Switch to SHA512 sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index e0d9cf9..7acf135 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -76937741f334d9650fdb17e7dc2e4cef plexus-interpolation-1.22.tar.gz +SHA512 (plexus-interpolation-1.22.tar.gz) = 46fdd079a45aaa20f066bf843eb810586bd394d3e086b6c05c748b1b323979f8b173949c26d788f6e887e510588cc9fe56fe735778e8b07df7542a8d9d0588d6 From 5951bc7d5c57dcd551e987daa4b85b102e177756 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:34 +0200 Subject: [PATCH 02/10] Mass rebuild for javapackages-tools 201901 --- plexus-interpolation.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-interpolation.spec b/plexus-interpolation.spec index da8973d..3c9031d 100644 --- a/plexus-interpolation.spec +++ b/plexus-interpolation.spec @@ -1,6 +1,6 @@ Name: plexus-interpolation Version: 1.22 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Plexus Interpolation API License: ASL 2.0 and ASL 1.1 and MIT URL: https://github.com/codehaus-plexus/plexus-interpolation @@ -40,6 +40,9 @@ API documentation for %{name}. %files javadoc -f .mfiles-javadoc %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1.22-10 +- Mass rebuild for javapackages-tools 201901 + * Fri Feb 09 2018 Fedora Release Engineering - 1.22-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 5109fec215c97d78ec0c39357dbe0489a2b6481f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 11:25:26 +0200 Subject: [PATCH 03/10] Use javadoc_package macro --- plexus-interpolation.spec | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/plexus-interpolation.spec b/plexus-interpolation.spec index 3c9031d..691f053 100644 --- a/plexus-interpolation.spec +++ b/plexus-interpolation.spec @@ -18,11 +18,7 @@ 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 -Summary: Javadoc for %{name} - -%description javadoc -API documentation for %{name}. +%{?javadoc_package} %prep %setup -q -n %{name}-%{name}-%{version} @@ -37,8 +33,6 @@ API documentation for %{name}. %files -f .mfiles -%files javadoc -f .mfiles-javadoc - %changelog * Fri May 24 2019 Mikolaj Izdebski - 1.22-10 - Mass rebuild for javapackages-tools 201901 From d82273a5e2383dea11747cd9c27fc2f7901f2601 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 11:25:55 +0200 Subject: [PATCH 04/10] Declare module package --- plexus-interpolation.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plexus-interpolation.spec b/plexus-interpolation.spec index 691f053..8cfe4f6 100644 --- a/plexus-interpolation.spec +++ b/plexus-interpolation.spec @@ -18,6 +18,7 @@ focused on providing a more modular, flexible interpolation framework for the expression language style commonly seen in Maven, Plexus, and other related projects. +%{?module_package} %{?javadoc_package} %prep @@ -31,7 +32,7 @@ related projects. %install %mvn_install -%files -f .mfiles +%files -n %{?module_prefix}%{name} -f .mfiles %changelog * Fri May 24 2019 Mikolaj Izdebski - 1.22-10 From c7f9798e5b1a7ef3337553f2dcae5e276f9f75ca Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 17 Jul 2019 16:58:55 +0200 Subject: [PATCH 05/10] Update to upstream version 1.26 --- .gitignore | 1 + plexus-interpolation.spec | 14 ++++++++++---- sources | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index c776534..e24e761 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ sonatype-plexus-interpolation-plexus-interpolation-1.15-0-g9690e65.tar.gz /plexus-interpolation-1.15.tar.gz /plexus-interpolation-1.21.tar.gz /plexus-interpolation-1.22.tar.gz +/plexus-interpolation-1.26.tar.gz diff --git a/plexus-interpolation.spec b/plexus-interpolation.spec index 8cfe4f6..0a6d0ca 100644 --- a/plexus-interpolation.spec +++ b/plexus-interpolation.spec @@ -1,16 +1,18 @@ Name: plexus-interpolation -Version: 1.22 -Release: 10%{?dist} +Version: 1.26 +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: ASL 2.0 and ASL 1.1 and MIT URL: https://github.com/codehaus-plexus/plexus-interpolation BuildArch: noarch -Source0: https://github.com/sonatype/%{name}/archive/%{name}-%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: https://github.com/codehaus-plexus/plexus-interpolation/archive/plexus-interpolation-%{version}.tar.gz BuildRequires: maven-local BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.codehaus.plexus:plexus-components:pom:) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) %description Plexus interpolator is the outgrowth of multiple iterations of development @@ -22,8 +24,9 @@ related projects. %{?javadoc_package} %prep -%setup -q -n %{name}-%{name}-%{version} +%setup -q -n plexus-interpolation-plexus-interpolation-%{version} %pom_remove_plugin :maven-release-plugin +%pom_remove_plugin :maven-scm-publish-plugin %build %mvn_file : plexus/interpolation @@ -35,6 +38,9 @@ related projects. %files -n %{?module_prefix}%{name} -f .mfiles %changelog +* Wed Jul 17 2019 Marian Koncek - 1.26-1 +- Update to upstream version 1.26 + * Fri May 24 2019 Mikolaj Izdebski - 1.22-10 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index 7acf135..90eb77e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (plexus-interpolation-1.22.tar.gz) = 46fdd079a45aaa20f066bf843eb810586bd394d3e086b6c05c748b1b323979f8b173949c26d788f6e887e510588cc9fe56fe735778e8b07df7542a8d9d0588d6 +SHA512 (plexus-interpolation-1.26.tar.gz) = 3503cb2b8d9331b9cc1effe271317c69dc8969775dac59b61b82e72a7924b63bae7414b61d9f2693e6a539863a10d53177603979c2529b01052f00e65891dc54 From f1e9baa7cd3244ae9a6fe3fc28717041f441ce10 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 06/10] Mass rebuild for javapackages-tools 201902 --- plexus-interpolation.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-interpolation.spec b/plexus-interpolation.spec index 0a6d0ca..d5b344b 100644 --- a/plexus-interpolation.spec +++ b/plexus-interpolation.spec @@ -1,6 +1,6 @@ Name: plexus-interpolation Version: 1.26 -Release: 1%{?dist} +Release: 2%{?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 @@ -38,6 +38,9 @@ related projects. %files -n %{?module_prefix}%{name} -f .mfiles %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 1.26-2 +- Mass rebuild for javapackages-tools 201902 + * Wed Jul 17 2019 Marian Koncek - 1.26-1 - Update to upstream version 1.26 From 8a6c0f0d29cec073342d1f58d45d484ed0e10355 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 25 Jan 2020 14:40:08 +0100 Subject: [PATCH 07/10] Build with OpenJDK 8 --- plexus-interpolation.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plexus-interpolation.spec b/plexus-interpolation.spec index d5b344b..5878d8f 100644 --- a/plexus-interpolation.spec +++ b/plexus-interpolation.spec @@ -1,6 +1,6 @@ Name: plexus-interpolation Version: 1.26 -Release: 2%{?dist} +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 @@ -9,7 +9,7 @@ BuildArch: noarch Source0: https://github.com/codehaus-plexus/plexus-interpolation/archive/plexus-interpolation-%{version}.tar.gz -BuildRequires: maven-local +BuildRequires: maven-local-openjdk8 BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.codehaus.plexus:plexus-components:pom:) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) @@ -38,6 +38,9 @@ related projects. %files -n %{?module_prefix}%{name} -f .mfiles %changelog +* Sat Jan 25 2020 Mikolaj Izdebski - 1.26-3 +- Build with OpenJDK 8 + * Tue Nov 05 2019 Mikolaj Izdebski - 1.26-2 - Mass rebuild for javapackages-tools 201902 From b0c39f1527eeec551d6d58134a03207e2be729d6 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 25 Mar 2020 07:00:47 +0100 Subject: [PATCH 08/10] Fix test failures when JAVA_HOME is not set --- ...TH-env-variable-instead-of-JAVA_HOME.patch | 39 +++++++++++++++++++ plexus-interpolation.spec | 3 ++ 2 files changed, 42 insertions(+) create mode 100644 0001-Use-PATH-env-variable-instead-of-JAVA_HOME.patch diff --git a/0001-Use-PATH-env-variable-instead-of-JAVA_HOME.patch b/0001-Use-PATH-env-variable-instead-of-JAVA_HOME.patch new file mode 100644 index 0000000..daf4bab --- /dev/null +++ b/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 +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 + diff --git a/plexus-interpolation.spec b/plexus-interpolation.spec index 5878d8f..da41568 100644 --- a/plexus-interpolation.spec +++ b/plexus-interpolation.spec @@ -9,6 +9,8 @@ BuildArch: 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 BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.codehaus.plexus:plexus-components:pom:) @@ -25,6 +27,7 @@ related projects. %prep %setup -q -n plexus-interpolation-plexus-interpolation-%{version} +%patch0 -p1 %pom_remove_plugin :maven-release-plugin %pom_remove_plugin :maven-scm-publish-plugin From f0e495d8900071fac6ef5ed2f229a7277a549065 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:13 +0200 Subject: [PATCH 09/10] Conditionalize buildrequires in bootstrap mode --- plexus-interpolation.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plexus-interpolation.spec b/plexus-interpolation.spec index da41568..fb0d3a6 100644 --- a/plexus-interpolation.spec +++ b/plexus-interpolation.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: plexus-interpolation Version: 1.26 Release: 3%{?dist} @@ -12,9 +14,13 @@ Source0: https://github.com/codehaus-plexus/plexus-interpolation/archive/ 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.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 From 5ee12347f70da3f8af87e05bdacfd4803d4588ab Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 10/10] Turn off bootstrap mode by default --- plexus-interpolation.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plexus-interpolation.spec b/plexus-interpolation.spec index fb0d3a6..61b7d59 100644 --- a/plexus-interpolation.spec +++ b/plexus-interpolation.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: plexus-interpolation Version: 1.26