SpringCloud/spring-cloud-cli
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update travis secrets

Browse Source
This commit is contained in:
Dave Syer
2016-08-15 13:55:21 +01:00
parent bad74d9447
commit 0ca734895c
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -27,4 +27,4 @@ env:
- VERSION=$(mvn validate | grep Building | head -1 | sed -e 's/.* //')
- MILESTONE=$(echo ${VERSION} | egrep 'M|RC' && echo true || echo false)
- MVN_PROFILE=$([ "${MILESTONE}" == "true" ] && echo -P milestone)
- secure: WNSvUU2eA+mbG+moEORn8Yr9ydoEdkPDccawncKxm8k4vgYTvOXpIUY4aFxI4gfYjDZWxcvKmm/hqEL2qPhzwlYqgljKQmLY6Leto6AaDVTryQGPuRpfDIHgeD7Oxs61Xle+MOWF2UyWbMnvQPQBKUBsn6Tz8qSLCgdVersYIPM=
- secure: "mGJnfRsxSdjAwedXAB8kvC3ckc1TGHS2ym+8dP7TSPhknpM9To+S6THwTmawOpJFq09A/1OlUWeanpGEIHCXB/Oz73ZQ9xqheqFf3mk83xOV0TjIP3AzT2boTNRVFGe+LXOIRgTwg7jULl9TIf6pBUK3s5iPvLYlZhCq1Q6QEIU="

13
spring-cloud-launcher/spring-cloud-launcher-cli/src/main/java/org/springframework/cloud/launcher/cli/LauncherCommand.java
View File

@@ -92,7 +92,7 @@ public class LauncherCommand extends OptionParsingCommand {
protected synchronized ExitStatus run(OptionSet options) throws Exception {
try {
URLClassLoader classLoader = populateClassloader();
URLClassLoader classLoader = populateClassloader(options);
String name = "org.springframework.cloud.launcher.deployer.DeployerThread";
Class<?> threadClass = classLoader.loadClass(name);
@@ -141,7 +141,7 @@ public class LauncherCommand extends OptionParsingCommand {
return args.toArray(new String[args.size()]);
}
URLClassLoader populateClassloader() throws MalformedURLException {
private URLClassLoader populateClassloader(OptionSet options) throws MalformedURLException {
DependencyResolutionContext resolutionContext = new DependencyResolutionContext();
GroovyClassLoader loader = new GroovyClassLoader(Thread.currentThread().getContextClassLoader(),
@@ -156,21 +156,18 @@ public class LauncherCommand extends OptionParsingCommand {
loader.addClasspath(classpath);
}
System.setProperty("groovy.grape.report.downloads", "true");
// System.setProperty("grape.root", ".");
if (options.has(debugOption)) {
System.setProperty("groovy.grape.report.downloads", "true");
}
AetherGrapeEngine grapeEngine = AetherGrapeEngineFactory.create(loader, repositoryConfiguration,
resolutionContext);
// GrapeEngineInstaller.install(grapeEngine);
// TODO: get version dynamically?
HashMap<String, String> dependency = new HashMap<>();
dependency.put("group", "org.springframework.cloud.launcher");
dependency.put("module", "spring-cloud-launcher-deployer");
dependency.put("version", getVersion());
URI[] uris = grapeEngine.resolve(null, dependency);
// System.out.println("resolved URI's " + Arrays.asList(uris));
for (URI uri : uris) {
loader.addURL(uri.toURL());
}