Avoid direct usage of Plexus SecDispatcher and use the proper Maven 3 API

maven/impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/ConfigurableMavenWorkingSessionImpl.java

@@ -21,6 +21,7 @@
 import java.util.logging.Logger;
 
 import org.apache.maven.settings.Settings;
+import org.apache.maven.settings.crypto.SettingsDecrypter;
 import org.eclipse.aether.DefaultRepositorySystemSession;
 import org.jboss.shrinkwrap.resolver.api.InvalidConfigurationFileException;
 import org.jboss.shrinkwrap.resolver.api.maven.MavenWorkingSession;
@@ -57,7 +58,7 @@ public abstract class ConfigurableMavenWorkingSessionImpl implements MavenWorkin
 
     public ConfigurableMavenWorkingSessionImpl() {
         this.system = new MavenRepositorySystem();
-        this.settingsManager = new SettingsManager();
+        this.settingsManager = new SettingsManager(system.getContext().lookup().lookup(SettingsDecrypter.class).get());
     }
 
     @Override

maven/impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/SettingsManager.java

@@ -21,6 +21,7 @@
 import org.apache.maven.settings.Settings;
 import org.apache.maven.settings.building.DefaultSettingsBuildingRequest;
 import org.apache.maven.settings.building.SettingsBuildingRequest;
+import org.apache.maven.settings.crypto.SettingsDecrypter;
 import org.jboss.shrinkwrap.resolver.api.InvalidConfigurationFileException;
 import org.jboss.shrinkwrap.resolver.impl.maven.bootstrap.MavenSettingsBuilder;
 
@@ -34,11 +35,17 @@
  */
 public class SettingsManager {
 
+    private final SettingsDecrypter settingsDecrypter;
+
     private Settings settings;
 
     // make sure that programmatic call to offline method is always preserved
     private Boolean programmaticOffline;
 
+    public SettingsManager(SettingsDecrypter settingsDecrypter) {
+        this.settingsDecrypter = settingsDecrypter;
+    }
+
     /**
      * Crates an instance of {@link Settings} and configures it from the given file.
      *
@@ -58,7 +65,7 @@ public void configureSettingsFromFile(File globalSettings, File userSettings)
         }
         request.setSystemProperties(SecurityActions.getProperties());
 
-        MavenSettingsBuilder builder = new MavenSettingsBuilder();
+        MavenSettingsBuilder builder = new MavenSettingsBuilder(settingsDecrypter);
         this.settings = builder.buildSettings(request);
 
         // ensure we keep offline(boolean) if previously set
@@ -72,7 +79,7 @@ public void configureSettingsFromFile(File globalSettings, File userSettings)
      */
     protected Settings getSettings() {
         if (this.settings == null) {
-            this.settings = new MavenSettingsBuilder().buildDefaultSettings();
+            this.settings = new MavenSettingsBuilder(settingsDecrypter).buildDefaultSettings();
             // ensure we keep offline(boolean) if previously set
             propagateProgrammaticOfflineIntoSettings();
         }

maven/impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/bootstrap/MavenRepositorySystem.java

@@ -61,7 +61,7 @@ public class MavenRepositorySystem {
      * Creates a Maven repository system
      */
     public MavenRepositorySystem() {
-        this.context = getContext();
+        this.context = doGetContext();
 
     }
 
@@ -159,10 +159,14 @@ public VersionRangeResult resolveVersionRange(final RepositorySystemSession sess
      *
      * @return Context
      */
-    private Context getContext() throws UnsupportedOperationException {
+    private Context doGetContext() throws UnsupportedOperationException {
         eu.maveniverse.maven.mima.context.Runtime runtime = Runtimes.INSTANCE.getRuntime();
         return runtime.create(ContextOverrides.create().checksumPolicy(ContextOverrides.ChecksumPolicy.WARN).build());
     }
+
+    public Context getContext() {
+        return context;
+    }
 }
 
 class MavenResolutionFilterWrap implements org.eclipse.aether.graph.DependencyFilter {

maven/impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/bootstrap/MavenSettingsBuilder.java

@@ -40,7 +40,6 @@
 import org.apache.maven.settings.crypto.SettingsDecryptionRequest;
 import org.apache.maven.settings.crypto.SettingsDecryptionResult;
 import org.jboss.shrinkwrap.resolver.api.InvalidConfigurationFileException;
-import org.jboss.shrinkwrap.resolver.impl.maven.internal.decrypt.MavenSettingsDecrypter;
 
 /**
  * Builds Maven settings from arbitrary settings.xml file
@@ -105,6 +104,12 @@ public class MavenSettingsBuilder {
 
     }
 
+    private final SettingsDecrypter settingsDecrypter;
+
+    public MavenSettingsBuilder(SettingsDecrypter settingsDecrypter) {
+        this.settingsDecrypter = settingsDecrypter;
+    }
+
     static String getFirstNotNull(String... values) {
         for(String value : values) {
             if(value != null) {
@@ -225,9 +230,8 @@ private Settings decryptPasswords(Settings settings) {
             securitySettings = new File(altSecuritySettings);
         }
 
-        SettingsDecrypter decrypter = new MavenSettingsDecrypter(securitySettings);
         SettingsDecryptionRequest request = new DefaultSettingsDecryptionRequest(settings);
-        SettingsDecryptionResult result = decrypter.decrypt(request);
+        SettingsDecryptionResult result = settingsDecrypter.decrypt(request);
 
         if (!result.getProblems().isEmpty()
                 && !Boolean.getBoolean("org.jboss.shrinkwrap.resolver.maven.ignoreDecryptionProblems")) {