diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 01d4cc7a6..fd7632ca0 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -4,8 +4,8 @@ 4.0.0 spring-cloud-function-deployer jar - spring-cloud-function-deployer-new - Spring Cloud Function Web Support + spring-cloud-function-deployer + Spring Cloud Function Deployer org.springframework.cloud @@ -44,17 +44,6 @@ - - - - - - - - - - - org.apache.maven.plugins maven-invoker-plugin diff --git a/spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/FunctionDeployerTests.java b/spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/FunctionDeployerTests.java index a012799e7..cf7f933b1 100644 --- a/spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/FunctionDeployerTests.java +++ b/spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/FunctionDeployerTests.java @@ -49,7 +49,7 @@ public class FunctionDeployerTests { @Test public void testWithMainAndStartClassNoSpringConfiguration() throws Exception { String[] args = new String[] { - "--spring.cloud.function.location=target/it/bootjar/target/bootjar-0.0.1.BUILD-SNAPSHOT-exec.jar", + "--spring.cloud.function.location=target/it/bootjar/target/bootjar-1.0.0.RELEASE-exec.jar", "--spring.cloud.function.function-class=function.example.UpperCaseFunction" }; ApplicationContext context = SpringApplication.run(DeployerApplication.class, args); @@ -69,7 +69,7 @@ public class FunctionDeployerTests { @Test public void testWithSimplestJar() throws Exception { String[] args = new String[] { - "--spring.cloud.function.location=target/it/simplestjar/target/simplestjar-0.0.1.BUILD-SNAPSHOT.jar", + "--spring.cloud.function.location=target/it/simplestjar/target/simplestjar-1.0.0.RELEASE.jar", "--spring.cloud.function.function-class=function.example.UpperCaseFunction" }; ApplicationContext context = SpringApplication.run(DeployerApplication.class, args); @@ -93,7 +93,7 @@ public class FunctionDeployerTests { @Test public void testNoMainAndNoStartClassAndNoSpringConfiguration() throws Exception { String[] args = new String[] { - "--spring.cloud.function.location=target/it/bootjarnostart/target/bootjarnostart-0.0.1.BUILD-SNAPSHOT-exec.jar", + "--spring.cloud.function.location=target/it/bootjarnostart/target/bootjarnostart-1.0.0.RELEASE-exec.jar", "--spring.cloud.function.function-class=function.example.UpperCaseFunction" }; ApplicationContext context = SpringApplication.run(DeployerApplication.class, args); @@ -119,7 +119,7 @@ public class FunctionDeployerTests { @Test public void testNoMainAndNoStartClassAndNoSpringConfigurationDiscoverClassFromManifest() throws Exception { String[] args = new String[] { - "--spring.cloud.function.location=target/it/bootjarnostart/target/bootjarnostart-0.0.1.BUILD-SNAPSHOT-exec.jar" }; + "--spring.cloud.function.location=target/it/bootjarnostart/target/bootjarnostart-1.0.0.RELEASE-exec.jar" }; ApplicationContext context = SpringApplication.run(DeployerApplication.class, args); FunctionCatalog catalog = context.getBean(FunctionCatalog.class); @@ -143,7 +143,7 @@ public class FunctionDeployerTests { @Test public void testWithMainAndStartClassAndSpringConfiguration() throws Exception { String[] args = new String[] { - "--spring.cloud.function.location=target/it/bootapp/target/bootapp-0.0.1.BUILD-SNAPSHOT-exec.jar", + "--spring.cloud.function.location=target/it/bootapp/target/bootapp-1.0.0.RELEASE-exec.jar", "--spring.cloud.function.function-name=uppercase" }; ApplicationContext context = SpringApplication.run(DeployerApplication.class, args); FunctionCatalog catalog = context.getBean(FunctionCatalog.class); @@ -162,7 +162,7 @@ public class FunctionDeployerTests { @Test public void testWithMainAndStartClassAndSpringConfigurationJavax() throws Exception { String[] args = new String[] { - "--spring.cloud.function.location=target/it/bootapp-with-javax/target/bootapp-with-javax-0.0.1.BUILD-SNAPSHOT-exec.jar", + "--spring.cloud.function.location=target/it/bootapp-with-javax/target/bootapp-with-javax-1.0.0.RELEASE-exec.jar", "--spring.cloud.function.function-name=uppercase" }; ApplicationContext context = SpringApplication.run(DeployerApplication.class, args); FunctionCatalog catalog = context.getBean(FunctionCatalog.class); @@ -183,7 +183,7 @@ public class FunctionDeployerTests { @Test public void testWithMainAndStartClassAndSpringConfigurationAndSCFOnClasspath() throws Exception { String[] args = new String[] { - "--spring.cloud.function.location=target/it/bootapp-with-scf/target/bootapp-with-scf-0.0.1.BUILD-SNAPSHOT-exec.jar", + "--spring.cloud.function.location=target/it/bootapp-with-scf/target/bootapp-with-scf-1.0.0.RELEASE-exec.jar", "--spring.cloud.function.function-name=uppercase" }; ApplicationContext context = SpringApplication.run(DeployerApplication.class, args); FunctionCatalog catalog = context.getBean(FunctionCatalog.class); @@ -202,7 +202,7 @@ public class FunctionDeployerTests { @Test public void testWithMainAndStartClassAndSpringConfigurationAndTypeConversion() throws Exception { String[] args = new String[] { - "--spring.cloud.function.location=target/it/bootapp/target/bootapp-0.0.1.BUILD-SNAPSHOT-exec.jar", + "--spring.cloud.function.location=target/it/bootapp/target/bootapp-1.0.0.RELEASE-exec.jar", "--spring.cloud.function.function-name=uppercasePerson" }; ApplicationContext context = SpringApplication.run(DeployerApplication.class, args); @@ -222,7 +222,7 @@ public class FunctionDeployerTests { @Test public void testBootAppWithMultipleInputOutput() { String[] args = new String[] { - "--spring.cloud.function.location=target/it/bootapp-multi/target/bootapp-multi-0.0.1.BUILD-SNAPSHOT-exec.jar", + "--spring.cloud.function.location=target/it/bootapp-multi/target/bootapp-multi-1.0.0.RELEASE-exec.jar", "--spring.cloud.function.function-name=fn" }; ApplicationContext context = SpringApplication.run(DeployerApplication.class, args); @@ -264,7 +264,7 @@ public class FunctionDeployerTests { @Test public void testBootJarWithMultipleInputOutput() { String[] args = new String[] { - "--spring.cloud.function.location=target/it/bootjar-multi/target/bootjar-multi-0.0.1.BUILD-SNAPSHOT-exec.jar", + "--spring.cloud.function.location=target/it/bootjar-multi/target/bootjar-multi-1.0.0.RELEASE-exec.jar", "--spring.cloud.function.function-class=function.example.Repeater" }; ApplicationContext context = SpringApplication.run(DeployerApplication.class, args);