From 43ca604d9cf64fe9d379f3e7100218b7c2708d8a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:06:44 +0000 Subject: [PATCH 01/11] Switch to SHA512 sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 0b04675..647e333 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -052bfc5cab808a1fe012a8f7d840f6b0 plexus-cipher-1.7.tar.gz +SHA512 (plexus-cipher-1.7.tar.gz) = fab57bc55519c29f0d0ae6c37a076d1a00b7ecdae50408705e31595d4dae8fd4a771cfe3b28be2afedc0b89dd5270f4b6abafc0b04019f8e406c667bf2f78bea From 2f49f6c8d7a182dc6ae4b3bcdf12308825f015f5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:29 +0200 Subject: [PATCH 02/11] Mass rebuild for javapackages-tools 201901 --- plexus-cipher.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-cipher.spec b/plexus-cipher.spec index 4928f1c..dc009e5 100644 --- a/plexus-cipher.spec +++ b/plexus-cipher.spec @@ -1,6 +1,6 @@ Name: plexus-cipher Version: 1.7 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Plexus Cipher: encryption/decryption Component License: ASL 2.0 # project moved to GitHub and it looks like there is no official website anymore @@ -57,6 +57,9 @@ API documentation for %{name}. %doc LICENSE.txt NOTICE.txt %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1.7-15 +- Mass rebuild for javapackages-tools 201901 + * Fri Feb 09 2018 Fedora Release Engineering - 1.7-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 90e111900f793d1748a4efb14a9777b173f9c154 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 11:17:20 +0200 Subject: [PATCH 03/11] Use javadoc_package macro --- plexus-cipher.spec | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/plexus-cipher.spec b/plexus-cipher.spec index dc009e5..605b912 100644 --- a/plexus-cipher.spec +++ b/plexus-cipher.spec @@ -23,11 +23,7 @@ BuildRequires: mvn(org.sonatype.spice:spice-parent:pom:) %description Plexus Cipher: encryption/decryption Component -%package javadoc -Summary: Javadoc for %{name} - -%description javadoc -API documentation for %{name}. +%{?javadoc_package} %prep %setup -q @@ -51,10 +47,7 @@ API documentation for %{name}. %mvn_install %files -f .mfiles -%doc LICENSE.txt NOTICE.txt - -%files javadoc -f .mfiles-javadoc -%doc LICENSE.txt NOTICE.txt +%license LICENSE.txt NOTICE.txt %changelog * Fri May 24 2019 Mikolaj Izdebski - 1.7-15 From f911c3284fa9efd95f6709a2db7e8da680a0baac Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 11:17:41 +0200 Subject: [PATCH 04/11] Declare module package --- plexus-cipher.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plexus-cipher.spec b/plexus-cipher.spec index 605b912..66a43bb 100644 --- a/plexus-cipher.spec +++ b/plexus-cipher.spec @@ -23,6 +23,7 @@ BuildRequires: mvn(org.sonatype.spice:spice-parent:pom:) %description Plexus Cipher: encryption/decryption Component +%{?module_package} %{?javadoc_package} %prep @@ -46,7 +47,7 @@ Plexus Cipher: encryption/decryption Component %install %mvn_install -%files -f .mfiles +%files -n %{?module_prefix}%{name} -f .mfiles %license LICENSE.txt NOTICE.txt %changelog From 5949034ed35af18b4d3142fc1f4f40a21a28fcfc Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 26 Oct 2019 12:08:20 +0200 Subject: [PATCH 05/11] Set compiler source/target to 1.6 --- plexus-cipher.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plexus-cipher.spec b/plexus-cipher.spec index 66a43bb..fd92eae 100644 --- a/plexus-cipher.spec +++ b/plexus-cipher.spec @@ -39,6 +39,8 @@ Plexus Cipher: encryption/decryption Component %pom_add_dep javax.inject:javax.inject:1:provided %pom_add_dep javax.enterprise:cdi-api:1.0:provided +%pom_xpath_set "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/*" 1.6 + %mvn_file : plexus/%{name} %build From 45dd6de7011be727e885e3e4ba644798aed18c51 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-cipher.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-cipher.spec b/plexus-cipher.spec index fd92eae..5006b68 100644 --- a/plexus-cipher.spec +++ b/plexus-cipher.spec @@ -1,6 +1,6 @@ Name: plexus-cipher Version: 1.7 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Plexus Cipher: encryption/decryption Component License: ASL 2.0 # project moved to GitHub and it looks like there is no official website anymore @@ -53,6 +53,9 @@ Plexus Cipher: encryption/decryption Component %license LICENSE.txt NOTICE.txt %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 1.7-16 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 1.7-15 - Mass rebuild for javapackages-tools 201901 From 385d8472b19e5ad6821a71c5dff9e9ece037e6fe 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-cipher.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plexus-cipher.spec b/plexus-cipher.spec index 5006b68..a3585ca 100644 --- a/plexus-cipher.spec +++ b/plexus-cipher.spec @@ -1,6 +1,6 @@ Name: plexus-cipher Version: 1.7 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Plexus Cipher: encryption/decryption Component License: ASL 2.0 # project moved to GitHub and it looks like there is no official website anymore @@ -13,7 +13,7 @@ BuildArch: noarch # git archive --format tar --prefix=plexus-cipher-1.7/ 0cff29e6b2e | gzip -9 > plexus-cipher-1.7.tar.gz Source0: %{name}-%{version}.tar.gz -BuildRequires: maven-local +BuildRequires: maven-local-openjdk8 BuildRequires: mvn(javax.enterprise:cdi-api) BuildRequires: mvn(javax.inject:javax.inject) BuildRequires: mvn(junit:junit) @@ -53,6 +53,9 @@ Plexus Cipher: encryption/decryption Component %license LICENSE.txt NOTICE.txt %changelog +* Sat Jan 25 2020 Mikolaj Izdebski - 1.7-17 +- Build with OpenJDK 8 + * Tue Nov 05 2019 Mikolaj Izdebski - 1.7-16 - Mass rebuild for javapackages-tools 201902 From 9633d124628d170e9a3eaf3e580a6f43be131573 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 16 May 2020 17:21:13 +0200 Subject: [PATCH 08/11] Remove dependency on parent POM --- plexus-cipher.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plexus-cipher.spec b/plexus-cipher.spec index a3585ca..9f8867e 100644 --- a/plexus-cipher.spec +++ b/plexus-cipher.spec @@ -18,7 +18,6 @@ BuildRequires: mvn(javax.enterprise:cdi-api) BuildRequires: mvn(javax.inject:javax.inject) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.sonatype.plugins:sisu-maven-plugin) -BuildRequires: mvn(org.sonatype.spice:spice-parent:pom:) %description Plexus Cipher: encryption/decryption Component @@ -29,6 +28,8 @@ Plexus Cipher: encryption/decryption Component %prep %setup -q +%pom_remove_parent + # replace %{version}-SNAPSHOT with %{version} %pom_xpath_replace pom:project/pom:version "%{version}" From 134de31c0c46fe6842c734039e8e2131bd89fd35 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 20 Jul 2020 13:42:22 +0200 Subject: [PATCH 09/11] Fix junit dependency scope --- plexus-cipher.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/plexus-cipher.spec b/plexus-cipher.spec index 9f8867e..4912f79 100644 --- a/plexus-cipher.spec +++ b/plexus-cipher.spec @@ -29,6 +29,7 @@ Plexus Cipher: encryption/decryption Component %setup -q %pom_remove_parent +%pom_xpath_inject "pom:dependency[pom:artifactId='junit']" "test" # replace %{version}-SNAPSHOT with %{version} %pom_xpath_replace pom:project/pom:version "%{version}" From 4e068749481a698fe79ad1148bb4719ea1baa1f7 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-cipher.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plexus-cipher.spec b/plexus-cipher.spec index 4912f79..a164f42 100644 --- a/plexus-cipher.spec +++ b/plexus-cipher.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: plexus-cipher Version: 1.7 Release: 17%{?dist} @@ -14,10 +16,14 @@ BuildArch: noarch Source0: %{name}-%{version}.tar.gz BuildRequires: maven-local-openjdk8 +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(javax.enterprise:cdi-api) BuildRequires: mvn(javax.inject:javax.inject) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.sonatype.plugins:sisu-maven-plugin) +%endif %description Plexus Cipher: encryption/decryption Component From 61af67f80db923ad455f4b6ee29eaed67b8c1f10 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-cipher.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plexus-cipher.spec b/plexus-cipher.spec index a164f42..c81986f 100644 --- a/plexus-cipher.spec +++ b/plexus-cipher.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: plexus-cipher Version: 1.7