Updated to s-c-deployer-nomad:1.2.0.RELEASE

* Added .travis.yml
donovanmuller · Jun 20, 2017 · 73c7418 · 73c7418
1 parent 8c0b9d6
commit 73c7418
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 12 deletions.
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -1 +1 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.3/apache-maven-3.3.3-bin.zip
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,8 @@
+language: java
+jdk:
+  - oraclejdk8
+
+install: true
+
+script:
+  - ./mvnw install -Dcheckstyle.skip=true
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Spring Cloud Data Flow Server Nomad
+# Spring Cloud Data Flow Server Nomad [![Build Status](https://travis-ci.org/donovanmuller/spring-cloud-dataflow-server-nomad.svg?branch=master)](https://travis-ci.org/donovanmuller/spring-cloud-dataflow-server-nomad)
 
 This project provides support for deploying Spring Cloud Dataflow's streaming and task/batch data pipelines to [Hashicorp Nomad](https://www.nomadproject.io). 
 It includes an implementation of Spring Cloud Data Flow’s [Deployer SPI for Nomad](https://github.com/donovanmuller/spring-cloud-deployer-nomad).

diff --git a/pom.xml b/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-dataflow-parent</artifactId>
-        <version>1.1.0.RELEASE</version>
+        <version>1.2.1.RELEASE</version>
         <relativePath />
     </parent>
 
     <groupId>org.springframework.cloud</groupId>
     <artifactId>spring-cloud-dataflow-server-nomad-parent</artifactId>
-    <version>1.1.1.BUILD-SNAPSHOT</version>
+    <version>1.2.0.BUILD-SNAPSHOT</version>
     <packaging>pom</packaging>
 
 	<name>Spring Cloud Data Flow Server for Nomad</name>
@@ -31,8 +31,8 @@
     </modules>
 
     <properties>
-        <spring-cloud-dataflow.version>1.1.0.RELEASE</spring-cloud-dataflow.version>
-        <spring-cloud-deployer-nomad.version>1.1.0.RELEASE</spring-cloud-deployer-nomad.version>
+        <spring-cloud-dataflow.version>1.2.1.RELEASE</spring-cloud-dataflow.version>
+        <spring-cloud-deployer-nomad.version>1.2.0.RELEASE</spring-cloud-deployer-nomad.version>
     </properties>
 
     <dependencyManagement>
@@ -91,6 +91,14 @@
                         <enabled>false</enabled>
                     </snapshots>
                 </repository>
+                <repository>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                    <id>bintray-donovanmuller-switchbit-public</id>
+                    <name>bintray</name>
+                    <url>http://dl.bintray.com/donovanmuller/switchbit-public</url>
+                </repository>
             </repositories>
             <pluginRepositories>
                 <pluginRepository>

diff --git a/spring-cloud-dataflow-server-nomad-autoconfig/pom.xml b/spring-cloud-dataflow-server-nomad-autoconfig/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-dataflow-server-nomad-parent</artifactId>
         <groupId>org.springframework.cloud</groupId>
-        <version>1.1.1.BUILD-SNAPSHOT</version>
+        <version>1.2.0.BUILD-SNAPSHOT</version>
     </parent>
 
     <artifactId>spring-cloud-dataflow-server-nomad-autoconfig</artifactId>

diff --git a/...org/springframework/cloud/dataflow/server/nomad/NomadDataFlowServerAutoConfiguration.java b/...org/springframework/cloud/dataflow/server/nomad/NomadDataFlowServerAutoConfiguration.java
@@ -16,7 +16,7 @@
 import org.springframework.core.io.ResourceLoader;
 
 /**
- * AutoConfiguration for the {@link NomadDataFlowServer}
+ * AutoConfiguration for the NomadDataFlowServer
  *
  * @author Donovan Muller
  */

diff --git a/spring-cloud-dataflow-server-nomad-docs/pom.xml b/spring-cloud-dataflow-server-nomad-docs/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>spring-cloud-dataflow-server-nomad-parent</artifactId>
         <groupId>org.springframework.cloud</groupId>
-        <version>1.1.1.BUILD-SNAPSHOT</version>
+        <version>1.2.0.BUILD-SNAPSHOT</version>
     </parent>
 
     <artifactId>spring-cloud-dataflow-server-nomad-docs</artifactId>

diff --git a/spring-cloud-dataflow-server-nomad/pom.xml b/spring-cloud-dataflow-server-nomad/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-dataflow-server-nomad-parent</artifactId>
-        <version>1.1.1.BUILD-SNAPSHOT</version>
+        <version>1.2.0.BUILD-SNAPSHOT</version>
     </parent>
 
     <groupId>org.springframework.cloud</groupId>
@@ -74,7 +74,7 @@
             <plugin>
                 <groupId>io.fabric8</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
-                <version>0.18.1</version>
+                <version>0.21.0</version>
                 <configuration>
                     <images>
                         <image>

diff --git a/...ad/src/main/java/org/springframework/cloud/dataflow/server/nomad/NomadDataFlowServer.java b/...ad/src/main/java/org/springframework/cloud/dataflow/server/nomad/NomadDataFlowServer.java
@@ -1,11 +1,13 @@
 package org.springframework.cloud.dataflow.server.nomad;
 
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.dataflow.server.EnableDataFlowServer;
 
 /**
  * @author Donovan Muller
  */
+@SpringBootApplication
 @EnableDataFlowServer
 public class NomadDataFlowServer {
 

diff --git a/...rc/test/java/org/springframework/cloud/dataflow/server/nomad/NomadDataFlowServerTest.java b/...rc/test/java/org/springframework/cloud/dataflow/server/nomad/NomadDataFlowServerTest.java
@@ -42,7 +42,7 @@ public void testDeployerProperties() {
 	public void testSupportedResource() {
 		DelegatingResourceLoader resourceLoader = context.getBean(DelegatingResourceLoader.class);
 		assertThat(resourceLoader
-				.getResource("maven://org.springframework.cloud:spring-cloud-dataflow-server-core:1.1.0.RELEASE"))
+				.getResource("maven://org.springframework.cloud:spring-cloud-dataflow-server-core:1.2.1.RELEASE"))
 						.isInstanceOf(MavenResource.class);
 		assertThat(resourceLoader.getResource("docker://helloworld:latest")).isInstanceOf(DockerResource.class);
 	}