Bumping version before M1 release

This commit is contained in:
Marcin Grzejszczak
2016-07-22 16:07:03 +02:00
parent 0f3a8fef61
commit 62f7d48f8d
42 changed files with 62 additions and 78 deletions

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-parent</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>1.0.0.M1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-docs</artifactId>

View File

@@ -7,13 +7,13 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>1.2.0.BUILD-SNAPSHOT</version>
<version>1.1.1.RELEASE</version>
<relativePath/>
</parent>
<artifactId>spring-cloud-contract-parent</artifactId>
<packaging>pom</packaging>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>1.0.0.M1</version>
<name>Spring Cloud Contract</name>
<description>Spring Cloud Contract</description>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-parent</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>1.0.0.M1</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -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"
}
}

View File

@@ -1,2 +1,2 @@
verifierVersion=1.0.0.BUILD-SNAPSHOT
verifierVersion=1.0.0.M1
BOM_VERSION=Brixton.SR3

View File

@@ -13,14 +13,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.4.0.BUILD-SNAPSHOT</version>
<version>1.4.0.RC1</version>
<relativePath />
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud-contract.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
<spring-cloud-contract.version>1.0.0.M1</spring-cloud-contract.version>
</properties>
<dependencies>

View File

@@ -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}"
}
}

View File

@@ -1,2 +1,2 @@
verifierVersion=1.0.0.BUILD-SNAPSHOT
verifierVersion=1.0.0.M1
BOM_VERSION=Brixton.SR3

View File

@@ -13,14 +13,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.4.0.BUILD-SNAPSHOT</version>
<version>1.4.0.RC1</version>
<relativePath />
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud-contract.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
<spring-cloud-contract.version>1.0.0.M1</spring-cloud-contract.version>
</properties>
<dependencies>
@@ -100,7 +100,7 @@
<pluginExecutionFilter>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-maven-plugin</artifactId>
<versionRange>[1.0.0.BUILD-SNAPSHOT,)</versionRange>
<versionRange>[1.0.0.M1,)</versionRange>
<goals>
<goal>convert</goal>
<goal>generateTests</goal>

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-samples</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>1.0.0.M1</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -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"
}
}

View File

@@ -1,2 +1,2 @@
verifierVersion=1.0.0.BUILD-SNAPSHOT
verifierVersion=1.0.0.M1
BOM_VERSION=Brixton.SR3

View File

@@ -14,14 +14,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.4.0.BUILD-SNAPSHOT</version>
<version>1.4.0.RC1</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud-contract.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
<spring-cloud-contract.version>1.0.0.M1</spring-cloud-contract.version>
</properties>
<dependencies>

View File

@@ -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}"
}
}

View File

@@ -1,2 +1,2 @@
verifierVersion=1.0.0.BUILD-SNAPSHOT
verifierVersion=1.0.0.M1
BOM_VERSION=Brixton.SR3

View File

@@ -14,14 +14,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.4.0.BUILD-SNAPSHOT</version>
<version>1.4.0.RC1</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud-contract.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
<spring-cloud-contract.version>1.0.0.M1</spring-cloud-contract.version>
</properties>
<dependencies>
@@ -101,7 +101,7 @@
<pluginExecutionFilter>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-maven-plugin</artifactId>
<versionRange>[1.0.0.BUILD-SNAPSHOT,)</versionRange>
<versionRange>[1.0.0.M1,)</versionRange>
<goals>
<goal>convert</goal>
<goal>generateTests</goal>

View File

@@ -14,14 +14,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.4.0.BUILD-SNAPSHOT</version>
<version>1.4.0.RC1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud-contract.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
<spring-cloud-contract.version>1.0.0.M1</spring-cloud-contract.version>
</properties>
<dependencies>

View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.4.0.BUILD-SNAPSHOT</version>
<version>1.4.0.RC1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
@@ -22,7 +22,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<jetty.version>9.2.13.v20150730</jetty.version>
<spring-cloud-contract.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
<spring-cloud-contract.version>1.0.0.M1</spring-cloud-contract.version>
</properties>
<dependencies>

