SAK-33595 Java 11 (sakaiproject#8974)

susowrc · Sep 24, 2021 · ffcc4f7 · ffcc4f7
1 parent 8635a3e
commit ffcc4f7
Show file tree

Hide file tree

Showing 79 changed files with 318 additions and 1,913 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -25,10 +25,10 @@ jobs:
           git pull --ff-only origin $GITHUB_BASE_REF
           echo "Commits after pull"
           git log --oneline $GIT_MERGE_BASE_SHA~1..HEAD
-      - name: JDK 8
+      - name: JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 8
+          java-version: 11
           architecture: x64
       - name: Cache local Maven repository
         uses: actions/cache@v2

diff --git a/.mvn/jvm.config b/.mvn/jvm.config
@@ -1 +1 @@
--Xms168m -Xmx1536m -XX:NewSize=64m -Djava.awt.headless=true
+-Djava.awt.headless=true
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
diff --git a/assignment/impl/pom.xml b/assignment/impl/pom.xml
@@ -193,7 +193,6 @@
         <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>jakarta.mail</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>

diff --git a/basiclti/basiclti-impl/pom.xml b/basiclti/basiclti-impl/pom.xml
@@ -142,11 +142,5 @@
                 </includes>
             </resource>
         </resources>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-          </plugin>
-        </plugins>
     </build>
 </project>
diff --git a/basiclti/tsugi-util/pom.xml b/basiclti/tsugi-util/pom.xml
@@ -21,6 +21,10 @@
     <dependencies>
         <!-- This pom should *never* add any "org.sakaiproject" dependencies - any
             Sakai-specific code needs to be placed in the basiclti-common folder -->
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>

diff --git a/calendar/calendar-impl/impl/pom.xml b/calendar/calendar-impl/impl/pom.xml
@@ -117,6 +117,10 @@
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito2</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4-common</artifactId>
@@ -141,12 +145,6 @@
             <version>${sakai.powermock.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <version>${sakai.powermock.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/...pl/impl/src/test/org/sakaiproject/calendar/impl/BaseExternalCalendarSubscriptionTest.java b/...pl/impl/src/test/org/sakaiproject/calendar/impl/BaseExternalCalendarSubscriptionTest.java
@@ -48,6 +48,7 @@
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.sakaiproject.authz.api.SecurityService;
@@ -78,6 +79,7 @@
  */
 @PrepareForTest(ComponentManager.class)
 @RunWith(PowerMockRunner.class)
+@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "javax.management.*"})
 public class BaseExternalCalendarSubscriptionTest {
 
 

diff --git a/cloud-content/impl/pom.xml b/cloud-content/impl/pom.xml
@@ -36,19 +36,17 @@
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+    </dependency>
 
     <!-- jclouds dependencies -->
     <!-- Package these directly in the impl/component -->
     <dependency>
       <groupId>org.apache.jclouds.driver</groupId>
       <artifactId>jclouds-slf4j</artifactId>
       <version>${jclouds.version}</version>
-          <exclusions>
-              <exclusion>
-                  <groupId>aopalliance</groupId>
-                  <artifactId>aopalliance</artifactId>
-              </exclusion>
-          </exclusions>
     </dependency>
     <!-- jclouds-sl4j needs jclouds-core which needs guice which needs aopalliance which is already provided in lib -->
     <dependency>
@@ -71,34 +69,5 @@
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>
     <testSourceDirectory>src/test/java</testSourceDirectory>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.4.2</version>
-        <configuration>
-          <skipTests>true</skipTests>
-        </configuration>
-      </plugin>
-    </plugins>
   </build>
-
-  <profiles>
-    <profile>
-      <id>swift-tests</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <version>2.4.2</version>
-            <configuration>
-              <skipTests>false</skipTests>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
 </project>
diff --git a/...d-content/impl/src/test/java/coza/opencollab/sakai/cloudcontent/SwiftFileHandlerTest.java b/...d-content/impl/src/test/java/coza/opencollab/sakai/cloudcontent/SwiftFileHandlerTest.java
@@ -15,6 +15,7 @@
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import org.springframework.util.FileCopyUtils;
@@ -157,7 +158,8 @@ public void testInvalidChars() throws Exception{
         SwiftFileSystemHandler.ContainerAndName can = getContainerAndName(ID2, ROOT0, PATH_INVALID);
         assertEquals(PATH_VALID, can.name);
     }
-
+
+    @Ignore("Setup a mock http listener to respond to http call")
     @Test
     public void testValid() throws IOException {
         long contentSize = swift.saveInputStream(ID2, ROOT1, PATH2, getInputStream());
@@ -173,7 +175,8 @@ public void testValid() throws IOException {
             assertNotNull(e);
         }
     }
-
+
+    @Ignore("Setup a mock http listener to respond to http call")
     @Test
     public void testValidText() throws IOException {
         long contentSize = swift.saveInputStream(ID3, ROOT1, PATH3, getInputStream());
@@ -183,7 +186,8 @@ public void testValidText() throws IOException {
         assertEquals(MESSAGE, message);
         swift.delete(ID3, ROOT1, PATH3);
     }
-
+
+    @Ignore("Setup a mock http listener to respond to http call")
     @Test
     public void testValidBinary() throws IOException {
         long contentSize = swift.saveInputStream(ID4, ROOT1, PATH4, getBinaryInputStream());

diff --git a/commons/impl/pom.xml b/commons/impl/pom.xml
@@ -111,18 +111,6 @@
             </resource>
         </resources>
         <!-- unit testing -->
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <!--
-                    By default, the surefire plugin will automatically include all test classes with the following wildcard patterns:
-                    "**/Test*.java" - includes all of its subdirectory and all java filenames that start with "Test".
-                    "**/*Test.java" - includes all of its subdirectory and all java filenames that end with "Test".
-                    "**/*TestCase.java" - includes all of its subdirectory and all java filenames that end with "TestCase".
-                -->
-            </plugin>
-        </plugins>
         <testResources>
             <testResource>
                 <directory>${basedir}/src/test</directory>

diff --git a/content-review/impl/compilatio/pom.xml b/content-review/impl/compilatio/pom.xml
@@ -13,6 +13,10 @@
 	</parent>
 
 	<dependencies>
+		<dependency>
+			<groupId>jakarta.xml.soap</groupId>
+			<artifactId>jakarta.xml.soap-api</artifactId>
+		</dependency>
 		<!-- Content Review dependencies -->
 		<dependency>
 			<groupId>org.sakaiproject.contentreview</groupId>

diff --git a/deploy/pom.xml b/deploy/pom.xml
@@ -64,6 +64,42 @@
     </profiles>
 
     <dependencies>
+        <!-- JDK 9+ -->
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.activation</groupId>
+            <artifactId>jakarta.activation-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.activation</groupId>
+            <artifactId>jakarta.activation</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.xml.soap</groupId>
+            <artifactId>jakarta.xml.soap-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.istack</groupId>
+            <artifactId>istack-commons-runtime</artifactId>
+            <scope>compile</scope>
+        </dependency>
         <!-- database -->
         <dependency>
             <groupId>org.hsqldb</groupId>
@@ -715,15 +751,20 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator-annotation-processor</artifactId>
+            <scope>compile</scope>
+        </dependency>
 
         <!-- hibernate related -->
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -782,11 +823,6 @@
             <artifactId>jakarta.mail</artifactId>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-            <scope>compile</scope>
-        </dependency>
         <!-- caching -->
         <dependency>
             <groupId>javax.cache</groupId>

diff --git a/entitybroker/core-providers/pom.xml b/entitybroker/core-providers/pom.xml
@@ -14,8 +14,8 @@
     </parent>
     <dependencies>
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
         <!-- internal dependencies -->
         <dependency>

diff --git a/external-calendaring-service/impl/pom.xml b/external-calendaring-service/impl/pom.xml
@@ -94,18 +94,6 @@
         </resources>
 
         <!-- unit testing -->
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <!-- 
-                    By default, the surefire plugin will automatically include all test classes with the following wildcard patterns:
-                    "**/Test*.java" - includes all of its subdirectory and all java filenames that start with "Test".
-                    "**/*Test.java" - includes all of its subdirectory and all java filenames that end with "Test".
-                    "**/*TestCase.java" - includes all of its subdirectory and all java filenames that end with "TestCase".
-                -->
-            </plugin>
-        </plugins>
         <testResources>
             <testResource>
                 <directory>${basedir}/src/test</directory>

diff --git a/feedback/src/java/org/sakaiproject/feedback/tool/entityproviders/FeedbackEntityProvider.java b/feedback/src/java/org/sakaiproject/feedback/tool/entityproviders/FeedbackEntityProvider.java
@@ -29,8 +29,8 @@
 import java.util.Locale;
 import java.util.Map;
 
-import jakarta.mail.internet.AddressException;
-import jakarta.mail.internet.InternetAddress;
+import javax.mail.internet.AddressException;
+import javax.mail.internet.InternetAddress;
 
 import lombok.extern.slf4j.Slf4j;
 

diff --git a/feedback/src/java/org/sakaiproject/feedback/util/FileItemDataSource.java b/feedback/src/java/org/sakaiproject/feedback/util/FileItemDataSource.java
@@ -18,7 +18,7 @@
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.io.FilenameUtils;
 
-import jakarta.activation.DataSource;
+import javax.activation.DataSource;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;

diff --git a/hierarchy/impl/pom.xml b/hierarchy/impl/pom.xml
@@ -171,18 +171,6 @@
         </resources>
 
         <!-- unit testing -->
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <!-- 
-                    By default, the surefire plugin will automatically include all test classes with the following wildcard patterns:
-                    "**/Test*.java" - includes all of its subdirectory and all java filenames that start with "Test".
-                    "**/*Test.java" - includes all of its subdirectory and all java filenames that end with "Test".
-                    "**/*TestCase.java" - includes all of its subdirectory and all java filenames that end with "TestCase".
-                -->
-            </plugin>
-        </plugins>
        <testResources>
             <testResource>
                 <directory>${basedir}/src/webapp/WEB-INF</directory>

diff --git a/jobscheduler/scheduler-component-shared/pom.xml b/jobscheduler/scheduler-component-shared/pom.xml
@@ -166,7 +166,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.6</version>
                 <configuration>
                     <excludes>
                         <exclude>org/sakaiproject/component/app/scheduler/jobs/*.java</exclude>

diff --git a/kernel/api/pom.xml b/kernel/api/pom.xml
@@ -110,9 +110,5 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
-        <dependency>
-          <groupId>jakarta.activation</groupId>
-          <artifactId>jakarta.activation-api</artifactId>
-         </dependency>
     </dependencies>
 </project>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		-Xms168m -Xmx1536m -XX:NewSize=64m -Djava.awt.headless=true
		-Djava.awt.headless=true