Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies, remove deprecations #157

Merged
merged 4 commits into from
Nov 20, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 8 additions & 20 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

strategy:
matrix:
java: [ 8, 11 ]
java: [ 8, 11, 17 ]

name: Java ${{ matrix.java }}

Expand All @@ -28,24 +28,18 @@ 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 -Pcoverage,central-modules,noncentral-modules,release verify

- 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'
Expand All @@ -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`
Expand Down
2 changes: 1 addition & 1 deletion jicoco-config/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jitsi-metaconfig</artifactId>
<version>1.0-8-g022dff6</version>
<version>1.0-9-g5e1b624</version>
</dependency>
<dependency>
<groupId>com.typesafe</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class TypesafeConfigSource(
return when (type) {
typeOf<Boolean>() -> wrap { key ->
// Typesafe is case-sensitive and does not accept "True" or "False" as valid boolean values.
when (config.getString(key).toLowerCase()) {
when (config.getString(key).lowercase()) {
"true" -> true
"false" -> false
else -> config.getBoolean(key)
Expand Down
35 changes: 30 additions & 5 deletions jicoco/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
<description>Jitsi Common Components</description>

<properties>
<jetty.version>9.4.41.v20210516</jetty.version>
<jersey.version>2.34</jersey.version>
<jetty.version>9.4.44.v20210927</jetty.version>
<jersey.version>2.35</jersey.version>
<smack.version>4.4.4</smack.version>
</properties>

Expand Down Expand Up @@ -142,7 +142,7 @@
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<version>1.7.0</version>
<version>1.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -168,18 +168,36 @@
<artifactId>jersey-test-framework-core</artifactId>
<version>${jersey.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
<artifactId>jersey-test-framework-provider-jetty</artifactId>
<version>${jersey.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
<version>${jersey.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.kotest</groupId>
Expand Down Expand Up @@ -270,17 +288,24 @@
<source>1.8</source>
<target>1.8</target>
<compilerArgs>
<arg>-Xlint:all</arg>
<arg>-Xlint:all,-serial</arg>
</compilerArgs>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.1</version>
<version>3.1.2</version>
<configuration>
<configLocation>checkstyle.xml</configLocation>
</configuration>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>9.1</version>
</dependency>
</dependencies>
<executions>
<execution>
<goals>
Expand Down
220 changes: 0 additions & 220 deletions jicoco/src/main/java/org/jitsi/meet/OSGiBundleConfig.java

This file was deleted.