Establish 2.0.x branch

Set up goals to verify 2.0 builds work with related stables releases and snapshots, but will also work with 2.1.
This commit is contained in:
Greg Turnquist
2018-08-03 12:03:27 -05:00
parent a2bfa4d39d
commit 6e25cfd0ac
3 changed files with 4 additions and 49 deletions

View File

@@ -9,7 +9,7 @@ jobs:
name: Java 8 - Test current version
command: mvn clean dependency:list test -P${PROFILE} -Dsort
environment:
PROFILE: non-existent,convergence
PROFILE: convergence
j8_spring_next:
docker:
@@ -33,17 +33,6 @@ jobs:
environment:
PROFILE: spring51-next,convergence
j8_springdata_next:
docker:
- image: circleci/openjdk:8u141
steps:
- checkout
- run:
name: Java 8 - Test Spring Data.NEXT
command: mvn clean dependency:list test -P${PROFILE} -Dsort
environment:
PROFILE: springdata-next,convergence
j10_current:
docker:
- image: circleci/openjdk:10.0.1-jdk-node-browsers
@@ -53,7 +42,7 @@ jobs:
name: Java 10 - Test current version
command: mvn clean dependency:list test -P${PROFILE} -Dsort
environment:
PROFILE: non-existent,java10,convergence
PROFILE: java10,convergence
j10_spring_next:
docker:
@@ -77,17 +66,6 @@ jobs:
environment:
PROFILE: spring51-next,java10,convergence
j10_springdata_next:
docker:
- image: circleci/openjdk:10.0.1-jdk-node-browsers
steps:
- checkout
- run:
name: Java 10 - Test Spring Data.NEXT
command: mvn clean dependency:list test -P${PROFILE} -Dsort
environment:
PROFILE: springdata-next,java10,convergence
deploy:
docker:
- image: circleci/openjdk:8u141
@@ -104,21 +82,17 @@ workflows:
- j8_current
- j8_spring_next
- j8_spring51_next
- j8_springdata_next
- j10_current
- j10_spring_next
- j10_spring51_next
- j10_springdata_next
- deploy:
requires:
- j8_current
- j8_spring_next
- j8_spring51_next
- j8_springdata_next
- j10_current
- j10_spring_next
- j10_spring51_next
- j10_springdata_next
general:
branches:

View File

@@ -1,7 +1,7 @@
#!/bin/bash -x
if [ "${CIRCLE_BRANCH}" == "master" ]; then
if [ "${CIRCLE_BRANCH}" == "master" ] || [ "${CIRCLE_BRANCH}" == "2.0.x" ]; then
mvn -Pdistribute,snapshot,docs clean deploy
else
echo "We only deploy 'master' branch"
echo "We only deploy 'master' branch and '2.0.x' branch."
fi

19
pom.xml
View File

@@ -122,25 +122,6 @@
</repositories>
</profile>
<profile>
<id>springdata-next</id>
<properties>
<reactor.version>Californium-M1</reactor.version>
<mongo.version>3.8.0</mongo.version>
<mongo-reactivestreams.version>1.9.0</mongo-reactivestreams.version>
<spring.version>5.1.0.RC1</spring.version>
<spring-data.version>Lovelace-BUILD-SNAPSHOT</spring-data.version>
<spring-security.version>5.1.0.M2</spring-security.version>
<spring-session.version>2.1.0.BUILD-SNAPSHOT</spring-session.version>
</properties>
<repositories>
<repository>
<id>spring-libs-snapshot</id>
<url>http://repo.spring.io/libs-snapshot</url>
</repository>
</repositories>
</profile>
<profile>
<id>convergence</id>