DATAES-808 - After release cleanups.

This commit is contained in:
Mark Paluch 2020-05-12 12:40:55 +02:00
parent d28f643997
commit 9adfa0b389
No known key found for this signature in database
GPG Key ID: 51A00FA751B91849
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' }
} }
} }
@ -36,7 +36,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' }
} }
} }
@ -76,7 +76,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' }
} }
} }
@ -107,7 +107,7 @@ pipeline {
} }
stage('Publish documentation') { stage('Publish documentation') {
when { when {
branch 'master' branch '4.0.x'
} }
agent { agent {
docker { docker {

View File

@ -10,7 +10,7 @@
<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>
<name>Spring Data Elasticsearch</name> <name>Spring Data Elasticsearch</name>
@ -21,7 +21,7 @@
<commonslang>2.6</commonslang> <commonslang>2.6</commonslang>
<elasticsearch>7.6.2</elasticsearch> <elasticsearch>7.6.2</elasticsearch>
<log4j>2.9.1</log4j> <log4j>2.9.1</log4j>
<springdata.commons>2.3.0.RELEASE</springdata.commons> <springdata.commons>2.3.1.BUILD-SNAPSHOT</springdata.commons>
<netty>4.1.39.Final</netty> <netty>4.1.39.Final</netty>
<java-module-name>spring.data.elasticsearch</java-module-name> <java-module-name>spring.data.elasticsearch</java-module-name>
</properties> </properties>
@ -373,8 +373,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>
</repositories> </repositories>