Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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
This commit is contained in:
Tamas Cservenak 2021-09-10 14:33:45 +02:00 committed by Michael Osipov
parent ccafe8bf46
commit c76c9d9116
6 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml
View File

@ -473,7 +473,7 @@ under the License.
<version>${mercuryMp3Version}</version> <version>${mercuryMp3Version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.sonatype.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-sec-dispatcher</artifactId> <artifactId>plexus-sec-dispatcher</artifactId>
<version>${securityDispatcherVersion}</version> <version>${securityDispatcherVersion}</version>
</dependency> </dependency>

2
maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml
View File

@ -473,7 +473,7 @@ under the License.
<version>${mercuryMp3Version}</version> <version>${mercuryMp3Version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.sonatype.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-sec-dispatcher</artifactId> <artifactId>plexus-sec-dispatcher</artifactId>
<version>${securityDispatcherVersion}</version> <version>${securityDispatcherVersion}</version>
</dependency> </dependency>

2
maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml
View File

@ -473,7 +473,7 @@ under the License.
<version>${mercuryMp3Version}</version> <version>${mercuryMp3Version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.sonatype.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-sec-dispatcher</artifactId> <artifactId>plexus-sec-dispatcher</artifactId>
<version>${securityDispatcherVersion}</version> <version>${securityDispatcherVersion}</version>
</dependency> </dependency>

2
maven-embedder/pom.xml
View File

@ -131,7 +131,7 @@ under the License.
<artifactId>org.eclipse.sisu.plexus</artifactId> <artifactId>org.eclipse.sisu.plexus</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.sonatype.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-sec-dispatcher</artifactId> <artifactId>plexus-sec-dispatcher</artifactId>
</dependency> </dependency>
<dependency> <dependency>

2
maven-settings-builder/pom.xml
View File

@ -62,7 +62,7 @@ under the License.
<artifactId>maven-settings</artifactId> <artifactId>maven-settings</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.sonatype.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-sec-dispatcher</artifactId> <artifactId>plexus-sec-dispatcher</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>

17
pom.xml
View File

@ -61,8 +61,8 @@ under the License.
<sisuInjectVersion>0.3.4</sisuInjectVersion> <sisuInjectVersion>0.3.4</sisuInjectVersion>
<wagonVersion>3.4.3</wagonVersion> <wagonVersion>3.4.3</wagonVersion>
<jsoupVersion>1.12.1</jsoupVersion> <jsoupVersion>1.12.1</jsoupVersion>
<securityDispatcherVersion>1.4</securityDispatcherVersion> <securityDispatcherVersion>2.0</securityDispatcherVersion>
<cipherVersion>1.8</cipherVersion> <cipherVersion>2.0</cipherVersion>
<modelloVersion>1.11</modelloVersion> <modelloVersion>1.11</modelloVersion>
<jxpathVersion>1.3</jxpathVersion> <jxpathVersion>1.3</jxpathVersion>
<resolverVersion>1.6.3</resolverVersion> <resolverVersion>1.6.3</resolverVersion>
@ -402,15 +402,9 @@ under the License.
<version>${commonsLangVersion}</version> <version>${commonsLangVersion}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.sonatype.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-sec-dispatcher</artifactId> <artifactId>plexus-sec-dispatcher</artifactId>
<version>${securityDispatcherVersion}</version> <version>${securityDispatcherVersion}</version>
<exclusions>
<exclusion>
<groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-cipher</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
@ -641,15 +635,16 @@ under the License.
<goal>enforce</goal> <goal>enforce</goal>
</goals> </goals>
<phase>validate</phase> <phase>validate</phase>
<id>ensure-no-org.sonatype:plexus-cipher</id> <id>ensure-no-sonatype-cipher-and-sec-dispatcher</id>
<configuration> <configuration>
<rules> <rules>
<bannedDependencies> <bannedDependencies>
<excludes> <excludes>
<exclude>org.sonatype.plexus:plexus-sec-dispatcher</exclude>
<exclude>org.sonatype.plexus:plexus-cipher</exclude> <exclude>org.sonatype.plexus:plexus-cipher</exclude>
</excludes> </excludes>
<message> <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> </message>
</bannedDependencies> </bannedDependencies>
</rules> </rules>