Merge pull request #59 from kaklakariada/update-dependencies

Update dependencies

Author: kaklakariada

.github/workflows/codeql-analysis.yml

@@ -2,9 +2,9 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [master, develop]
+    branches: [main]
   pull_request:
-    branches: [master, develop]
+    branches: [main]
   schedule:
     - cron: '0 7 * * 6'
 

.github/workflows/gradle.yml

@@ -2,9 +2,9 @@ name: Java CI
 
 on:
   push:
-    branches: [master, develop]
+    branches: [main]
   pull_request:
-    branches: [master, develop]
+    branches: [main]
 
 jobs:
   build:
@@ -41,11 +41,7 @@ jobs:
 
     - name: Sonar analysis
       if: ${{ env.DEFAULT_JAVA == matrix.java && env.SONAR_TOKEN != null }}
-      run: |
-        ./gradlew sonarqube -Dsonar.host.url=https://sonarcloud.io \
-                            -Dsonar.organization=kaklakariada-github \
-                            -Dsonar.login=$SONAR_TOKEN \
-                            --info --warning-mode=summary
+      run: ./gradlew sonarqube -Dsonar.token=$SONAR_TOKEN --info --warning-mode=summary
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.vscode/settings.json

@@ -0,0 +1,13 @@
+{
+  "java.configuration.updateBuildConfiguration": "automatic",
+  "editor.formatOnSave": true,
+  "editor.codeActionsOnSave": {
+    "source.organizeImports": true,
+    "source.generate.finalModifiers": true,
+    "source.fixAll": true
+  },
+  "java.codeGeneration.useBlocks": true,
+  "java.saveActions.organizeImports": true,
+  "java.sources.organizeImports.starThreshold": 3,
+  "java.sources.organizeImports.staticStarThreshold": 3
+}

CHANGELOG.md

@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Refactoring
 
 - [#50](https://github.com/kaklakariada/fritzbox-java-api/pull/50) Migrate to Junit 5
+- [#59](https://github.com/kaklakariada/fritzbox-java-api/pull/59) Upgrade dependencies
 
 ## [1.6.0] - 2021-12-04
 

README.md

@@ -59,32 +59,32 @@ See [CHANGELOG.md](CHANGELOG.md).
     fritzbox.username = user
     fritzbox.password = secret
     ```
-2. Run example class [`TestDriver`](https://github.com/kaklakariada/fritzbox-java-api/blob/master/src/main/java/com/github/kaklakariada/fritzbox/TestDriver.java).
+2. Run example class [`TestDriver`](https://github.com/kaklakariada/fritzbox-java-api/blob/main/src/main/java/com/github/kaklakariada/fritzbox/TestDriver.java).
 
 ## Development
 
 ### Generate / update license header
 
-```bash
+```sh
 ./gradlew licenseFormat
 ```
 
 ### Check if dependencies are up-to-date
 
-```bash
+```sh
 ./gradlew dependencyUpdates
 ```
 
 ### Check dependencies for vulnerabilities
 
-```bash
+```sh
 ./gradlew ossIndexAudit
 ```
 
 ### Building
 
 Install to local maven repository:
-```bash
+```sh
 ./gradlew clean publishToMavenLocal
 ```
 
@@ -102,11 +102,18 @@ Install to local maven repository:
     ```
 
 2. Increment version number in `build.gradle` and `README.md`, update [CHANGELOG.md](CHANGELOG.md), commit and push.
-3. Run the following command:
 
-    ```bash
-    ./gradlew clean check build publish closeAndReleaseRepository --info
+3. Optional: run the following command to do a dry-run:
+
+    ```sh
+    ./gradlew clean check build publishToSonatype closeSonatypeStagingRepository --info
+    ```
+
+4. Run the following command to publish to Maven Central:
+
+    ```sh
+    ./gradlew clean check build publishToSonatype closeAndReleaseSonatypeStagingRepository --info
     ```
 
-4. Create a new [release](https://github.com/kaklakariada/fritzbox-java-api/releases) on GitHub.
-5. After some time the release will be available at [Maven Central](https://repo1.maven.org/maven2/com/github/kaklakariada/fritzbox-java-api/).
+5. Create a new [release](https://github.com/kaklakariada/fritzbox-java-api/releases) on GitHub.
+6. After some time the release will be available at [Maven Central](https://repo1.maven.org/maven2/com/github/kaklakariada/fritzbox-java-api/).

build.gradle

@@ -4,10 +4,10 @@ plugins {
     id "maven-publish"
     id "jacoco"
     id "com.github.hierynomus.license" version "0.16.1"
-    id "org.sonarqube" version "3.4.0.2513"
-    id "io.codearte.nexus-staging" version "0.30.0"
-    id "com.github.ben-manes.versions" version "0.42.0"
-    id "org.sonatype.gradle.plugins.scan" version "2.4.1"
+    id "org.sonarqube" version "4.4.1.3373"
+    id "io.github.gradle-nexus.publish-plugin" version "1.3.0"
+    id "com.github.ben-manes.versions" version "0.48.0"
+    id "org.sonatype.gradle.plugins.scan" version "2.6.1"
 }
 
 group 'com.github.kaklakariada'
@@ -31,24 +31,24 @@ tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
 }
 
-test {
-    useJUnitPlatform()
-    if(logger.infoEnabled) {
-        testLogging.showStandardStreams = true
+testing {
+    suites { 
+        test { 
+            useJUnitJupiter() 
+        }
     }
-    jvmArgs '-XX:+HeapDumpOnOutOfMemoryError', '-enableassertions'
 }
 
 dependencies {
-    implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.11.0'
+    implementation 'com.squareup.okio:okio:3.6.0' // Fix CVE-2023-3635
     implementation 'com.subshell.simpleframework:simple-xml:2.9.0'
-    implementation 'org.slf4j:slf4j-api:2.0.0'
+    implementation 'org.slf4j:slf4j-api:2.0.9'
 
-    runtimeOnly 'ch.qos.logback:logback-classic:1.3.0-beta0'
+    testRuntimeOnly 'ch.qos.logback:logback-classic:1.4.11'
 
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0'
-    testImplementation 'org.mockito:mockito-core:4.7.0'
-    testImplementation 'org.assertj:assertj-core:3.23.1'
+    testImplementation 'org.mockito:mockito-core:5.6.0'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
 }
 
 license {
@@ -64,6 +64,14 @@ jacocoTestReport {
     }
 }
 
+sonar {
+  properties {
+    property("sonar.organization", "kaklakariada-github")
+    property("sonar.host.url", "https://sonarcloud.io")
+    property("sonar.gradle.skipCompile", "true")
+  }
+}
+
 rootProject.tasks["sonarqube"].dependsOn(tasks["jacocoTestReport"])
 
 def getOptionalProperty(String name) {
@@ -124,10 +132,15 @@ signing {
     sign publishing.publications.mavenJava
 }
 
-nexusStaging {
+nexusPublishing {
     packageGroup = project.group
-    username = getOptionalProperty("ossrhUsername")
-    password = getOptionalProperty("ossrhPassword")
+    repositories {
+        sonatype {
+            stagingProfileId = "4f1b95618be44"
+            username = getOptionalProperty("ossrhUsername")
+            password = getOptionalProperty("ossrhPassword")
+        }
+    }
 }
 
 def isNonStable = { String version ->

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%