Skip to content

Commit 15981cf

Browse files
authored
Merge pull request #240 from jitsi/remove-private-jdk-api
Remove private jdk api
2 parents d4a1453 + 0811007 commit 15981cf

23 files changed

+147
-2673
lines changed

.github/workflows/maven.yml

+7-19
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

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

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

@@ -28,17 +28,11 @@ jobs:
2828
uses: actions/checkout@v2
2929

3030
- name: Set up JDK ${{ matrix.java }}
31-
uses: actions/setup-java@v1
31+
uses: actions/setup-java@v2
3232
with:
33+
distribution: temurin
3334
java-version: ${{ matrix.java }}
34-
35-
- name: Cache local Maven repository
36-
uses: actions/cache@v2
37-
with:
38-
path: ~/.m2/repository
39-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
40-
restore-keys: |
41-
${{ runner.os }}-maven-
35+
cache: maven
4236

4337
- name: Build and test with Maven
4438
run: mvn -B -Dgpg.skip -Drelease=true -Pcoverage verify
@@ -58,21 +52,15 @@ jobs:
5852
fetch-depth: 0
5953

6054
- name: Set up JDK
61-
uses: actions/setup-java@v1
55+
uses: actions/setup-java@v2
6256
with:
57+
distribution: temurin
6358
java-version: ${{ env.RELEASE_JAVA_VERSION }}
59+
cache: maven
6460
server-id: ossrh
6561
server-username: SONATYPE_USER
6662
server-password: SONATYPE_PW
6763

68-
- name: Cache local Maven repository
69-
uses: actions/cache@v2
70-
with:
71-
path: ~/.m2/repository
72-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
73-
restore-keys: |
74-
${{ runner.os }}-maven-
75-
7664
- name: Set version
7765
run: |
7866
VERSION=`git describe --match "v[0-9\.]*" --long --dirty --always`

pom.xml

+12-10
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,10 @@
3838

3939
<properties>
4040
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
41-
<jicoco.version>1.1-90-gfa0e11e</jicoco.version>
42-
<kotlin.version>1.5.20</kotlin.version>
43-
<kotest.version>4.6.1</kotest.version>
44-
<junit.version>5.7.0</junit.version>
45-
<dokka.version>1.4.32</dokka.version>
41+
<jicoco.version>1.1-95-gd8fd866</jicoco.version>
42+
<kotlin.version>1.5.31</kotlin.version>
43+
<kotest.version>4.6.3</kotest.version>
44+
<junit.version>5.8.1</junit.version>
4645
</properties>
4746

4847
<dependencies>
@@ -59,7 +58,7 @@
5958
<dependency>
6059
<groupId>${project.groupId}</groupId>
6160
<artifactId>jitsi-utils</artifactId>
62-
<version>1.0-94-ge7c7a43</version>
61+
<version>1.0-107-g566f8f8</version>
6362
</dependency>
6463
<dependency>
6564
<groupId>${project.groupId}</groupId>
@@ -71,7 +70,7 @@
7170
<dependency>
7271
<groupId>org.junit.platform</groupId>
7372
<artifactId>junit-platform-launcher</artifactId>
74-
<version>1.7.0</version>
73+
<version>1.8.1</version>
7574
<scope>test</scope>
7675
</dependency>
7776
<dependency>
@@ -107,7 +106,7 @@
107106
<dependency>
108107
<groupId>org.mockito</groupId>
109108
<artifactId>mockito-core</artifactId>
110-
<version>3.6.28</version>
109+
<version>4.0.0</version>
111110
<scope>test</scope>
112111
</dependency>
113112
</dependencies>
@@ -156,7 +155,7 @@
156155
<plugin>
157156
<groupId>org.apache.maven.plugins</groupId>
158157
<artifactId>maven-compiler-plugin</artifactId>
159-
<version>3.8.0</version>
158+
<version>3.8.1</version>
160159
<executions>
161160
<!-- Replacing default-compile as it is treated specially by maven -->
162161
<execution>
@@ -255,6 +254,9 @@
255254
<version>2.22.2</version>
256255
<configuration>
257256
<includes>**/*</includes>
257+
<systemPropertyVariables>
258+
<java.util.logging.config.file>${project.build.testSourceDirectory}/../resources/logging.properties</java.util.logging.config.file>
259+
</systemPropertyVariables>
258260
</configuration>
259261
</plugin>
260262
<plugin>
@@ -478,7 +480,7 @@
478480
<plugin>
479481
<groupId>org.jetbrains.dokka</groupId>
480482
<artifactId>dokka-maven-plugin</artifactId>
481-
<version>${dokka.version}</version>
483+
<version>${kotlin.version}</version>
482484
<executions>
483485
<execution>
484486
<phase>package</phase>

0 commit comments

Comments
 (0)