Merge branch 'feat/java11-upgrade'

Author: bjagg

.github/workflows/CI.yml

@@ -28,13 +28,16 @@ on:
 
 jobs:
   test:
-    name: '${{ matrix.platform }} with Java 8'
+    name: '${{ matrix.platform }} with Java ${{ matrix.java-version }}'
     strategy:
       matrix:
         platform:
           - ubuntu-latest
           - windows-latest
           - macos-latest
+        java-version:
+          - 8
+          - 11
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Checkout
@@ -43,6 +46,6 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: adopt-hotspot
-          java-version: 8
+          java-version: ${{ matrix.java-version }}
       - name: Build and Test
         run: 'mvn -B package'

pom.xml

@@ -60,8 +60,8 @@
         <resource-server.version>1.0.44</resource-server.version>
         <servlet-api.version>2.5</servlet-api.version>
         <spring.version>4.3.30.RELEASE</spring.version>
-        <logbackVersion>1.4.5</logbackVersion>
-        <slf4jVersion>1.7.36</slf4jVersion>
+        <logbackVersion>1.3.5</logbackVersion>
+        <slf4jVersion>2.0.6</slf4jVersion>
         <mockito.version>4.9.0</mockito.version>
         <portlet.mvc.util.version>1.1.3</portlet.mvc.util.version>
         <uportal-libs.version>5.12.0</uportal-libs.version>
@@ -236,6 +236,11 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
+        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>