diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 888f04c9b..882dcf716 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -9,10 +9,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 java-package: jdk+fx distribution: zulu - name: Build and test with gradle diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 62307648f..1ab5e26b3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,10 +10,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 java-package: jdk+fx distribution: zulu - name: Cache local Maven repository diff --git a/build.gradle b/build.gradle index 7edb92ea7..aaf388191 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ import java.nio.file.Files plugins { id 'application' id 'com.github.jk1.dependency-license-report' version "2.0" - id "org.sonarqube" version "7.3.0.8198" + id "org.sonarqube" version "7.3.1.8318" id 'org.openjfx.javafxplugin' version '0.1.0' } @@ -32,28 +32,28 @@ def jarName = 'MServer.jar' def mainClass = 'mServer.Main' dependencies { - implementation 'commons-net:commons-net:3.12.0' + implementation 'commons-net:commons-net:3.13.0' implementation 'org.apache.commons:commons-compress:1.28.0' - implementation 'org.apache.commons:commons-text:1.14.0' - implementation 'org.tukaani:xz:1.10' - implementation 'com.google.code.gson:gson:2.13.1' - implementation 'org.glassfish.jersey.core:jersey-client:3.1.11' - implementation 'org.glassfish.jersey.inject:jersey-hk2:3.1.11' - implementation 'org.jsoup:jsoup:1.21.1' - implementation 'jakarta.activation:jakarta.activation-api:2.1.3' - implementation 'com.google.guava:guava:33.4.8-jre' - implementation 'org.apache.logging.log4j:log4j-core:2.25.1' + implementation 'org.apache.commons:commons-text:1.15.0' + implementation 'org.tukaani:xz:1.12' + implementation 'com.google.code.gson:gson:2.14.0' + implementation 'org.glassfish.jersey.core:jersey-client:3.1.12' + implementation 'org.glassfish.jersey.inject:jersey-hk2:3.1.12' + implementation 'org.jsoup:jsoup:1.22.2' + implementation 'jakarta.activation:jakarta.activation-api:2.1.4' + implementation 'com.google.guava:guava:33.6.0-jre' + implementation 'org.apache.logging.log4j:log4j-core:2.26.1' implementation 'fm.void.jetm:jetm:1.2.3' implementation 'com.jidesoft:jide-oss:3.6.18' implementation 'com.squareup.okhttp3:okhttp:4.12.0' - implementation 'com.fasterxml.jackson.core:jackson-core:2.15.0' - testImplementation 'org.mockito:mockito-core:4.11.0' - testImplementation 'com.squareup.okhttp3:mockwebserver:4.10.0' + implementation 'com.fasterxml.jackson.core:jackson-core:2.22.1' + testImplementation 'org.mockito:mockito-core:5.23.0' + testImplementation 'com.squareup.okhttp3:mockwebserver:4.12.0' testImplementation "org.hamcrest:hamcrest-junit:2.0.0.0" - testImplementation 'org.assertj:assertj-core:3.23.1' - testImplementation "org.hamcrest:hamcrest:2.2" - testImplementation "org.junit.jupiter:junit-jupiter:5.14.4" - testImplementation "org.junit.platform:junit-platform-launcher:1.14.4" + testImplementation 'org.assertj:assertj-core:3.27.7' + testImplementation "org.hamcrest:hamcrest:3.0" + testImplementation "org.junit.jupiter:junit-jupiter:6.1.2" + testImplementation "org.junit.platform:junit-platform-launcher:6.1.1" } @@ -274,6 +274,6 @@ sonarqube { } java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } diff --git a/src/main/java/mServer/crawler/AddToFilmlist.java b/src/main/java/mServer/crawler/AddToFilmlist.java index e83efad6d..2e19ef12f 100644 --- a/src/main/java/mServer/crawler/AddToFilmlist.java +++ b/src/main/java/mServer/crawler/AddToFilmlist.java @@ -17,7 +17,6 @@ import mServer.tool.MserverDaten; import okhttp3.OkHttpClient; import okhttp3.Request; -import okhttp3.Request.Builder; import okhttp3.Response; import org.jetbrains.annotations.NotNull; @@ -400,7 +399,7 @@ private boolean orfRemovedVideo(DatenFilm film, Response response) { @NotNull private Request createOnlineCheckRequest(String url) { - Builder builder = new Builder().url(url); + Request.Builder builder = new Request.Builder().url(url); if (isM3u8File(url)) { // head request of m3u8 files always returns 405 => use get instead return builder.get().build();