Eventuate local and spring update.

eventuate-examples · Mar 1, 2018 · c57cc8f · c57cc8f
1 parent f7193ae
commit c57cc8f
Show file tree

Hide file tree

Showing 26 changed files with 37 additions and 47 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ build/
 *.idea/
 *.iml
 *.log
+out/
diff --git a/multi-module/build.gradle b/multi-module/build.gradle
@@ -8,7 +8,7 @@ buildscript {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.0'
+    gradleVersion = '3.5'
 }
 
 subprojects {

diff --git a/multi-module/common-hateoas/build.gradle b/multi-module/common-hateoas/build.gradle
@@ -10,5 +10,5 @@ dependencies {
     compile "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion"
     compile("org.springframework.hateoas:spring-hateoas:$springHateoasVersion")
 
-    testCompile 'junit:junit:4.11'
+    testCompile 'junit:junit:4.12'
 }
diff --git a/multi-module/common/build.gradle b/multi-module/common/build.gradle
@@ -5,5 +5,5 @@ dependencies {
     compile "org.springframework.boot:spring-boot-starter-web:$springBootVersion"
     compile("org.springframework.boot:spring-boot-starter-data-jpa:$springBootVersion")
 
-    testCompile 'junit:junit:4.11'
+    testCompile 'junit:junit:4.12'
 }
diff --git a/multi-module/docker-compose-eventuate-local-postgres.yml b/multi-module/docker-compose-eventuate-local-postgres.yml
@@ -25,7 +25,9 @@ postgres:
     POSTGRES_PASSWORD: eventuate
 
 cdcservice:
-  image: eventuateio/eventuateio-local-cdc-service:0.15.0
+  image: eventuateio/eventuateio-local-cdc-service:0.17.0.RELEASE
+  ports:
+    - "8099:8080"
   links:
     - postgres
     - kafka

diff --git a/multi-module/docker-compose-eventuate-local.yml b/multi-module/docker-compose-eventuate-local.yml
@@ -18,7 +18,7 @@ kafka:
     - ZOOKEEPER_SERVERS=zookeeper:2181
 
 cdcservice:
-  image: eventuateio/eventuateio-local-cdc-service:0.15.0
+  image: eventuateio/eventuateio-local-cdc-service:0.17.0.RELEASE
   ports:
     - "8099:8080"
   links:

diff --git a/multi-module/e2etest/build.gradle b/multi-module/e2etest/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
     testCompile "org.apache.httpcomponents:httpclient:4.5"
     testCompile project(":test-utils")
-    testCompile "junit:junit:4.11"
+    testCompile "junit:junit:4.12"
     testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
 }
 

diff --git a/...src/test/java/net/chrisrichardson/eventstore/examples/todolist/e2etests/EndToEndTest.java b/...src/test/java/net/chrisrichardson/eventstore/examples/todolist/e2etests/EndToEndTest.java
@@ -2,12 +2,10 @@
 
 import net.chrisrichardson.eventstore.examples.todolist.AbstractTodoRestAPITest;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 
 
