[WIP] Java 10 Support

.travis.yml

@@ -10,6 +10,11 @@ matrix:
       dist: trusty
       jdk: openjdk8
       sudo: required
+    - os: linux
+      dist: trusty
+      group: edge
+      jdk: oraclejdk9
+      sudo: required
     - os: osx
       osx_image: xcode9.1 # OSX 10.12, Oracle Java 8
 

build.gradle

@@ -75,7 +75,7 @@ allprojects {
     }
 
     // Version has to be set directly here, using a variable does not set Java compatability version
-    sourceCompatibility = 1.8
+    sourceCompatibility = 1.9
 
     gradleLint.criticalRules = [
       'overridden-dependency-version',

gradle.properties

@@ -19,7 +19,7 @@
 
 # TODO:  Change to org.apereo.portal
 group=org.jasig.portal
-version=5.0.1
+version=5.0.1-SNAPSHOT
 
 # Project Metadata (NB:  copied from CAS;  may or may not be used by us;  review later)
 projectUrl=https://www.apereo.org/projects/uPortal
@@ -38,6 +38,7 @@ servletApiDependency=javax.servlet:javax.servlet-api:3.0.1
 portletApiDependency=org.apache.portals:portlet-api_2.1.0_spec:1.0
 
 # Dependency Versions
+activationVersion:1.0.2
 antVersion=1.8.4
 awsVersion=1.10.65
 apereoPortletUtilsVersion=1.1.0
@@ -75,8 +76,9 @@ httpcomponentsVersion=4.4.4
 jacksonVersion=2.5.3
 jansiVersion=1.11
 javaxMailVersion=1.4.5
+javaxmlVersion=1.3.1
 jasyptVersion=1.9.2
-jaxb2basicsVersion=0.6.5.1
+jaxb2basicsVersion=1.11.1
 jgroupsVersion=3.6.13.Final
 jjwtVersion=0.6.0
 jlineVersion=2.11

uPortal-api/uPortal-api-search/build.gradle

@@ -12,7 +12,8 @@ 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 'javax.xml.bind:jaxb-api:2.3.0'
+    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'
     jaxb 'org.jvnet.jaxb2_commons:jaxb2-basics-annotate:0.6.4'
@@ -48,4 +49,15 @@ jaxb {
     }
 }
 
+compileJava {
+	doFirst {
+        options.compilerArgs = [
+            '--class-path', classpath.asPath,
+            '--module-path', classpath.asPath,
+            '--add-modules', 'java.xml.bind',  
+        ]
+        classpath = files()
+    }
+}
+
 compileJava.dependsOn(xjc)

uPortal-io/uPortal-io-core/build.gradle

@@ -3,7 +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.annotation:javax.annotation-api:${javaxmlVersion}"
     compile "commons-lang:commons-lang:${commonsLangVersion}"
+    compile 'jaxb:activation:1.0.2'
     compile "org.apache.commons:commons-compress:${commonsCompressVersion}"
     compile "org.apache.tika:tika-core:${tikaVersion}"
     compile "org.slf4j:slf4j-api:${slf4jVersion}"

uPortal-io/uPortal-io-jaxb/build.gradle

@@ -9,10 +9,13 @@ ext {
 }
 
 dependencies {
+    //jaxb "javax.annotation:javax.annotation-api:${javaxmlVersion}"
+
     // 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 "javax.xml.bind:jaxb-api:2.3.0"
+    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'
     jaxb 'org.jvnet.jaxb2_commons:jaxb2-basics-annotate:0.6.4'
@@ -48,4 +51,14 @@ jaxb {
     }
 }
 
+compileJava {
+	doFirst {
+        options.compilerArgs = [
+            '--class-path', classpath.asPath,
+            '--module-path', classpath.asPath,
+            '--add-modules', 'java.xml.bind',  
+        ] 
+    }
+}
+
 compileJava.dependsOn(xjc)

uPortal-layout/uPortal-layout-core/src/main/java/org/apereo/portal/layout/UserLayoutHelperImpl.java

@@ -87,7 +87,7 @@ public void resetUserLayoutAllProfiles(final IPersonAttributes personAttributes)
     /**
      * @param personAttributes
      * @see
-     *     org.apereo.portal.layout.IUserLayoutHelper#resetUserLayout(org.jasig.services.persondir.IPersonAttributes)
+     *     org.apereo.portal.layout.IUserLayoutHelper#resetUserLayout(org.apereo.services.persondir.IPersonAttributes)
      */
     @Override
     public void resetUserLayout(final IPersonAttributes personAttributes) {

uPortal-soffit/uPortal-soffit-core/build.gradle

@@ -1,6 +1,7 @@
 description = "Apereo uPortal Soffit Core"
 
 dependencies {
+    compile "javax.annotation:javax.annotation-api:${javaxmlVersion}"
     compile "io.jsonwebtoken:jjwt:${jjwtVersion}"
     compile "org.apache.commons:commons-lang3:${commonsLang3Version}"
     compile "org.jasypt:jasypt:${jasyptVersion}"

uPortal-utils/uPortal-utils-core/build.gradle

@@ -8,6 +8,8 @@ ext {
 dependencies {
     compile project(':uPortal-concurrency')
 
+    compile "javax.xml.bind:jaxb-api:2.3.0"
+    compile "javax.annotation:javax.annotation-api:${javaxmlVersion}"
     compile "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
     compile "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
     compile "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
@@ -78,6 +80,9 @@ dependencies {
     compileOnly "${servletApiDependency}"
 }
 
+sourceCompatibility = '9'
+targetCompatibility = '9'
+
 /*
  * This section is the key to IDE integration.  IDE will look for source files in both...
  *
@@ -96,6 +101,13 @@ sourceSets {
 // These are the only modifications to build process that are required.
 compileJava {
     doFirst {
+        options.compilerArgs += [
+            '--class-path', classpath.asPath, 
+            '--module-path', classpath.asPath, 
+            '--add-modules', 'java.sql',
+        ]
+        classpath = files()
+
         // Generated sources directory should be present & empty before compilation
         generatedSourcesDir.deleteDir()
         generatedSourcesDir.mkdirs()

uPortal-webapp/build.gradle

@@ -151,3 +151,14 @@ war {
         into '/'
     }
 }
+
+compileJava {
+    doFirst {
+        options.compilerArgs = [
+            '--class-path', classpath.asPath, 
+            '--module-path', classpath.asPath, 
+            '--add-modules', 'java.xml.bind',
+        ]
+        //classpath = files()
+    }
+}

uPortal-webapp/src/main/webapp/WEB-INF/flows/reset-user-layout/reset-user-layout.xml

@@ -23,8 +23,8 @@
     xsi:schemaLocation="http://www.springframework.org/schema/webflow
                           http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
 
-    <input name="person" type="org.jasig.services.persondir.IPersonAttributes" required="true" />
-    
+    <input name="person" type="org.apereo.services.persondir.IPersonAttributes" required="true" />
+
     <view-state id="reset-confirm">
         <transition on="confirm" to="reset-result">
             <!-- Choose resetUserLayoutAllProfiles if on layout reset, you need
@@ -33,10 +33,10 @@
         </transition>
         <transition on="cancel" to="reset-complete"/>
     </view-state>
-    
+
     <view-state id="reset-result">
-        <transition on="continue" to="reset-complete" />        
+        <transition on="continue" to="reset-complete" />
     </view-state>
-    
+
     <end-state id="reset-complete"/>
-</flow>
+</flow>