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/11/16 19:39:11 UTC
[maven-resolver-ant-tasks] branch master updated: [MRESOLVER-221] Upgrade Plexus Cipher to 2.0
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-resolver-ant-tasks.git
The following commit(s) were added to refs/heads/master by this push:
new f131a9e [MRESOLVER-221] Upgrade Plexus Cipher to 2.0
f131a9e is described below
commit f131a9e1e32816aa570af561743173f694e58d03
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Tue Nov 16 20:38:26 2021 +0100
[MRESOLVER-221] Upgrade Plexus Cipher to 2.0
---
pom.xml | 9 ++-------
.../maven/resolver/internal/ant/AntSecDispatcher.java | 13 +++----------
2 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0336e9d..b74a2ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,9 +79,9 @@
<version>3.2.0</version>
</dependency>
<dependency>
- <groupId>org.sonatype.plexus</groupId>
+ <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-cipher</artifactId>
- <version>1.7</version>
+ <version>2.0</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -170,11 +170,6 @@
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-annotations</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interpolation</artifactId>
<version>1.26</version>
</dependency>
diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/AntSecDispatcher.java b/src/main/java/org/apache/maven/resolver/internal/ant/AntSecDispatcher.java
index f4678e5..5ee044b 100644
--- a/src/main/java/org/apache/maven/resolver/internal/ant/AntSecDispatcher.java
+++ b/src/main/java/org/apache/maven/resolver/internal/ant/AntSecDispatcher.java
@@ -20,9 +20,10 @@ package org.apache.maven.resolver.internal.ant;
*/
import org.sonatype.plexus.components.cipher.DefaultPlexusCipher;
-import org.sonatype.plexus.components.cipher.PlexusCipherException;
import org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher;
+import java.util.Collections;
+
/**
*/
class AntSecDispatcher
@@ -31,15 +32,7 @@ class AntSecDispatcher
AntSecDispatcher()
{
- _configurationFile = "~/.m2/settings-security.xml";
- try
- {
- _cipher = new DefaultPlexusCipher();
- }
- catch ( PlexusCipherException e )
- {
- e.printStackTrace();
- }
+ super( new DefaultPlexusCipher(), Collections.emptyMap(), "~/.m2/settings-security.xml" );
}
}