DATAGEODE-334 - After release cleanups.

This commit is contained in:
Mark Paluch
2020-05-12 12:40:55 +02:00
parent 882c6708b0
commit 38b3678d62
2 changed files with 9 additions and 9 deletions

10
Jenkinsfile vendored
View File

@@ -3,7 +3,7 @@ pipeline {
triggers {
pollSCM 'H/10 * * * *'
upstream(upstreamProjects: "spring-data-commons/master", threshold: hudson.model.Result.SUCCESS)
upstream(upstreamProjects: "spring-data-commons/2.3.x", threshold: hudson.model.Result.SUCCESS)
}
options {
@@ -15,7 +15,7 @@ pipeline {
stage("test: baseline (jdk8)") {
when {
anyOf {
branch 'master'
branch '2.3.x'
not { triggeredBy 'UpstreamCause' }
}
}
@@ -42,7 +42,7 @@ pipeline {
stage("Test other configurations") {
when {
anyOf {
branch 'master'
branch '2.3.x'
not { triggeredBy 'UpstreamCause' }
}
}
@@ -94,7 +94,7 @@ pipeline {
stage('Release to artifactory') {
when {
anyOf {
branch 'master'
branch '2.3.x'
not { triggeredBy 'UpstreamCause' }
}
}
@@ -131,7 +131,7 @@ pipeline {
}
stage('Publish documentation') {
when {
branch 'master'
branch '2.3.x'
}
agent {
docker {

View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.data.build</groupId>
<artifactId>spring-data-parent</artifactId>
<version>2.3.0.RELEASE</version>
<version>2.3.1.BUILD-SNAPSHOT</version>
</parent>
<groupId>org.springframework.data</groupId>
@@ -50,14 +50,14 @@
<log4j.version>2.12.1</log4j.version>
<multithreadedtc.version>1.01</multithreadedtc.version>
<snappy.version>0.4</snappy.version>
<springdata.commons>2.3.0.RELEASE</springdata.commons>
<springdata.commons>2.3.1.BUILD-SNAPSHOT</springdata.commons>
<spring-shell.version>1.2.0.RELEASE</spring-shell.version>
</properties>
<repositories>
<repository>
<id>spring-libs-release</id>
<url>https://repo.spring.io/libs-release</url>
<id>spring-libs-snapshot</id>
<url>https://repo.spring.io/libs-snapshot</url>
</repository>
<!--
<repository>