Skip to content

Commit

Permalink
Merge pull request #94 from groybal/UPSE-296
Browse files Browse the repository at this point in the history
UPSE-296: updates for Java 11 (JAXB issues); downgrade logback to Jav…
  • Loading branch information
loulou2u authored Jan 17, 2023
2 parents 6760ba7 + f7320a6 commit 3e9cfb4
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 5 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,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
Expand All @@ -43,6 +46,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
run: mvn -B package
18 changes: 16 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,12 @@
</issueManagement>

<properties>
<logbackVersion>1.4.5</logbackVersion>
<slf4jVersion>1.7.36</slf4jVersion>
<logbackVersion>1.3.5</logbackVersion>
<slf4jVersion>2.0.6</slf4jVersion>
<spring.version>4.3.30.RELEASE</spring.version>
<uportal-libs.version>5.12.0</uportal-libs.version>
<jaxb-api.version>2.3.1</jaxb-api.version>
<jaxb-impl.version>2.3.3</jaxb-impl.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -143,6 +145,18 @@
<version>2.0.1.Final</version>
</dependency>

<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${jaxb-api.version}</version>
</dependency>

<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${jaxb-impl.version}</version>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
Expand Down

0 comments on commit 3e9cfb4

Please sign in to comment.