From f9e3bcf59d886454bb43d71048703fdf258a2b31 Mon Sep 17 00:00:00 2001 From: CBL-Mariner Servicing Account Date: Tue, 13 Feb 2024 06:23:48 +0000 Subject: [PATCH 1/6] Upgrade plexus-sec-dispatcher to 2 3.0 package upgrade --- .../plexus-sec-dispatcher.signatures.json | 10 +++++----- SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.spec | 7 +++++-- cgmanifest.json | 4 ++-- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.signatures.json b/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.signatures.json index c1a295c0bc0..50e269f7793 100644 --- a/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.signatures.json +++ b/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.signatures.json @@ -1,6 +1,6 @@ { - "Signatures": { - "plexus-sec-dispatcher-1.4.tar.gz": "e59fe85fa69b4b2345987a3619d17c57e5d6d595b3d2c14192a58a17ab278766", - "LICENSE-2.0.txt": "cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30" - } -} + "Signatures": { + "LICENSE-2.0.txt": "cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30", + "plexus-sec-dispatcher-2.tar.gz": "21ab7548945f3d6a2cb599fe198575f11ea18841a85d5bbe3d62fa6f9183d39a" + } +} \ No newline at end of file diff --git a/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.spec b/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.spec index bdbbe44d038..a3d9acbddfe 100644 --- a/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.spec +++ b/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.spec @@ -2,8 +2,8 @@ Summary: Plexus Security Dispatcher Component Name: plexus-sec-dispatcher -Version: 1.4 -Release: 2%{?dist} +Version: 2 +Release: 1%{?dist} License: Apache-2.0 Vendor: Microsoft Corporation Distribution: Azure Linux @@ -52,6 +52,9 @@ cp %{SOURCE1} . %license LICENSE-2.0.txt %changelog +* Mon Apr 01 2024 CBL-Mariner Servicing Account - 2-1 +- Auto-upgrade to 2 - 3.0 package upgrade + * Fri Feb 23 2024 Riken Maharjan - 1.4-2 - Rebuilt with msopenjdk-17 - change source, target and release version diff --git a/cgmanifest.json b/cgmanifest.json index f7c38e955ec..7365a757084 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -20963,8 +20963,8 @@ "type": "other", "other": { "name": "plexus-sec-dispatcher", - "version": "1.4", - "downloadUrl": "https://github.com/codehaus-plexus/plexus-sec-dispatcher/archive/refs/tags/sec-dispatcher-1.4.tar.gz" + "version": "2", + "downloadUrl": "https://github.com/codehaus-plexus/plexus-sec-dispatcher/archive/refs/tags/plexus-sec-dispatcher-2.0.tar.gz" } } }, From 604f9abc9d51cf3844ddeb75e8d58b786fe8706e Mon Sep 17 00:00:00 2001 From: Saul Paredes Date: Wed, 14 Feb 2024 21:43:59 -0800 Subject: [PATCH 2/6] wip adapt to fedora spec --- .../plexus-sec-dispatcher.signatures.json | 4 +- .../plexus-sec-dispatcher.spec | 38 ++++++++++++------- 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.signatures.json b/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.signatures.json index 50e269f7793..3a6478c746e 100644 --- a/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.signatures.json +++ b/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.signatures.json @@ -1,6 +1,6 @@ { "Signatures": { "LICENSE-2.0.txt": "cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30", - "plexus-sec-dispatcher-2.tar.gz": "21ab7548945f3d6a2cb599fe198575f11ea18841a85d5bbe3d62fa6f9183d39a" + "plexus-sec-dispatcher-2.0.tar.gz": "21ab7548945f3d6a2cb599fe198575f11ea18841a85d5bbe3d62fa6f9183d39a" } -} \ No newline at end of file +} diff --git a/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.spec b/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.spec index a3d9acbddfe..b6f775a421b 100644 --- a/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.spec +++ b/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.spec @@ -2,29 +2,29 @@ Summary: Plexus Security Dispatcher Component Name: plexus-sec-dispatcher -Version: 2 +Version: 2.0 Release: 1%{?dist} License: Apache-2.0 Vendor: Microsoft Corporation Distribution: Azure Linux Group: Development/Libraries/Java URL: https://github.com/codehaus-plexus/plexus-sec-dispatcher -Source0: %{url}/archive/refs/tags/sec-dispatcher-%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: %{url}/archive/refs/tags/plexus-sec-dispatcher-%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: https://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 +# Patch0: %{name}-pom.patch BuildArch: noarch %if %{with bootstrap} BuildRequires: javapackages-bootstrap -BuildRequires: javapackages-local-bootstrap +BuildRequires: javapackages-local-bootstrap %else -BuildRequires: mvn(org.codehaus.plexus:plexus-utils) -BuildRequires: mvn(org.sonatype.plexus:plexus-cipher) +BuildRequires: maven-local 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.eclipse.sisu:sisu-maven-plugin) +BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: mvn(org.sonatype.plexus:plexus-cipher) %endif %description @@ -32,24 +32,36 @@ Plexus Security Dispatcher Component %{?module_package} %{?javadoc_package} + +echo here1 %prep -%setup -q -%patch 0 -p1 +%autosetup -n %{name}-%{name}-%{version} +echo here2 + cp %{SOURCE1} . %pom_remove_parent -%pom_xpath_inject "pom:dependency[pom:artifactId='junit']" "test" +%pom_xpath_inject 'pom:project' 'org.codehaus.plexus' %mvn_file : plexus/%{name} + +echo here3 + +%mvn_alias org.codehaus.plexus: org.sonatype.plexus: %build -%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 +%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 + %install %mvn_install -%files -n %{?module_prefix}%{name} -f .mfiles + + +%files -f .mfiles %license LICENSE-2.0.txt + +echo here4 %changelog * Mon Apr 01 2024 CBL-Mariner Servicing Account - 2-1 From 4d9251a884e896e22af3ce904ce602074aa4cca1 Mon Sep 17 00:00:00 2001 From: Saul Paredes Date: Fri, 16 Feb 2024 15:58:28 -0800 Subject: [PATCH 3/6] tring things --- SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.spec b/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.spec index b6f775a421b..f21b07e651c 100644 --- a/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.spec +++ b/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.spec @@ -15,6 +15,9 @@ Source1: https://www.apache.org/licenses/LICENSE-2.0.txt # Patch0: %{name}-pom.patch BuildArch: noarch +# BuildRequires: plexus-cipher +# BuildRequires: mvn(org.sonatype.plexus:plexus-cipher) + %if %{with bootstrap} BuildRequires: javapackages-bootstrap BuildRequires: javapackages-local-bootstrap @@ -50,6 +53,9 @@ cp %{SOURCE1} . echo here3 %mvn_alias org.codehaus.plexus: org.sonatype.plexus: + +# %pom_remove_dep org.codehaus.plexus:plexus-cipher +# %pom_add_dep org.codehaus.plexus:plexus-cipher %build %mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 From 9f4053d052b4ba4ca9ff9545036ed11199db0316 Mon Sep 17 00:00:00 2001 From: Saul Paredes Date: Mon, 1 Apr 2024 16:57:45 -0700 Subject: [PATCH 4/6] remove outdated patch --- .../plexus-sec-dispatcher-pom.patch | 43 ------------------- .../plexus-sec-dispatcher.spec | 17 -------- 2 files changed, 60 deletions(-) delete mode 100644 SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher-pom.patch diff --git a/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher-pom.patch b/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher-pom.patch deleted file mode 100644 index e732f301de3..00000000000 --- a/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher-pom.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 14e75895ba19a3a42e5e4ece78ff6fd1e5fb41f3 Mon Sep 17 00:00:00 2001 -From: Mykhailo Bykhovtsev -Date: Thu, 23 Mar 2023 10:10:01 -0700 -Subject: [PATCH] patching pom file - ---- - pom.xml | 12 ++---------- - 1 file changed, 2 insertions(+), 10 deletions(-) - -diff --git a/pom.xml b/pom.xml -index 1eb2158..7e7ac5d 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -25,24 +25,16 @@ - - - org.codehaus.plexus -- plexus-maven-plugin -+ plexus-component-metadata - 1.3.5 - - - -- descriptor -+ generate-metadata - - - - -- -- maven-compiler-plugin -- -- -- 1.4 -- 1.4 -- -- - - org.codehaus.modello - modello-maven-plugin --- -2.38.0.windows.1 - diff --git a/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.spec b/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.spec index f21b07e651c..d522b59aa89 100644 --- a/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.spec +++ b/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.spec @@ -11,13 +11,8 @@ Group: Development/Libraries/Java URL: https://github.com/codehaus-plexus/plexus-sec-dispatcher Source0: %{url}/archive/refs/tags/plexus-sec-dispatcher-%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: https://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 BuildArch: noarch -# BuildRequires: plexus-cipher -# BuildRequires: mvn(org.sonatype.plexus:plexus-cipher) - %if %{with bootstrap} BuildRequires: javapackages-bootstrap BuildRequires: javapackages-local-bootstrap @@ -35,13 +30,9 @@ Plexus Security Dispatcher Component %{?module_package} %{?javadoc_package} - -echo here1 %prep %autosetup -n %{name}-%{name}-%{version} - -echo here2 cp %{SOURCE1} . @@ -50,12 +41,7 @@ cp %{SOURCE1} . %mvn_file : plexus/%{name} -echo here3 - %mvn_alias org.codehaus.plexus: org.sonatype.plexus: - -# %pom_remove_dep org.codehaus.plexus:plexus-cipher -# %pom_add_dep org.codehaus.plexus:plexus-cipher %build %mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 @@ -63,11 +49,8 @@ echo here3 %install %mvn_install - %files -f .mfiles %license LICENSE-2.0.txt - -echo here4 %changelog * Mon Apr 01 2024 CBL-Mariner Servicing Account - 2-1 From 213e3f5beca2fe4cbfb494ef40ab63e191ade858 Mon Sep 17 00:00:00 2001 From: Saul Paredes Date: Wed, 3 Apr 2024 13:59:50 -0700 Subject: [PATCH 5/6] update manifest --- SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.spec | 4 ++-- cgmanifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.spec b/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.spec index d522b59aa89..1901734eb2c 100644 --- a/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.spec +++ b/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.spec @@ -9,7 +9,7 @@ Vendor: Microsoft Corporation Distribution: Azure Linux Group: Development/Libraries/Java URL: https://github.com/codehaus-plexus/plexus-sec-dispatcher -Source0: %{url}/archive/refs/tags/plexus-sec-dispatcher-%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: %{url}/archive/refs/tags/%{name}-%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: https://www.apache.org/licenses/LICENSE-2.0.txt BuildArch: noarch @@ -54,7 +54,7 @@ cp %{SOURCE1} . %changelog * Mon Apr 01 2024 CBL-Mariner Servicing Account - 2-1 -- Auto-upgrade to 2 - 3.0 package upgrade +- Auto-upgrade to 2.0 - 3.0 package upgrade * Fri Feb 23 2024 Riken Maharjan - 1.4-2 - Rebuilt with msopenjdk-17 diff --git a/cgmanifest.json b/cgmanifest.json index 7365a757084..e84e4889d91 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -20963,7 +20963,7 @@ "type": "other", "other": { "name": "plexus-sec-dispatcher", - "version": "2", + "version": "2.0", "downloadUrl": "https://github.com/codehaus-plexus/plexus-sec-dispatcher/archive/refs/tags/plexus-sec-dispatcher-2.0.tar.gz" } } From 513ee2dc9ceec98662b96ada90ec88b0208724cc Mon Sep 17 00:00:00 2001 From: Saul Paredes Date: Wed, 3 Apr 2024 14:59:22 -0700 Subject: [PATCH 6/6] update changelog --- SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.spec b/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.spec index 1901734eb2c..a6c81ad7329 100644 --- a/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.spec +++ b/SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.spec @@ -53,8 +53,9 @@ cp %{SOURCE1} . %license LICENSE-2.0.txt %changelog -* Mon Apr 01 2024 CBL-Mariner Servicing Account - 2-1 +* Wed Apr 03 2024 CBL-Mariner Servicing Account - 2.0-1 - Auto-upgrade to 2.0 - 3.0 package upgrade +- Import prep and build section from Fedora 40 (license: MIT). * Fri Feb 23 2024 Riken Maharjan - 1.4-2 - Rebuilt with msopenjdk-17