Skip to content

Commit ffcc4f7

Browse files
ernern
authored
SAK-33595 Java 11 (sakaiproject#8974)
1 parent 8635a3e commit ffcc4f7

File tree

79 files changed

+318
-1913
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+318
-1913
lines changed

‎.github/workflows/maven.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
git pull --ff-only origin $GITHUB_BASE_REF
2626
echo "Commits after pull"
2727
git log --oneline $GIT_MERGE_BASE_SHA~1..HEAD
28-
- name: JDK 8
28+
- name: JDK 11
2929
uses: actions/setup-java@v1
3030
with:
31-
java-version: 8
31+
java-version: 11
3232
architecture: x64
3333
- name: Cache local Maven repository
3434
uses: actions/cache@v2

‎.mvn/jvm.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
-Xms168m -Xmx1536m -XX:NewSize=64m -Djava.awt.headless=true
1+
-Djava.awt.headless=true

‎.mvn/wrapper/maven-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip
2-
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar
1+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip
2+
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

‎assignment/impl/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@
193193
<dependency>
194194
<groupId>com.sun.mail</groupId>
195195
<artifactId>jakarta.mail</artifactId>
196-
<scope>test</scope>
197196
</dependency>
198197
<dependency>
199198
<groupId>org.mockito</groupId>

‎basiclti/basiclti-impl/pom.xml

-6
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,5 @@
142142
</includes>
143143
</resource>
144144
</resources>
145-
<plugins>
146-
<plugin>
147-
<groupId>org.apache.maven.plugins</groupId>
148-
<artifactId>maven-surefire-plugin</artifactId>
149-
</plugin>
150-
</plugins>
151145
</build>
152146
</project>

‎basiclti/tsugi-util/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
<dependencies>
2222
<!-- This pom should *never* add any "org.sakaiproject" dependencies - any
2323
Sakai-specific code needs to be placed in the basiclti-common folder -->
24+
<dependency>
25+
<groupId>jakarta.xml.bind</groupId>
26+
<artifactId>jakarta.xml.bind-api</artifactId>
27+
</dependency>
2428
<dependency>
2529
<groupId>javax.servlet</groupId>
2630
<artifactId>javax.servlet-api</artifactId>

‎calendar/calendar-impl/impl/pom.xml

+4-6
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,10 @@
117117
<groupId>org.powermock</groupId>
118118
<artifactId>powermock-api-mockito2</artifactId>
119119
</dependency>
120+
<dependency>
121+
<groupId>org.powermock</groupId>
122+
<artifactId>powermock-module-junit4</artifactId>
123+
</dependency>
120124
<dependency>
121125
<groupId>org.powermock</groupId>
122126
<artifactId>powermock-module-junit4-common</artifactId>
@@ -141,12 +145,6 @@
141145
<version>${sakai.powermock.version}</version>
142146
<scope>test</scope>
143147
</dependency>
144-
<dependency>
145-
<groupId>org.powermock</groupId>
146-
<artifactId>powermock-module-junit4</artifactId>
147-
<version>${sakai.powermock.version}</version>
148-
<scope>test</scope>
149-
</dependency>
150148
</dependencies>
151149

152150
<build>

‎calendar/calendar-impl/impl/src/test/org/sakaiproject/calendar/impl/BaseExternalCalendarSubscriptionTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import org.mockito.invocation.InvocationOnMock;
4949
import org.mockito.stubbing.Answer;
5050
import org.powermock.api.mockito.PowerMockito;
51+
import org.powermock.core.classloader.annotations.PowerMockIgnore;
5152
import org.powermock.core.classloader.annotations.PrepareForTest;
5253
import org.powermock.modules.junit4.PowerMockRunner;
5354
import org.sakaiproject.authz.api.SecurityService;
@@ -78,6 +79,7 @@
7879
*/
7980
@PrepareForTest(ComponentManager.class)
8081
@RunWith(PowerMockRunner.class)
82+
@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "javax.management.*"})
8183
public class BaseExternalCalendarSubscriptionTest {
8284

8385

‎cloud-content/impl/pom.xml

+4-35
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,17 @@
3636
<groupId>commons-codec</groupId>
3737
<artifactId>commons-codec</artifactId>
3838
</dependency>
39+
<dependency>
40+
<groupId>jakarta.xml.bind</groupId>
41+
<artifactId>jakarta.xml.bind-api</artifactId>
42+
</dependency>
3943

4044
<!-- jclouds dependencies -->
4145
<!-- Package these directly in the impl/component -->
4246
<dependency>
4347
<groupId>org.apache.jclouds.driver</groupId>
4448
<artifactId>jclouds-slf4j</artifactId>
4549
<version>${jclouds.version}</version>
46-
<exclusions>
47-
<exclusion>
48-
<groupId>aopalliance</groupId>
49-
<artifactId>aopalliance</artifactId>
50-
</exclusion>
51-
</exclusions>
5250
</dependency>
5351
<!-- jclouds-sl4j needs jclouds-core which needs guice which needs aopalliance which is already provided in lib -->
5452
<dependency>
@@ -71,34 +69,5 @@
7169
<build>
7270
<sourceDirectory>src/main/java</sourceDirectory>
7371
<testSourceDirectory>src/test/java</testSourceDirectory>
74-
<plugins>
75-
<plugin>
76-
<groupId>org.apache.maven.plugins</groupId>
77-
<artifactId>maven-surefire-plugin</artifactId>
78-
<version>2.4.2</version>
79-
<configuration>
80-
<skipTests>true</skipTests>
81-
</configuration>
82-
</plugin>
83-
</plugins>
8472
</build>
85-
86-
<profiles>
87-
<profile>
88-
<id>swift-tests</id>
89-
<build>
90-
<plugins>
91-
<plugin>
92-
<groupId>org.apache.maven.plugins</groupId>
93-
<artifactId>maven-surefire-plugin</artifactId>
94-
<version>2.4.2</version>
95-
<configuration>
96-
<skipTests>false</skipTests>
97-
</configuration>
98-
</plugin>
99-
</plugins>
100-
</build>
101-
</profile>
102-
</profiles>
103-
10473
</project>

‎cloud-content/impl/src/test/java/coza/opencollab/sakai/cloudcontent/SwiftFileHandlerTest.java

+7-3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
import org.junit.AfterClass;
1717
import org.junit.BeforeClass;
18+
import org.junit.Ignore;
1819
import org.junit.Test;
1920

2021
import org.springframework.util.FileCopyUtils;
@@ -157,7 +158,8 @@ public void testInvalidChars() throws Exception{
157158
SwiftFileSystemHandler.ContainerAndName can = getContainerAndName(ID2, ROOT0, PATH_INVALID);
158159
assertEquals(PATH_VALID, can.name);
159160
}
160-
161+
162+
@Ignore("Setup a mock http listener to respond to http call")
161163
@Test
162164
public void testValid() throws IOException {
163165
long contentSize = swift.saveInputStream(ID2, ROOT1, PATH2, getInputStream());
@@ -173,7 +175,8 @@ public void testValid() throws IOException {
173175
assertNotNull(e);
174176
}
175177
}
176-
178+
179+
@Ignore("Setup a mock http listener to respond to http call")
177180
@Test
178181
public void testValidText() throws IOException {
179182
long contentSize = swift.saveInputStream(ID3, ROOT1, PATH3, getInputStream());
@@ -183,7 +186,8 @@ public void testValidText() throws IOException {
183186
assertEquals(MESSAGE, message);
184187
swift.delete(ID3, ROOT1, PATH3);
185188
}
186-
189+
190+
@Ignore("Setup a mock http listener to respond to http call")
187191
@Test
188192
public void testValidBinary() throws IOException {
189193
long contentSize = swift.saveInputStream(ID4, ROOT1, PATH4, getBinaryInputStream());

‎commons/impl/pom.xml

-12
Original file line numberDiff line numberDiff line change
@@ -111,18 +111,6 @@
111111
</resource>
112112
</resources>
113113
<!-- unit testing -->
114-
<plugins>
115-
<plugin>
116-
<groupId>org.apache.maven.plugins</groupId>
117-
<artifactId>maven-surefire-plugin</artifactId>
118-
<!--
119-
By default, the surefire plugin will automatically include all test classes with the following wildcard patterns:
120-
"**/Test*.java" - includes all of its subdirectory and all java filenames that start with "Test".
121-
"**/*Test.java" - includes all of its subdirectory and all java filenames that end with "Test".
122-
"**/*TestCase.java" - includes all of its subdirectory and all java filenames that end with "TestCase".
123-
-->
124-
</plugin>
125-
</plugins>
126114
<testResources>
127115
<testResource>
128116
<directory>${basedir}/src/test</directory>

‎content-review/impl/compilatio/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
</parent>
1414

1515
<dependencies>
16+
<dependency>
17+
<groupId>jakarta.xml.soap</groupId>
18+
<artifactId>jakarta.xml.soap-api</artifactId>
19+
</dependency>
1620
<!-- Content Review dependencies -->
1721
<dependency>
1822
<groupId>org.sakaiproject.contentreview</groupId>

‎deploy/pom.xml

+44-8
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,42 @@
6464
</profiles>
6565

6666
<dependencies>
67+
<!-- JDK 9+ -->
68+
<dependency>
69+
<groupId>jakarta.annotation</groupId>
70+
<artifactId>jakarta.annotation-api</artifactId>
71+
<scope>compile</scope>
72+
</dependency>
73+
<dependency>
74+
<groupId>jakarta.activation</groupId>
75+
<artifactId>jakarta.activation-api</artifactId>
76+
<scope>compile</scope>
77+
</dependency>
78+
<dependency>
79+
<groupId>com.sun.activation</groupId>
80+
<artifactId>jakarta.activation</artifactId>
81+
<scope>compile</scope>
82+
</dependency>
83+
<dependency>
84+
<groupId>jakarta.xml.soap</groupId>
85+
<artifactId>jakarta.xml.soap-api</artifactId>
86+
<scope>compile</scope>
87+
</dependency>
88+
<dependency>
89+
<groupId>jakarta.xml.bind</groupId>
90+
<artifactId>jakarta.xml.bind-api</artifactId>
91+
<scope>compile</scope>
92+
</dependency>
93+
<dependency>
94+
<groupId>com.sun.xml.bind</groupId>
95+
<artifactId>jaxb-impl</artifactId>
96+
<scope>compile</scope>
97+
</dependency>
98+
<dependency>
99+
<groupId>com.sun.istack</groupId>
100+
<artifactId>istack-commons-runtime</artifactId>
101+
<scope>compile</scope>
102+
</dependency>
67103
<!-- database -->
68104
<dependency>
69105
<groupId>org.hsqldb</groupId>
@@ -715,15 +751,20 @@
715751
<scope>compile</scope>
716752
</dependency>
717753
<dependency>
718-
<groupId>org.hibernate</groupId>
754+
<groupId>org.hibernate.validator</groupId>
719755
<artifactId>hibernate-validator</artifactId>
720756
<scope>compile</scope>
721757
</dependency>
758+
<dependency>
759+
<groupId>org.hibernate.validator</groupId>
760+
<artifactId>hibernate-validator-annotation-processor</artifactId>
761+
<scope>compile</scope>
762+
</dependency>
722763

723764
<!-- hibernate related -->
724765
<dependency>
725-
<groupId>javax.validation</groupId>
726-
<artifactId>validation-api</artifactId>
766+
<groupId>jakarta.validation</groupId>
767+
<artifactId>jakarta.validation-api</artifactId>
727768
<scope>compile</scope>
728769
</dependency>
729770
<dependency>
@@ -782,11 +823,6 @@
782823
<artifactId>jakarta.mail</artifactId>
783824
<scope>compile</scope>
784825
</dependency>
785-
<dependency>
786-
<groupId>jakarta.activation</groupId>
787-
<artifactId>jakarta.activation-api</artifactId>
788-
<scope>compile</scope>
789-
</dependency>
790826
<!-- caching -->
791827
<dependency>
792828
<groupId>javax.cache</groupId>

‎entitybroker/core-providers/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
</parent>
1515
<dependencies>
1616
<dependency>
17-
<groupId>javax.validation</groupId>
18-
<artifactId>validation-api</artifactId>
17+
<groupId>jakarta.validation</groupId>
18+
<artifactId>jakarta.validation-api</artifactId>
1919
</dependency>
2020
<!-- internal dependencies -->
2121
<dependency>

‎external-calendaring-service/impl/pom.xml

-12
Original file line numberDiff line numberDiff line change
@@ -94,18 +94,6 @@
9494
</resources>
9595

9696
<!-- unit testing -->
97-
<plugins>
98-
<plugin>
99-
<groupId>org.apache.maven.plugins</groupId>
100-
<artifactId>maven-surefire-plugin</artifactId>
101-
<!--
102-
By default, the surefire plugin will automatically include all test classes with the following wildcard patterns:
103-
"**/Test*.java" - includes all of its subdirectory and all java filenames that start with "Test".
104-
"**/*Test.java" - includes all of its subdirectory and all java filenames that end with "Test".
105-
"**/*TestCase.java" - includes all of its subdirectory and all java filenames that end with "TestCase".
106-
-->
107-
</plugin>
108-
</plugins>
10997
<testResources>
11098
<testResource>
11199
<directory>${basedir}/src/test</directory>

‎feedback/src/java/org/sakaiproject/feedback/tool/entityproviders/FeedbackEntityProvider.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
import java.util.Locale;
3030
import java.util.Map;
3131

32-
import jakarta.mail.internet.AddressException;
33-
import jakarta.mail.internet.InternetAddress;
32+
import javax.mail.internet.AddressException;
33+
import javax.mail.internet.InternetAddress;
3434

3535
import lombok.extern.slf4j.Slf4j;
3636

‎feedback/src/java/org/sakaiproject/feedback/util/FileItemDataSource.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import org.apache.commons.fileupload.FileItem;
1919
import org.apache.commons.io.FilenameUtils;
2020

21-
import jakarta.activation.DataSource;
21+
import javax.activation.DataSource;
2222
import java.io.IOException;
2323
import java.io.InputStream;
2424
import java.io.OutputStream;

‎hierarchy/impl/pom.xml

-12
Original file line numberDiff line numberDiff line change
@@ -171,18 +171,6 @@
171171
</resources>
172172

173173
<!-- unit testing -->
174-
<plugins>
175-
<plugin>
176-
<groupId>org.apache.maven.plugins</groupId>
177-
<artifactId>maven-surefire-plugin</artifactId>
178-
<!--
179-
By default, the surefire plugin will automatically include all test classes with the following wildcard patterns:
180-
"**/Test*.java" - includes all of its subdirectory and all java filenames that start with "Test".
181-
"**/*Test.java" - includes all of its subdirectory and all java filenames that end with "Test".
182-
"**/*TestCase.java" - includes all of its subdirectory and all java filenames that end with "TestCase".
183-
-->
184-
</plugin>
185-
</plugins>
186174
<testResources>
187175
<testResource>
188176
<directory>${basedir}/src/webapp/WEB-INF</directory>

‎jobscheduler/scheduler-component-shared/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@
166166
<plugin>
167167
<groupId>org.apache.maven.plugins</groupId>
168168
<artifactId>maven-surefire-plugin</artifactId>
169-
<version>2.6</version>
170169
<configuration>
171170
<excludes>
172171
<exclude>org/sakaiproject/component/app/scheduler/jobs/*.java</exclude>

‎kernel/api/pom.xml

-4
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,5 @@
110110
<groupId>com.fasterxml.jackson.core</groupId>
111111
<artifactId>jackson-databind</artifactId>
112112
</dependency>
113-
<dependency>
114-
<groupId>jakarta.activation</groupId>
115-
<artifactId>jakarta.activation-api</artifactId>
116-
</dependency>
117113
</dependencies>
118114
</project>

0 commit comments

Comments
 (0)