GEODE-3: add lib jars that will be missing in jdk9 and later

apache · Sep 14, 2018 · fd7ff2c · fd7ff2c
1 parent 5e35490
commit fd7ff2c
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 1 deletion.
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
@@ -213,6 +213,8 @@ def cp = {
         it.contains('jackson-core') ||
         it.contains('jackson-databind') ||
         it.contains('jansi') ||
+        it.contains('activation') ||
+        it.contains('jaxb') ||
         it.contains('javax.resource-api') ||
         it.contains('javax.servlet-api') ||
         it.contains('javax.transaction-api') ||

diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1156,7 +1156,7 @@ javadoc/script.js
 javadoc/serialized-form.html
 javadoc/stylesheet.css
 lib/HikariCP-3.2.0.jar
-lib/activation-1.1.jar
+lib/activation-1.1.1.jar
 lib/antlr-2.7.7.jar
 lib/classgraph-4.0.6.jar
 lib/commons-beanutils-1.9.3.jar
@@ -1193,6 +1193,9 @@ lib/javax.mail-api-1.6.1.jar
 lib/javax.resource-api-1.7.jar
 lib/javax.servlet-api-3.1.0.jar
 lib/javax.transaction-api-1.2.jar
+lib/jaxb-api-2.2.11.jar
+lib/jaxb-core-2.2.11.jar
+lib/jaxb-impl-2.2.11.jar
 lib/jetty-http-9.4.8.v20171121.jar
 lib/jetty-io-9.4.8.v20171121.jar
 lib/jetty-security-9.4.8.v20171121.jar

diff --git a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -1,4 +1,5 @@
 HikariCP-3.2.0.jar
+activation-1.1.1.jar
 antlr-2.7.7.jar
 classgraph-4.0.6.jar
 commons-beanutils-1.9.3.jar
@@ -20,6 +21,9 @@ geode-protobuf-1.8.0-SNAPSHOT.jar
 geode-protobuf-messages-1.8.0-SNAPSHOT.jar
 geode-rebalancer-1.8.0-SNAPSHOT.jar
 geode-wan-1.8.0-SNAPSHOT.jar
+jaxb-api-2.2.11.jar
+jaxb-core-2.2.11.jar
+jaxb-impl-2.2.11.jar
 jackson-annotations-2.9.6.jar
 jackson-core-2.9.6.jar
 jackson-databind-2.9.6.jar

diff --git a/geode-assembly/src/integrationTest/resources/expected_jars.txt b/geode-assembly/src/integrationTest/resources/expected_jars.txt
@@ -29,6 +29,9 @@ javax.mail-api
 javax.resource-api
 javax.servlet-api
 javax.transaction-api
+jaxb-api
+jaxb-core
+jaxb-impl
 jetty-http
 jetty-io
 jetty-security

diff --git a/geode-core/build.gradle b/geode-core/build.gradle
@@ -54,6 +54,10 @@ dependencies {
   compile 'commons-io:commons-io:' + project.'commons-io.version'
   compile 'commons-validator:commons-validator:' + project.'commons-validator.version'
   compile 'commons-digester:commons-digester:' + project.'commons-digester.version'
+  compile 'javax.activation:activation:' + project.'javax-activation.version'
+  compile 'javax.xml.bind:jaxb-api:' + project.'jaxb.version'
+  compile 'com.sun.xml.bind:jaxb-core:' + project.'jaxb.version'
+  compile 'com.sun.xml.bind:jaxb-impl:' + project.'jaxb.version'
 
   compile 'commons-lang:commons-lang:' + project.'commons-lang.version'
   compile('commons-modeler:commons-modeler:' + project.'commons-modeler.version') {

diff --git a/geode-core/src/test/resources/expected-pom.xml b/geode-core/src/test/resources/expected-pom.xml
@@ -83,6 +83,30 @@
       <version>2.1</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>javax.activation</groupId>
+      <artifactId>activation</artifactId>
+      <version>1.1.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>2.2.11</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-core</artifactId>
+      <version>2.2.11</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>2.2.11</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>

diff --git a/gradle/dependency-versions.properties b/gradle/dependency-versions.properties
@@ -54,6 +54,8 @@ javax.resource-api.version = 1.7
 javax.servlet-api.version = 3.1.0
 javax.transaction-api.version = 1.2
 jedis.version = 2.9.0
+jaxb.version = 2.2.11
+javax-activation.version = 1.1.1
 # The jetty version is also hard-coded in geode-assembly:test
 # at o.a.g.sessions.tests.GenericAppServerInstall.java
 jetty.version = 9.4.8.v20171121