From 2104d8453f3a8ada648091c11596d2fee62cd9b7 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Wed, 10 Oct 2018 13:56:10 +0100 Subject: [PATCH] Finchley -> Greenwich --- spring-cloud-cli-integration-tests/pom.xml | 35 +++++++++++++++++++ .../cloud/cli/SampleIntegrationTests.java | 6 ++-- .../SpringCloudBomAstTransformation.java | 2 +- 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/spring-cloud-cli-integration-tests/pom.xml b/spring-cloud-cli-integration-tests/pom.xml index 12f6249..9a2a11b 100644 --- a/spring-cloud-cli-integration-tests/pom.xml +++ b/spring-cloud-cli-integration-tests/pom.xml @@ -75,5 +75,40 @@ + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.codehaus.mojo + + + exec-maven-plugin + + + [1.6.0,) + + + exec + + + + + + + + + + + + diff --git a/spring-cloud-cli-integration-tests/src/test/java/org/springframework/cloud/cli/SampleIntegrationTests.java b/spring-cloud-cli-integration-tests/src/test/java/org/springframework/cloud/cli/SampleIntegrationTests.java index 0dbc814..0fa698f 100644 --- a/spring-cloud-cli-integration-tests/src/test/java/org/springframework/cloud/cli/SampleIntegrationTests.java +++ b/spring-cloud-cli-integration-tests/src/test/java/org/springframework/cloud/cli/SampleIntegrationTests.java @@ -15,14 +15,14 @@ */ package org.springframework.cloud.cli; -import static org.junit.Assert.assertTrue; - import java.io.File; import java.net.URI; import org.junit.Rule; import org.junit.Test; +import static org.junit.Assert.assertTrue; + /** * @author Dave Syer * @@ -34,7 +34,7 @@ public class SampleIntegrationTests { @Test public void appSample() throws Exception { - String output = this.cli.run("app.groovy", "--verbose"); + String output = this.cli.run("app.groovy"); URI scriptUri = new File("samples/app.groovy").toURI(); assertTrue("Wrong output: " + output, output.contains("Hello World! From " + scriptUri)); diff --git a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/SpringCloudBomAstTransformation.java b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/SpringCloudBomAstTransformation.java index c374d3c..cdfcf48 100644 --- a/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/SpringCloudBomAstTransformation.java +++ b/spring-cloud-cli/src/main/java/org/springframework/cloud/cli/compiler/SpringCloudBomAstTransformation.java @@ -28,7 +28,7 @@ import org.springframework.boot.cli.compiler.GenericBomAstTransformation; @GroovyASTTransformation(phase = CompilePhase.CONVERSION) public class SpringCloudBomAstTransformation extends GenericBomAstTransformation { - private static final String SPRING_CLOUD_VERSION = "Finchley.BUILD-SNAPSHOT"; + private static final String SPRING_CLOUD_VERSION = "Greenwich.BUILD-SNAPSHOT"; @Override protected String getBomModule() {