Update dependencies

.github/workflows/codeql-analysis.yml

@@ -2,9 +2,9 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [master]
+    branches: [main]
   pull_request:
-    branches: [master]
+    branches: [main]
   schedule:
     - cron: '0 15 * * 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:
@@ -14,7 +14,7 @@ jobs:
       matrix:
         java: [11, 17]
     env:
-      DEFAULT_JAVA: 11
+      DEFAULT_JAVA: 17
 
     steps:
 
@@ -56,11 +56,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

@@ -13,6 +13,7 @@
         "source.organizeImports": true
     },
     "java.codeGeneration.useBlocks": true,
+    "java.configuration.updateBuildConfiguration": "automatic",
     "editor.formatOnSave": true,
     "editor.formatOnSaveMode": "modificationsIfAvailable",
     "sonarlint.connectedMode.project": {

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Refactoring
+
+- [PR #118](https://github.com/kaklakariada/portmapper/pull/118): Upgrade dependencies
+
 ## [2.2.3] - 2023-03-19
 
 - [PR #113](https://github.com/kaklakariada/portmapper/pull/113)

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 "4.0.0.2929"
-    id 'com.github.johnrengelman.shadow' version '8.1.0'
-    id 'io.codearte.nexus-staging' version '0.30.0'
-    id 'com.github.ben-manes.versions' version '0.46.0'
+    id "org.sonarqube" version "4.4.1.3373"
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
+    id "io.github.gradle-nexus.publish-plugin" version "1.3.0"
+    id 'com.github.ben-manes.versions' version '0.48.0'
 }
 
 repositories {
@@ -79,10 +79,10 @@ artifacts {
 
 dependencies {
     implementation 'args4j:args4j:2.33'
-    implementation 'org.slf4j:slf4j-api:2.0.7'
-    implementation 'org.slf4j:jul-to-slf4j:2.0.7'
-    implementation 'ch.qos.logback:logback-classic:1.4.6'
-    implementation 'com.miglayout:miglayout-swing:11.0'
+    implementation 'org.slf4j:slf4j-api:2.0.9'
+    implementation 'org.slf4j:jul-to-slf4j:2.0.9'
+    implementation 'ch.qos.logback:logback-classic:1.4.11'
+    implementation 'com.miglayout:miglayout-swing:11.1'
     implementation 'org.jdesktop.bsaf:bsaf:1.9.2'
     implementation ':sbbi-upnplib:1.0.4'
     implementation 'org.fourthline.cling:cling-support:2.1.2'
@@ -91,7 +91,7 @@ dependencies {
     runtimeOnly 'commons-jxpath:commons-jxpath:1.1' // sbbi
 
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.mockito:mockito-core:5.2.0'
+    testImplementation 'org.mockito:mockito-core:5.6.0'
 }
 
 license {
@@ -105,6 +105,14 @@ jacocoTestReport {
     }
 }
 
+sonar {
+  properties {
+    property("sonar.organization", "kaklakariada-github")
+    property("sonar.host.url", "https://sonarcloud.io")
+    property("sonar.gradle.skipCompile", "true")
+  }
+}
+
 tasks["sonarqube"].dependsOn(tasks["jacocoTestReport"])
 
 def getOptionalProperty(String name) {
@@ -164,10 +172,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 ->

doc/developer_guide.md

@@ -55,11 +55,17 @@ java -jar build/libs/portmapper-*.jar
     ```
 
 2. Increment version number in `build.gradle` and `README.md`, commit and push.
-3. Run the following command:
+3. Optional: run the following command to do a dry-run:
 
-    ```bash
-    ./gradlew clean check build publish closeAndReleaseRepository --info
+    ```sh
+    ./gradlew clean check build publishToSonatype closeSonatypeStagingRepository --info
     ```
 
-4. Create a new [release](https://github.com/kaklakariada/portmapper/releases) on GitHub.
-5. After some time the release will be available at [Maven Central](https://repo1.maven.org/maven2/com/github/kaklakariada/portmapper/).
+4. Run the following command to publish to Maven Central:
+
+    ```sh
+    ./gradlew clean check build publishToSonatype closeAndReleaseSonatypeStagingRepository --info
+    ```
+
+5. Create a new [release](https://github.com/kaklakariada/portmapper/releases) on GitHub.
+6. After some time the release will be available at [Maven Central](https://repo1.maven.org/maven2/com/github/kaklakariada/portmapper/).

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# 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,26 +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=SC3045
+        # 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=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,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" \