diff --git a/.travis.yml b/.travis.yml index 84b031fad..45323dcfd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: java dist: xenial jdk: -- openjdk8 - openjdk11 env: diff --git a/cqrs/pom.xml b/cqrs/pom.xml index fc89a93b7..9c9458505 100644 --- a/cqrs/pom.xml +++ b/cqrs/pom.xml @@ -38,26 +38,18 @@ org.hibernate hibernate-core + + com.sun.xml.bind + jaxb-impl + test + 2.1.17 + + + javax.xml.bind + jaxb-api + test + + - - - jdk11-deps - - [11,) - - - - com.sun.xml.bind - jaxb-impl - test - 2.1.17 - - - javax.xml.bind - jaxb-api - test - - - - + diff --git a/eip-aggregator/pom.xml b/eip-aggregator/pom.xml index 39270f020..6a5e32845 100644 --- a/eip-aggregator/pom.xml +++ b/eip-aggregator/pom.xml @@ -47,6 +47,15 @@ ${camel.version} + + com.sun.xml.bind + jaxb-impl + + + javax.xml.bind + jaxb-api + + com.github.sbrannen @@ -71,23 +80,4 @@ - - - jdk11-deps - - [11,) - - - - com.sun.xml.bind - jaxb-impl - - - javax.xml.bind - jaxb-api - - - - - diff --git a/eip-splitter/pom.xml b/eip-splitter/pom.xml index 7319f6519..9769d0803 100644 --- a/eip-splitter/pom.xml +++ b/eip-splitter/pom.xml @@ -47,6 +47,16 @@ ${camel.version} + + com.sun.xml.bind + jaxb-impl + + + javax.xml.bind + jaxb-api + + + com.github.sbrannen @@ -71,24 +81,4 @@ - - - jdk11-deps - - [11,) - - - - com.sun.xml.bind - jaxb-impl - - - javax.xml.bind - jaxb-api - - - - - - diff --git a/eip-wire-tap/pom.xml b/eip-wire-tap/pom.xml index a9d309242..c96063418 100644 --- a/eip-wire-tap/pom.xml +++ b/eip-wire-tap/pom.xml @@ -47,6 +47,16 @@ ${camel.version} + + com.sun.xml.bind + jaxb-impl + + + javax.xml.bind + jaxb-api + + + com.github.sbrannen @@ -71,22 +81,4 @@ - - - jdk11-deps - - [11,) - - - - com.sun.xml.bind - jaxb-impl - - - javax.xml.bind - jaxb-api - - - - diff --git a/naked-objects/dom/pom.xml b/naked-objects/dom/pom.xml index 039afc373..e816c76bb 100644 --- a/naked-objects/dom/pom.xml +++ b/naked-objects/dom/pom.xml @@ -36,6 +36,17 @@ + + + org.apache.maven.plugins + maven-compiler-plugin + ${compiler.version} + + 8 + 8 + + + diff --git a/naked-objects/integtests/pom.xml b/naked-objects/integtests/pom.xml index f12f4ae1e..7365a71a9 100644 --- a/naked-objects/integtests/pom.xml +++ b/naked-objects/integtests/pom.xml @@ -90,6 +90,11 @@ hsqldb + + javax.annotation + javax.annotation-api + + - - - jdk11-deps - - [11,) - - - - javax.annotation - javax.annotation-api - - - - - diff --git a/pom.xml b/pom.xml index efeee185c..b3756e1c0 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ 1.2.17 2.3.1 2.3.2 - 1.3.1 + 1.3.2 abstract-factory @@ -320,6 +320,11 @@ jaxb-impl ${jaxb-impl.version} + + org.javassist + javassist + 3.25.0-GA + @@ -380,8 +385,8 @@ maven-compiler-plugin ${compiler.version} - 1.8 - 1.8 + 11 + 11 @@ -500,27 +505,4 @@ - - - jdk11-dep-management - - [11,) - - - - - org.javassist - javassist - 3.25.0-GA - - - javax.annotation - javax.annotation-api - 1.3.2 - - - - - - diff --git a/service-layer/pom.xml b/service-layer/pom.xml index 4edd95074..057a70134 100644 --- a/service-layer/pom.xml +++ b/service-layer/pom.xml @@ -41,6 +41,14 @@ com.h2database h2 + + com.sun.xml.bind + jaxb-impl + + + javax.xml.bind + jaxb-api + org.junit.jupiter junit-jupiter-engine @@ -52,22 +60,5 @@ test - - - jdk11-deps - - [11,) - - - - com.sun.xml.bind - jaxb-impl - - - javax.xml.bind - jaxb-api - - - - +