UPSE-282: add Java 11 build; address logging issues

uPortal-Project · Jan 12, 2023 · bf24f76 · bf24f76
1 parent f3e36cf
commit bf24f76
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 3 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 }}
     timeout-minutes: 10
     steps:
@@ -25,7 +28,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: adopt-hotspot
-          java-version: 8
+          java-version: ${{ matrix.java-version }}
       - name: Test
         run: mvn -B test
       - name: Checkstyle

diff --git a/pom.xml b/pom.xml
@@ -39,7 +39,7 @@
         <logback.version>1.3.5</logback.version>
         <resource-server.version>1.3.1</resource-server.version>
         <servlet-api.version>3.1.0</servlet-api.version>
-        <slf4j.version>1.7.36</slf4j.version>
+        <slf4j.version>2.0.6</slf4j.version>
         <spring.version>4.3.30.RELEASE</spring.version>
 
         <!-- The JDBC Driver used by the portlet -->
@@ -142,6 +142,12 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
             <version>${spring.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -191,6 +197,12 @@
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-tools</artifactId>
             <version>3.6.0.Final</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency><!-- java bytecode processor required by hibernate-->
@@ -713,6 +725,41 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>enforce-versions</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireJavaVersion>
+                                    <version>1.8</version>
+                                </requireJavaVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>enforce-banned-dependencies</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <bannedDependencies>
+                                    <excludes>
+                                        <exclude>log4j:*</exclude>
+                                        <exclude>commons-logging:*</exclude>
+                                    </excludes>
+                                </bannedDependencies>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <reporting>