Merge branch 'feat/java11-upgrade'

uPortal-Project · Jan 19, 2023 · de7f5db · de7f5db
2 parents 31c98af + 2206f03
commit de7f5db
Show file tree

Hide file tree

Showing 2 changed files with 107 additions and 12 deletions.
diff --git 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
@@ -80,10 +80,10 @@
  <jackson-databind.version>2.13.4</jackson-databind.version>
  <jaxb2basicsVersion>0.6.0</jaxb2basicsVersion>
  <joda-time.version>2.12.0</joda-time.version>
- <logbackVersion>1.4.4</logbackVersion>
+ <logbackVersion>1.3.5</logbackVersion>
  <resource-server.version>1.3.1</resource-server.version>
  <servlet-api.version>3.0.1</servlet-api.version>
- <slf4jVersion>1.7.36</slf4jVersion>
+ <slf4jVersion>2.0.6</slf4jVersion>
  <spring.version>4.3.30.RELEASE</spring.version>
  <spring-ws.version>2.4.6.RELEASE</spring-ws.version>
  <uportal-libs.version>5.13.1</uportal-libs.version>
@@ -142,19 +142,12 @@
  </exclusion>
  </exclusions>
  </dependency>
- <dependency>
- <!-- for cernunnos -->
- <groupId>javax.script</groupId>
- <artifactId>script-api</artifactId>
- <version>1.0-osgi</version>
- <scope>runtime</scope>
- </dependency>
  <dependency>
  <!-- for cernunnos -->
  <groupId>javax.script</groupId>
  <artifactId>groovy-engine</artifactId>
  <version>1.1</version>
- <scope>runtime</scope>
+ <classifier>jdk14</classifier>
  </dependency>
  <dependency>
  <groupId>com.ibm.icu</groupId>
@@ -195,6 +188,10 @@
  <artifactId>commons-httpclient</artifactId>
  <version>3.1</version>
  <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
  <exclusion>
  <groupId>junit</groupId>
  <artifactId>junit</artifactId>
@@ -216,6 +213,12 @@
  <groupId>org.mnode.ical4j</groupId>
  <artifactId>ical4j</artifactId>
  <version>1.0.8</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
  </dependency>
  <dependency>
  <groupId>javax.servlet</groupId>
@@ -294,11 +297,31 @@
  <groupId>org.jasig.portlet.courses</groupId>
  <artifactId>courses-portlet-dao</artifactId>
  <version>1.0.0-M3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
  </dependency>
  <dependency>
  <groupId>org.jasig.portlet.utils</groupId>
  <artifactId>portlet-form-resources</artifactId>
  <version>1.0.0-M1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
  </dependency>
  <dependency>
  <groupId>org.jasig.resourceserver</groupId>
@@ -351,6 +374,12 @@
  <groupId>org.hibernate</groupId>
  <artifactId>hibernate-tools</artifactId>
  <version>${hibernateTools.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
  </dependency>
  <dependency>
  <groupId>com.fasterxml.jackson.core</groupId>
@@ -382,6 +411,14 @@
  <artifactId>caldav4j</artifactId>
  <version>0.7</version>
  <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
  <exclusion>
  <groupId>net.fortuna.ical4j</groupId>
  <artifactId>ical4j</artifactId>
@@ -457,12 +494,22 @@
  <groupId>org.springframework.ws</groupId>
  <artifactId>spring-ws-core</artifactId>
  <version>${spring-ws.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
  </dependency>
  <dependency>
  <groupId>org.springframework.ws</groupId>
  <artifactId>spring-ws-security</artifactId>
  <version>${spring-ws.version}</version>
  <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
  <exclusion>
  <groupId>com.sun.xml.wss</groupId>
  <artifactId>xws-security</artifactId>
@@ -582,6 +629,12 @@
  <groupId>javax.annotation</groupId>
  <artifactId>jsr250-api</artifactId>
  </dependency>
+ <dependency>
+ <!-- for cernunnos -->
+ <groupId>javax.script</groupId>
+ <artifactId>groovy-engine</artifactId>
+ <classifier>jdk14</classifier>
+ </dependency>
  <dependency>
  <groupId>javax.servlet</groupId>
  <artifactId>jstl</artifactId>
@@ -718,6 +771,22 @@
  <artifactId>xercesImpl</artifactId>
  </dependency>
 
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <version>2.3.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <version>2.3.3</version>
+ <scope>runtime</scope>
+ </dependency>
 
  <!-- ===== Runtime Dependencies ================================== -->
  <dependency>
@@ -834,6 +903,22 @@
  </rules>
  </configuration>
  </execution>
+ <execution>
+ <id>enforce-banned-dependencies</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <bannedDependencies>
+ <excludes>
+ <exclude>commons-logging:*</exclude>
+ <exclude>log4j:*</exclude>
+ </excludes>
+ </bannedDependencies>
+ </rules>
+ </configuration>
+ </execution>
  </executions>
  </plugin>
  <plugin>
@@ -849,6 +934,13 @@
  <groupId>org.jasig.resourceserver</groupId>
  <artifactId>resource-server-plugin</artifactId>
  <version>${resource-server.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.3.3</version>
+ </dependency>
+ </dependencies>
  <executions>
  <execution>
  <id>aggregate-resources</id>