Skip to content

Commit 71e244d

Browse files
ibauersachsdamencho
authored andcommitted
Update dependencies
1 parent f41542d commit 71e244d

File tree

3 files changed

+36
-29
lines changed

3 files changed

+36
-29
lines changed

.github/workflows/maven.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,24 @@ on:
1111

1212
env:
1313
# Java version to use for the release
14-
RELEASE_JAVA_VERSION: 8
14+
RELEASE_JAVA_VERSION: 11
1515

1616
jobs:
1717
test:
1818
runs-on: ubuntu-latest
1919

2020
strategy:
2121
matrix:
22-
java: [ 8, 11, 17 ]
22+
java: [ 11, 17 ]
2323

2424
name: Java ${{ matrix.java }}
2525

2626
steps:
2727
- name: Checkout
28-
uses: actions/checkout@v2
28+
uses: actions/checkout@v3
2929

3030
- name: Set up JDK ${{ matrix.java }}
31-
uses: actions/setup-java@v2
31+
uses: actions/setup-java@v3
3232
with:
3333
distribution: temurin
3434
java-version: ${{ matrix.java }}
@@ -39,20 +39,20 @@ jobs:
3939

4040
- name: Upload coverage report
4141
if: matrix.java == env.RELEASE_JAVA_VERSION
42-
uses: codecov/codecov-action@v1
42+
uses: codecov/codecov-action@v2
4343

4444
release:
4545
if: github.ref == 'refs/heads/master'
4646
needs: test
4747
runs-on: ubuntu-latest
4848
steps:
4949
- name: Checkout
50-
uses: actions/checkout@v2
50+
uses: actions/checkout@v3
5151
with:
5252
fetch-depth: 0
5353

5454
- name: Set up JDK
55-
uses: actions/setup-java@v2
55+
uses: actions/setup-java@v3
5656
with:
5757
distribution: temurin
5858
java-version: ${{ env.RELEASE_JAVA_VERSION }}

pom.xml

+26-19
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838

3939
<properties>
4040
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
41-
<jicoco.version>1.1-95-gd8fd866</jicoco.version>
41+
<jicoco.version>1.1-104-g20c4353</jicoco.version>
4242
<kotlin.version>1.5.31</kotlin.version>
43-
<kotest.version>4.6.3</kotest.version>
44-
<junit.version>5.8.1</junit.version>
43+
<kotest.version>5.3.0</kotest.version>
44+
<junit.version>5.8.2</junit.version>
4545
</properties>
4646

