From caed30b05d6a77f2adeb2c196f942d26f17edc23 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 12 May 2020 12:40:55 +0200 Subject: [PATCH] DATAREST-1516 - After release cleanups. --- Jenkinsfile | 12 ++++++------ pom.xml | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8ec90df36..cb4581969 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,8 +3,8 @@ pipeline { triggers { pollSCM 'H/10 * * * *' - upstream(upstreamProjects: "spring-hateoas/master,spring-data-cassandra/master,spring-data-couchbase/master,spring-data-elasticsearch/master,spring-data-gemfire/master," + - "spring-data-geode/master,spring-data-jpa/master,spring-data-ldap/master,spring-data-mongodb/master,spring-data-neo4j/master,spring-data-redis/master,spring-data-solr/master", threshold: hudson.model.Result.SUCCESS) + upstream(upstreamProjects: "spring-hateoas/1.1.x,spring-data-cassandra/3.0.x,spring-data-couchbase/4.0.x,spring-data-elasticsearch/3.0.x,spring-data-gemfire/2.3.x," + + "spring-data-geode/2.3.x,spring-data-jpa/2.3.x,spring-data-ldap/2.3.x,spring-data-mongodb/3.0.x,spring-data-neo4j/5.3.x,spring-data-redis/2.3.x,spring-data-solr/4.2.x", threshold: hudson.model.Result.SUCCESS) } options { @@ -16,7 +16,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' } } } @@ -129,7 +129,7 @@ pipeline { stage('Release to artifactory') { when { anyOf { - branch 'master' + branch '2.3.x' not { triggeredBy 'UpstreamCause' } } } @@ -160,7 +160,7 @@ pipeline { } stage('Publish documentation') { when { - branch 'master' + branch '2.3.x' } agent { docker { diff --git a/pom.xml b/pom.xml index 659f0117a..1916f1504 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.springframework.data.build spring-data-parent - 2.3.0.RELEASE + 2.3.1.BUILD-SNAPSHOT @@ -29,13 +29,13 @@ multi spring-data-rest - 2.3.0.RELEASE - 2.3.0.RELEASE - 3.0.0.RELEASE - 2.3.0.RELEASE - 4.2.0.RELEASE - 3.0.0.RELEASE - 2.3.0.RELEASE + 2.3.1.BUILD-SNAPSHOT + 2.3.1.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT + 2.3.1.BUILD-SNAPSHOT + 4.2.1.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT + 2.3.1.BUILD-SNAPSHOT 5.4.8.Final 1.1.0 @@ -144,8 +144,8 @@ - spring-libs-release - https://repo.spring.io/libs-release + spring-libs-snapshot + https://repo.spring.io/libs-snapshot