feature/UPSE-286 update to support Java 11 (#2504)

* feature/UPSE-286 update to support Java 11 * feature/UPSE-286 include support for Java 8 back into the configs * feature/UPSE-286 move jaxbApiVersion into gradle.properties * feature/UPSE-286 add Java 11 to github workflow * feature/UPSE-286 update build run timeout due to Windows long build time Co-authored-by: Michael Gillian <[email protected]>
uPortal-Project · Dec 16, 2022 · d92de0a · d92de0a
1 parent deb7f24
commit d92de0a
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 6 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -21,8 +21,9 @@ jobs:
           - zulu
         java-version:
           - 8
+          - 11
     runs-on: ${{ matrix.platform }}
-    timeout-minutes: 20
+    timeout-minutes: 45
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -34,4 +35,4 @@ jobs:
       - name: Build and Test
         run: ./gradlew -S --no-daemon --no-parallel build jacocoAggregateReport coveralls
       - name: Lint JavaScript
-        run: ./gradlew -S --no-daemon --no-parallel :npm_run_lint-js
+        run: ./gradlew -S --no-daemon --no-parallel :npm_run_lint-js
diff --git a/build.gradle b/build.gradle
@@ -49,7 +49,7 @@ allprojects {
     }
 
     dependencies {
-        errorprone 'com.google.errorprone:error_prone_core:2.3.3'
+        errorprone 'com.google.errorprone:error_prone_core:2.3.4'
         errorproneJavac "com.google.errorprone:javac:9+181-r4173-1"
     }
 

diff --git a/gradle.properties b/gradle.properties
@@ -66,7 +66,7 @@ grouperClientVersion=2.5.56
 guavaVersion=31.1-jre
 hamcrestVersion=1.3
 hibernateVersion=4.2.21.Final
-hibernateJpamodelgenVersion=1.3.0.Final
+hibernateJpamodelgenVersion=5.6.3.Final
 hsqldbVersion=2.5.1
 httpclientVersion=4.5.13
 httpcomponentsVersion=4.4.16
@@ -75,6 +75,7 @@ jansiVersion=1.11
 javaxMailVersion=1.4.7
 jasyptVersion=1.9.3
 jaxb2basicsVersion=1.11.1
+jaxbApiVersion=2.3.1
 jgroupsVersion=3.6.20.Final
 jjwtVersion=0.11.5
 jodaTimeVersion=2.12.1

diff --git a/uPortal-api/uPortal-api-search/build.gradle b/uPortal-api/uPortal-api-search/build.gradle
@@ -12,10 +12,11 @@ dependencies {
     // All 6 of the following are for the 'com.github.jacobono.jaxb' plugin
     jaxb 'com.sun.xml.bind:jaxb-xjc:2.3.4'
     jaxb 'com.sun.xml.bind:jaxb-impl:2.3.4'
-    jaxb 'javax.xml.bind:jaxb-api:2.3.1'
+    jaxb "javax.xml.bind:jaxb-api:${jaxbApiVersion}"
     jaxb 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:1.11.1'
     jaxb 'org.jvnet.jaxb2_commons:jaxb2-basics:1.11.1'
     jaxb 'org.jvnet.jaxb2_commons:jaxb2-basics-annotate:1.1.0'
+    compile "javax.xml.bind:jaxb-api:${jaxbApiVersion}"
 }
 
 /*

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

diff --git a/uPortal-io/uPortal-io-jaxb/build.gradle b/uPortal-io/uPortal-io-jaxb/build.gradle
@@ -12,10 +12,11 @@ dependencies {
     // All 6 of the following are for the 'com.github.jacobono.jaxb' plugin
     jaxb 'com.sun.xml.bind:jaxb-xjc:2.3.4'
     jaxb 'com.sun.xml.bind:jaxb-impl:2.3.4'
-    jaxb 'javax.xml.bind:jaxb-api:2.3.1'
+    jaxb "javax.xml.bind:jaxb-api:${jaxbApiVersion}"
     jaxb 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:1.11.1'
     jaxb 'org.jvnet.jaxb2_commons:jaxb2-basics:1.11.1'
     jaxb 'org.jvnet.jaxb2_commons:jaxb2-basics-annotate:1.1.0'
+    compile "javax.xml.bind:jaxb-api:${jaxbApiVersion}"
 }
 
 /*

diff --git a/...y-permissions/src/main/java/org/apereo/portal/permission/target/PermissionTargetImpl.java b/...y-permissions/src/main/java/org/apereo/portal/permission/target/PermissionTargetImpl.java
@@ -25,6 +25,7 @@
  *
  * @since 3.3
  */
+@SuppressWarnings("ComparableType")
 public class PermissionTargetImpl
         implements IPermissionTarget, Comparable<IPermissionTarget>, Serializable {
 

diff --git a/uPortal-soffit/uPortal-soffit-core/build.gradle b/uPortal-soffit/uPortal-soffit-core/build.gradle
@@ -2,6 +2,7 @@ description = "Apereo uPortal Soffit Core"
 
 dependencies {
     compile "io.jsonwebtoken:jjwt-api:${jjwtVersion}"
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
     runtime "io.jsonwebtoken:jjwt-impl:${jjwtVersion}",
             "org.bouncycastle:bcprov-jdk15on:${bouncyVersion}",  // for RSASSA-PSS
             "io.jsonwebtoken:jjwt-jackson:${jjwtVersion}"

diff --git a/uPortal-webapp/build.gradle b/uPortal-webapp/build.gradle
@@ -5,6 +5,9 @@ buildscript {
     }
     dependencies {
         classpath "org.jasig.resourceserver:resource-server-core:${resourceServerVersion}"
+        classpath "javax.xml.bind:jaxb-api:${jaxbApiVersion}"
+        classpath 'com.sun.xml.bind:jaxb-xjc:2.3.4'
+        classpath 'com.sun.xml.bind:jaxb-impl:2.3.4'
     }
 }