Skip to content

Commit 8ee9dfc

Browse files
mp911demp911de
committed
#1090 - After release cleanups.
1 parent 4f52cc2 commit 8ee9dfc

File tree

4 files changed

+26
-38
lines changed

4 files changed

+26
-38
lines changed

‎Jenkinsfile

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ pipeline {
7676
}
7777
}
7878

79-
stage('Build project & BOM then release to artifactory') {
79+
stage('Build project and release to artifactory') {
8080
when {
8181
anyOf {
8282
branch 'master'
@@ -96,26 +96,15 @@ pipeline {
9696
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
9797
}
9898

99-
steps {
100-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' +
101-
'-Dartifactory.server=https://repo.spring.io ' +
102-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
103-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
104-
"-Dartifactory.staging-repository=libs-snapshot-local " +
105-
"-Dartifactory.build-name=spring-data-build-without-bom " +
106-
"-Dartifactory.build-number=${BUILD_NUMBER} " +
107-
'-Dmaven.test.skip=true clean dependency:tree source:jar javadoc:javadoc javadoc:jar deploy -pl "!bom" -B -U'
108-
109-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pwith-bom-client verify -pl bom,bom-client -B -U'
110-
99+
steps {
111100
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory ' +
112101
'-Dartifactory.server=https://repo.spring.io ' +
113102
"-Dartifactory.username=${ARTIFACTORY_USR} " +
114103
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
115104
"-Dartifactory.staging-repository=libs-snapshot-local " +
116-
"-Dartifactory.build-name=spring-data-build-bom " +
105+
"-Dartifactory.build-name=spring-data-build " +
117106
"-Dartifactory.build-number=${BUILD_NUMBER} " +
118-
'-Dmaven.test.skip=true clean deploy -pl bom -B -U'
107+
'-Dmaven.test.skip=true clean deploy -B -U'
119108
}
120109
}
121110
}

‎bom/pom.xml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,140 +24,140 @@
2424
<dependency>
2525
<groupId>org.springframework.data</groupId>
2626
<artifactId>spring-data-cassandra</artifactId>
27-
<version>3.0.0.RELEASE</version>
27+
<version>3.1.0-SNAPSHOT</version>
2828
</dependency>
2929

3030
<!-- Spring Data Commons -->
3131
<dependency>
3232
<groupId>org.springframework.data</groupId>
3333
<artifactId>spring-data-commons</artifactId>
34-
<version>2.3.0.RELEASE</version>
34+
<version>2.4.0-SNAPSHOT</version>
3535
</dependency>
3636

3737
<!-- Spring Data Couchbase -->
3838
<dependency>
3939
<groupId>org.springframework.data</groupId>
4040
<artifactId>spring-data-couchbase</artifactId>
41-
<version>4.0.0.RELEASE</version>
41+
<version>4.1.0-SNAPSHOT</version>
4242
</dependency>
4343

4444
<!-- Spring Data Elasticsearch -->
4545
<dependency>
4646
<groupId>org.springframework.data</groupId>
4747
<artifactId>spring-data-elasticsearch</artifactId>
48-
<version>4.0.0.RELEASE</version>
48+
<version>4.1.0-SNAPSHOT</version>
4949
</dependency>
5050

5151
<!-- Spring Data Gemfire -->
5252
<dependency>
5353
<groupId>org.springframework.data</groupId>
5454
<artifactId>spring-data-gemfire</artifactId>
55-
<version>2.3.0.RELEASE</version>
55+
<version>2.4.0-SNAPSHOT</version>
5656
</dependency>
5757

5858
<!-- Spring Data Geode -->
5959
<dependency>
6060
<groupId>org.springframework.data</groupId>
6161
<artifactId>spring-data-geode</artifactId>
62-
<version>2.3.0.RELEASE</version>
62+
<version>2.4.0-SNAPSHOT</version>
6363
</dependency>
6464

6565
<!-- Spring Data JDBC -->
6666
<dependency>
6767
<groupId>org.springframework.data</groupId>
6868
<artifactId>spring-data-jdbc</artifactId>
69-
<version>2.0.0.RELEASE</version>
69+
<version>2.1.0-SNAPSHOT</version>
7070
</dependency>
7171

7272
<dependency>
7373
<groupId>org.springframework.data</groupId>
7474
<artifactId>spring-data-relational</artifactId>
75-
<version>2.0.0.RELEASE</version>
75+
<version>2.1.0-SNAPSHOT</version>
7676
</dependency>
7777

7878
<!-- Spring Data JPA -->
7979
<dependency>
8080
<groupId>org.springframework.data</groupId>
8181
<artifactId>spring-data-jpa</artifactId>
82-
<version>2.3.0.RELEASE</version>
82+
<version>2.4.0-SNAPSHOT</version>
8383
</dependency>
8484

8585
<!-- Spring Data MongoDB -->
8686
<dependency>
8787
<groupId>org.springframework.data</groupId>
8888
<artifactId>spring-data-mongodb</artifactId>
89-
<version>3.0.0.RELEASE</version>
89+
<version>3.1.0-SNAPSHOT</version>
9090
</dependency>
9191

9292
<!-- Spring Data Neo4j -->
9393
<dependency>
9494
<groupId>org.springframework.data</groupId>
9595
<artifactId>spring-data-neo4j</artifactId>
96-
<version>5.3.0.RELEASE</version>
96+
<version>5.4.0-SNAPSHOT</version>
9797
</dependency>
9898

9999
<!-- Spring Data R2DBC -->
100100
<dependency>
101101
<groupId>org.springframework.data</groupId>
102102
<artifactId>spring-data-r2dbc</artifactId>
103-
<version>1.1.0.RELEASE</version>
103+
<version>1.2.0-SNAPSHOT</version>
104104
</dependency>
105105

106106
<!-- Spring Data Redis -->
107107
<dependency>
108108
<groupId>org.springframework.data</groupId>
109109
<artifactId>spring-data-redis</artifactId>
110-
<version>2.3.0.RELEASE</version>
110+
<version>2.4.0-SNAPSHOT</version>
111111
</dependency>
112112

113113
<!-- Spring Data REST -->
114114
<dependency>
115115
<groupId>org.springframework.data</groupId>
116116
<artifactId>spring-data-rest-webmvc</artifactId>
117-
<version>3.3.0.RELEASE</version>
117+
<version>3.4.0-SNAPSHOT</version>
118118
</dependency>
119119
<dependency>
120120
<groupId>org.springframework.data</groupId>
121121
<artifactId>spring-data-rest-core</artifactId>
122-
<version>3.3.0.RELEASE</version>
122+
<version>3.4.0-SNAPSHOT</version>
123123
</dependency>
124124
<dependency>
125125
<groupId>org.springframework.data</groupId>
126126
<artifactId>spring-data-rest-hal-browser</artifactId>
127-
<version>3.3.0.RELEASE</version>
127+
<version>3.4.0-SNAPSHOT</version>
128128
</dependency>
129129
<dependency>
130130
<groupId>org.springframework.data</groupId>
131131
<artifactId>spring-data-rest-hal-explorer</artifactId>
132-
<version>3.3.0.RELEASE</version>
132+
<version>3.4.0-SNAPSHOT</version>
133133
</dependency>
134134

135135
<!-- Spring Data Solr -->
136136
<dependency>
137137
<groupId>org.springframework.data</groupId>
138138
<artifactId>spring-data-solr</artifactId>
139-
<version>4.2.0.RELEASE</version>
139+
<version>4.3.0-SNAPSHOT</version>
140140
</dependency>
141141

142142
<!-- Spring Data KeyValue -->
143143
<dependency>
144144
<groupId>org.springframework.data</groupId>
145145
<artifactId>spring-data-keyvalue</artifactId>
146-
<version>2.3.0.RELEASE</version>
146+
<version>2.4.0-SNAPSHOT</version>
147147
</dependency>
148148

149149
<!-- Spring Data Envers -->
150150
<dependency>
151151
<groupId>org.springframework.data</groupId>
152152
<artifactId>spring-data-envers</artifactId>
153-
<version>2.3.0.RELEASE</version>
153+
<version>2.4.0-SNAPSHOT</version>
154154
</dependency>
155155

156156
<!-- Spring Data LDAP -->
157157
<dependency>
158158
<groupId>org.springframework.data</groupId>
159159
<artifactId>spring-data-ldap</artifactId>
160-
<version>2.3.0.RELEASE</version>
160+
<version>2.4.0-SNAPSHOT</version>
161161
</dependency>
162162

163163
</dependencies>

‎parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
<webbeans>2.0.16</webbeans>
133133
<javax-annotation-api>1.3.2</javax-annotation-api>
134134

135-
<releasetrain>Neumann-RELEASE</releasetrain>
135+
<releasetrain>Neumann-BUILD-SNAPSHOT</releasetrain>
136136

137137
<!-- To be overridden by individual modules -->
138138
<java-module-name/>

‎pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<modules>
2020
<module>resources</module>
2121
<module>parent</module>
22-
<module>bom</module>
2322
</modules>
2423

2524
<developers>

0 commit comments

Comments
 (0)