DATAREST-1516 - After release cleanups.

This commit is contained in:
Mark Paluch
2020-05-12 12:40:55 +02:00
parent e8cde1804c
commit caed30b05d
2 changed files with 16 additions and 16 deletions

12
Jenkinsfile vendored
View File

@@ -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 {

20
pom.xml
View File

@@ -13,7 +13,7 @@
<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>
<relativePath/>
</parent>
@@ -29,13 +29,13 @@
<project.type>multi</project.type>
<dist.id>spring-data-rest</dist.id>
<springdata.commons>2.3.0.RELEASE</springdata.commons>
<springdata.jpa>2.3.0.RELEASE</springdata.jpa>
<springdata.mongodb>3.0.0.RELEASE</springdata.mongodb>
<springdata.geode>2.3.0.RELEASE</springdata.geode>
<springdata.solr>4.2.0.RELEASE</springdata.solr>
<springdata.cassandra>3.0.0.RELEASE</springdata.cassandra>
<springdata.keyvalue>2.3.0.RELEASE</springdata.keyvalue>
<springdata.commons>2.3.1.BUILD-SNAPSHOT</springdata.commons>
<springdata.jpa>2.3.1.BUILD-SNAPSHOT</springdata.jpa>
<springdata.mongodb>3.0.1.BUILD-SNAPSHOT</springdata.mongodb>
<springdata.geode>2.3.1.BUILD-SNAPSHOT</springdata.geode>
<springdata.solr>4.2.1.BUILD-SNAPSHOT</springdata.solr>
<springdata.cassandra>3.0.1.BUILD-SNAPSHOT</springdata.cassandra>
<springdata.keyvalue>2.3.1.BUILD-SNAPSHOT</springdata.keyvalue>
<hibernate.version>5.4.8.Final</hibernate.version>
<jsonpath>1.1.0</jsonpath>
@@ -144,8 +144,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>