4747
<dependencies>
@@ -70,7 +70,7 @@
7070
<dependency>
7171
<groupId>org.junit.platform</groupId>
7272
<artifactId>junit-platform-launcher</artifactId>
73-
<version>1.8.1</version>
73+
<version>1.8.2</version>
7474
<scope>test</scope>
7575
</dependency>
7676
<dependency>
@@ -106,7 +106,7 @@
106106
<dependency>
107107
<groupId>org.mockito</groupId>
108108
<artifactId>mockito-core</artifactId>
109-
<version>4.0.0</version>
109+
<version>4.5.1</version>
110110
<scope>test</scope>
111111
</dependency>
112112
</dependencies>
@@ -146,7 +146,7 @@
146146
</execution>
147147
</executions>
148148
<configuration>
149-
<jvmTarget>1.8</jvmTarget>
149+
<jvmTarget>11</jvmTarget>
150150
<args>
151151
<arg>-Xallow-result-return-type</arg>
152152
</args>
@@ -155,7 +155,7 @@
155155
<plugin>
156156
<groupId>org.apache.maven.plugins</groupId>
157157
<artifactId>maven-compiler-plugin</artifactId>
158-
<version>3.8.1</version>
158+
<version>3.10.1</version>
159159
<executions>
160160
<!-- Replacing default-compile as it is treated specially by maven -->
161161
<execution>
@@ -183,8 +183,7 @@
183183
</execution>
184184
</executions>
185185
<configuration>
186-
<source>1.8</source>
187-
<target>1.8</target>
186+
<release>11</release>
188187
<compilerArgs>
189188
<arg>-Xlint:all</arg>
190189
</compilerArgs>
@@ -193,10 +192,17 @@
193192
<plugin>
194193
<groupId>org.apache.maven.plugins</groupId>
195194
<artifactId>maven-checkstyle-plugin</artifactId>
196-
<version>3.1.1</version>
195+
<version>3.1.2</version>
197196
<configuration>
198197
<configLocation>checkstyle.xml</configLocation>
199198
</configuration>
199+
<dependencies>
200+
<dependency>
201+
<groupId>com.puppycrawl.tools</groupId>
202+
<artifactId>checkstyle</artifactId>
203+
<version>10.1</version>
204+
</dependency>
205+
</dependencies>
200206
<executions>
201207
<execution>
202208
<goals>
@@ -208,7 +214,7 @@
208214
<plugin>
209215
<groupId>com.github.gantsign.maven</groupId>
210216
<artifactId>ktlint-maven-plugin</artifactId>
211-
<version>1.7.0</version>
217+
<version>1.13.1</version>
212218
<configuration>
213219
<sourceRoots>
214220
<sourceRoot>${project.basedir}/src/main/kotlin</sourceRoot>
@@ -229,7 +235,7 @@
229235
<plugin>
230236
<groupId>biz.aQute.bnd</groupId>
231237
<artifactId>bnd-maven-plugin</artifactId>
232-
<version>5.2.0</version>
238+
<version>6.2.0</version>
233239
<executions>
234240
<execution>
235241
<goals>
@@ -241,7 +247,7 @@
241247
<plugin>
242248
<groupId>org.apache.maven.plugins</groupId>
243249
<artifactId>maven-jar-plugin</artifactId>
244-
<version>3.2.0</version>
250+
<version>3.2.2</version>
245251
<configuration>
246252
<archive>
247253
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
@@ -251,7 +257,7 @@
251257
<plugin>
252258
<groupId>org.apache.maven.plugins</groupId>
253259
<artifactId>maven-surefire-plugin</artifactId>
254-
<version>2.22.2</version>
260+
<version>3.0.0-M6</version>
255261
<configuration>
256262
<includes>**/*</includes>
257263
<systemPropertyVariables>
@@ -262,12 +268,12 @@
262268
<plugin>
263269
<groupId>org.apache.maven.plugins</groupId>
264270
<artifactId>maven-deploy-plugin</artifactId>
265-
<version>2.8.2</version>
271+
<version>3.0.0-M2</version>
266272
</plugin>
267273
<plugin>
268274
<groupId>org.sonatype.plugins</groupId>
269275
<artifactId>nexus-staging-maven-plugin</artifactId>
270-
<version>1.6.8</version>
276+
<version>1.6.13</version>
271277
<extensions>true</extensions>
272278
<configuration>
273279
<serverId>ossrh</serverId>
@@ -282,6 +288,7 @@
282288
<plugin>
283289
<groupId>org.codehaus.mojo</groupId>
284290
<artifactId>exec-maven-plugin</artifactId>
291+
<version>3.0.0</version>
285292
<executions>
286293
<execution>
287294
<goals>
@@ -311,7 +318,7 @@
311318
<plugin>
312319
<groupId>org.jacoco</groupId>
313320
<artifactId>jacoco-maven-plugin</artifactId>
314-
<version>0.8.7</version>
321+
<version>0.8.8</version>
315322
<executions>
316323
<execution>
317324
<goals>
@@ -448,7 +455,7 @@
448455
<plugin>
449456
<groupId>org.codehaus.mojo</groupId>
450457
<artifactId>build-helper-maven-plugin</artifactId>
451-
<version>3.2.0</version>
458+
<version>3.3.0</version>
452459
<executions>
453460
<execution>
454461
<phase>generate-sources</phase>
@@ -493,7 +500,7 @@
493500
<plugin>
494501
<groupId>org.apache.maven.plugins</groupId>
495502
<artifactId>maven-gpg-plugin</artifactId>
496-
<version>1.6</version>
503+
<version>3.0.1</version>
497504
<executions>
498505
<execution>
499506
<id>sign-artifacts</id>

src/test/kotlin/org/ice4j/ConfigTest.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import io.kotest.core.spec.IsolationMode
2020
import io.kotest.core.spec.Spec
2121
import io.kotest.core.spec.style.ShouldSpec
2222
import io.kotest.extensions.system.withSystemProperties
23-
import org.jitsi.config.useNewConfig
23+
import org.jitsi.config.withNewConfig
2424
import org.jitsi.metaconfig.MetaconfigSettings
2525

2626
/**
@@ -29,13 +29,13 @@ import org.jitsi.metaconfig.MetaconfigSettings
2929
abstract class ConfigTest : ShouldSpec() {
3030
override fun isolationMode(): IsolationMode? = IsolationMode.InstancePerLeaf
3131

32-
override fun beforeSpec(spec: Spec) {
32+
override suspend fun beforeSpec(spec: Spec) {
3333
super.beforeSpec(spec)
3434
MetaconfigSettings.cacheEnabled = false
3535
}
3636

3737
inline fun withNewConfig(config: String, block: () -> Unit) {
38-
useNewConfig("new-${this::class.simpleName}", config, true, block)
38+
withNewConfig(config, "new-${this::class.simpleName}", true, block)
3939
}
4040

4141
fun withLegacyConfig(config: Map<String, String?>, block: () -> Unit) = withSystemProperties(config) { block }

0 commit comments

Comments
 (0)