From c7060ef4cceb00a513f0eba66bc58f729aded8b8 Mon Sep 17 00:00:00 2001
From: lukaseder <lukas.eder@gmail.com>
Date: Tue, 10 Jul 2018 10:09:23 +0200
Subject: [PATCH] [#7649] jOOQ 3.11+ transitive dependency prevents it from
 being loaded on WebLogic 12.1.3

---
 .travis.yml          |  1 -
 jOOQ-codegen/pom.xml | 12 ------------
 jOOQ-meta/pom.xml    | 12 ------------
 jOOQ/pom.xml         |  4 ++++
 pom.xml              |  6 ++++++
 5 files changed, 10 insertions(+), 25 deletions(-)

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 @@
             <groupId>org.jooq</groupId>
             <artifactId>jooq-meta</artifactId>
         </dependency>
-
-        <!-- From JDK 9 onwards, the JAXB dependency needs to be made explicit -->
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
-
-        <!-- From JDK 11 onwards, the transitive activation dependency needs to be made explicit -->
-        <dependency>
-            <groupId>com.sun.activation</groupId>
-            <artifactId>javax.activation</artifactId>
-        </dependency>
     </dependencies>
 </project>
\ 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 @@
             <groupId>org.jooq</groupId>
             <artifactId>jooq</artifactId>
         </dependency>
-
-        <!-- From JDK 9 onwards, the JAXB dependency needs to be made explicit -->
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
-
-        <!-- From JDK 11 onwards, the transitive activation dependency needs to be made explicit -->
-        <dependency>
-            <groupId>com.sun.activation</groupId>
-            <artifactId>javax.activation</artifactId>
-        </dependency>
     </dependencies>
 </project>
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 @@
         </dependency>
 
         <!-- From JDK 9 onwards, the JAXB dependency needs to be made explicit -->
+        <!-- The dependency can cause trouble in older JDKs, so it needs to be
+             excluded from pre-java-9 builds: https://github.com/jOOQ/jOOQ/issues/7649 -->
+        <!-- [java-9] -->
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
@@ -95,6 +98,7 @@
             <groupId>com.sun.activation</groupId>
             <artifactId>javax.activation</artifactId>
         </dependency>
+        <!-- [/java-9] -->
 
 
 
diff --git a/pom.xml b/pom.xml
index f0c49a3ffa..a237d17382 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,16 +97,22 @@
 
 
             <!-- From JDK 9 onwards, the JAXB dependency needs to be made explicit -->
+            <!-- The dependency can cause trouble in older JDKs, so it needs to be
+                 excluded from pre-java-9 builds: https://github.com/jOOQ/jOOQ/issues/7649 -->
+            <!-- [java-9] -->
             <dependency>
                 <groupId>javax.xml.bind</groupId>
                 <artifactId>jaxb-api</artifactId>
                 <version>2.3.0</version>
             </dependency>
+
+            <!-- From JDK 11 onwards, the transitive activation dependency needs to be made explicit -->
             <dependency>
                 <groupId>com.sun.activation</groupId>
                 <artifactId>javax.activation</artifactId>
                 <version>1.2.0</version>
             </dependency>
+            <!-- [/java-9] -->
 
             <!-- Optional logging dependency -->
             <dependency>