[MNG-6886] upgrade plexus-cipher to 1.8 and update changed groupId (#335)

Signed-off-by: olivier lamy <olamy@apache.org>
This commit is contained in:
Olivier Lamy 2020-04-10 09:17:25 +10:00 committed by Michael Osipov
parent d862fdd841
commit 41efc134a9
5 changed files with 49 additions and 3 deletions

View File

@ -113,6 +113,10 @@ under the License.
<groupId>org.fusesource.jansi</groupId> <groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId> <artifactId>jansi</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-cipher</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>

View File

@ -99,6 +99,11 @@ under the License.
<artifactId>wagon-provider-api</artifactId> <artifactId>wagon-provider-api</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-cipher</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.apache.maven.wagon</groupId> <groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId> <artifactId>wagon-file</artifactId>

View File

@ -122,6 +122,11 @@ under the License.
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId> <artifactId>plexus-component-annotations</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-cipher</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>

View File

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

36
pom.xml
View File

@ -62,7 +62,7 @@ under the License.
<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>1.4</securityDispatcherVersion>
<cipherVersion>1.7</cipherVersion> <cipherVersion>1.8</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>
@ -405,9 +405,15 @@ under the License.
<groupId>org.sonatype.plexus</groupId> <groupId>org.sonatype.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.sonatype.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-cipher</artifactId> <artifactId>plexus-cipher</artifactId>
<version>${cipherVersion}</version> <version>${cipherVersion}</version>
</dependency> </dependency>
@ -642,6 +648,32 @@ under the License.
</excludes> </excludes>
</configuration> </configuration>
</plugin> </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> </plugins>
</build> </build>