Skip to content

Commit 26ed993

Browse files
groybalgroybal
committed
UPSE-288: more Java 11 updates
1 parent 18e1ff9 commit 26ed993

File tree

2 files changed

+60
-12
lines changed

2 files changed

+60
-12
lines changed

‎.github/workflows/CI.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,16 @@ on:
99

1010
jobs:
1111
test:
12-
name: '${{ matrix.platform }} with Java 8'
12+
name: '${{ matrix.platform }} with Java ${{ matrix.java-version }}'
1313
strategy:
1414
matrix:
1515
platform:
1616
- ubuntu-latest
1717
- windows-latest
1818
- macos-latest
19+
java-version:
20+
- 8
21+
- 11
1922
runs-on: ${{ matrix.platform }}
2023
steps:
2124
- name: Checkout
@@ -24,6 +27,6 @@ jobs:
2427
uses: actions/setup-java@v3
2528
with:
2629
distribution: adopt-hotspot
27-
java-version: 8
30+
java-version: ${{ matrix.java-version }}
2831
- name: Test
2932
run: mvn -B test

‎pom.xml

+55-10
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
<hsqldb.version>2.6.1</hsqldb.version>
2929
<jaxb2basics.version>0.6.0</jaxb2basics.version>
3030
<jackson.version>2.14.1</jackson.version>
31-
<logbackVersion>1.4.5</logbackVersion>
31+
<logbackVersion>1.3.5</logbackVersion>
3232
<pluto.version>2.1.0-M3</pluto.version>
33-
<sl4jVersion>1.7.36</sl4jVersion>
33+
<slf4j.version>2.0.6</slf4j.version>
3434
<ehcache-spring-annotations.version>1.2.0</ehcache-spring-annotations.version>
3535
<ehcache.version>2.10.4</ehcache.version>
3636
<portletUtils.version>1.1.3</portletUtils.version>
@@ -165,6 +165,14 @@
165165
<groupId>org.springframework</groupId>
166166
<artifactId>spring-webmvc</artifactId>
167167
</exclusion>
168+
<exclusion>
169+
<groupId>commons-logging</groupId>
170+
<artifactId>commons-logging</artifactId>
171+
</exclusion>
172+
<exclusion>
173+
<groupId>log4j</groupId>
174+
<artifactId>log4j</artifactId>
175+
</exclusion>
168176
</exclusions>
169177
</dependency>
170178
<!--
@@ -175,11 +183,23 @@
175183
<groupId>commons-httpclient</groupId>
176184
<artifactId>commons-httpclient</artifactId>
177185
<version>3.1</version>
186+
<exclusions>
187+
<exclusion>
188+
<groupId>commons-logging</groupId>
189+
<artifactId>commons-logging</artifactId>
190+
</exclusion>
191+
</exclusions>
178192
</dependency>
179193
<dependency>
180194
<groupId>org.apache.httpcomponents</groupId>
181195
<artifactId>httpclient</artifactId>
182196
<version>4.5.14</version>
197+
<exclusions>
198+
<exclusion>
199+
<groupId>commons-logging</groupId>
200+
<artifactId>commons-logging</artifactId>
201+
</exclusion>
202+
</exclusions>
183203
</dependency>
184204
<dependency>
185205
<groupId>org.apache.portals.pluto</groupId>
@@ -200,6 +220,12 @@
200220
<groupId>org.jasig</groupId>
201221
<artifactId>AjaxPortletSupport</artifactId>
202222
<version>1.0.9</version>
223+
<exclusions>
224+
<exclusion>
225+
<groupId>commons-logging</groupId>
226+
<artifactId>commons-logging</artifactId>
227+
</exclusion>
228+
</exclusions>
203229
</dependency>
204230
<dependency>
205231
<groupId>org.jasig.portlet.utils</groupId>
@@ -280,6 +306,12 @@
280306
<groupId>org.springframework</groupId>
281307
<artifactId>spring-beans</artifactId>
282308
<version>${spring.version}</version>
309+
<exclusions>
310+
<exclusion>
311+
<groupId>commons-logging</groupId>
312+
<artifactId>commons-logging</artifactId>
313+
</exclusion>
314+
</exclusions>
283315
</dependency>
284316
<dependency>
285317
<groupId>org.springframework</groupId>
@@ -327,26 +359,26 @@
327359
<version>1.1.2</version>
328360
</dependency>
329361

330-
<!-- For sl4j/logback logging, see https://wiki.jasig.org/display/PLT/Logging+Best+Practices -->
362+
<!-- For slf4j/logback logging, see https://wiki.jasig.org/display/PLT/Logging+Best+Practices -->
331363
<dependency>
332364
<groupId>org.slf4j</groupId>
333365
<artifactId>slf4j-api</artifactId>
334-
<version>${sl4jVersion}</version>
366+
<version>${slf4j.version}</version>
335367
</dependency>
336368
<dependency>
337369
<groupId>org.slf4j</groupId>
338370
<artifactId>jul-to-slf4j</artifactId>
339-
<version>${sl4jVersion}</version>
371+
<version>${slf4j.version}</version>
340372
</dependency>
341373
<dependency>
342374
<groupId>org.slf4j</groupId>
343375
<artifactId>log4j-over-slf4j</artifactId>
344-
<version>${sl4jVersion}</version>
376+
<version>${slf4j.version}</version>
345377
</dependency>
346378
<dependency>
347379
<groupId>org.slf4j</groupId>
348380
<artifactId>jcl-over-slf4j</artifactId>
349-
<version>${sl4jVersion}</version>
381+
<version>${slf4j.version}</version>
350382
</dependency>
351383
<dependency>
352384
<groupId>ch.qos.logback</groupId>
@@ -600,9 +632,6 @@
600632
<artifactId>lombok</artifactId>
601633
</dependency>
602634
<dependency>
603-
<groupId>org.apache.maven.plugins</groupId>
604-
<artifactId>maven-checkstyle-plugin</artifactId>
605-
<version>3.1.2</version>
606635
<groupId>javax.activation</groupId>
607636
<artifactId>javax.activation-api</artifactId>
608637
<version>1.2.0</version>
@@ -691,6 +720,22 @@
691720
</rules>
692721
</configuration>
693722
</execution>
723+
<execution>
724+
<id>enforce-banned-dependencies</id>
725+
<goals>
726+
<goal>enforce</goal>
727+
</goals>
728+
<configuration>
729+
<rules>
730+
<bannedDependencies>
731+
<excludes>
732+
<exclude>commons-logging:*</exclude>
733+
<exclude>log4j:*</exclude>
734+
</excludes>
735+
</bannedDependencies>
736+
</rules>
737+
</configuration>
738+
</execution>
694739
</executions>
695740
</plugin>
696741
<plugin>

0 commit comments

Comments
 (0)