From a422c5983cafca479b55a083fd0f7da221ce921f Mon Sep 17 00:00:00 2001 From: Ingo Bauersachs Date: Sun, 15 May 2022 19:07:54 +0200 Subject: [PATCH] Update dependencies --- .github/workflows/maven.yml | 14 ++++---- pom.xml | 45 ++++++++++++++----------- src/test/kotlin/org/ice4j/ConfigTest.kt | 6 ++-- 3 files changed, 36 insertions(+), 29 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 6f3c6af..4d6ea5f 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -11,7 +11,7 @@ on: env: # Java version to use for the release - RELEASE_JAVA_VERSION: 8 + RELEASE_JAVA_VERSION: 11 jobs: test: @@ -19,16 +19,16 @@ jobs: strategy: matrix: - java: [ 8, 11, 17 ] + java: [ 11, 17 ] name: Java ${{ matrix.java }} steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: temurin java-version: ${{ matrix.java }} @@ -39,7 +39,7 @@ jobs: - name: Upload coverage report if: matrix.java == env.RELEASE_JAVA_VERSION - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v2 release: if: github.ref == 'refs/heads/master' @@ -47,12 +47,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: temurin java-version: ${{ env.RELEASE_JAVA_VERSION }} diff --git a/pom.xml b/pom.xml index 5f774ac..8f9eb82 100644 --- a/pom.xml +++ b/pom.xml @@ -38,10 +38,10 @@ UTF-8 - 1.1-95-gd8fd866 + 1.1-104-g20c4353 1.5.31 - 4.6.3 - 5.8.1 + 5.3.0 + 5.8.2 @@ -70,7 +70,7 @@ org.junit.platform junit-platform-launcher - 1.8.1 + 1.8.2 test @@ -106,7 +106,7 @@ org.mockito mockito-core - 4.0.0 + 4.5.1 test @@ -146,7 +146,7 @@ - 1.8 + 11 -Xallow-result-return-type @@ -155,7 +155,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.10.1 @@ -183,8 +183,7 @@ - 1.8 - 1.8 + 11 -Xlint:all @@ -193,10 +192,17 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.1.1 + 3.1.2 checkstyle.xml + + + com.puppycrawl.tools + checkstyle + 10.1 + + @@ -208,7 +214,7 @@ com.github.gantsign.maven ktlint-maven-plugin - 1.7.0 + 1.13.1 ${project.basedir}/src/main/kotlin @@ -229,7 +235,7 @@ biz.aQute.bnd bnd-maven-plugin - 5.2.0 + 6.2.0 @@ -241,7 +247,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.2.0 + 3.2.2 ${project.build.outputDirectory}/META-INF/MANIFEST.MF @@ -251,7 +257,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.2 + 3.0.0-M6 **/* @@ -262,12 +268,12 @@ org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + 3.0.0-M2 org.sonatype.plugins nexus-staging-maven-plugin - 1.6.8 + 1.6.13 true ossrh @@ -282,6 +288,7 @@ org.codehaus.mojo exec-maven-plugin + 3.0.0 @@ -311,7 +318,7 @@ org.jacoco jacoco-maven-plugin - 0.8.7 + 0.8.8 @@ -448,7 +455,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.2.0 + 3.3.0 generate-sources @@ -493,7 +500,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 + 3.0.1 sign-artifacts diff --git a/src/test/kotlin/org/ice4j/ConfigTest.kt b/src/test/kotlin/org/ice4j/ConfigTest.kt index 542aa56..0993e3e 100644 --- a/src/test/kotlin/org/ice4j/ConfigTest.kt +++ b/src/test/kotlin/org/ice4j/ConfigTest.kt @@ -20,7 +20,7 @@ import io.kotest.core.spec.IsolationMode import io.kotest.core.spec.Spec import io.kotest.core.spec.style.ShouldSpec import io.kotest.extensions.system.withSystemProperties -import org.jitsi.config.useNewConfig +import org.jitsi.config.withNewConfig import org.jitsi.metaconfig.MetaconfigSettings /** @@ -29,13 +29,13 @@ import org.jitsi.metaconfig.MetaconfigSettings abstract class ConfigTest : ShouldSpec() { override fun isolationMode(): IsolationMode? = IsolationMode.InstancePerLeaf - override fun beforeSpec(spec: Spec) { + override suspend fun beforeSpec(spec: Spec) { super.beforeSpec(spec) MetaconfigSettings.cacheEnabled = false } inline fun withNewConfig(config: String, block: () -> Unit) { - useNewConfig("new-${this::class.simpleName}", config, true, block) + withNewConfig(config, "new-${this::class.simpleName}", true, block) } fun withLegacyConfig(config: Map, block: () -> Unit) = withSystemProperties(config) { block }