Author: bentmann
Date: Thu Feb 10 12:38:18 2011
New Revision: 1069361
URL: http://svn.apache.org/viewvc?rev=1069361&view=rev
Log:
o Simplified workaround for MNG-4384
Removed:
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/SettingsDecrypter.java
Modified:
maven/scm/trunk/maven-scm-plugin/pom.xml
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
maven/scm/trunk/maven-scm-plugin/src/main/resources/META-INF/plexus/components.xml
Modified: maven/scm/trunk/maven-scm-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/pom.xml?rev=1069361&r1=1069360&r2=1069361&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-plugin/pom.xml (original)
+++ maven/scm/trunk/maven-scm-plugin/pom.xml Thu Feb 10 12:38:18 2011
@@ -186,39 +186,6 @@
</plugin>
</plugins>
</pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>1.4</version>
- <executions>
- <!-- workaround for MNG-4384, we include our own private copy of the
component and avoid interferences with the Maven core -->
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <artifactSet>
- <includes>
- <include>org.sonatype.plexus:*</include>
- </includes>
- </artifactSet>
- <relocations>
- <relocation>
- <pattern>org.sonatype.plexus</pattern>
-
<shadedPattern>org.apache.maven.scm.org.sonatype.plexus</shadedPattern>
- </relocation>
- </relocations>
- <transformers>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer"/>
- </transformers>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
</build>
<profiles>
Modified:
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java?rev=1069361&r1=1069360&r2=1069361&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
(original)
+++
maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
Thu Feb 10 12:38:18 2011
@@ -48,6 +48,8 @@ import org.apache.maven.settings.Setting
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="[email protected]">Emmanuel Venisse</a>
@@ -142,9 +144,12 @@ public abstract class AbstractScmMojo
private ScmManager manager;
/**
- * @component
+ * 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 roleHint="mng-4384"
*/
- private SettingsDecrypter decryptor;
+ private SecDispatcher secDispatcher;
/**
* The base directory.
@@ -389,7 +394,7 @@ public abstract class AbstractScmMojo
if ( password == null )
{
- password = decryptor.decrypt( server.getPassword(), host );
+ password = decrypt( server.getPassword(), host );
}
if ( privateKey == null )
@@ -399,12 +404,25 @@ public abstract class AbstractScmMojo
if ( passphrase == null )
{
- passphrase = decryptor.decrypt( server.getPassphrase(),
host );
+ passphrase = decrypt( server.getPassphrase(), host );
}
}
}
}
+ private String decrypt( String str, String server )
+ {
+ try
+ {
+ return secDispatcher.decrypt( str );
+ }
+ catch ( SecDispatcherException e )
+ {
+ getLog().warn( "Failed to decrypt password/passphrase for server "
+ server + ", using auth token as is" );
+ return str;
+ }
+ }
+
public void checkResult( ScmResult result )
throws MojoExecutionException
{
Modified:
maven/scm/trunk/maven-scm-plugin/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/resources/META-INF/plexus/components.xml?rev=1069361&r1=1069360&r2=1069361&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-plugin/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/scm/trunk/maven-scm-plugin/src/main/resources/META-INF/plexus/components.xml
Thu Feb 10 12:38:18 2011
@@ -22,25 +22,13 @@ under the License.
<component-set>
<components>
<component>
- <role>org.apache.maven.scm.plugin.SettingsDecrypter</role>
- <role-hint>default</role-hint>
-
<implementation>org.apache.maven.scm.plugin.SettingsDecrypter</implementation>
- <requirements>
- <requirement>
-
<role>org.sonatype.plexus.components.sec.dispatcher.SecDispatcher</role>
- <role-hint>mng-4384</role-hint>
- <field-name>secDispatcher</field-name>
- </requirement>
- </requirements>
- </component>
-
- <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>
@@ -48,5 +36,10 @@ under the License.
<_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>