View File

@@ -14,14 +14,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.4.0.BUILD-SNAPSHOT</version>
<version>1.4.0.RC1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud-contract.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
<spring-cloud-contract.version>1.0.0.M1</spring-cloud-contract.version>
</properties>
<dependencies>

View File

@@ -14,14 +14,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.4.0.BUILD-SNAPSHOT</version>
<version>1.4.0.RC1</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<spring-cloud-contract.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
<spring-cloud-contract.version>1.0.0.M1</spring-cloud-contract.version>
</properties>
<dependencies>

View File

@@ -5,11 +5,11 @@
<parent>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<groupId>org.springframework.cloud</groupId>
<version>1.1.2.BUILD-SNAPSHOT</version>
<version>1.1.1.RELEASE</version>
<relativePath/>
</parent>
<artifactId>spring-cloud-contract-dependencies</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>1.0.0.M1</version>
<packaging>pom</packaging>
<name>spring-cloud-contract-dependencies</name>
<description>Spring Cloud Contract Dependencies</description>
@@ -18,9 +18,9 @@
<jsonassert.version>0.4.7</jsonassert.version>
<aether.version>1.1.0</aether.version>
<spring-cloud-stream.version>1.0.2.RELEASE</spring-cloud-stream.version>
<spring-cloud-zookeeper.version>1.0.3.BUILD-SNAPSHOT</spring-cloud-zookeeper.version>
<spring-cloud-netflix.version>1.1.5.BUILD-SNAPSHOT</spring-cloud-netflix.version>
<spring-boot.version>1.4.0.BUILD-SNAPSHOT</spring-boot.version>
<spring-cloud-zookeeper.version>1.0.2.RELEASE</spring-cloud-zookeeper.version>
<spring-cloud-netflix.version>1.1.4.RELEASE</spring-cloud-netflix.version>
<spring-boot.version>1.4.0.RC1</spring-boot.version>
</properties>
<dependencyManagement>
<dependencies>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-parent</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>1.0.0.M1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-spec</artifactId>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-parent</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>1.0.0.M1</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-starters</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>1.0.0.M1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-starter-contract-stub-runner-jetty</artifactId>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-starters</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>1.0.0.M1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-starter-contract-stub-runner</artifactId>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-starters</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>1.0.0.M1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-starter-contract-verifier</artifactId>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-parent</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>1.0.0.M1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-stub-runner</artifactId>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-parent</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>1.0.0.M1</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-tools</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>1.0.0.M1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-converters</artifactId>

View File

@@ -16,4 +16,4 @@
nexusUsername =
nexusPassword =
verifierVersion=1.0.0.BUILD-SNAPSHOT
verifierVersion=1.0.0.M1

View File

@@ -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 {

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-tools</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>1.0.0.M1</version>
<relativePath>..</relativePath>
</parent>
@@ -25,7 +25,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<dependency.locations.enabled>false</dependency.locations.enabled>
<spring.cloud.contract.verifier.version>1.0.0.BUILD-SNAPSHOT</spring.cloud.contract.verifier.version>
<spring.cloud.contract.verifier.version>1.0.0.M1</spring.cloud.contract.verifier.version>
<aether.version>1.1.0</aether.version>
<maven.compiler.source>1.7</maven.compiler.source>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-parent</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>1.0.0.M1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-verifier</artifactId>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-parent</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>1.0.0.M1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-wiremock</artifactId>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-parent</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>1.0.0.M1</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-tests</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>1.0.0.M1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-sample-camel</artifactId>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-tests</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>1.0.0.M1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-sample-integration</artifactId>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-tests</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>1.0.0.M1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-sample-spring</artifactId>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-tests</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>1.0.0.M1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-sample-stream</artifactId>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-tests</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>1.0.0.M1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-stub-runner-camel</artifactId>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-tests</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>1.0.0.M1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-stub-runner-integration</artifactId>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-tests</artifactId>
<version>1.0.0.BUILD-SNAPSHOT</version>
<version>1.0.0.M1</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-contract-stub-runner-stream</artifactId>