diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 1ca68d09..465e2668 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -9,13 +9,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
@@ -24,6 +27,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
diff --git a/pom.xml b/pom.xml
index d447ef8e..75edc371 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,10 +80,10 @@
2.13.4
0.6.0
2.12.0
- 1.4.4
+ 1.3.5
1.3.1
3.0.1
- 1.7.36
+ 2.0.6
4.3.30.RELEASE
2.4.6.RELEASE
5.13.1
@@ -142,19 +142,12 @@
-
-
- javax.script
- script-api
- 1.0-osgi
- runtime
-
javax.script
groovy-engine
1.1
- runtime
+ jdk14
com.ibm.icu
@@ -195,6 +188,10 @@
commons-httpclient
3.1
+
+ commons-logging
+ commons-logging
+
junit
junit
@@ -216,6 +213,12 @@
org.mnode.ical4j
ical4j
1.0.8
+
+
+ commons-logging
+ commons-logging
+
+
javax.servlet
@@ -294,11 +297,31 @@
org.jasig.portlet.courses
courses-portlet-dao
1.0.0-M3
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.jasig.portlet.utils
portlet-form-resources
1.0.0-M1
+
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
+
org.jasig.resourceserver
@@ -351,6 +374,12 @@
org.hibernate
hibernate-tools
${hibernateTools.version}
+
+
+ commons-logging
+ commons-logging
+
+
com.fasterxml.jackson.core
@@ -382,6 +411,14 @@
caldav4j
0.7
+
+ commons-logging
+ commons-logging
+
+
+ log4j
+ log4j
+
net.fortuna.ical4j
ical4j
@@ -457,12 +494,22 @@
org.springframework.ws
spring-ws-core
${spring-ws.version}
+
+
+ commons-logging
+ commons-logging
+
+
org.springframework.ws
spring-ws-security
${spring-ws.version}
+
+ commons-logging
+ commons-logging
+
com.sun.xml.wss
xws-security
@@ -582,6 +629,12 @@
javax.annotation
jsr250-api
+
+
+ javax.script
+ groovy-engine
+ jdk14
+
javax.servlet
jstl
@@ -718,6 +771,22 @@
xercesImpl
+
+ javax.xml.bind
+ jaxb-api
+ 2.3.1
+
+
+ jakarta.xml.ws
+ jakarta.xml.ws-api
+ 2.3.3
+
+
+ com.sun.xml.ws
+ jaxws-rt
+ 2.3.3
+ runtime
+
@@ -834,6 +903,22 @@
+
+ enforce-banned-dependencies
+
+ enforce
+
+
+
+
+
+ commons-logging:*
+ log4j:*
+
+
+
+
+
@@ -849,6 +934,13 @@
org.jasig.resourceserver
resource-server-plugin
${resource-server.version}
+
+
+ com.sun.xml.bind
+ jaxb-impl
+ 2.3.3
+
+
aggregate-resources