From a1b3c9b50383852aeaa8ef64017d991f947a4291 Mon Sep 17 00:00:00 2001 From: Ingo Bauersachs Date: Mon, 8 Nov 2021 21:06:15 +0100 Subject: [PATCH] Upgrade dependencies and build/test also on Java 17 --- .github/workflows/maven.yml | 26 +++++++------------------- pom.xml | 22 ++++++++++++---------- 2 files changed, 19 insertions(+), 29 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index cfc1f96..6f3c6af 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: - java: [ 8, 11 ] + java: [ 8, 11, 17 ] name: Java ${{ matrix.java }} @@ -28,17 +28,11 @@ jobs: uses: actions/checkout@v2 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: + distribution: temurin java-version: ${{ matrix.java }} - - - name: Cache local Maven repository - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- + cache: maven - name: Build and test with Maven run: mvn -B -Dgpg.skip -Drelease=true -Pcoverage verify @@ -58,21 +52,15 @@ jobs: fetch-depth: 0 - name: Set up JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: + distribution: temurin java-version: ${{ env.RELEASE_JAVA_VERSION }} + cache: maven server-id: ossrh server-username: SONATYPE_USER server-password: SONATYPE_PW - - name: Cache local Maven repository - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - - name: Set version run: | VERSION=`git describe --match "v[0-9\.]*" --long --dirty --always` diff --git a/pom.xml b/pom.xml index 8ae4523..881f976 100644 --- a/pom.xml +++ b/pom.xml @@ -38,11 +38,10 @@ UTF-8 - 1.1-90-gfa0e11e - 1.5.20 - 4.6.1 - 5.7.0 - 1.4.32 + 1.1-95-gd8fd866 + 1.5.31 + 4.6.3 + 5.8.1 @@ -59,7 +58,7 @@ ${project.groupId} jitsi-utils - 1.0-94-ge7c7a43 + 1.0-107-g566f8f8 ${project.groupId} @@ -71,7 +70,7 @@ org.junit.platform junit-platform-launcher - 1.7.0 + 1.8.1 test @@ -107,7 +106,7 @@ org.mockito mockito-core - 3.6.28 + 4.0.0 test @@ -156,7 +155,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.0 + 3.8.1 @@ -255,6 +254,9 @@ 2.22.2 **/* + + ${project.build.testSourceDirectory}/../resources/logging.properties + @@ -478,7 +480,7 @@ org.jetbrains.dokka dokka-maven-plugin - ${dokka.version} + ${kotlin.version} package