Merge pull request #359 from Naenyn/fix-java-21-issues

First pass at fixing java 21 issues.

Author: bjagg

.github/workflows/CI.yml

@@ -25,6 +25,7 @@ on:
   pull_request:
     branches:
       - master
+  workflow_dispatch:
 
 jobs:
   test:
@@ -38,20 +39,20 @@ jobs:
           - temurin
           - zulu
         java-version:
-          - 8
-          - 11
+          - 17
+          - 21
         include:
           - platform: windows-latest
             java-distribution: adopt-hotspot
-            java-version: 11
+            java-version: 17
           - platform: macos-latest
             java-distribution: adopt-hotspot
-            java-version: 11
+            java-version: 17
     runs-on: ${{ matrix.platform }}
     timeout-minutes: 5
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:

pom.xml

@@ -87,7 +87,7 @@
         <spring-ws.version>2.4.7.RELEASE</spring-ws.version>
         <uportal-libs.version>5.13.1</uportal-libs.version>
         <uportal-maven-plugin.version>1.0.1</uportal-maven-plugin.version>
-        <mockito.version>1.10.19</mockito.version>
+        <mockito.version>5.8.0</mockito.version>
 
         <!-- The JDBC Driver used by the calendar portlet -->
         <jdbc.groupId>org.hsqldb</jdbc.groupId>
@@ -924,8 +924,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>17</source>
+                    <target>17</target>
                 </configuration>
             </plugin>
 
@@ -963,7 +963,7 @@
             <plugin>
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>0.14.0</version>
+                <version>0.15.3</version>
                 <executions>
                     <execution>
                         <goals>
@@ -994,6 +994,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
+                <version>3.4.0</version>
                 <configuration>
                     <attachClasses>true</attachClasses>
                     <warName>CalendarPortlet</warName>
@@ -1020,6 +1021,13 @@
                         </overlay>
                     </overlays>
                 </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.codehaus.plexus</groupId>
+                        <artifactId>plexus-archiver</artifactId>
+                        <version>4.9.1</version>
+                    </dependency>
+                </dependencies>
             </plugin>
             <plugin>
                 <groupId>com.mycila</groupId>

src/test/java/org/jasig/portlet/calendar/adapter/ExchangeCalendarAdapterTest.java

@@ -21,8 +21,8 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -133,7 +133,7 @@ public void setUp() throws IOException {
     Source source = new StreamSource(sampleExchangeResponse.getInputStream());
     GetUserAvailabilityResponse response =
         (GetUserAvailabilityResponse) marshaller.unmarshal(source);
-    when(webService.marshalSendAndReceive(any(), any(WebServiceMessageCallback.class)))
+    when(webService.marshalSendAndReceive(any(Object.class), any(WebServiceMessageCallback.class)))
         .thenReturn(response);
   }
 

src/test/java/org/jasig/portlet/calendar/mvc/controller/AjaxCalendarControllerTest.java

@@ -22,7 +22,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.when;
@@ -83,9 +83,14 @@ public void setUp() {
     emptyEvents = new HashSet<CalendarDisplayEvent>();
     events = new HashSet<CalendarDisplayEvent>();
 
+    when(mockHelper.getEventList(any(), any(), any())).thenReturn(emptyEvents);
+
     when(appContext.getMessage(
-            eq("date.formatter.display"), any(Object[].class), anyString(), any(Locale.class)))
-        .thenReturn("EEE MMM d");
+            anyString(),
+            any(),
+            anyString(),
+            any()))
+            .thenReturn("EEE MMM d");
     testee.setApplicationContext(appContext);
   }