#1090 - After release cleanups.

This commit is contained in:
Mark Paluch
2020-05-12 12:40:30 +02:00
parent 4f52cc281b
commit 8ee9dfccc9
4 changed files with 26 additions and 38 deletions

19
Jenkinsfile vendored
View File

@@ -76,7 +76,7 @@ pipeline {
}
}
stage('Build project & BOM then release to artifactory') {
stage('Build project and release to artifactory') {
when {
anyOf {
branch 'master'
@@ -96,26 +96,15 @@ pipeline {
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
}
steps {
steps {
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' +
'-Dartifactory.server=https://repo.spring.io ' +
"-Dartifactory.username=${ARTIFACTORY_USR} " +
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
"-Dartifactory.staging-repository=libs-snapshot-local " +
"-Dartifactory.build-name=spring-data-build-without-bom " +
"-Dartifactory.build-name=spring-data-build " +
"-Dartifactory.build-number=${BUILD_NUMBER} " +
'-Dmaven.test.skip=true clean dependency:tree source:jar javadoc:javadoc javadoc:jar deploy -pl "!bom" -B -U'
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pwith-bom-client verify -pl bom,bom-client -B -U'
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' +
'-Dartifactory.server=https://repo.spring.io ' +
"-Dartifactory.username=${ARTIFACTORY_USR} " +
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
"-Dartifactory.staging-repository=libs-snapshot-local " +
"-Dartifactory.build-name=spring-data-build-bom " +
"-Dartifactory.build-number=${BUILD_NUMBER} " +
'-Dmaven.test.skip=true clean deploy -pl bom -B -U'
'-Dmaven.test.skip=true clean deploy -B -U'
}
}
}

View File

@@ -24,140 +24,140 @@
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-cassandra</artifactId>
<version>3.0.0.RELEASE</version>
<version>3.1.0-SNAPSHOT</version>
</dependency>
<!-- Spring Data Commons -->
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId>
<version>2.3.0.RELEASE</version>
<version>2.4.0-SNAPSHOT</version>
</dependency>
<!-- Spring Data Couchbase -->
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-couchbase</artifactId>
<version>4.0.0.RELEASE</version>
<version>4.1.0-SNAPSHOT</version>
</dependency>
<!-- Spring Data Elasticsearch -->
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-elasticsearch</artifactId>
<version>4.0.0.RELEASE</version>
<version>4.1.0-SNAPSHOT</version>
</dependency>
<!-- Spring Data Gemfire -->
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-gemfire</artifactId>
<version>2.3.0.RELEASE</version>
<version>2.4.0-SNAPSHOT</version>
</dependency>
<!-- Spring Data Geode -->
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-geode</artifactId>
<version>2.3.0.RELEASE</version>
<version>2.4.0-SNAPSHOT</version>
</dependency>
<!-- Spring Data JDBC -->
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-jdbc</artifactId>
<version>2.0.0.RELEASE</version>
<version>2.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-relational</artifactId>
<version>2.0.0.RELEASE</version>
<version>2.1.0-SNAPSHOT</version>
</dependency>
<!-- Spring Data JPA -->
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-jpa</artifactId>
<version>2.3.0.RELEASE</version>
<version>2.4.0-SNAPSHOT</version>
</dependency>
<!-- Spring Data MongoDB -->
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-mongodb</artifactId>
<version>3.0.0.RELEASE</version>
<version>3.1.0-SNAPSHOT</version>
</dependency>
<!-- Spring Data Neo4j -->
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-neo4j</artifactId>
<version>5.3.0.RELEASE</version>
<version>5.4.0-SNAPSHOT</version>
</dependency>
<!-- Spring Data R2DBC -->
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-r2dbc</artifactId>
<version>1.1.0.RELEASE</version>
<version>1.2.0-SNAPSHOT</version>
</dependency>
<!-- Spring Data Redis -->
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-redis</artifactId>
<version>2.3.0.RELEASE</version>
<version>2.4.0-SNAPSHOT</version>
</dependency>
<!-- Spring Data REST -->
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-webmvc</artifactId>
<version>3.3.0.RELEASE</version>
<version>3.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-core</artifactId>
<version>3.3.0.RELEASE</version>
<version>3.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-hal-browser</artifactId>
<version>3.3.0.RELEASE</version>
<version>3.4.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-hal-explorer</artifactId>
<version>3.3.0.RELEASE</version>
<version>3.4.0-SNAPSHOT</version>
</dependency>
<!-- Spring Data Solr -->
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-solr</artifactId>
<version>4.2.0.RELEASE</version>
<version>4.3.0-SNAPSHOT</version>
</dependency>
<!-- Spring Data KeyValue -->
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-keyvalue</artifactId>
<version>2.3.0.RELEASE</version>
<version>2.4.0-SNAPSHOT</version>
</dependency>
<!-- Spring Data Envers -->
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-envers</artifactId>
<version>2.3.0.RELEASE</version>
<version>2.4.0-SNAPSHOT</version>
</dependency>
<!-- Spring Data LDAP -->
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-ldap</artifactId>
<version>2.3.0.RELEASE</version>
<version>2.4.0-SNAPSHOT</version>
</dependency>
</dependencies>

View File

@@ -132,7 +132,7 @@
<webbeans>2.0.16</webbeans>
<javax-annotation-api>1.3.2</javax-annotation-api>
<releasetrain>Neumann-RELEASE</releasetrain>
<releasetrain>Neumann-BUILD-SNAPSHOT</releasetrain>
<!-- To be overridden by individual modules -->
<java-module-name/>

View File

@@ -19,7 +19,6 @@
<modules>
<module>resources</module>
<module>parent</module>
<module>bom</module>
</modules>
<developers>