Skip to content

Commit ba09926

Browse files
committed
SWS-1040 - Upgrade to latest Spring versions
Introduce another profile and two more CI jobs to verify more combinations of Spring portfolio and Java 8/11.
1 parent 28b643c commit ba09926

File tree

2 files changed

+63
-6
lines changed

2 files changed

+63
-6
lines changed

circle.yml

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,22 @@ jobs:
1818
name: Java 8 - Test Spring.NEXT
1919
command: ./mvnw -Pspringnext,convergence clean test
2020

21+
java_8_test_spring_next_buildsnapshot:
22+
docker:
23+
- image: circleci/openjdk:8u141
24+
steps:
25+
- checkout
26+
- run:
27+
name: Java 8 - Test Spring.NEXT (snapshots)
28+
command: ./mvnw -Pspringnext-buildsnapshot,convergence clean test
29+
2130
java_8_test_spring_buildsnapshot:
2231
docker:
2332
- image: circleci/openjdk:8u141
2433
steps:
2534
- checkout
2635
- run:
27-
name: Java 8 - Test Spring.NEXT
36+
name: Java 8 - Test Spring (snapshots)
2837
command: ./mvnw -Pspring-buildsnapshot,convergence clean test
2938

3039
java_11_test_current:
@@ -45,13 +54,22 @@ jobs:
4554
name: Java 11 - Test Spring.NEXT
4655
command: ./mvnw -Pspringnext,java11,convergence clean test
4756

57+
java_11_test_spring_next_buildsnapshot:
58+
docker:
59+
- image: circleci/openjdk:11-ea-27-jdk-sid
60+
steps:
61+
- checkout
62+
- run:
63+
name: Java 11 - Test Spring.NEXT (snapshots)
64+
command: ./mvnw -Pspringnext-buildsnapshot,java11,convergence clean test
65+
4866
java_11_test_spring_buildsnapshot:
4967
docker:
5068
- image: circleci/openjdk:11-ea-27-jdk-sid
5169
steps:
5270
- checkout
5371
- run:
54-
name: Java 11 - Test Spring.NEXT
72+
name: Java 11 - Test Spring (snapshots)
5573
command: ./mvnw -Pspring-buildsnapshot,java11,convergence clean test
5674

5775
deploy:
@@ -72,6 +90,8 @@ workflows:
7290
- java_11_test_spring_next
7391
- java_8_test_spring_buildsnapshot
7492
- java_11_test_spring_buildsnapshot
93+
- java_8_test_spring_next_buildsnapshot
94+
- java_11_test_spring_next_buildsnapshot
7595
- deploy:
7696
requires:
7797
- java_8_test_current
@@ -80,6 +100,8 @@ workflows:
80100
- java_11_test_spring_next
81101
- java_8_test_spring_buildsnapshot
82102
- java_11_test_spring_buildsnapshot
103+
- java_8_test_spring_next_buildsnapshot
104+
- java_11_test_spring_next_buildsnapshot
83105

84106
general:
85107
branches:

pom.xml

Lines changed: 39 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,8 @@
209209
<id>spring-buildsnapshot</id>
210210
<properties>
211211
<aspectj.version>1.9.1</aspectj.version>
212-
<spring.version>5.0.9.BUILD-SNAPSHOT</spring.version>
213-
<spring-security.version>5.0.8.BUILD-SNAPSHOT</spring-security.version>
212+
<spring.version>5.0.10.BUILD-SNAPSHOT</spring.version>
213+
<spring-security.version>5.0.9.BUILD-SNAPSHOT</spring-security.version>
214214
</properties>
215215
<repositories>
216216
<repository>
@@ -244,8 +244,43 @@
244244
<id>springnext</id>
245245
<properties>
246246
<aspectj.version>1.9.1</aspectj.version>
247-
<spring.version>5.1.0.RC1</spring.version>
248-
<spring-security.version>5.1.0.M2</spring-security.version>
247+
<spring.version>5.1.0.RC3</spring.version>
248+
<spring-security.version>5.1.0.RC2</spring-security.version>
249+
</properties>
250+
<repositories>
251+
<repository>
252+
<id>spring-snapshots</id>
253+
<name>Spring Snapshots</name>
254+
<url>https://repo.spring.io/snapshot</url>
255+
<snapshots>
256+
<enabled>true</enabled>
257+
</snapshots>
258+
</repository>
259+
<repository>
260+
<id>spring-milestones</id>
261+
<name>Spring Milestones</name>
262+
<url>https://repo.spring.io/milestone</url>
263+
<snapshots>
264+
<enabled>false</enabled>
265+
</snapshots>
266+
</repository>
267+
<repository>
268+
<id>spring-release</id>
269+
<name>Spring Releases</name>
270+
<url>https://repo.spring.io/release</url>
271+
<snapshots>
272+
<enabled>false</enabled>
273+
</snapshots>
274+
</repository>
275+
</repositories>
276+
</profile>
277+
278+
<profile>
279+
<id>springnext-buildsnapshot</id>
280+
<properties>
281+
<aspectj.version>1.9.1</aspectj.version>
282+
<spring.version>5.1.0.BUILD-SNAPSHOT</spring.version>
283+
<spring-security.version>5.1.0.BUILD-SNAPSHOT</spring-security.version>
249284
</properties>
250285
<repositories>
251286
<repository>

0 commit comments

Comments
 (0)