Revert "SONAR-5051 Support Maven encryption mechanism for SonarQube passwords"

This reverts commit 854f66c3360141bcdd5c59dd5b6215472ee8ca17.

diff --git a/sonar-maven-plugin/pom.xml b/sonar-maven-plugin/pom.xml
index ad18cff7b793398543517882c58f5f06941a0d16..00e8fb9a021e1cb98af15ceb74181773b6f3f155 100644 (file)
--- a/sonar-maven-plugin/pom.xml
+++ b/sonar-maven-plugin/pom.xml
@@ -34,12 +34,6 @@
       <artifactId>maven-project</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.sonatype.plexus</groupId>
-      <artifactId>plexus-sec-dispatcher</artifactId>
-      <version>1.4</version>
-      <scope>compile</scope>
-    </dependency>
 
     <!-- Test -->
     <dependency>

diff --git a/sonar-maven-plugin/src/main/java/org/sonar/maven/SonarMojo.java b/sonar-maven-plugin/src/main/java/org/sonar/maven/SonarMojo.java
index 0164c2e0c114bc817487fa843cde94c5a0c45d26..dfc313844a2146521233a4ad152b379468cfc58e 100644 (file)
--- a/sonar-maven-plugin/src/main/java/org/sonar/maven/SonarMojo.java
+++ b/sonar-maven-plugin/src/main/java/org/sonar/maven/SonarMojo.java
@@ -35,12 +35,9 @@ import org.apache.maven.shared.dependency.tree.DependencyTreeBuilder;
 import org.sonar.runner.api.EmbeddedRunner;
 import org.sonar.runner.api.RunnerProperties;
 import org.sonar.runner.api.ScanProperties;
-import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher;
-import org.sonatype.plexus.components.sec.dispatcher.SecDispatcherException;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Properties;
 
 /**
  * @goal sonar
@@ -129,13 +126,6 @@ public final class SonarMojo extends AbstractMojo {
    */
   RuntimeInformation runtimeInformation;
 
-  /**
-   * Plexus component for the SecDispatcher
-   * @component role="org.sonatype.plexus.components.sec.dispatcher.SecDispatcher"
-   * @required  
-   */
-  private SecDispatcher securityDispatcher;
-
   @Override
   public void execute() throws MojoExecutionException {
     ArtifactVersion mavenVersion = getMavenVersion();
@@ -180,8 +170,6 @@ public final class SonarMojo extends AbstractMojo {
       if (getLog().isDebugEnabled()) {
         runner.setProperty("sonar.verbose", "true");
       }
-      // Replace all properties by decrypted ones if applicable
-      runner.addProperties(decryptProperties(runner.properties()));
       runner.execute();
     } catch (Exception e) {
       throw ExceptionHandling.handle(e, getLog());
@@ -227,26 +215,4 @@ public final class SonarMojo extends AbstractMojo {
     return null;
   }
 
-  public Properties decryptProperties(Properties properties) {
-    Properties newProperties = new Properties();
-    try {
-      for (String key : properties.stringPropertyNames()) {
-        if (key.contains(".password")) {
-          decrypt(properties, newProperties, key);
-        }
-      }
-    } catch (Exception e) {
-      getLog().warn("Unable to decrypt properties", e);
-    }
-    return newProperties;
-  }
-
-  private void decrypt(Properties properties, Properties newProperties, String key) {
-    try {
-      String decrypted = securityDispatcher.decrypt(properties.getProperty(key));
-      newProperties.setProperty(key, decrypted);
-    } catch (SecDispatcherException e) {
-      getLog().warn("Unable to decrypt property " + key, e);
-    }
-  }
 }

diff --git a/sonar-maven-plugin/src/main/resources/META-INF/plexus/components.xml b/sonar-maven-plugin/src/main/resources/META-INF/plexus/components.xml
deleted file mode 100644 (file)
index 0101f8e..0000000
--- a/sonar-maven-plugin/src/main/resources/META-INF/plexus/components.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<component-set>
-  <components>
-    <component>
-      <role>org.sonatype.plexus.components.sec.dispatcher.SecDispatcher</role>
-      <role-hint>default</role-hint>
-      <implementation>org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher</implementation>
-      <requirements>
-        <requirement>
-          <role>org.sonatype.plexus.components.cipher.PlexusCipher</role>
-          <role-hint>default</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>default</role-hint>
-      <implementation>org.sonatype.plexus.components.cipher.DefaultPlexusCipher</implementation>
-    </component>
-  </components>
-</component-set>