You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2020/04/09 11:20:34 UTC
[maven] branch MNG-6886-plexus-cipher-1.8 created (now a18d03f)
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a change to branch MNG-6886-plexus-cipher-1.8
in repository https://gitbox.apache.org/repos/asf/maven.git.
at a18d03f [MNG-6886] upgrade plexus-cipher to 1.8 and update changed groupId
This branch includes the following new commits:
new a18d03f [MNG-6886] upgrade plexus-cipher to 1.8 and update changed groupId
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.
[maven] 01/01: [MNG-6886] upgrade plexus-cipher to 1.8 and update
changed groupId
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch MNG-6886-plexus-cipher-1.8
in repository https://gitbox.apache.org/repos/asf/maven.git
commit a18d03f817b086ccd3f58145b055fe19f1cb5f09
Author: olivier lamy <ol...@apache.org>
AuthorDate: Thu Apr 9 21:20:04 2020 +1000
[MNG-6886] upgrade plexus-cipher to 1.8 and update changed groupId
Signed-off-by: olivier lamy <ol...@apache.org>
---
apache-maven/pom.xml | 4 ++++
maven-compat/pom.xml | 5 +++++
maven-core/pom.xml | 5 +++++
maven-embedder/pom.xml | 2 +-
pom.xml | 36 ++++++++++++++++++++++++++++++++++--
5 files changed, 49 insertions(+), 3 deletions(-)
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index a73163f..96f72a5 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -113,6 +113,10 @@ under the License.
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-cipher</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index c94c6a8..c838401 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -100,6 +100,11 @@ under the License.
</dependency>
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-cipher</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
<scope>test</scope>
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index cd363f5..43a6bee 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -119,6 +119,11 @@ under the License.
<artifactId>plexus-classworlds</artifactId>
</dependency>
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-cipher</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index f4982da..05db498 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -135,7 +135,7 @@ under the License.
<artifactId>plexus-sec-dispatcher</artifactId>
</dependency>
<dependency>
- <groupId>org.sonatype.plexus</groupId>
+ <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-cipher</artifactId>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index d718abc..96889e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@ under the License.
<wagonVersion>3.3.4</wagonVersion>
<jsoupVersion>1.12.1</jsoupVersion>
<securityDispatcherVersion>1.4</securityDispatcherVersion>
- <cipherVersion>1.7</cipherVersion>
+ <cipherVersion>1.8</cipherVersion>
<modelloVersion>1.11</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
<resolverVersion>1.4.1</resolverVersion>
@@ -395,9 +395,15 @@ under the License.
<groupId>org.sonatype.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.sonatype.plexus</groupId>
+ <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-cipher</artifactId>
<version>${cipherVersion}</version>
</dependency>
@@ -617,6 +623,32 @@ under the License.
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <phase>validate</phase>
+ <id>ensure-no-org.sonatype:plexus-cipher</id>
+ <configuration>
+ <rules>
+ <bannedDependencies>
+ <excludes>
+ <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.
+ </message>
+ </bannedDependencies>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>