chore: update jaxb 2.3.0 and jaxb2basics to 1.11.1

also extracts these into gradle.properties variables
uPortal-Project · Feb 27, 2018 · cf35c51 · cf35c51
1 parent c65b2bc
commit cf35c51
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -75,7 +75,8 @@ jacksonVersion=2.9.4
 jansiVersion=1.11
 javaxMailVersion=1.4.7
 jasyptVersion=1.9.2
-jaxb2basicsVersion=0.6.5.1
+jaxbVersion=2.3.0
+jaxb2basicsVersion=1.11.1
 jgroupsVersion=3.6.14.Final
 jjwtVersion=0.9.0
 jlineVersion=2.11

diff --git a/uPortal-api/uPortal-api-search/build.gradle b/uPortal-api/uPortal-api-search/build.gradle
@@ -9,13 +9,13 @@ ext {
 }
 
 dependencies {
-    // All 6 of the following are for the 'com.github.jacobono.jaxb' plugin
-    jaxb 'com.sun.xml.bind:jaxb-xjc:2.2.7-b41'
-    jaxb 'com.sun.xml.bind:jaxb-impl:2.2.7-b41'
-    jaxb 'javax.xml.bind:jaxb-api:2.2.7'
-    jaxb 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.6.5'
-    jaxb 'org.jvnet.jaxb2_commons:jaxb2-basics:0.6.4'
-    jaxb 'org.jvnet.jaxb2_commons:jaxb2-basics-annotate:0.6.4'
+    // All 6 of the following are for the 'org.openrepose.gradle.plugins.jaxb' plugin
+    jaxb "com.sun.xml.bind:jaxb-xjc:${jaxbVersion}"
+    jaxb "com.sun.xml.bind:jaxb-impl:${jaxbVersion}"
+    jaxb "javax.xml.bind:jaxb-api:${jaxbVersion}"
+    jaxb "org.jvnet.jaxb2_commons:jaxb2-basics-ant:${jaxb2basicsVersion}"
+    jaxb "org.jvnet.jaxb2_commons:jaxb2-basics:${jaxb2basicsVersion}"
+    jaxb "org.jvnet.jaxb2_commons:jaxb2-basics-annotate:${jaxb2basicsVersion}"
 }
 
 /*

diff --git a/uPortal-io/uPortal-io-jaxb/build.gradle b/uPortal-io/uPortal-io-jaxb/build.gradle
@@ -9,13 +9,13 @@ ext {
 }
 
 dependencies {
-    // All 6 of the following are for the 'com.github.jacobono.jaxb' plugin
-    jaxb 'com.sun.xml.bind:jaxb-xjc:2.2.7-b41'
-    jaxb 'com.sun.xml.bind:jaxb-impl:2.2.7-b41'
-    jaxb 'javax.xml.bind:jaxb-api:2.2.7'
-    jaxb 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.6.5'
-    jaxb 'org.jvnet.jaxb2_commons:jaxb2-basics:0.6.4'
-    jaxb 'org.jvnet.jaxb2_commons:jaxb2-basics-annotate:0.6.4'
+    // All 6 of the following are for the 'org.openrepose.gradle.plugins.jaxb' plugin
+    jaxb "com.sun.xml.bind:jaxb-xjc:${jaxbVersion}"
+    jaxb "com.sun.xml.bind:jaxb-impl:${jaxbVersion}"
+    jaxb "javax.xml.bind:jaxb-api:${jaxbVersion}"
+    jaxb "org.jvnet.jaxb2_commons:jaxb2-basics-ant:${jaxb2basicsVersion}"
+    jaxb "org.jvnet.jaxb2_commons:jaxb2-basics:${jaxb2basicsVersion}"
+    jaxb "org.jvnet.jaxb2_commons:jaxb2-basics-annotate:${jaxb2basicsVersion}"
 }
 
 /*