From 2ed746d15186b62fc203fee08d74846b807a6429 Mon Sep 17 00:00:00 2001 From: Greg Turnquist Date: Wed, 30 May 2018 14:57:23 -0500 Subject: [PATCH] Add a Spring Framework 5.1 profile --- build.bash | 7 ------- circle.yml | 26 ++++++++++++++++++++++++++ pom.xml | 17 +++++++++++++++++ 3 files changed, 43 insertions(+), 7 deletions(-) delete mode 100755 build.bash diff --git a/build.bash b/build.bash deleted file mode 100755 index d75771b..0000000 --- a/build.bash +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -x - -if [ "${TRAVIS_PULL_REQUEST}" = "false" -a "${TRAVIS_BRANCH}" = "master" -a "${DEPLOY}" = "true" ]; then - mvn -Pdistribute,snapshot,docs clean deploy -else - mvn clean dependency:list test -P${PROFILE} -Dsort -fi \ No newline at end of file diff --git a/circle.yml b/circle.yml index d2d9a88..3e03f03 100644 --- a/circle.yml +++ b/circle.yml @@ -22,6 +22,17 @@ jobs: environment: PROFILE: spring5-next + j8_spring51_next: + docker: + - image: circleci/openjdk:8u141 + steps: + - checkout + - run: + name: Java 8 - Test Spring.NEXT 5.1 + command: mvn clean dependency:list test -P${PROFILE} -Dsort + environment: + PROFILE: spring51-next + j8_springdata_next: docker: - image: circleci/openjdk:8u141 @@ -55,6 +66,17 @@ jobs: environment: PROFILE: spring5-next + j10_spring51_next: + docker: + - image: circleci/openjdk:10.0.1-jdk-node-browsers + steps: + - checkout + - run: + name: Java 10 - Test Spring.NEXT 5.1 + command: mvn clean dependency:list test -P${PROFILE} -Dsort + environment: + PROFILE: spring51-next + j10_springdata_next: docker: - image: circleci/openjdk:10.0.1-jdk-node-browsers @@ -81,17 +103,21 @@ workflows: jobs: - 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: diff --git a/pom.xml b/pom.xml index d588114..9bf4561 100644 --- a/pom.xml +++ b/pom.xml @@ -103,6 +103,23 @@ + + spring51-next + + Bismuth-BUILD-SNAPSHOT + 5.1.0.BUILD-SNAPSHOT + Kay-BUILD-SNAPSHOT + 5.0.6.BUILD-SNAPSHOT + 2.0.4.BUILD-SNAPSHOT + + + + spring-libs-snapshot + http://repo.spring.io/libs-snapshot + + + + springdata-next