From 2990f9ee5896f8f2d7acf3d2f33a146567c686bc Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:06:44 +0000 Subject: [PATCH 1/9] Switch to SHA512 sources --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 3238668..7b64611 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -3dc76e0f6936addf5e4fbeb9551ab107 sonatype-sisu-build-api-plexus-build-api-0.0.7-0-g883ea67.tar.gz -3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt +SHA512 (sonatype-sisu-build-api-plexus-build-api-0.0.7-0-g883ea67.tar.gz) = 3c8d73b390937a33da496c1d43d38c6ee4ed50951859654449c84a38f30e6ed15b218680fd16e747e33928cfc944d13577044edb399110e65f199b7f54702549 +SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From e79ad5afda28d90f7408f2e2d415f52ab53e909d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:28 +0200 Subject: [PATCH 2/9] Mass rebuild for javapackages-tools 201901 --- plexus-build-api.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-build-api.spec b/plexus-build-api.spec index 1edef99..c18df71 100644 --- a/plexus-build-api.spec +++ b/plexus-build-api.spec @@ -1,6 +1,6 @@ Name: plexus-build-api Version: 0.0.7 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Plexus Build API License: ASL 2.0 URL: https://github.com/sonatype/sisu-build-api @@ -49,6 +49,9 @@ cp -p %{SOURCE1} . %doc LICENSE-2.0.txt %changelog +* Fri May 24 2019 Mikolaj Izdebski - 0.0.7-21 +- Mass rebuild for javapackages-tools 201901 + * Fri Feb 09 2018 Igor Gnatenko - 0.0.7-20 - Escape macros in %%changelog From 01a54c25f43d47272060b60931a878070071de2b Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 23 Oct 2019 15:22:09 +0200 Subject: [PATCH 3/9] Port to plexus-utils 3.3.0 --- 0000-Port-to-plexus-utils-3.3.0.patch | 54 +++++++++++++++++++++++++++ plexus-build-api.spec | 2 + 2 files changed, 56 insertions(+) create mode 100644 0000-Port-to-plexus-utils-3.3.0.patch diff --git a/0000-Port-to-plexus-utils-3.3.0.patch b/0000-Port-to-plexus-utils-3.3.0.patch new file mode 100644 index 0000000..595639e --- /dev/null +++ b/0000-Port-to-plexus-utils-3.3.0.patch @@ -0,0 +1,54 @@ +From b31cf07a664173c8fa11309859dcb9f6929da578 Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Wed, 23 Oct 2019 15:18:54 +0200 +Subject: [PATCH] Port to plexus-utils 3.3.0 + +--- + .../org/sonatype/plexus/build/incremental/EmptyScanner.java | 3 +++ + .../build/incremental/test/TestIncrementalBuildContext.java | 4 ++++ + 2 files changed, 7 insertions(+) + +diff --git a/src/main/java/org/sonatype/plexus/build/incremental/EmptyScanner.java b/src/main/java/org/sonatype/plexus/build/incremental/EmptyScanner.java +index 7cce37d..2cca716 100644 +--- a/src/main/java/org/sonatype/plexus/build/incremental/EmptyScanner.java ++++ b/src/main/java/org/sonatype/plexus/build/incremental/EmptyScanner.java +@@ -14,6 +14,7 @@ See the Apache License Version 2.0 for the specific language governing permissio + package org.sonatype.plexus.build.incremental; + + import java.io.File; ++import java.util.Comparator; + + import org.codehaus.plexus.util.Scanner; + +@@ -54,4 +55,6 @@ public class EmptyScanner implements Scanner { + return basedir; + } + ++public void setFilenameComparator(Comparator comparator) { ++} + } +diff --git a/src/test/java/org/sonatype/plexus/build/incremental/test/TestIncrementalBuildContext.java b/src/test/java/org/sonatype/plexus/build/incremental/test/TestIncrementalBuildContext.java +index 14c1e26..01a9fba 100644 +--- a/src/test/java/org/sonatype/plexus/build/incremental/test/TestIncrementalBuildContext.java ++++ b/src/test/java/org/sonatype/plexus/build/incremental/test/TestIncrementalBuildContext.java +@@ -18,6 +18,7 @@ import java.io.FileOutputStream; + import java.io.IOException; + import java.io.OutputStream; + import java.util.ArrayList; ++import java.util.Comparator; + import java.util.HashSet; + import java.util.Iterator; + import java.util.List; +@@ -66,6 +67,9 @@ public class TestIncrementalBuildContext implements BuildContext { + public File getBasedir() { + return basedir; + } ++ ++ public void setFilenameComparator(Comparator comparator) { ++ } + } + + private final Set changedFiles; +-- +2.21.0 + diff --git a/plexus-build-api.spec b/plexus-build-api.spec index c18df71..3f36915 100644 --- a/plexus-build-api.spec +++ b/plexus-build-api.spec @@ -12,6 +12,7 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt # Forwarded upstream: https://github.com/sonatype/sisu-build-api/pull/2 Patch0: %{name}-migration-to-component-metadata.patch +Patch1: 0000-Port-to-plexus-utils-3.3.0.patch BuildRequires: maven-local BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) @@ -33,6 +34,7 @@ API documentation for %{name}. cp -p %{SOURCE1} . %patch0 -p1 +%patch1 -p1 %mvn_file : plexus/%{name} From 88a42975b5c4201e240b208e4a6b44f22c33b14f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 26 Oct 2019 12:09:24 +0200 Subject: [PATCH 4/9] Set compiler source/target to 1.6 --- plexus-build-api.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plexus-build-api.spec b/plexus-build-api.spec index 3f36915..5ae0337 100644 --- a/plexus-build-api.spec +++ b/plexus-build-api.spec @@ -36,6 +36,8 @@ cp -p %{SOURCE1} . %patch0 -p1 %patch1 -p1 +%pom_xpath_set "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/*" 1.6 + %mvn_file : plexus/%{name} %build From e03daa01a6bea8126cad29331a860fd8cf171e7f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 5/9] Mass rebuild for javapackages-tools 201902 --- plexus-build-api.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-build-api.spec b/plexus-build-api.spec index 5ae0337..48266c6 100644 --- a/plexus-build-api.spec +++ b/plexus-build-api.spec @@ -1,6 +1,6 @@ Name: plexus-build-api Version: 0.0.7 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Plexus Build API License: ASL 2.0 URL: https://github.com/sonatype/sisu-build-api @@ -53,6 +53,9 @@ cp -p %{SOURCE1} . %doc LICENSE-2.0.txt %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 0.0.7-22 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 0.0.7-21 - Mass rebuild for javapackages-tools 201901 From c0a3d4808e719cc62af6ad8c5a1235826d2abe32 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 16 May 2020 17:20:42 +0200 Subject: [PATCH 6/9] Remove dependency on parent POM --- plexus-build-api.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plexus-build-api.spec b/plexus-build-api.spec index 48266c6..895cdaa 100644 --- a/plexus-build-api.spec +++ b/plexus-build-api.spec @@ -18,7 +18,6 @@ BuildRequires: maven-local BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) -BuildRequires: mvn(org.sonatype.spice:spice-parent:pom:) %description Plexus Build API @@ -36,6 +35,7 @@ cp -p %{SOURCE1} . %patch0 -p1 %patch1 -p1 +%pom_remove_parent %pom_xpath_set "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/*" 1.6 %mvn_file : plexus/%{name} From 2ad3d367706238bc5487bbb6be86a8f9912195b9 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 26 Aug 2020 13:35:11 +0200 Subject: [PATCH 7/9] Add tests jar --- plexus-build-api.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plexus-build-api.spec b/plexus-build-api.spec index 895cdaa..007a4fb 100644 --- a/plexus-build-api.spec +++ b/plexus-build-api.spec @@ -40,6 +40,9 @@ cp -p %{SOURCE1} . %mvn_file : plexus/%{name} +# Install plexus-build-api-tests as well +%mvn_package : + %build %mvn_build From dadfaaf3934918e535e53814c67b29dbfc038553 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:13 +0200 Subject: [PATCH 8/9] Conditionalize buildrequires in bootstrap mode --- plexus-build-api.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plexus-build-api.spec b/plexus-build-api.spec index 007a4fb..9472a2a 100644 --- a/plexus-build-api.spec +++ b/plexus-build-api.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: plexus-build-api Version: 0.0.7 Release: 22%{?dist} @@ -15,9 +17,13 @@ Patch0: %{name}-migration-to-component-metadata.patch Patch1: 0000-Port-to-plexus-utils-3.3.0.patch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +%endif %description Plexus Build API From 596d222884245a4003f0b5e8dd74242426ea0266 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 9/9] Turn off bootstrap mode by default --- plexus-build-api.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plexus-build-api.spec b/plexus-build-api.spec index 9472a2a..b613c21 100644 --- a/plexus-build-api.spec +++ b/plexus-build-api.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: plexus-build-api Version: 0.0.7