diff --git a/docs/pom.xml b/docs/pom.xml index 60b38070e2..8f3f1dc004 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 .. spring-cloud-contract-docs diff --git a/pom.xml b/pom.xml index c378b2956c..3fc439baee 100644 --- a/pom.xml +++ b/pom.xml @@ -7,13 +7,13 @@ org.springframework.cloud spring-cloud-build - 1.2.0.BUILD-SNAPSHOT + 1.1.1.RELEASE spring-cloud-contract-parent pom - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 Spring Cloud Contract Spring Cloud Contract diff --git a/samples/pom.xml b/samples/pom.xml index 2af692e62a..4c9fd6f7b8 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 .. diff --git a/samples/standalone/http-client/build.gradle b/samples/standalone/http-client/build.gradle index 4db1443b15..cbbe041bff 100644 --- a/samples/standalone/http-client/build.gradle +++ b/samples/standalone/http-client/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:1.4.0.BUILD-SNAPSHOT" + classpath "org.springframework.boot:spring-boot-gradle-plugin:1.4.0.RC1" } } diff --git a/samples/standalone/http-client/gradle.properties b/samples/standalone/http-client/gradle.properties index 004e3e550a..b3366f6cfc 100644 --- a/samples/standalone/http-client/gradle.properties +++ b/samples/standalone/http-client/gradle.properties @@ -1,2 +1,2 @@ -verifierVersion=1.0.0.BUILD-SNAPSHOT +verifierVersion=1.0.0.M1 BOM_VERSION=Brixton.SR3 \ No newline at end of file diff --git a/samples/standalone/http-client/pom.xml b/samples/standalone/http-client/pom.xml index 9529065a77..710247dad5 100644 --- a/samples/standalone/http-client/pom.xml +++ b/samples/standalone/http-client/pom.xml @@ -13,14 +13,14 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.BUILD-SNAPSHOT + 1.4.0.RC1 UTF-8 1.8 - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 diff --git a/samples/standalone/http-server/build.gradle b/samples/standalone/http-server/build.gradle index 6279c4264c..bd6a8d42e6 100644 --- a/samples/standalone/http-server/build.gradle +++ b/samples/standalone/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:1.4.0.BUILD-SNAPSHOT" + classpath "org.springframework.boot:spring-boot-gradle-plugin:1.4.0.RC1" classpath "org.springframework.cloud:spring-cloud-contract-gradle-plugin:${findProperty('verifierVersion') ?: verifierVersion}" } } diff --git a/samples/standalone/http-server/gradle.properties b/samples/standalone/http-server/gradle.properties index 004e3e550a..b3366f6cfc 100644 --- a/samples/standalone/http-server/gradle.properties +++ b/samples/standalone/http-server/gradle.properties @@ -1,2 +1,2 @@ -verifierVersion=1.0.0.BUILD-SNAPSHOT +verifierVersion=1.0.0.M1 BOM_VERSION=Brixton.SR3 \ No newline at end of file diff --git a/samples/standalone/http-server/pom.xml b/samples/standalone/http-server/pom.xml index bf5c9a1a9f..c617b5b259 100644 --- a/samples/standalone/http-server/pom.xml +++ b/samples/standalone/http-server/pom.xml @@ -13,14 +13,14 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.BUILD-SNAPSHOT + 1.4.0.RC1 UTF-8 1.8 - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 @@ -100,7 +100,7 @@ org.springframework.cloud spring-cloud-contract-maven-plugin - [1.0.0.BUILD-SNAPSHOT,) + [1.0.0.M1,) convert generateTests diff --git a/samples/standalone/pom.xml b/samples/standalone/pom.xml index 98e33aa48c..53a23c2025 100644 --- a/samples/standalone/pom.xml +++ b/samples/standalone/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-samples - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 .. diff --git a/samples/standalone/stream-sink/build.gradle b/samples/standalone/stream-sink/build.gradle index de3a0db9f0..a227e3df67 100644 --- a/samples/standalone/stream-sink/build.gradle +++ b/samples/standalone/stream-sink/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:1.4.0.BUILD-SNAPSHOT" + classpath "org.springframework.boot:spring-boot-gradle-plugin:1.4.0.RC1" } } diff --git a/samples/standalone/stream-sink/gradle.properties b/samples/standalone/stream-sink/gradle.properties index 004e3e550a..b3366f6cfc 100644 --- a/samples/standalone/stream-sink/gradle.properties +++ b/samples/standalone/stream-sink/gradle.properties @@ -1,2 +1,2 @@ -verifierVersion=1.0.0.BUILD-SNAPSHOT +verifierVersion=1.0.0.M1 BOM_VERSION=Brixton.SR3 \ No newline at end of file diff --git a/samples/standalone/stream-sink/pom.xml b/samples/standalone/stream-sink/pom.xml index b1d7ab4fd5..4dd0c890f2 100644 --- a/samples/standalone/stream-sink/pom.xml +++ b/samples/standalone/stream-sink/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.BUILD-SNAPSHOT + 1.4.0.RC1 UTF-8 1.8 - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 diff --git a/samples/standalone/stream-source/build.gradle b/samples/standalone/stream-source/build.gradle index 4a71def335..722205e294 100644 --- a/samples/standalone/stream-source/build.gradle +++ b/samples/standalone/stream-source/build.gradle @@ -8,7 +8,7 @@ buildscript { maven { url "http://repo.spring.io/plugins-staging-local/" } } dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:1.4.0.BUILD-SNAPSHOT" + classpath "org.springframework.boot:spring-boot-gradle-plugin:1.4.0.RC1" classpath "org.springframework.cloud:spring-cloud-contract-gradle-plugin:${findProperty('verifierVersion') ?: verifierVersion}" } } diff --git a/samples/standalone/stream-source/gradle.properties b/samples/standalone/stream-source/gradle.properties index 004e3e550a..b3366f6cfc 100644 --- a/samples/standalone/stream-source/gradle.properties +++ b/samples/standalone/stream-source/gradle.properties @@ -1,2 +1,2 @@ -verifierVersion=1.0.0.BUILD-SNAPSHOT +verifierVersion=1.0.0.M1 BOM_VERSION=Brixton.SR3 \ No newline at end of file diff --git a/samples/standalone/stream-source/pom.xml b/samples/standalone/stream-source/pom.xml index f01ce2efec..b7c1632401 100644 --- a/samples/standalone/stream-source/pom.xml +++ b/samples/standalone/stream-source/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.BUILD-SNAPSHOT + 1.4.0.RC1 UTF-8 1.8 - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 @@ -101,7 +101,7 @@ org.springframework.cloud spring-cloud-contract-maven-plugin - [1.0.0.BUILD-SNAPSHOT,) + [1.0.0.M1,) convert generateTests diff --git a/samples/wiremock-jetty/pom.xml b/samples/wiremock-jetty/pom.xml index 4be394b35f..afe260518c 100644 --- a/samples/wiremock-jetty/pom.xml +++ b/samples/wiremock-jetty/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.BUILD-SNAPSHOT + 1.4.0.RC1 UTF-8 1.8 - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 diff --git a/samples/wiremock-native/pom.xml b/samples/wiremock-native/pom.xml index a14d2bb143..149daa5b4c 100644 --- a/samples/wiremock-native/pom.xml +++ b/samples/wiremock-native/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.BUILD-SNAPSHOT + 1.4.0.RC1 @@ -22,7 +22,7 @@ UTF-8 1.8 9.2.13.v20150730 - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 diff --git a/samples/wiremock-tomcat/pom.xml b/samples/wiremock-tomcat/pom.xml index 2023bec26d..7ee1cd9238 100644 --- a/samples/wiremock-tomcat/pom.xml +++ b/samples/wiremock-tomcat/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.BUILD-SNAPSHOT + 1.4.0.RC1 UTF-8 1.8 - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 diff --git a/samples/wiremock-undertow/pom.xml b/samples/wiremock-undertow/pom.xml index 00d6d3d14f..71f1d800fb 100644 --- a/samples/wiremock-undertow/pom.xml +++ b/samples/wiremock-undertow/pom.xml @@ -14,14 +14,14 @@ org.springframework.boot spring-boot-starter-parent - 1.4.0.BUILD-SNAPSHOT + 1.4.0.RC1 UTF-8 1.8 - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml index 668b9f7057..2a2ba84f0e 100644 --- a/spring-cloud-contract-dependencies/pom.xml +++ b/spring-cloud-contract-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.1.2.BUILD-SNAPSHOT + 1.1.1.RELEASE spring-cloud-contract-dependencies - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 pom spring-cloud-contract-dependencies Spring Cloud Contract Dependencies @@ -18,9 +18,9 @@ 0.4.7 1.1.0 1.0.2.RELEASE - 1.0.3.BUILD-SNAPSHOT - 1.1.5.BUILD-SNAPSHOT - 1.4.0.BUILD-SNAPSHOT + 1.0.2.RELEASE + 1.1.4.RELEASE + 1.4.0.RC1 diff --git a/spring-cloud-contract-spec/pom.xml b/spring-cloud-contract-spec/pom.xml index 02b0320f29..fb7b6d5b07 100644 --- a/spring-cloud-contract-spec/pom.xml +++ b/spring-cloud-contract-spec/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 .. spring-cloud-contract-spec diff --git a/spring-cloud-contract-starters/pom.xml b/spring-cloud-contract-starters/pom.xml index e841b1f51c..250e875c01 100644 --- a/spring-cloud-contract-starters/pom.xml +++ b/spring-cloud-contract-starters/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 .. diff --git a/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner-jetty/pom.xml b/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner-jetty/pom.xml index eb8a7de8d2..129844cf46 100644 --- a/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner-jetty/pom.xml +++ b/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner-jetty/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-starters - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 .. spring-cloud-starter-contract-stub-runner-jetty diff --git a/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner/pom.xml b/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner/pom.xml index 0d7d362648..76b864fe6e 100644 --- a/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner/pom.xml +++ b/spring-cloud-contract-starters/spring-cloud-starter-contract-stub-runner/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-starters - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 .. spring-cloud-starter-contract-stub-runner diff --git a/spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml b/spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml index 8c0a8f1273..0ee1436d31 100644 --- a/spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml +++ b/spring-cloud-contract-starters/spring-cloud-starter-contract-verifier/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-starters - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 .. spring-cloud-starter-contract-verifier diff --git a/spring-cloud-contract-stub-runner/pom.xml b/spring-cloud-contract-stub-runner/pom.xml index 3e236d9ac3..ae2e2204c6 100644 --- a/spring-cloud-contract-stub-runner/pom.xml +++ b/spring-cloud-contract-stub-runner/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 .. spring-cloud-contract-stub-runner diff --git a/spring-cloud-contract-tools/pom.xml b/spring-cloud-contract-tools/pom.xml index 12a75d5992..851d229172 100644 --- a/spring-cloud-contract-tools/pom.xml +++ b/spring-cloud-contract-tools/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 .. diff --git a/spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml index 3c2f456076..760144337c 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-converters/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-tools - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 .. spring-cloud-contract-converters diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties index 94cad3ac91..11474cd11e 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties @@ -16,4 +16,4 @@ nexusUsername = nexusPassword = -verifierVersion=1.0.0.BUILD-SNAPSHOT \ No newline at end of file +verifierVersion=1.0.0.M1 \ No newline at end of file diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle/release.gradle b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle/release.gradle index 141f421c6a..6a5f916917 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle/release.gradle +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle/release.gradle @@ -2,32 +2,16 @@ apply plugin: 'maven' apply plugin: 'signing' ext { - resolveRepoName = { Project project -> - String version = project.version - String name = project.name - resolvedRepoName = "plugins-${resolveVersion(version)}-local" - logger.lifecycle("For project [$project.name] with " + - "version [$project.version] the resolved Artifactory repo is [$resolvedRepoName]") - return resolvedRepoName - } - - resolveVersion = { String version -> - if (version.endsWith('BUILD-SNAPSHOT')) return 'snapshot' - if (version.matches('[0-9].[0-9].[0-9].M[0-9]+')) return 'milestone' - if (version.matches('[0-9].[0-9].[0-9].RC[0-9]+')) return 'milestone' - if (version.endsWith('RELEASE')) return 'release' - return 'snapshot' - } - - isReleaseVersion = !version.endsWith("SNAPSHOT") + isReleaseVersion = version.endsWith("RELEASE") + isMilestoneVersion = version.matches('[0-9].[0-9].[0-9].M[0-9]+') || version.matches('[0-9].[0-9].[0-9].RC[0-9]+') } uploadArchives.dependsOn { [check] } ext { - repositoryUrl = "https://repo.spring.io/${repoPrefix()}-${resolveVersion(version)}-local" - snapshotRepositoryUrl = "https://repo.spring.io/${repoPrefix()}-snapshot-local" - repoUrl = isReleaseVersion ? repositoryUrl : snapshotRepositoryUrl + repositoryUrl = "https://repo.spring.io/plugins-release-local" + snapshotRepositoryUrl = "https://repo.spring.io/plugins-snapshot-local" + repoUrl = (isReleaseVersion || isMilestoneVersion) ? repositoryUrl : snapshotRepositoryUrl } afterEvaluate { diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml index 8f0dd4a6ee..609c6b0d9e 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-contract-tools - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 .. @@ -25,7 +25,7 @@ UTF-8 false - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 1.1.0 1.7 diff --git a/spring-cloud-contract-verifier/pom.xml b/spring-cloud-contract-verifier/pom.xml index 4630f7752f..524452031e 100644 --- a/spring-cloud-contract-verifier/pom.xml +++ b/spring-cloud-contract-verifier/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 .. spring-cloud-contract-verifier diff --git a/spring-cloud-contract-wiremock/pom.xml b/spring-cloud-contract-wiremock/pom.xml index 49415ce94f..a20ecbafeb 100644 --- a/spring-cloud-contract-wiremock/pom.xml +++ b/spring-cloud-contract-wiremock/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 .. spring-cloud-contract-wiremock diff --git a/tests/pom.xml b/tests/pom.xml index 7c4215426c..0b45b70411 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-contract-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 .. diff --git a/tests/samples-messaging-camel/pom.xml b/tests/samples-messaging-camel/pom.xml index fb4d93fb34..3186117e17 100644 --- a/tests/samples-messaging-camel/pom.xml +++ b/tests/samples-messaging-camel/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-tests - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 .. spring-cloud-contract-sample-camel diff --git a/tests/samples-messaging-integration/pom.xml b/tests/samples-messaging-integration/pom.xml index 669b3e001c..064b45d7e0 100644 --- a/tests/samples-messaging-integration/pom.xml +++ b/tests/samples-messaging-integration/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-tests - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 .. spring-cloud-contract-sample-integration diff --git a/tests/samples-messaging-spring/pom.xml b/tests/samples-messaging-spring/pom.xml index 8744349134..59a8a35c0a 100644 --- a/tests/samples-messaging-spring/pom.xml +++ b/tests/samples-messaging-spring/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-tests - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 .. spring-cloud-contract-sample-spring diff --git a/tests/samples-messaging-stream/pom.xml b/tests/samples-messaging-stream/pom.xml index 0ca978ac84..18e0376b74 100644 --- a/tests/samples-messaging-stream/pom.xml +++ b/tests/samples-messaging-stream/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-tests - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 .. spring-cloud-contract-sample-stream diff --git a/tests/spring-cloud-contract-stub-runner-camel/pom.xml b/tests/spring-cloud-contract-stub-runner-camel/pom.xml index 7fa76e19c8..97cac19d0f 100644 --- a/tests/spring-cloud-contract-stub-runner-camel/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-camel/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-tests - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 .. spring-cloud-contract-stub-runner-camel diff --git a/tests/spring-cloud-contract-stub-runner-integration/pom.xml b/tests/spring-cloud-contract-stub-runner-integration/pom.xml index 0213b712b0..0314bdb8d2 100644 --- a/tests/spring-cloud-contract-stub-runner-integration/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-integration/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-tests - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 .. spring-cloud-contract-stub-runner-integration diff --git a/tests/spring-cloud-contract-stub-runner-stream/pom.xml b/tests/spring-cloud-contract-stub-runner-stream/pom.xml index cbf8c51f63..bd593bd0ef 100644 --- a/tests/spring-cloud-contract-stub-runner-stream/pom.xml +++ b/tests/spring-cloud-contract-stub-runner-stream/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-contract-tests - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 .. spring-cloud-contract-stub-runner-stream