diff --git a/.travis.yml b/.travis.yml index 4e3029ae42..8913836ec7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: java jdk: - openjdk10 - - openjdk-ea before_install: - wget https://archive.apache.org/dist/maven/maven-3/3.5.4/binaries/apache-maven-3.5.4-bin.zip - unzip -qq apache-maven-3.5.4-bin.zip diff --git a/jOOQ-codegen/pom.xml b/jOOQ-codegen/pom.xml index 05d8dd9e90..9d7ff9d319 100644 --- a/jOOQ-codegen/pom.xml +++ b/jOOQ-codegen/pom.xml @@ -53,17 +53,5 @@ org.jooq jooq-meta - - - - javax.xml.bind - jaxb-api - - - - - com.sun.activation - javax.activation - \ No newline at end of file diff --git a/jOOQ-meta/pom.xml b/jOOQ-meta/pom.xml index e223ff6092..dabddec6f4 100644 --- a/jOOQ-meta/pom.xml +++ b/jOOQ-meta/pom.xml @@ -48,17 +48,5 @@ org.jooq jooq - - - - javax.xml.bind - jaxb-api - - - - - com.sun.activation - javax.activation - diff --git a/jOOQ/pom.xml b/jOOQ/pom.xml index 9eae4a7abc..6c44bc5373 100644 --- a/jOOQ/pom.xml +++ b/jOOQ/pom.xml @@ -85,6 +85,9 @@ + + javax.xml.bind jaxb-api @@ -95,6 +98,7 @@ com.sun.activation javax.activation + diff --git a/pom.xml b/pom.xml index f0c49a3ffa..a237d17382 100644 --- a/pom.xml +++ b/pom.xml @@ -97,16 +97,22 @@ + + javax.xml.bind jaxb-api 2.3.0 + + com.sun.activation javax.activation 1.2.0 +