From d3b4dd751d5bc1a97e409bdf14b1a6284fdd6f2e Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 12 May 2020 12:40:57 +0200 Subject: [PATCH] DATACOUCH-530 - After release cleanups. --- Jenkinsfile | 10 +++++----- pom.xml | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index caeda510..37062f87 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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 '4.0.x' not { triggeredBy 'UpstreamCause' } } } @@ -38,7 +38,7 @@ pipeline { stage("Test other configurations") { when { anyOf { - branch 'master' + branch '4.0.x' not { triggeredBy 'UpstreamCause' } } } @@ -82,7 +82,7 @@ pipeline { stage('Release to artifactory') { when { anyOf { - branch 'master' + branch '4.0.x' not { triggeredBy 'UpstreamCause' } } } @@ -114,7 +114,7 @@ pipeline { stage('Publish documentation') { when { - branch 'master' + branch '4.0.x' } agent { docker { diff --git a/pom.xml b/pom.xml index 91f2eaae..30071bff 100644 --- a/pom.xml +++ b/pom.xml @@ -14,13 +14,13 @@ org.springframework.data.build spring-data-parent - 2.3.0.RELEASE + 2.3.1.BUILD-SNAPSHOT 3.0.4 3.0.4 - 2.3.0.RELEASE + 2.3.1.BUILD-SNAPSHOT spring.data.couchbase @@ -184,8 +184,8 @@ - spring-libs-release - https://repo.spring.io/libs-release + spring-libs-snapshot + https://repo.spring.io/libs-snapshot sonatype-snapshot