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 2022/05/21 20:05:46 UTC
[maven-scm] branch scm-979-deplexus updated (c68718b87 -> 83953ce51)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch scm-979-deplexus
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
from c68718b87 Small improvements
new c2e14634d Replace SecDispatcher
new 83953ce51 Clean up dependencies
The 2 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-scm-api/pom.xml | 4 ++
maven-scm-client/pom.xml | 15 ++++++++
.../maven-scm-manager-plexus/pom.xml | 4 --
maven-scm-plugin/pom.xml | 25 ++++++++++++
.../apache/maven/scm/plugin/AbstractScmMojo.java | 34 ++++++++--------
.../main/resources/META-INF/plexus/components.xml | 45 ----------------------
maven-scm-providers/maven-scm-provider-hg/pom.xml | 15 ++++++++
.../maven-scm-provider-local/pom.xml | 4 ++
.../maven-scm-provider-git-commons/pom.xml | 17 ++++++++
.../maven-scm-provider-gitexe/pom.xml | 14 +++++++
.../maven-scm-provider-gittest/pom.xml | 17 ++++++++
.../maven-scm-provider-jgit/pom.xml | 5 +++
.../maven-scm-provider-svn-commons/pom.xml | 5 +++
.../maven-scm-provider-svnexe/pom.xml | 19 +++++++++
.../maven-scm-provider-svntest/pom.xml | 8 ++++
maven-scm-test/pom.xml | 17 ++++++--
.../java/org/apache/maven/scm/ScmTestCase.java | 21 ----------
pom.xml | 8 ----
18 files changed, 177 insertions(+), 100 deletions(-)
delete mode 100644 maven-scm-plugin/src/main/resources/META-INF/plexus/components.xml
[maven-scm] 02/02: Clean up dependencies
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch scm-979-deplexus
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
commit 83953ce51dfb7d11bbc373e57c2c806ce0002004
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat May 21 20:49:51 2022 +0200
Clean up dependencies
---
maven-scm-api/pom.xml | 4 ++++
maven-scm-client/pom.xml | 15 +++++++++++++
.../maven-scm-manager-plexus/pom.xml | 4 ----
maven-scm-plugin/pom.xml | 25 ++++++++++++++++++++++
maven-scm-providers/maven-scm-provider-hg/pom.xml | 15 +++++++++++++
.../maven-scm-provider-local/pom.xml | 4 ++++
.../maven-scm-provider-git-commons/pom.xml | 17 +++++++++++++++
.../maven-scm-provider-gitexe/pom.xml | 14 ++++++++++++
.../maven-scm-provider-gittest/pom.xml | 17 +++++++++++++++
.../maven-scm-provider-jgit/pom.xml | 5 +++++
.../maven-scm-provider-svn-commons/pom.xml | 5 +++++
.../maven-scm-provider-svnexe/pom.xml | 19 ++++++++++++++++
.../maven-scm-provider-svntest/pom.xml | 8 +++++++
maven-scm-test/pom.xml | 17 +++++++++++----
pom.xml | 8 -------
15 files changed, 161 insertions(+), 16 deletions(-)
diff --git a/maven-scm-api/pom.xml b/maven-scm-api/pom.xml
index ff0b9a3e8..94d1997c8 100644
--- a/maven-scm-api/pom.xml
+++ b/maven-scm-api/pom.xml
@@ -38,6 +38,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/maven-scm-client/pom.xml b/maven-scm-client/pom.xml
index 533bd7c98..875e586db 100644
--- a/maven-scm-client/pom.xml
+++ b/maven-scm-client/pom.xml
@@ -37,24 +37,37 @@
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-manager-plexus</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
</dependency>
<!-- providers declaration -->
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-gitexe</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-hg</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-local</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-svnexe</artifactId>
+ <scope>runtime</scope>
</dependency>
<!-- end providers declaration -->
@@ -62,10 +75,12 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-classworlds</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.eclipse.sisu</groupId>
diff --git a/maven-scm-managers/maven-scm-manager-plexus/pom.xml b/maven-scm-managers/maven-scm-manager-plexus/pom.xml
index afe48733e..c8f5142f2 100644
--- a/maven-scm-managers/maven-scm-manager-plexus/pom.xml
+++ b/maven-scm-managers/maven-scm-manager-plexus/pom.xml
@@ -38,10 +38,6 @@
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
- <dependency>
- <groupId>org.eclipse.sisu</groupId>
- <artifactId>org.eclipse.sisu.plexus</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-api</artifactId>
diff --git a/maven-scm-plugin/pom.xml b/maven-scm-plugin/pom.xml
index 2d01744ab..8154d7b55 100644
--- a/maven-scm-plugin/pom.xml
+++ b/maven-scm-plugin/pom.xml
@@ -55,6 +55,12 @@
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>${mavenVersion}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
@@ -73,9 +79,20 @@
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings-builder</artifactId>
+ <version>${mavenVersion}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-manager-plexus</artifactId>
+ <scope>runtime</scope>
</dependency>
<!-- providers declaration -->
@@ -84,10 +101,12 @@
<artifactId>maven-scm-providers-standard</artifactId>
<version>${project.version}</version>
<type>pom</type>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-local</artifactId>
+ <scope>runtime</scope>
</dependency>
<!-- This is used directly by the mojo -->
<dependency>
@@ -110,6 +129,7 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-sec-dispatcher</artifactId>
+ <scope>runtime</scope>
</dependency>
<!-- dependencies to annotations -->
@@ -131,6 +151,11 @@
<version>3.3.0</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-test</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-svntest</artifactId>
diff --git a/maven-scm-providers/maven-scm-provider-hg/pom.xml b/maven-scm-providers/maven-scm-provider-hg/pom.xml
index cf4190cd9..e8f6270e8 100644
--- a/maven-scm-providers/maven-scm-provider-hg/pom.xml
+++ b/maven-scm-providers/maven-scm-provider-hg/pom.xml
@@ -53,6 +53,21 @@
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/maven-scm-providers/maven-scm-provider-local/pom.xml b/maven-scm-providers/maven-scm-provider-local/pom.xml
index 47146250b..96a772495 100644
--- a/maven-scm-providers/maven-scm-provider-local/pom.xml
+++ b/maven-scm-providers/maven-scm-provider-local/pom.xml
@@ -38,6 +38,10 @@
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml
index 17e1a308e..be0cda19f 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/pom.xml
@@ -74,4 +74,21 @@
</plugin>
</plugins>
</build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId> javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml
index 44c60590f..113e6d07c 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/pom.xml
@@ -46,6 +46,10 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
<!-- Test -->
<dependency>
@@ -57,6 +61,16 @@
<artifactId>maven-scm-provider-gittest</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/pom.xml b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/pom.xml
index c7f278830..0e145bfb1 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/pom.xml
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/pom.xml
@@ -42,5 +42,22 @@
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-git-commons</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <version>1.3</version>
+ </dependency>
</dependencies>
</project>
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/pom.xml b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/pom.xml
index cebff98df..c3f4885ae 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/pom.xml
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-jgit/pom.xml
@@ -58,6 +58,11 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
</dependency>
<!-- Test -->
diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml
index 3630d31ad..2bfdaf674 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/pom.xml
@@ -37,6 +37,11 @@
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
</dependency>
</dependencies>
diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml
index 26a5ba5d0..2b8296e37 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/pom.xml
@@ -52,6 +52,10 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
<!-- Test -->
<dependency>
@@ -59,6 +63,21 @@
<artifactId>maven-scm-provider-svntest</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/pom.xml b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/pom.xml
index e073434e7..9a9f794b7 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/pom.xml
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svntest/pom.xml
@@ -38,5 +38,13 @@
<groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-test</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/maven-scm-test/pom.xml b/maven-scm-test/pom.xml
index 4a14ca645..94d1316d8 100644
--- a/maven-scm-test/pom.xml
+++ b/maven-scm-test/pom.xml
@@ -39,22 +39,29 @@
<artifactId>maven-scm-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-manager-plexus</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
</dependency>
<!-- runtime bits needed to construct Plexus and others -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-classworlds</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.sisu</groupId>
- <artifactId>org.eclipse.sisu.plexus</artifactId>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-manager-plexus</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
@@ -65,10 +72,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-sec-dispatcher</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 1bc94e0e7..4e4a368da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -277,15 +277,7 @@
</dependencies>
</dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
- </dependencies>
-
<build>
-
<pluginManagement>
<plugins>
<plugin>
[maven-scm] 01/02: Replace SecDispatcher
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch scm-979-deplexus
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
commit c2e14634d71e7317afb59875ae21e554758a280d
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat May 21 20:24:09 2022 +0200
Replace SecDispatcher
---
.../apache/maven/scm/plugin/AbstractScmMojo.java | 34 ++++++++--------
.../main/resources/META-INF/plexus/components.xml | 45 ----------------------
.../java/org/apache/maven/scm/ScmTestCase.java | 21 ----------
3 files changed, 16 insertions(+), 84 deletions(-)
diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
index 7c17086d1..f1ecfeddc 100644
--- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
+++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
@@ -48,11 +48,13 @@ import org.apache.maven.scm.repository.ScmRepository;
import org.apache.maven.scm.repository.ScmRepositoryException;
import org.apache.maven.settings.Server;
import org.apache.maven.settings.Settings;
+import org.apache.maven.settings.building.SettingsProblem;
+import org.apache.maven.settings.crypto.DefaultSettingsDecryptionRequest;
+import org.apache.maven.settings.crypto.SettingsDecrypter;
+import org.apache.maven.settings.crypto.SettingsDecryptionResult;
import org.apache.maven.shared.model.fileset.FileSet;
import org.apache.maven.shared.model.fileset.util.FileSetManager;
import org.codehaus.plexus.util.StringUtils;
-import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher;
-import org.sonatype.plexus.components.sec.dispatcher.SecDispatcherException;
/**
* @author <a href="evenisse@apache.org">Emmanuel Venisse</a>
@@ -142,12 +144,8 @@ public abstract class AbstractScmMojo
@Component
private ScmManager manager;
- /**
- * When this plugin requires Maven 3.0 as minimum, this component can be removed and o.a.m.s.c.SettingsDecrypter be
- * used instead.
- */
- @Component( hint = "mng-4384" )
- private SecDispatcher secDispatcher;
+ @Component
+ private SettingsDecrypter settingsDecrypter;
/**
* The base directory.
@@ -397,6 +395,8 @@ public abstract class AbstractScmMojo
if ( server != null )
{
+ server = decrypt( server );
+
if ( username == null )
{
username = server.getUsername();
@@ -404,7 +404,7 @@ public abstract class AbstractScmMojo
if ( password == null )
{
- password = decrypt( server.getPassword(), host );
+ password = server.getPassword();
}
if ( privateKey == null )
@@ -414,23 +414,21 @@ public abstract class AbstractScmMojo
if ( passphrase == null )
{
- passphrase = decrypt( server.getPassphrase(), host );
+ passphrase = server.getPassphrase();
}
}
}
}
- private String decrypt( String str, String server )
+ private Server decrypt( Server server )
{
- try
- {
- return secDispatcher.decrypt( str );
- }
- catch ( SecDispatcherException e )
+ SettingsDecryptionResult result = settingsDecrypter.decrypt( new DefaultSettingsDecryptionRequest( server ) );
+ for ( SettingsProblem problem : result.getProblems() )
{
- getLog().warn( "Failed to decrypt password/passphrase for server " + server + ", using auth token as is" );
- return str;
+ getLog().error( problem.getMessage(), problem.getException() );
}
+
+ return result.getServer();
}
public void checkResult( ScmResult result )
diff --git a/maven-scm-plugin/src/main/resources/META-INF/plexus/components.xml b/maven-scm-plugin/src/main/resources/META-INF/plexus/components.xml
deleted file mode 100644
index 6c997dbc6..000000000
--- a/maven-scm-plugin/src/main/resources/META-INF/plexus/components.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<component-set>
- <components>
- <component>
- <role>org.sonatype.plexus.components.sec.dispatcher.SecDispatcher</role>
- <role-hint>mng-4384</role-hint>
- <implementation>org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher</implementation>
- <requirements>
- <requirement>
- <role>org.sonatype.plexus.components.cipher.PlexusCipher</role>
- <role-hint>mng-4384</role-hint>
- <field-name>_cipher</field-name>
- </requirement>
- </requirements>
- <configuration>
- <_configuration-file>~/.m2/settings-security.xml</_configuration-file>
- </configuration>
- </component>
- <component>
- <role>org.sonatype.plexus.components.cipher.PlexusCipher</role>
- <role-hint>mng-4384</role-hint>
- <implementation>org.sonatype.plexus.components.cipher.DefaultPlexusCipher</implementation>
- </component>
- </components>
-</component-set>
diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java b/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
index a447dc803..4755b6373 100644
--- a/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
+++ b/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java
@@ -30,7 +30,6 @@ import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.CommandLineUtils.StringStreamConsumer;
import org.codehaus.plexus.util.cli.Commandline;
-import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher;
import java.io.File;
import java.io.FileWriter;
@@ -58,8 +57,6 @@ public abstract class ScmTestCase
private ScmManager scmManager;
- private SecDispatcher secDispatcher;
-
protected void setUp()
throws Exception
{
@@ -146,24 +143,6 @@ public abstract class ScmTestCase
return scmManager;
}
- /**
- * If you wish to use this component, make sure to configure your
- * TCK implementation to include plexus component configuration
- * as doc at https://issues.apache.org/jira/browse/MNG-4384
- * @return SecDispatcher
- * @throws Exception
- */
- public SecDispatcher getSecDispatcher()
- throws Exception
- {
- if ( secDispatcher == null )
- {
- secDispatcher = (SecDispatcher) lookup( SecDispatcher.class, "mng-4384" );
- }
-
- return secDispatcher;
- }
-
protected ScmRepository makeScmRepository( String scmUrl )
throws Exception
{