DATACOUCH-530 - After release cleanups.

This commit is contained in:
Mark Paluch
2020-05-12 12:40:57 +02:00
parent 6897a7654a
commit d3b4dd751d
2 changed files with 9 additions and 9 deletions

10
Jenkinsfile vendored
View File

@@ -3,7 +3,7 @@ pipeline {
triggers { triggers {
pollSCM 'H/10 * * * *' 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 { options {
@@ -15,7 +15,7 @@ pipeline {
stage("test: baseline (jdk8)") { stage("test: baseline (jdk8)") {
when { when {
anyOf { anyOf {
branch 'master' branch '4.0.x'
not { triggeredBy 'UpstreamCause' } not { triggeredBy 'UpstreamCause' }
} }
} }
@@ -38,7 +38,7 @@ pipeline {
stage("Test other configurations") { stage("Test other configurations") {
when { when {
anyOf { anyOf {
branch 'master' branch '4.0.x'
not { triggeredBy 'UpstreamCause' } not { triggeredBy 'UpstreamCause' }
} }
} }
@@ -82,7 +82,7 @@ pipeline {
stage('Release to artifactory') { stage('Release to artifactory') {
when { when {
anyOf { anyOf {
branch 'master' branch '4.0.x'
not { triggeredBy 'UpstreamCause' } not { triggeredBy 'UpstreamCause' }
} }
} }
@@ -114,7 +114,7 @@ pipeline {
stage('Publish documentation') { stage('Publish documentation') {
when { when {
branch 'master' branch '4.0.x'
} }
agent { agent {
docker { docker {

View File

@@ -14,13 +14,13 @@
<parent> <parent>
<groupId>org.springframework.data.build</groupId> <groupId>org.springframework.data.build</groupId>
<artifactId>spring-data-parent</artifactId> <artifactId>spring-data-parent</artifactId>
<version>2.3.0.RELEASE</version> <version>2.3.1.BUILD-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>
<couchbase>3.0.4</couchbase> <couchbase>3.0.4</couchbase>
<couchbase.osgi>3.0.4</couchbase.osgi> <couchbase.osgi>3.0.4</couchbase.osgi>
<springdata.commons>2.3.0.RELEASE</springdata.commons> <springdata.commons>2.3.1.BUILD-SNAPSHOT</springdata.commons>
<java-module-name>spring.data.couchbase</java-module-name> <java-module-name>spring.data.couchbase</java-module-name>
</properties> </properties>
@@ -184,8 +184,8 @@
<repositories> <repositories>
<repository> <repository>
<id>spring-libs-release</id> <id>spring-libs-snapshot</id>
<url>https://repo.spring.io/libs-release</url> <url>https://repo.spring.io/libs-snapshot</url>
</repository> </repository>
<repository> <repository>
<id>sonatype-snapshot</id> <id>sonatype-snapshot</id>