From 1b1d4049d428e404b594c3bd11dbd6d6880f7a8e Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 6 Nov 2018 17:06:43 +0100 Subject: [PATCH] Bumped - cglib to 3.2.9 - commons-text to 1.6 - handlebars to 4.1.2 - jgit to 5.1.3.201810200350-r - gmaven to 1.6.2 - boot to 2.1.0 - aether to 1.1.0 --- pom.xml | 10 +++++----- .../standalone/contracts/com/example/server/pom.xml | 2 +- samples/standalone/dsl/http-client/build.gradle | 2 +- samples/standalone/dsl/http-client/pom.xml | 2 +- samples/standalone/dsl/http-server/build.gradle | 2 +- samples/standalone/dsl/http-server/pom.xml | 2 +- samples/standalone/messaging/stream-sink/build.gradle | 2 +- samples/standalone/messaging/stream-sink/pom.xml | 2 +- .../standalone/messaging/stream-source/build.gradle | 2 +- samples/standalone/messaging/stream-source/pom.xml | 2 +- samples/standalone/pact/pact-http-client/build.gradle | 2 +- samples/standalone/pact/pact-http-client/pom.xml | 2 +- samples/standalone/pact/pact-http-server/build.gradle | 2 +- samples/standalone/pact/pact-http-server/pom.xml | 2 +- samples/standalone/restdocs/http-client/build.gradle | 2 +- samples/standalone/restdocs/http-client/pom.xml | 2 +- samples/standalone/restdocs/http-server/build.gradle | 2 +- samples/standalone/restdocs/http-server/pom.xml | 2 +- samples/standalone/webclient/http-client/build.gradle | 2 +- samples/standalone/webclient/http-client/pom.xml | 2 +- samples/standalone/webclient/http-server/build.gradle | 2 +- samples/standalone/webclient/http-server/pom.xml | 2 +- samples/standalone/yml/http-client/build.gradle | 2 +- samples/standalone/yml/http-client/pom.xml | 2 +- samples/standalone/yml/http-server/build.gradle | 2 +- samples/standalone/yml/http-server/pom.xml | 2 +- spring-cloud-contract-dependencies/pom.xml | 2 +- .../cloud/contract/stubrunner/GitRepo.java | 4 ++-- .../src/test/projects/complex-configuration/pom.xml | 2 +- .../different-module-configuration/module/pom.xml | 2 +- .../src/test/projects/plugin-extension/pom.xml | 2 +- .../src/test/projects/spring-boot-groovy/pom.xml | 2 +- .../src/test/projects/spring-boot-java/pom.xml | 2 +- 33 files changed, 38 insertions(+), 38 deletions(-) diff --git a/pom.xml b/pom.xml index cd167f9a9c..2f524287f6 100644 --- a/pom.xml +++ b/pom.xml @@ -32,13 +32,13 @@ 2.1.0.BUILD-SNAPSHOT 2.1.0.BUILD-SNAPSHOT 5.0.3 - 3.2.4 + 3.2.9 1.0-groovy-2.4 0.5.1 0.2.2 - 1.1 - 4.0.6 - 4.6.0.201612231935-r + 1.6 + 4.1.2 + 5.1.3.201810200350-r 1 2.4.15 @@ -392,7 +392,7 @@ org.codehaus.gmavenplus gmavenplus-plugin - 1.6.1 + 1.6.2 diff --git a/samples/standalone/contracts/com/example/server/pom.xml b/samples/standalone/contracts/com/example/server/pom.xml index 0450d6f3b2..6201fc920a 100644 --- a/samples/standalone/contracts/com/example/server/pom.xml +++ b/samples/standalone/contracts/com/example/server/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.0.RC1 + 2.1.0.RELEASE diff --git a/samples/standalone/dsl/http-client/build.gradle b/samples/standalone/dsl/http-client/build.gradle index 713d9d1865..c5acfd0b5b 100644 --- a/samples/standalone/dsl/http-client/build.gradle +++ b/samples/standalone/dsl/http-client/build.gradle @@ -7,7 +7,7 @@ buildscript { maven { url "http://repo.spring.io/release" } } dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.RC1" + classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.RELEASE" } } diff --git a/samples/standalone/dsl/http-client/pom.xml b/samples/standalone/dsl/http-client/pom.xml index 344b77064e..e24e5132be 100644 --- a/samples/standalone/dsl/http-client/pom.xml +++ b/samples/standalone/dsl/http-client/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.0.RC1 + 2.1.0.RELEASE diff --git a/samples/standalone/dsl/http-server/build.gradle b/samples/standalone/dsl/http-server/build.gradle index 30dc30dce0..b46d21d30e 100644 --- a/samples/standalone/dsl/http-server/build.gradle +++ b/samples/standalone/dsl/http-server/build.gradle @@ -9,7 +9,7 @@ buildscript { } // end::repos[] dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.RC1" + classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.RELEASE" classpath "org.springframework.cloud:spring-cloud-contract-gradle-plugin:${findProperty('verifierVersion') ?: verifierVersion}" } } diff --git a/samples/standalone/dsl/http-server/pom.xml b/samples/standalone/dsl/http-server/pom.xml index 39aa68b310..ad1ef451cb 100644 --- a/samples/standalone/dsl/http-server/pom.xml +++ b/samples/standalone/dsl/http-server/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.0.RC1 + 2.1.0.RELEASE diff --git a/samples/standalone/messaging/stream-sink/build.gradle b/samples/standalone/messaging/stream-sink/build.gradle index f6036eeacb..3a97f6d870 100644 --- a/samples/standalone/messaging/stream-sink/build.gradle +++ b/samples/standalone/messaging/stream-sink/build.gradle @@ -7,7 +7,7 @@ buildscript { maven { url "http://repo.spring.io/release" } } dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.RC1" + classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.RELEASE" } } diff --git a/samples/standalone/messaging/stream-sink/pom.xml b/samples/standalone/messaging/stream-sink/pom.xml index be2841f80b..3a4770eaa5 100644 --- a/samples/standalone/messaging/stream-sink/pom.xml +++ b/samples/standalone/messaging/stream-sink/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.0.RC1 + 2.1.0.RELEASE diff --git a/samples/standalone/messaging/stream-source/build.gradle b/samples/standalone/messaging/stream-source/build.gradle index 354ba06e4b..65786aa6dd 100644 --- a/samples/standalone/messaging/stream-source/build.gradle +++ b/samples/standalone/messaging/stream-source/build.gradle @@ -7,7 +7,7 @@ buildscript { maven { url "http://repo.spring.io/release" } } dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.RC1" + classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.RELEASE" classpath "org.springframework.cloud:spring-cloud-contract-gradle-plugin:${findProperty('verifierVersion') ?: verifierVersion}" // Example of using Rest Assured 3.x. If you don't add this section Rest Assured 2.9.0 will be used // classpath "com.jayway.restassured:rest-assured:2.9.0" diff --git a/samples/standalone/messaging/stream-source/pom.xml b/samples/standalone/messaging/stream-source/pom.xml index 3feb18cc72..0379a6b38f 100644 --- a/samples/standalone/messaging/stream-source/pom.xml +++ b/samples/standalone/messaging/stream-source/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.0.RC1 + 2.1.0.RELEASE diff --git a/samples/standalone/pact/pact-http-client/build.gradle b/samples/standalone/pact/pact-http-client/build.gradle index e4139685e6..ce55fc61f8 100644 --- a/samples/standalone/pact/pact-http-client/build.gradle +++ b/samples/standalone/pact/pact-http-client/build.gradle @@ -7,7 +7,7 @@ buildscript { maven { url "http://repo.spring.io/release" } } dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.RC1" + classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.RELEASE" } } diff --git a/samples/standalone/pact/pact-http-client/pom.xml b/samples/standalone/pact/pact-http-client/pom.xml index 00bb9049e3..12384747ea 100644 --- a/samples/standalone/pact/pact-http-client/pom.xml +++ b/samples/standalone/pact/pact-http-client/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.0.RC1 + 2.1.0.RELEASE diff --git a/samples/standalone/pact/pact-http-server/build.gradle b/samples/standalone/pact/pact-http-server/build.gradle index 2805d9c4ea..4037483a41 100644 --- a/samples/standalone/pact/pact-http-server/build.gradle +++ b/samples/standalone/pact/pact-http-server/build.gradle @@ -7,7 +7,7 @@ buildscript { maven { url "http://repo.spring.io/release" } } dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.RC1" + classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.RELEASE" classpath "org.springframework.cloud:spring-cloud-contract-gradle-plugin:${findProperty('verifierVersion') ?: verifierVersion}" //tag::pact_dependency[] classpath "org.springframework.cloud:spring-cloud-contract-pact:${findProperty('verifierVersion') ?: verifierVersion}" diff --git a/samples/standalone/pact/pact-http-server/pom.xml b/samples/standalone/pact/pact-http-server/pom.xml index 12455bbb94..2e7d54b181 100644 --- a/samples/standalone/pact/pact-http-server/pom.xml +++ b/samples/standalone/pact/pact-http-server/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.0.RC1 + 2.1.0.RELEASE diff --git a/samples/standalone/restdocs/http-client/build.gradle b/samples/standalone/restdocs/http-client/build.gradle index 183810882a..a880596b61 100644 --- a/samples/standalone/restdocs/http-client/build.gradle +++ b/samples/standalone/restdocs/http-client/build.gradle @@ -7,7 +7,7 @@ buildscript { maven { url "http://repo.spring.io/release" } } dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.RC1" + classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.RELEASE" } } diff --git a/samples/standalone/restdocs/http-client/pom.xml b/samples/standalone/restdocs/http-client/pom.xml index 18379ec340..ea328d1e03 100644 --- a/samples/standalone/restdocs/http-client/pom.xml +++ b/samples/standalone/restdocs/http-client/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.0.RC1 + 2.1.0.RELEASE diff --git a/samples/standalone/restdocs/http-server/build.gradle b/samples/standalone/restdocs/http-server/build.gradle index b4e3fe8771..97df983b4d 100644 --- a/samples/standalone/restdocs/http-server/build.gradle +++ b/samples/standalone/restdocs/http-server/build.gradle @@ -10,7 +10,7 @@ buildscript { maven { url "http://repo.spring.io/plugins-staging-local/" } } dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.RC1" + classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.RELEASE" classpath "org.springframework.cloud:spring-cloud-contract-gradle-plugin:${project.findProperty('verifierVersion') ?: verifierVersion}" } } diff --git a/samples/standalone/restdocs/http-server/pom.xml b/samples/standalone/restdocs/http-server/pom.xml index 82ca4976d3..2325b01f15 100644 --- a/samples/standalone/restdocs/http-server/pom.xml +++ b/samples/standalone/restdocs/http-server/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.0.RC1 + 2.1.0.RELEASE diff --git a/samples/standalone/webclient/http-client/build.gradle b/samples/standalone/webclient/http-client/build.gradle index 1b1759d259..92bf3abb68 100644 --- a/samples/standalone/webclient/http-client/build.gradle +++ b/samples/standalone/webclient/http-client/build.gradle @@ -7,7 +7,7 @@ buildscript { maven { url "http://repo.spring.io/release" } } dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.RC1" + classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.RELEASE" } } diff --git a/samples/standalone/webclient/http-client/pom.xml b/samples/standalone/webclient/http-client/pom.xml index 1720b10292..9cf72da338 100644 --- a/samples/standalone/webclient/http-client/pom.xml +++ b/samples/standalone/webclient/http-client/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.0.RC1 + 2.1.0.RELEASE diff --git a/samples/standalone/webclient/http-server/build.gradle b/samples/standalone/webclient/http-server/build.gradle index bb7fa8cf7b..6e187af0c2 100644 --- a/samples/standalone/webclient/http-server/build.gradle +++ b/samples/standalone/webclient/http-server/build.gradle @@ -10,7 +10,7 @@ buildscript { maven { url "http://repo.spring.io/plugins-staging-local/" } } dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.RC1" + classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.RELEASE" } } diff --git a/samples/standalone/webclient/http-server/pom.xml b/samples/standalone/webclient/http-server/pom.xml index f1b937aa69..c63f72bc7d 100644 --- a/samples/standalone/webclient/http-server/pom.xml +++ b/samples/standalone/webclient/http-server/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.0.RC1 + 2.1.0.RELEASE diff --git a/samples/standalone/yml/http-client/build.gradle b/samples/standalone/yml/http-client/build.gradle index 9e438ec4b0..947f91646c 100644 --- a/samples/standalone/yml/http-client/build.gradle +++ b/samples/standalone/yml/http-client/build.gradle @@ -7,7 +7,7 @@ buildscript { maven { url "http://repo.spring.io/release" } } dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.RC1" + classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.RELEASE" } } diff --git a/samples/standalone/yml/http-client/pom.xml b/samples/standalone/yml/http-client/pom.xml index 3c245c4605..bd1e360746 100644 --- a/samples/standalone/yml/http-client/pom.xml +++ b/samples/standalone/yml/http-client/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.0.RC1 + 2.1.0.RELEASE diff --git a/samples/standalone/yml/http-server/build.gradle b/samples/standalone/yml/http-server/build.gradle index 89989fa869..35c7f26157 100644 --- a/samples/standalone/yml/http-server/build.gradle +++ b/samples/standalone/yml/http-server/build.gradle @@ -9,7 +9,7 @@ buildscript { } // end::repos[] dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.RC1" + classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.RELEASE" classpath "org.springframework.cloud:spring-cloud-contract-gradle-plugin:${findProperty('verifierVersion') ?: verifierVersion}" } } diff --git a/samples/standalone/yml/http-server/pom.xml b/samples/standalone/yml/http-server/pom.xml index 799fa9b2ca..8505f5f020 100644 --- a/samples/standalone/yml/http-server/pom.xml +++ b/samples/standalone/yml/http-server/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.0.RC1 + 2.1.0.RELEASE diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml index 12314a7c67..8e02da3e5e 100644 --- a/spring-cloud-contract-dependencies/pom.xml +++ b/spring-cloud-contract-dependencies/pom.xml @@ -16,7 +16,7 @@ 2.19.0 0.4.13 - 1.0.2.v20150114 + 1.1.0 3.2.0 diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/GitRepo.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/GitRepo.java index f660b4e533..609d355d09 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/GitRepo.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/GitRepo.java @@ -44,7 +44,7 @@ import org.eclipse.jgit.api.PullCommand; import org.eclipse.jgit.api.PushCommand; import org.eclipse.jgit.api.ResetCommand; import org.eclipse.jgit.api.TransportConfigCallback; -import org.eclipse.jgit.api.errors.EmtpyCommitException; +import org.eclipse.jgit.api.errors.EmptyCommitException; import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.transport.CredentialsProvider; @@ -164,7 +164,7 @@ class GitRepo { log.info("Commited successfully with message [" + message + "]"); return CommitResult.SUCCESSFUL; } - catch (EmtpyCommitException e) { + catch (EmptyCommitException e) { log.info("There were no changes detected. Will not commit an empty commit"); return CommitResult.EMPTY; } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml index b4ee5b98e1..c838e66bb6 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/complex-configuration/pom.xml @@ -28,7 +28,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.0.RC1 + 2.1.0.RELEASE diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/different-module-configuration/module/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/different-module-configuration/module/pom.xml index 4ab4ccb254..9051fadd0d 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/different-module-configuration/module/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/different-module-configuration/module/pom.xml @@ -28,7 +28,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.0.RC1 + 2.1.0.RELEASE diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml index 91efccfb9e..bc1c20c150 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/plugin-extension/pom.xml @@ -28,7 +28,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.0.RC1 + 2.1.0.RELEASE diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml index ed2c89ea7d..c06ef524a5 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-groovy/pom.xml @@ -28,7 +28,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.0.RC1 + 2.1.0.RELEASE diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml index c12228f29f..cbedcf9aae 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/spring-boot-java/pom.xml @@ -28,7 +28,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.0.RC1 + 2.1.0.RELEASE