Browse Source

Merge branch '1.1.x'

pull/1297/head
Andy Wilkinson 12 years ago
parent
commit
3c99bbf524
  1. 5
      spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/SettingsXmlRepositorySystemSessionAutoConfiguration.java

5
spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/SettingsXmlRepositorySystemSessionAutoConfiguration.java

@ -47,6 +47,7 @@ import org.eclipse.aether.util.repository.DefaultProxySelector; @@ -47,6 +47,7 @@ import org.eclipse.aether.util.repository.DefaultProxySelector;
import org.sonatype.plexus.components.cipher.DefaultPlexusCipher;
import org.sonatype.plexus.components.cipher.PlexusCipherException;
import org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher;
import org.springframework.boot.cli.util.Log;
/**
* Auto-configuration for a RepositorySystemSession that uses Maven's settings.xml to
@ -76,8 +77,8 @@ public class SettingsXmlRepositorySystemSessionAutoConfiguration implements @@ -76,8 +77,8 @@ public class SettingsXmlRepositorySystemSessionAutoConfiguration implements
Settings settings = loadSettings();
SettingsDecryptionResult decryptionResult = decryptSettings(settings);
if (!decryptionResult.getProblems().isEmpty()) {
throw new IllegalStateException("Settings decryption failed: "
+ decryptionResult.getProblems());
Log.error("Settings decryption failed: " + decryptionResult.getProblems());
// Continue - the encrypted credentials may not be used
}
session.setOffline(settings.isOffline());

Loading…
Cancel
Save