-@SpringApplicationConfiguration(classes = {E2ETestConfiguration.class})
-@IntegrationTest
+@SpringBootTest(classes = {E2ETestConfiguration.class})
 public class EndToEndTest extends AbstractTodoRestAPITest {
 
     @Value("#{systemEnvironment['DOCKER_HOST_IP']}")

diff --git a/multi-module/gradle.properties b/multi-module/gradle.properties
@@ -5,7 +5,7 @@ eventuateMavenRepoUrl=
 
 springHateoasVersion=0.17.0.RELEASE
 
-springBootVersion=1.3.5.RELEASE
+springBootVersion=1.4.7.RELEASE
 
-eventuateClientVersion=0.19.0.RELEASE
-eventuateLocalVersion=0.15.0.RELEASE
+eventuateClientVersion=0.20.1.RELEASE
+eventuateLocalVersion=0.17.0.RELEASE
diff --git a/multi-module/gradle/wrapper/gradle-wrapper.properties b/multi-module/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
diff --git a/multi-module/mysql/Dockerfile b/multi-module/mysql/Dockerfile
@@ -1,2 +1,2 @@
-FROM eventuateio/eventuateio-local-mysql:0.15.0
+FROM eventuateio/eventuateio-local-mysql:0.17.0.RELEASE
 COPY schema-mysql.sql /docker-entrypoint-initdb.d
diff --git a/multi-module/postgres/Dockerfile b/multi-module/postgres/Dockerfile
@@ -1,2 +1,2 @@
-FROM eventuateio/eventuateio-local-postgres:0.14.0
+FROM eventuateio/eventuateio-local-postgres:0.17.0.RELEASE
 COPY schema-postgres.sql /docker-entrypoint-initdb.d
diff --git a/multi-module/rest-api-integration-tests/build.gradle b/multi-module/rest-api-integration-tests/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     testCompile project(":todo-view-service")
 
     testCompile project(":test-utils")
-    testCompile "junit:junit:4.11"
+    testCompile "junit:junit:4.12"
     testCompile "org.mockito:mockito-all:1.9.5"
     testCompile "org.apache.httpcomponents:httpclient:4.5"
     testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion"

diff --git a/...t/java/net/chrisrichardson/eventstore/examples/todolist/integrationtests/RestAPITest.java b/...t/java/net/chrisrichardson/eventstore/examples/todolist/integrationtests/RestAPITest.java
@@ -2,12 +2,10 @@
 
 import net.chrisrichardson.eventstore.examples.todolist.AbstractTodoRestAPITest;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 
 
-@SpringApplicationConfiguration(classes = {RestAPITestConfiguration.class})
-@WebAppConfiguration
+@SpringBootTest(classes = {RestAPITestConfiguration.class}, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 public class RestAPITest extends AbstractTodoRestAPITest {
     @Value("${local.server.port}")
     private int port;

diff --git a/multi-module/test-utils/build.gradle b/multi-module/test-utils/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     compile "io.eventuate.client.java:eventuate-client-java-spring:$eventuateClientVersion"
 
     compile("org.springframework.boot:spring-boot-starter-web:$springBootVersion")
-    compile "junit:junit:4.11"
+    compile "junit:junit:4.12"
     compile "io.reactivex:rxjava:1.1.5"
     compile "org.apache.httpcomponents:httpclient:4.5"
     compile "org.springframework.boot:spring-boot-starter-test:$springBootVersion"

diff --git a/...c/main/java/net/chrisrichardson/eventstore/examples/todolist/AbstractTodoRestAPITest.java b/...c/main/java/net/chrisrichardson/eventstore/examples/todolist/AbstractTodoRestAPITest.java
@@ -6,7 +6,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.IntegrationTest;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
@@ -15,16 +14,13 @@
 import org.springframework.web.client.RestTemplate;
 
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
 
 import static net.chrisrichardson.eventstore.examples.todolist.testutil.TestUtil.awaitSuccessfulRequest;
 import static net.chrisrichardson.eventstore.examples.todolist.testutil.TestUtil.awaitNotFoundResponse;
-import static net.chrisrichardson.eventstore.examples.todolist.testutil.TestUtil.awaitSuccessfulRequest;
 
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@IntegrationTest({"server.port=0"})
 public abstract class AbstractTodoRestAPITest {
 
     protected int port;

diff --git a/single-module/build.gradle b/single-module/build.gradle
@@ -8,7 +8,7 @@ buildscript {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.0'
+    gradleVersion = '3.5'
 }
 
 apply plugin: 'java'
@@ -45,7 +45,7 @@ dependencies {
     compile "io.springfox:springfox-swagger2:2.2.2"
     compile 'io.springfox:springfox-swagger-ui:2.2.2'
 
-    testCompile "junit:junit:4.11"
+    testCompile "junit:junit:4.12"
     testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
     testCompile "io.eventuate.client.java:eventuate-client-java-jdbc:$eventuateClientVersion"
 }

diff --git a/single-module/docker-compose-eventuate-local-postgres.yml b/single-module/docker-compose-eventuate-local-postgres.yml
@@ -25,7 +25,9 @@ postgres:
     POSTGRES_PASSWORD: eventuate
 
 cdcservice:
-  image: eventuateio/eventuateio-local-cdc-service:0.15.0
+  image: eventuateio/eventuateio-local-cdc-service:0.17.0.RELEASE
+  ports:
+    - "8099:8080"
   links:
     - postgres
     - kafka

diff --git a/single-module/docker-compose-eventuate-local.yml b/single-module/docker-compose-eventuate-local.yml
@@ -18,7 +18,7 @@ kafka:
     - ZOOKEEPER_SERVERS=zookeeper:2181
 
 cdcservice:
-  image: eventuateio/eventuateio-local-cdc-service:0.15.0
+  image: eventuateio/eventuateio-local-cdc-service:0.17.0.RELEASE
   ports:
     - "8099:8080"
   links:

diff --git a/single-module/gradle.properties b/single-module/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.jvmargs=-XX:MaxPermSize=512m
 eventuateMavenRepoUrl=
 
 springHateoasVersion=0.17.0.RELEASE
-springBootVersion=1.3.5.RELEASE
+springBootVersion=1.4.7.RELEASE
 
-eventuateClientVersion=0.19.0.RELEASE
-eventuateLocalVersion=0.15.0.RELEASE
+eventuateClientVersion=0.20.1.RELEASE
+eventuateLocalVersion=0.17.0.RELEASE
diff --git a/single-module/gradle/wrapper/gradle-wrapper.properties b/single-module/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
diff --git a/single-module/mysql/Dockerfile b/single-module/mysql/Dockerfile
@@ -1,2 +1,2 @@
-FROM eventuateio/eventuateio-local-mysql:0.15.0
+FROM eventuateio/eventuateio-local-mysql:0.17.0.RELEASE
 COPY schema-mysql.sql /docker-entrypoint-initdb.d
diff --git a/single-module/postgres/Dockerfile b/single-module/postgres/Dockerfile
@@ -1,2 +1,2 @@
-FROM eventuateio/eventuateio-local-postgres:0.14.0
+FROM eventuateio/eventuateio-local-postgres:0.17.0.RELEASE
 COPY schema-postgres.sql /docker-entrypoint-initdb.d
diff --git a/...c/test/java/net/chrisrichardson/eventstore/examples/todolist/AbstractTodoRestAPITest.java b/...c/test/java/net/chrisrichardson/eventstore/examples/todolist/AbstractTodoRestAPITest.java
@@ -6,7 +6,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.IntegrationTest;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
@@ -22,7 +21,6 @@
 
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@IntegrationTest({"server.port=0"})
 public abstract class AbstractTodoRestAPITest {
 
     protected int port;

diff --git a/...src/test/java/net/chrisrichardson/eventstore/examples/todolist/e2etests/EndToEndTest.java b/...src/test/java/net/chrisrichardson/eventstore/examples/todolist/e2etests/EndToEndTest.java
@@ -1,14 +1,11 @@
 package net.chrisrichardson.eventstore.examples.todolist.e2etests;
 
 import net.chrisrichardson.eventstore.examples.todolist.AbstractTodoRestAPITest;
-import net.chrisrichardson.eventstore.examples.todolist.testutil.BasicWebTestConfiguration;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 
 
-@SpringApplicationConfiguration(classes = {E2ETestConfiguration.class})
-@IntegrationTest
+@SpringBootTest(classes = {E2ETestConfiguration.class})
 public class EndToEndTest extends AbstractTodoRestAPITest {
 
     @Value("#{systemEnvironment['DOCKER_HOST_IP']}")

diff --git a/...c/test/java/net/chrisrichardson/eventstore/examples/todolist/integration/RestAPITest.java b/...c/test/java/net/chrisrichardson/eventstore/examples/todolist/integration/RestAPITest.java
@@ -2,12 +2,10 @@
 
 import net.chrisrichardson.eventstore.examples.todolist.AbstractTodoRestAPITest;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 
 
-@SpringApplicationConfiguration(classes = {RestAPITestConfiguration.class})
-@WebAppConfiguration
+@SpringBootTest(classes = {RestAPITestConfiguration.class}, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 public class RestAPITest extends AbstractTodoRestAPITest {
     @Value("${local.server.port}")
     private int port;