root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 22 Packages Projects Releases Wiki Activity

Fix package tangle in CLI

This commit is contained in:
Phillip Webb 2015-10-20 15:00:32 -07:00
parent 88cc883e94
commit 9be0020f7b
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactory.java
View File

@ -25,6 +25,8 @@ import org.apache.maven.settings.Profile;
import org.apache.maven.settings.Repository; import org.apache.maven.settings.Repository;
import org.springframework.boot.cli.compiler.grape.RepositoryConfiguration; import org.springframework.boot.cli.compiler.grape.RepositoryConfiguration;
import org.springframework.boot.cli.compiler.maven.MavenSettings;
import org.springframework.boot.cli.compiler.maven.MavenSettingsReader;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
/** /**

22
spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/SettingsXmlRepositorySystemSessionAutoConfiguration.java
View File

@ -20,8 +20,8 @@ import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.RepositorySystem; import org.eclipse.aether.RepositorySystem;
import org.eclipse.aether.repository.LocalRepository; import org.eclipse.aether.repository.LocalRepository;
import org.springframework.boot.cli.compiler.MavenSettings; import org.springframework.boot.cli.compiler.maven.MavenSettings;
import org.springframework.boot.cli.compiler.MavenSettingsReader; import org.springframework.boot.cli.compiler.maven.MavenSettingsReader;
/** /**
* Auto-configuration for a RepositorySystemSession that uses Maven's settings.xml to * Auto-configuration for a RepositorySystemSession that uses Maven's settings.xml to
@ -35,14 +35,7 @@ public class SettingsXmlRepositorySystemSessionAutoConfiguration
@Override @Override
public void apply(DefaultRepositorySystemSession session, public void apply(DefaultRepositorySystemSession session,
RepositorySystem repositorySystem) { RepositorySystem repositorySystem) {
MavenSettings settings = getSettings(session);
MavenSettings settings = new MavenSettingsReader().readSettings();
session.setOffline(settings.getOffline());
session.setMirrorSelector(settings.getMirrorSelector());
session.setAuthenticationSelector(settings.getAuthenticationSelector());
session.setProxySelector(settings.getProxySelector());
String localRepository = settings.getLocalRepository(); String localRepository = settings.getLocalRepository();
if (localRepository != null) { if (localRepository != null) {
session.setLocalRepositoryManager(repositorySystem.newLocalRepositoryManager( session.setLocalRepositoryManager(repositorySystem.newLocalRepositoryManager(
@ -50,4 +43,13 @@ public class SettingsXmlRepositorySystemSessionAutoConfiguration
} }
} }
private MavenSettings getSettings(DefaultRepositorySystemSession session) {
MavenSettings settings = new MavenSettingsReader().readSettings();
session.setOffline(settings.getOffline());
session.setMirrorSelector(settings.getMirrorSelector());
session.setAuthenticationSelector(settings.getAuthenticationSelector());
session.setProxySelector(settings.getProxySelector());
return settings;
}
} }

2
spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/MavenSettings.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/maven/MavenSettings.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.boot.cli.compiler; package org.springframework.boot.cli.compiler.maven;
import java.io.File; import java.io.File;
import java.io.PrintWriter; import java.io.PrintWriter;

2
spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/MavenSettingsReader.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/maven/MavenSettingsReader.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.boot.cli.compiler; package org.springframework.boot.cli.compiler.maven;
import java.io.File; import java.io.File;
import java.lang.reflect.Field; import java.lang.reflect.Field;