diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d146c7c..2e22622 100644 --- 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 index 52dd1f0..1498dd7 100644 --- 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 index eba55d8..e69de29 100644 --- 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 \ No newline at end of file diff --git a/pact/pact-feign-consumer/build.gradle b/pact/pact-feign-consumer/build.gradle index c16d12f..02bbe8b 100644 --- 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() } \ No newline at end of file diff --git a/pact/pact-feign-consumer/gradle/wrapper/gradle-wrapper.properties b/pact/pact-feign-consumer/gradle/wrapper/gradle-wrapper.properties index 52dd1f0..1498dd7 100644 --- 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 index bfca1b8..d8232af 100644 --- 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 \ No newline at end of file +spring.rabbitmq.connection-timeout=10 \ No newline at end of file diff --git a/pact/pact-message-consumer/build.gradle b/pact/pact-message-consumer/build.gradle index 3895d57..3f86d1b 100644 --- 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 index 52dd1f0..1498dd7 100644 --- 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 index 619aded..bc37567 100644 --- 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 class MessageConsumerConfiguration { 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 index bfca1b8..e69de29 100644 --- 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 \ No newline at end of file diff --git a/pact/pact-message-producer/build.gradle b/pact/pact-message-producer/build.gradle index 259eb48..721c655 100644 --- 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 index 52dd1f0..1498dd7 100644 --- 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 deleted file mode 100644 index f05d97d..0000000 --- a/pact/pact-message-producer/target/pacts/userclient-userservice.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "consumer": { - "name": "userclient" - }, - "provider": { - "name": "userservice" - }, - "messages": [ - { - "description": "a user created message", - "metaData": { - "Content-Type": "application/json; charset=UTF-8" - }, - "contents": { - "messageUuid": "string", - "user": { - "name": "Zaphod Beeblebrox", - "id": 42 - } - }, - "matchingRules": { - "body": { - "$.messageUuid": { - "matchers": [ - { - "match": "type" - } - ], - "combine": "AND" - }, - "$.user.id": { - "matchers": [ - { - "match": "number" - } - ], - "combine": "AND" - }, - "$.user.name": { - "matchers": [ - { - "match": "type" - } - ], - "combine": "AND" - } - } - } - } - ], - "metadata": { - "pactSpecification": { - "version": "3.0.0" - }, - "pact-jvm": { - "version": "3.5.20" - } - } -} \ No newline at end of file diff --git a/pact/pact-spring-provider/build.gradle b/pact/pact-spring-provider/build.gradle index 98040f4..faca518 100644 --- 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 index 52dd1f0..1498dd7 100644 --- 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 index 52dd1f0..1498dd7 100644 --- 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 index 52dd1f0..1498dd7 100644 --- 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 index 52dd1f0..1498dd7 100644 --- 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 index 52dd1f0..1498dd7 100644 --- 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 index 52dd1f0..1498dd7 100644 --- 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 index 52dd1f0..1498dd7 100644 --- 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 index 52dd1f0..1498dd7 100644 --- 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 index 52dd1f0..1498dd7 100644 --- 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