From 477ed57822c69f93e4f619944009ba88ee439bb4 Mon Sep 17 00:00:00 2001 From: Greg Turnquist Date: Tue, 28 Aug 2018 10:57:13 -0500 Subject: [PATCH] Backport support for Java 11 --- circle.yml | 30 +++++++++++++++--------------- pom.xml | 4 ---- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/circle.yml b/circle.yml index ff0f7b5..fa5ea2d 100644 --- a/circle.yml +++ b/circle.yml @@ -33,35 +33,35 @@ jobs: environment: PROFILE: spring51-next,convergence - j10_current: + j11_current: docker: - - image: circleci/openjdk:10.0.1-jdk-node-browsers + - image: circleci/openjdk:11-ea-27-jdk-sid steps: - checkout - run: - name: Java 10 - Test current version + name: Java 11 - Test current version command: mvn clean dependency:list test -P${PROFILE} -Dsort environment: PROFILE: java10,convergence - j10_spring_next: + j11_spring_next: docker: - - image: circleci/openjdk:10.0.1-jdk-node-browsers + - image: circleci/openjdk:11-ea-27-jdk-sid steps: - checkout - run: - name: Java 10 - Test Spring.NEXT + name: Java 11 - Test Spring.NEXT command: mvn clean dependency:list test -P${PROFILE} -Dsort environment: PROFILE: spring5-next,java10,convergence - j10_spring51_next: + j11_spring51_next: docker: - - image: circleci/openjdk:10.0.1-jdk-node-browsers + - image: circleci/openjdk:11-ea-27-jdk-sid steps: - checkout - run: - name: Java 10 - Test Spring.NEXT 5.1 + name: Java 11 - Test Spring.NEXT 5.1 command: mvn clean dependency:list test -P${PROFILE} -Dsort environment: PROFILE: spring51-next,java10,convergence @@ -82,17 +82,17 @@ workflows: - j8_current - j8_spring_next - j8_spring51_next - - j10_current - - j10_spring_next - - j10_spring51_next + - j11_current + - j11_spring_next + - j11_spring51_next - deploy: requires: - j8_current - j8_spring_next - j8_spring51_next - - j10_current - - j10_spring_next - - j10_spring51_next + - j11_current + - j11_spring_next + - j11_spring51_next general: branches: diff --git a/pom.xml b/pom.xml index 08b786f..14b7b3b 100644 --- a/pom.xml +++ b/pom.xml @@ -471,10 +471,6 @@ - - java10 - -