#357 - After release cleanups.

This commit is contained in:
Mark Paluch
2020-05-12 12:40:55 +02:00
parent 6ebc94d448
commit 94f7f1759b
2 changed files with 10 additions and 10 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 '1.1.x'
not { triggeredBy 'UpstreamCause' }
}
}
@@ -38,7 +38,7 @@ pipeline {
stage("Test other configurations") {
when {
anyOf {
branch 'master'
branch '1.1.x'
not { triggeredBy 'UpstreamCause' }
}
}
@@ -82,7 +82,7 @@ pipeline {
stage('Release to artifactory') {
when {
anyOf {
branch 'master'
branch '1.1.x'
not { triggeredBy 'UpstreamCause' }
}
}
@@ -114,7 +114,7 @@ pipeline {
stage('Publish documentation') {
when {
branch 'master'
branch '1.1.x'
}
agent {
docker {

10
pom.xml
View File

@@ -14,15 +14,15 @@
<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>
<properties>
<dist.key>DATAR2DBC</dist.key>
<springdata.commons>2.3.0.RELEASE</springdata.commons>
<springdata.jdbc>2.0.0.RELEASE</springdata.jdbc>
<springdata.commons>2.3.1.BUILD-SNAPSHOT</springdata.commons>
<springdata.jdbc>2.0.1.BUILD-SNAPSHOT</springdata.jdbc>
<springdata.relational>${springdata.jdbc}</springdata.relational>
<java-module-name>spring.data.r2dbc</java-module-name>
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
@@ -448,8 +448,8 @@
<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>
</repositories>