[AUTOPATCHER-CORE] Upgrade plexus-sec-dispatcher to 2 3.0 package upg…

…rade (#7852)

Co-authored-by: Saul Paredes <[email protected]>

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.0.tar.gz": "21ab7548945f3d6a2cb599fe198575f11ea18841a85d5bbe3d62fa6f9183d39a"
+  }
 }

SPECS/plexus-sec-dispatcher/plexus-sec-dispatcher.spec

@@ -2,29 +2,27 @@
 
 Summary:        Plexus Security Dispatcher Component
 Name:           plexus-sec-dispatcher
-Version:        1.4
-Release:        2%{?dist}
+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/%{name}-%{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
 
 %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
@@ -34,24 +32,31 @@ Plexus Security Dispatcher Component
 %{?javadoc_package}
 
 %prep
-%setup -q
-%patch 0 -p1
-
+%autosetup -n %{name}-%{name}-%{version}
+
 cp %{SOURCE1} .
 
 %pom_remove_parent
-%pom_xpath_inject "pom:dependency[pom:artifactId='junit']" "<scope>test</scope>"
+%pom_xpath_inject 'pom:project' '<groupId>org.codehaus.plexus</groupId>'
 
 %mvn_file : plexus/%{name}
+
+%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
 
 %changelog
+* Wed Apr 03 2024 CBL-Mariner Servicing Account <[email protected]> - 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 <[email protected]> - 1.4-2
 - Rebuilt with msopenjdk-17
 - change source, target and release version

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.0",
+          "downloadUrl": "https://github.com/codehaus-plexus/plexus-sec-dispatcher/archive/refs/tags/plexus-sec-dispatcher-2.0.tar.gz"
         }
       }
     },