From 083b7f554fa5252eded68f2eb1831e3115f4d879 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:37 +0200 Subject: [PATCH 01/11] Mass rebuild for javapackages-tools 201901 --- plexus-sec-dispatcher.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-sec-dispatcher.spec b/plexus-sec-dispatcher.spec index 7f5cf75..a19773d 100644 --- a/plexus-sec-dispatcher.spec +++ b/plexus-sec-dispatcher.spec @@ -1,6 +1,6 @@ Name: plexus-sec-dispatcher Version: 1.4 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Plexus Security Dispatcher Component License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-sec-dispatcher @@ -54,6 +54,9 @@ cp %{SOURCE1} . %license LICENSE-2.0.txt %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1.4-27 +- Mass rebuild for javapackages-tools 201901 + * Tue Jul 31 2018 Michael Simacek - 1.4-26 - Include license file From d6c6666a272108e581aa6460eac5d68908f6acdb Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 13:42:24 +0200 Subject: [PATCH 02/11] Use javadoc_package macro --- plexus-sec-dispatcher.spec | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/plexus-sec-dispatcher.spec b/plexus-sec-dispatcher.spec index a19773d..5d5d8e5 100644 --- a/plexus-sec-dispatcher.spec +++ b/plexus-sec-dispatcher.spec @@ -26,15 +26,10 @@ BuildRequires: mvn(org.sonatype.spice:spice-parent:pom:) %description Plexus Security Dispatcher Component -%package javadoc -Summary: Javadoc for %{name} - -%description javadoc -API documentation for %{name}. +%{?javadoc_package} %prep %setup -q - %patch0 -p1 cp %{SOURCE1} . @@ -50,9 +45,6 @@ cp %{SOURCE1} . %files -f .mfiles %license LICENSE-2.0.txt -%files javadoc -f .mfiles-javadoc -%license LICENSE-2.0.txt - %changelog * Fri May 24 2019 Mikolaj Izdebski - 1.4-27 - Mass rebuild for javapackages-tools 201901 From 64389485bc1149177156742c1c5e4ec3a8ce47e7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 13:43:08 +0200 Subject: [PATCH 03/11] Declare module package --- plexus-sec-dispatcher.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plexus-sec-dispatcher.spec b/plexus-sec-dispatcher.spec index 5d5d8e5..38bd61c 100644 --- a/plexus-sec-dispatcher.spec +++ b/plexus-sec-dispatcher.spec @@ -26,6 +26,7 @@ BuildRequires: mvn(org.sonatype.spice:spice-parent:pom:) %description Plexus Security Dispatcher Component +%{?module_package} %{?javadoc_package} %prep @@ -42,7 +43,7 @@ cp %{SOURCE1} . %install %mvn_install -%files -f .mfiles +%files -n %{?module_prefix}%{name -f .mfiles %license LICENSE-2.0.txt %changelog From 6786b6498e37d54aa8a52998b0b555530321bf76 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 13:43:43 +0200 Subject: [PATCH 04/11] Namespace buildrequires --- plexus-sec-dispatcher.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plexus-sec-dispatcher.spec b/plexus-sec-dispatcher.spec index 38bd61c..0f75fc2 100644 --- a/plexus-sec-dispatcher.spec +++ b/plexus-sec-dispatcher.spec @@ -19,8 +19,8 @@ BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin) 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.plexus:plexus-cipher) +BuildRequires: %{?module_prefix}mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: %{?module_prefix}mvn(org.sonatype.plexus:plexus-cipher) BuildRequires: mvn(org.sonatype.spice:spice-parent:pom:) %description From 29a761cfc3947fc2a7968fcaf9ce299c136e1a57 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 13:49:39 +0200 Subject: [PATCH 05/11] Fix a typo --- plexus-sec-dispatcher.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plexus-sec-dispatcher.spec b/plexus-sec-dispatcher.spec index 0f75fc2..322c624 100644 --- a/plexus-sec-dispatcher.spec +++ b/plexus-sec-dispatcher.spec @@ -43,7 +43,7 @@ cp %{SOURCE1} . %install %mvn_install -%files -n %{?module_prefix}%{name -f .mfiles +%files -n %{?module_prefix}%{name} -f .mfiles %license LICENSE-2.0.txt %changelog From d19d5273e34e334dd87f69783e73198791523918 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 06/11] Mass rebuild for javapackages-tools 201902 --- plexus-sec-dispatcher.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-sec-dispatcher.spec b/plexus-sec-dispatcher.spec index 322c624..a332a63 100644 --- a/plexus-sec-dispatcher.spec +++ b/plexus-sec-dispatcher.spec @@ -1,6 +1,6 @@ Name: plexus-sec-dispatcher Version: 1.4 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Plexus Security Dispatcher Component License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-sec-dispatcher @@ -47,6 +47,9 @@ cp %{SOURCE1} . %license LICENSE-2.0.txt %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 1.4-28 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 1.4-27 - Mass rebuild for javapackages-tools 201901 From 7db9ce78214f6fed677716a13931529f1f6c5970 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 25 Jan 2020 14:40:08 +0100 Subject: [PATCH 07/11] Build with OpenJDK 8 --- plexus-sec-dispatcher.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plexus-sec-dispatcher.spec b/plexus-sec-dispatcher.spec index a332a63..d973c97 100644 --- a/plexus-sec-dispatcher.spec +++ b/plexus-sec-dispatcher.spec @@ -1,6 +1,6 @@ Name: plexus-sec-dispatcher Version: 1.4 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Plexus Security Dispatcher Component License: ASL 2.0 URL: https://github.com/codehaus-plexus/plexus-sec-dispatcher @@ -14,7 +14,7 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt # Removed maven-compiler-plugin configuration version in the pom as annotations isn't available in version 1.4. Patch0: %{name}-pom.patch -BuildRequires: maven-local +BuildRequires: maven-local-openjdk8 BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) @@ -47,6 +47,9 @@ cp %{SOURCE1} . %license LICENSE-2.0.txt %changelog +* Sat Jan 25 2020 Mikolaj Izdebski - 1.4-29 +- Build with OpenJDK 8 + * Tue Nov 05 2019 Mikolaj Izdebski - 1.4-28 - Mass rebuild for javapackages-tools 201902 From 149dec7d8b1be7288dba9cda74cd513d293d3a16 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 16 May 2020 17:22:04 +0200 Subject: [PATCH 08/11] Remove dependency on parent POM --- plexus-sec-dispatcher.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plexus-sec-dispatcher.spec b/plexus-sec-dispatcher.spec index d973c97..95348a2 100644 --- a/plexus-sec-dispatcher.spec +++ b/plexus-sec-dispatcher.spec @@ -21,7 +21,6 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) BuildRequires: %{?module_prefix}mvn(org.codehaus.plexus:plexus-utils) BuildRequires: %{?module_prefix}mvn(org.sonatype.plexus:plexus-cipher) -BuildRequires: mvn(org.sonatype.spice:spice-parent:pom:) %description Plexus Security Dispatcher Component @@ -35,6 +34,7 @@ Plexus Security Dispatcher Component cp %{SOURCE1} . +%pom_remove_parent %mvn_file : plexus/%{name} %build From 7f402dcbe8529a50aa18d10c5097453997177381 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 20 Jul 2020 13:42:35 +0200 Subject: [PATCH 09/11] Fix junit dependency scope --- plexus-sec-dispatcher.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plexus-sec-dispatcher.spec b/plexus-sec-dispatcher.spec index 95348a2..3bd2d87 100644 --- a/plexus-sec-dispatcher.spec +++ b/plexus-sec-dispatcher.spec @@ -35,6 +35,8 @@ Plexus Security Dispatcher Component cp %{SOURCE1} . %pom_remove_parent +%pom_xpath_inject "pom:dependency[pom:artifactId='junit']" "test" + %mvn_file : plexus/%{name} %build From 3a2901ade40d30b7f8230bb29333b99ed2b72f77 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:13 +0200 Subject: [PATCH 10/11] Conditionalize buildrequires in bootstrap mode --- plexus-sec-dispatcher.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plexus-sec-dispatcher.spec b/plexus-sec-dispatcher.spec index 3bd2d87..6580127 100644 --- a/plexus-sec-dispatcher.spec +++ b/plexus-sec-dispatcher.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: plexus-sec-dispatcher Version: 1.4 Release: 29%{?dist} @@ -15,12 +17,16 @@ Source1: http://www.apache.org/licenses/LICENSE-2.0.txt Patch0: %{name}-pom.patch BuildRequires: maven-local-openjdk8 +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) BuildRequires: %{?module_prefix}mvn(org.codehaus.plexus:plexus-utils) BuildRequires: %{?module_prefix}mvn(org.sonatype.plexus:plexus-cipher) +%endif %description Plexus Security Dispatcher Component From 73d09e8d60d3cbd846ea79c141b4f6d72ba5c747 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 11/11] Turn off bootstrap mode by default --- plexus-sec-dispatcher.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plexus-sec-dispatcher.spec b/plexus-sec-dispatcher.spec index 6580127..9157178 100644 --- a/plexus-sec-dispatcher.spec +++ b/plexus-sec-dispatcher.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: plexus-sec-dispatcher Version: 1.4