You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2021/09/11 08:53:05 UTC
[maven] branch MNG-7246-plexus-sec-dispatcher updated (f4e01a2 ->
067171d)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MNG-7246-plexus-sec-dispatcher
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard f4e01a2 [MNG-7246] Upgrade plexus-sec-dispatcher
new 067171d [MNG-7246] Upgrade Plexus Cipher and Sec Dispatcher to 2.0
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (f4e01a2)
\
N -- N -- N refs/heads/MNG-7246-plexus-sec-dispatcher (067171d)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
[maven] 01/01: [MNG-7246] Upgrade Plexus Cipher and Sec Dispatcher
to 2.0
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MNG-7246-plexus-sec-dispatcher
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 067171d28acc7399f421c668254148394d7f78f7
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Fri Sep 10 14:33:45 2021 +0200
[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
---
.../lifecycle-executor/project-with-inheritance/pom.xml | 2 +-
.../plugin-manager/project-with-inheritance/pom.xml | 2 +-
.../test/resources/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 37a7331..5b51ce0 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 37a7331..5b51ce0 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 d8fdef9..39e1654 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 b83dd0e..f106605 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -123,7 +123,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 c873740..be3107e 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 4212a53..4975091 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,8 +62,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.7.1</resolverVersion>
@@ -396,15 +396,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>
@@ -655,15 +649,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>