Merge pull request #6 from JoshBrudnak/feature/support-java-9

Fixed issues with jaxb and spring-ldap version
ChristianMurphy · Mar 1, 2018 · 4fa4ad3 · 4fa4ad3
2 parents b581402 + b33ea4c
commit 4fa4ad3
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 13 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -77,6 +77,7 @@ jansiVersion=1.11
 javaxMailVersion=1.4.7
 javaxmlVersion=1.3.1
 jasyptVersion=1.9.2
+jaxbApiVersion=2.3.0
 jaxb2basicsVersion=1.11.1
 jgroupsVersion=3.6.14.Final
 jjwtVersion=0.9.0
@@ -100,7 +101,7 @@ slf4jVersion=1.7.25
 springVersion=4.3.11.RELEASE
 spockVersion=1.1-groovy-2.4
 springfoxSwaggerVersion=2.7.0
-springLdapVersion=1.3.1.RELEASE
+springLdapVersion=2.3.2.RELEASE
 springModulesCacheVersion=0.8a
 springSecurityVersion=4.2.3.RELEASE
 springWebflowVersion=2.4.6.RELEASE

diff --git a/uPortal-api/uPortal-api-search/build.gradle b/uPortal-api/uPortal-api-search/build.gradle
@@ -9,13 +9,13 @@ ext {
 }
 
 dependencies {
-    compile 'javax.xml.bind:jaxb-api:2.3.0'
+    compile "javax.xml.bind:jaxb-api:${jaxbApiVersion}"
     compile "jaxb:activation:${activationVersion}"
 
     // 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.3.0'
+    jaxb "javax.xml.bind:jaxb-api:${jaxbApiVersion}"
     jaxb "jaxb:activation:${activationVersion}"
     jaxb 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.6.5'
     jaxb 'org.jvnet.jaxb2_commons:jaxb2-basics:0.6.4'

diff --git a/uPortal-core/build.gradle b/uPortal-core/build.gradle
@@ -5,6 +5,7 @@ dependencies {
         exclude group: 'com.google.guava', module: 'guava'
     }
     compile "commons-lang:commons-lang:${commonsLangVersion}"
+    compile "javax.annotation:javax.annotation-api:1.3.2"
     compile "joda-time:joda-time:${jodaTimeVersion}"
     compile "org.apache.commons:commons-lang3:${commonsLang3Version}"
     compile "org.hibernate:hibernate-core:${hibernateVersion}"

diff --git a/...roups/uPortal-groups-ldap/src/main/java/org/apereo/portal/groups/ldap/LDAPGroupStore.java b/...roups/uPortal-groups-ldap/src/main/java/org/apereo/portal/groups/ldap/LDAPGroupStore.java
@@ -49,7 +49,7 @@
 import org.apereo.portal.spring.locator.EntityTypesLocator;
 import org.apereo.portal.utils.ResourceLoader;
 import org.apereo.portal.utils.SmartCache;
-import org.springframework.ldap.core.LdapEncoder;
+import org.springframework.ldap.support.LdapEncoder;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;

diff --git a/uPortal-io/uPortal-io-core/build.gradle b/uPortal-io/uPortal-io-core/build.gradle
@@ -3,10 +3,10 @@ description = "Apereo uPortal Import/Export Core"
 dependencies {
     compile project(':uPortal-utils:uPortal-utils-core')
 
-    compile "javax.xml.bind:jaxb-api:2.3.0"
+    compile "javax.xml.bind:jaxb-api:${jaxbApiVersion}"
     compile "javax.annotation:javax.annotation-api:${javaxmlVersion}"
     compile "commons-lang:commons-lang:${commonsLangVersion}"
-    compile 'jaxb:activation:1.0.2'
+    compile "jaxb:activation:${activationVersion}"
     compile "org.apache.commons:commons-compress:${commonsCompressVersion}"
     compile "org.apache.tika:tika-core:${tikaVersion}"
     compile "org.slf4j:slf4j-api:${slf4jVersion}"

diff --git a/uPortal-io/uPortal-io-jaxb/build.gradle b/uPortal-io/uPortal-io-jaxb/build.gradle
@@ -9,15 +9,13 @@ ext {
 }
 
 dependencies {
-    //jaxb "javax.annotation:javax.annotation-api:${javaxmlVersion}"
-    compile "javax.xml.bind:jaxb-api:2.3.0"
+    compile "javax.xml.bind:jaxb-api:${jaxbApiVersion}"
     compile "jaxb:activation:${activationVersion}"
-
 
     // 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.3.0"
+    jaxb "javax.xml.bind:jaxb-api:${jaxbApiVersion}"
     jaxb "jaxb:activation:${activationVersion}"
     jaxb 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.6.5'
     jaxb 'org.jvnet.jaxb2_commons:jaxb2-basics:0.6.4'

diff --git a/uPortal-spring/build.gradle b/uPortal-spring/build.gradle
@@ -11,6 +11,7 @@ dependencies {
     compile "net.oauth.core:oauth:${oauthVersion}"
     compile "org.jasypt:jasypt:${jasyptVersion}"
     compile "org.slf4j:slf4j-api:${slf4jVersion}"
+    compile "javax.xml.bind:jaxb-api:${jaxbApiVersion}"
     compile "org.springframework:spring-web:${springVersion}"
     compile "org.springframework:spring-webmvc:${springVersion}"
     compile "org.springframework:spring-webmvc-portlet:${springVersion}"

diff --git a/uPortal-utils/uPortal-utils-core/build.gradle b/uPortal-utils/uPortal-utils-core/build.gradle
@@ -8,7 +8,7 @@ ext {
 dependencies {
     compile project(':uPortal-concurrency')
 
-    compile "javax.xml.bind:jaxb-api:2.3.0"
+    compile "javax.xml.bind:jaxb-api:${jaxbApiVersion}"
     compile "javax.annotation:javax.annotation-api:${javaxmlVersion}"
     compile "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
     compile "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
@@ -17,7 +17,7 @@ dependencies {
     compile "net.sf.ehcache:ehcache-core:${ehcacheVersion}"
     compile "org.apache.ant:ant:${antVersion}"
     compile "org.apache.commons:commons-lang3:${commonsLang3Version}"
-    compile "org.aspectj:aspectjrt:${aspectjVersion}"
+    compile "org.aspectj:aspectjweaver:${aspectjVersion}"
     compile("org.codehaus.woodstox:woodstox-core-asl:${woodstoxVersion}") {
         exclude group: 'javax.xml.stream', module: 'stax-api'
     }

diff --git a/uPortal-web/build.gradle b/uPortal-web/build.gradle
@@ -14,6 +14,7 @@ dependencies {
     compileOnly project(':uPortal-api:uPortal-api-platform')
 
     compile "com.google.visualization:visualization-datasource:${googleVisualizationVersion}"
+    compile "javax.xml.bind:jaxb-api:${jaxbApiVersion}"
 
     testCompile "org.apache.portals.pluto:pluto-container-api:${plutoVersion}"
     testCompile "${servletApiDependency}"
@@ -25,6 +26,8 @@ dependencies {
     compileOnly "javax.servlet.jsp:jsp-api:${jspApiVersion}"
     compileOnly "${portletApiDependency}"
     compileOnly "${servletApiDependency}"
+
+    runtime "javax.xml.bind:jaxb-api:${jaxbApiVersion}"
 }
 
 /*

diff --git a/uPortal-webapp/build.gradle b/uPortal-webapp/build.gradle
@@ -39,6 +39,8 @@ dependencies {
     compile project(':uPortal-soffit:uPortal-soffit-connector')
     compile project(':uPortal-utils:uPortal-utils-jmx')
 
+    compile "javax.xml.bind:jaxb-api:${jaxbApiVersion}"
+
     compileOnly "org.apereo.service.persondir:person-directory-api:${personDirectoryVersion}"
     compileOnly "${servletApiDependency}"
 
@@ -50,7 +52,7 @@ dependencies {
     testCompile "${portletApiDependency}"
     testCompile "${servletApiDependency}"
 
-    runtime "javax.xml.bind:jaxb-api:2.3.0"
+    runtime "javax.xml.bind:jaxb-api:${jaxbApiVersion}"
     runtime "ch.qos.logback:logback-classic:${logbackVersion}"
     runtime "joda-time:joda-time-jsptags:${jodaTimeJsptagsVersion}"
     runtime "org.aspectj:aspectjweaver:${aspectjVersion}"