From c76c9d9116b4626c20abe26c025623797249f997 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Fri, 10 Sep 2021 14:33:45 +0200
Subject: [PATCH] [MNG-7246] Upgrade Plexus Cipher and Sec Dispatcher to 2.0

Both plexus-cipher and plexus-sec-dispatcher have had a
groupId change, but plexus-cipher change was implemented
for 1.8 version.

Latest versions of artifacts are 2.0. This PR
ups plexus-cipher version and adds proper changes
for plexus-sec-dispatcher groupId change.

This closes #534
---
 .../project-with-inheritance/pom.xml            |  2 +-
 .../project-with-inheritance/pom.xml            |  2 +-
 .../org/apache/maven/lifecycle/pom.xml          |  2 +-
 maven-embedder/pom.xml                          |  2 +-
 maven-settings-builder/pom.xml                  |  2 +-
 pom.xml                                         | 17 ++++++-----------
 6 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml b/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml
index c9a894d905..7d0850e483 100644
--- a/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml
+++ b/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml
@@ -473,7 +473,7 @@ under the License.
         <version>${mercuryMp3Version}</version>
       </dependency>
       <dependency>
-        <groupId>org.sonatype.plexus</groupId>
+        <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-sec-dispatcher</artifactId>
         <version>${securityDispatcherVersion}</version>
       </dependency>
diff --git a/maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml b/maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml
index c9a894d905..7d0850e483 100644
--- a/maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml
+++ b/maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml
@@ -473,7 +473,7 @@ under the License.
         <version>${mercuryMp3Version}</version>
       </dependency>
       <dependency>
-        <groupId>org.sonatype.plexus</groupId>
+        <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-sec-dispatcher</artifactId>
         <version>${securityDispatcherVersion}</version>
       </dependency>
diff --git a/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml b/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml
index 531e5510c5..5caaac1ba2 100644
--- a/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml
+++ b/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml
@@ -473,7 +473,7 @@ under the License.
         <version>${mercuryMp3Version}</version>
       </dependency>
       <dependency>
-        <groupId>org.sonatype.plexus</groupId>
+        <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-sec-dispatcher</artifactId>
         <version>${securityDispatcherVersion}</version>
       </dependency>
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index e0b6479020..fc90bbc134 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -131,7 +131,7 @@ under the License.
       <artifactId>org.eclipse.sisu.plexus</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.sonatype.plexus</groupId>
+      <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-sec-dispatcher</artifactId>
     </dependency>
     <dependency>
diff --git a/maven-settings-builder/pom.xml b/maven-settings-builder/pom.xml
index a85c8a8c11..dd0c09bb9c 100644
--- a/maven-settings-builder/pom.xml
+++ b/maven-settings-builder/pom.xml
@@ -62,7 +62,7 @@ under the License.
       <artifactId>maven-settings</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.sonatype.plexus</groupId>
+      <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-sec-dispatcher</artifactId>
     </dependency>
   </dependencies>
diff --git a/pom.xml b/pom.xml
index 4a4f69ba3f..40a7ee81ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,8 +61,8 @@ under the License.
     <sisuInjectVersion>0.3.4</sisuInjectVersion>
     <wagonVersion>3.4.3</wagonVersion>
     <jsoupVersion>1.12.1</jsoupVersion>
-    <securityDispatcherVersion>1.4</securityDispatcherVersion>
-    <cipherVersion>1.8</cipherVersion>
+    <securityDispatcherVersion>2.0</securityDispatcherVersion>
+    <cipherVersion>2.0</cipherVersion>
     <modelloVersion>1.11</modelloVersion>
     <jxpathVersion>1.3</jxpathVersion>
     <resolverVersion>1.6.3</resolverVersion>
@@ -402,15 +402,9 @@ under the License.
         <version>${commonsLangVersion}</version>
       </dependency>
       <dependency>
-        <groupId>org.sonatype.plexus</groupId>
+        <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-sec-dispatcher</artifactId>
         <version>${securityDispatcherVersion}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.sonatype.plexus</groupId>
-            <artifactId>plexus-cipher</artifactId>
-          </exclusion>
-        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
@@ -641,15 +635,16 @@ under the License.
               <goal>enforce</goal>
             </goals>
             <phase>validate</phase>
-            <id>ensure-no-org.sonatype:plexus-cipher</id>
+            <id>ensure-no-sonatype-cipher-and-sec-dispatcher</id>
             <configuration>
               <rules>
                 <bannedDependencies>
                   <excludes>
+                    <exclude>org.sonatype.plexus:plexus-sec-dispatcher</exclude>
                     <exclude>org.sonatype.plexus:plexus-cipher</exclude>
                   </excludes>
                   <message>
-                    ensure no more org.sonatype.plexus:plexus-cipher as groupId changed. you have to add some exclusions.
+                    ensure no more org.sonatype.plexus:plexus-cipher and org.sonatype.plexus:plexus-sec-dispatcher.
                   </message>
                 </bannedDependencies>
               </rules>