updated gradle wrapper and activated junit 5 tests in gradle build

thombergs · thombergs · commit 441cd4f80139 · 2018-09-15T12:08:15.000+02:00
diff --git a/gradle/wrapper/gradle-wrapper.properties b/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-4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
diff --git a/junit/assumptions/gradle/wrapper/gradle-wrapper.properties b/junit/assumptions/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip
diff --git a/pact/pact-feign-consumer/application.yml b/pact/pact-feign-consumer/application.yml
@@ -1,5 +0,0 @@
-userservice:
-  ribbon:
-    eureka:
-      enabled: false
-    listOfServers: localhost:8080
diff --git a/pact/pact-feign-consumer/build.gradle b/pact/pact-feign-consumer/build.gradle
@@ -38,13 +38,18 @@ dependencies {
     testCompile('org.codehaus.groovy:groovy-all:2.4.6')
     testCompile("au.com.dius:pact-jvm-consumer-junit5_2.12:${pact_version}")
     testCompile('org.springframework.boot:spring-boot-starter-test')
+    testRuntimeOnly( 'org.junit.jupiter:junit-jupiter-engine:5.1.0')
 }
 
 pact {
     publish {
         pactDirectory = 'target/pacts'
-        pactBrokerUrl = 'URL'
-        pactBrokerUsername = 'USERNAME'
-        pactBrokerPassword = 'PASSWORD'
+        pactBrokerUrl = 'TODO'
+        pactBrokerUsername = 'TODO'
+        pactBrokerPassword = 'TODO'
     }
+}
+
+test {
+    useJUnitPlatform()
 }
diff --git a/pact/pact-feign-consumer/gradle/wrapper/gradle-wrapper.properties b/pact/pact-feign-consumer/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip
diff --git a/pact/pact-message-consumer/application.yml b/pact/pact-message-consumer/application.yml
@@ -1,11 +1 @@
-spring:
-  datasource:
-    url: jdbc:h2:mem:AZ;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
-    driverClassName: org.h2.Driver
-    username: sa
-    password:
-  h2:
-    console:
-      enabled: true
-
-logging.level.org.hibernate.SQL: OFF
+spring.rabbitmq.connection-timeout=10
diff --git a/pact/pact-message-consumer/build.gradle b/pact/pact-message-consumer/build.gradle
@@ -21,11 +21,10 @@ repositories {
 }
 
 dependencies {
-    compile('org.springframework.boot:spring-boot-starter-data-jpa')
     compile('org.springframework.boot:spring-boot-starter-web')
     compile('org.springframework.boot:spring-boot-starter-amqp')
     compile('com.h2database:h2:1.4.196')
-    compileOnly('org.projectlombok:lombok')
+    compileOnly('org.projectlombok:lombok:1.18.2')
     testCompile("au.com.dius:pact-jvm-consumer-junit_2.12:${pact_version}")
     testCompile("au.com.dius:pact-jvm-consumer-groovy_2.12:${pact_version}")
     testCompile('org.springframework.boot:spring-boot-starter-test')
diff --git a/pact/pact-message-consumer/gradle/wrapper/gradle-wrapper.properties b/pact/pact-message-consumer/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip
diff --git a/pact/pact-message-consumer/src/main/java/io/reflectoring/MessageConsumerConfiguration.java b/pact/pact-message-consumer/src/main/java/io/reflectoring/MessageConsumerConfiguration.java
@@ -40,6 +40,7 @@ public Binding binding(Queue eventReceivingQueue, TopicExchange receiverExchange
 	public SimpleMessageListenerContainer container(ConnectionFactory connectionFactory,
 																									MessageListenerAdapter listenerAdapter) {
 		SimpleMessageListenerContainer container = new SimpleMessageListenerContainer();
+		container.setConsumerStartTimeout(1000); // we don't want to wait in this example project
 		container.setConnectionFactory(connectionFactory);
 		container.setQueueNames(QUEUE_NAME);
 		container.setMessageListener(listenerAdapter);
diff --git a/pact/pact-message-producer/application.yml b/pact/pact-message-producer/application.yml
@@ -1,11 +0,0 @@
-spring:
-  datasource:
-    url: jdbc:h2:mem:AZ;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
-    driverClassName: org.h2.Driver
-    username: sa
-    password:
-  h2:
-    console:
-      enabled: true
-
-logging.level.org.hibernate.SQL: OFF
diff --git a/pact/pact-message-producer/build.gradle b/pact/pact-message-producer/build.gradle
@@ -21,11 +21,10 @@ repositories {
 }
 
 dependencies {
-    compile('org.springframework.boot:spring-boot-starter-data-jpa')
     compile('org.springframework.boot:spring-boot-starter-web')
     compile('org.springframework.boot:spring-boot-starter-amqp')
     compile('com.h2database:h2:1.4.196')
-    compileOnly('org.projectlombok:lombok')
+    compileOnly('org.projectlombok:lombok:1.18.2')
     testCompile("au.com.dius:pact-jvm-provider-junit_2.12:${pact_version}")
     testCompile('org.springframework.boot:spring-boot-starter-test')
 }
diff --git a/pact/pact-message-producer/gradle/wrapper/gradle-wrapper.properties b/pact/pact-message-producer/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip
diff --git a/pact/pact-message-producer/target/pacts/userclient-userservice.json b/pact/pact-message-producer/target/pacts/userclient-userservice.json
diff --git a/pact/pact-spring-provider/build.gradle b/pact/pact-spring-provider/build.gradle
@@ -26,8 +26,13 @@ dependencies {
     compile('com.h2database:h2:1.4.196')
     testCompile("au.com.dius:pact-jvm-provider-junit5_2.12:${pact_version}")
     testCompile('org.springframework.boot:spring-boot-starter-test')
+    testRuntimeOnly( 'org.junit.jupiter:junit-jupiter-engine:5.1.0')
 }
 
 bootRun {
     jvmArgs = ["-Xdebug", "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005"]
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/pact/pact-spring-provider/gradle/wrapper/gradle-wrapper.properties b/pact/pact-spring-provider/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip
diff --git a/spring-boot/modular/application/gradle/wrapper/gradle-wrapper.properties b/spring-boot/modular/application/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip
diff --git a/spring-boot/rabbitmq-event-brokering/gradle/wrapper/gradle-wrapper.properties b/spring-boot/rabbitmq-event-brokering/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip
diff --git a/spring-cloud/feign-with-spring-data-rest/gradle/wrapper/gradle-wrapper.properties b/spring-cloud/feign-with-spring-data-rest/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip
diff --git a/spring-cloud/sleuth-downstream-service/gradle/wrapper/gradle-wrapper.properties b/spring-cloud/sleuth-downstream-service/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip
diff --git a/spring-cloud/sleuth-upstream-service/gradle/wrapper/gradle-wrapper.properties b/spring-cloud/sleuth-upstream-service/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip
diff --git a/spring-cloud/spring-cloud-contract-consumer/gradle/wrapper/gradle-wrapper.properties b/spring-cloud/spring-cloud-contract-consumer/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip
diff --git a/spring-cloud/spring-cloud-contract-provider/gradle/wrapper/gradle-wrapper.properties b/spring-cloud/spring-cloud-contract-provider/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip
diff --git a/spring-data/spring-data-rest-springfox/gradle/wrapper/gradle-wrapper.properties b/spring-data/spring-data-rest-springfox/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip
