Merge pull request #9 from itsallcode/upgrade-dependencies

Upgrade dependencies

.github/workflows/build.yml

@@ -12,8 +12,11 @@ jobs:
       matrix:
         java: [11, 17]
     env:
-      DEFAULT_JAVA: 11
+      DEFAULT_JAVA: 17
     runs-on: ubuntu-latest
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.java }}
+      cancel-in-progress: true
 
     steps:
     - uses: actions/checkout@v4
@@ -48,11 +51,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=itsallcode \
-                            -Dsonar.login=$SONAR_TOKEN \
-                            --info
+      run: ./gradlew sonarqube -Dsonar.token=$SONAR_TOKEN
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/codeql-analysis.yml

@@ -12,6 +12,9 @@ jobs:
   analyze:
     name: Analyze
     runs-on: ubuntu-latest
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}
+      cancel-in-progress: true
 
     steps:
     - name: Checkout repository

.vscode/settings.json

@@ -1,18 +1,17 @@
 {
     "editor.formatOnSave": true,
-    "java.completion.favoriteStaticMembers": [
-        "org.junit.jupiter.api.Assertions.*",
-        "org.junit.jupiter.api.Assumptions.*",
-        "org.junit.jupiter.api.DynamicContainer.*",
-        "org.junit.jupiter.api.DynamicTest.*",
-        "org.mockito.Mockito.*",
-        "org.mockito.ArgumentMatchers.*",
-        "org.mockito.Answers.*",
-        "org.assertj.core.api.Assertions.*",
-        "java.util.Arrays.*",
-        "java.util.Collections.*",
-        "java.util.Comparator",
-        "java.util.function.Predicate",
-        "java.util.stream.Collectors"
-    ]
+    "java.configuration.updateBuildConfiguration": "automatic",
+    "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,
+    "sonarlint.connectedMode.project": {
+        "connectionId": "itsallcode",
+        "projectKey": "org.itsallcode:simple-jdbc"
+    }
 }

CHANGELOG.md

@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [0.4.0] - unreleased
 
+- [PR #9](https://github.com/itsallcode/simple-jdbc/pull/9): Upgrade dependencies
+
 ## [0.3.0] - 2022-02-19
 
 Added simple insert method, validate parameters in batch insert.

README.md

@@ -48,14 +48,14 @@ try (SimpleConnection connection = connectionFactory.create("jdbc:h2:mem:", "use
 
 ### Check if dependencies are up-to-date
 
-```bash
-$ ./gradlew dependencyUpdates
+```sh
+./gradlew dependencyUpdates
 ```
 
 ### Building
 
 Install to local maven repository:
-```bash
+```sh
 ./gradlew clean publishToMavenLocal
 ```
 
@@ -73,11 +73,17 @@ 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:
+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/itsallcode/simple-jdbc/releases) on GitHub.
-5. After some time the release will be available at [Maven Central](https://repo1.maven.org/maven2/org/itsallcode/simple-jdbc/).
+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/itsallcode/simple-jdbc/releases) on GitHub.
+6. After some time the release will be available at [Maven Central](https://repo1.maven.org/maven2/org/itsallcode/simple-jdbc/).

build.gradle

@@ -3,9 +3,9 @@ plugins {
     id 'jacoco'
     id 'signing'
     id 'maven-publish'
-    id 'org.sonarqube' version '3.3'
-    id 'io.codearte.nexus-staging' version '0.30.0'
-    id 'com.github.ben-manes.versions' version '0.42.0'
+    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.49.0'
 }
 
 repositories {
@@ -16,8 +16,8 @@ group 'org.itsallcode'
 version = '0.3.0'
 
 dependencies {
-    testImplementation 'org.assertj:assertj-core:3.22.0'
-    testRuntimeOnly 'com.h2database:h2:2.1.210'
+    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testRuntimeOnly 'com.h2database:h2:2.2.224'
 }
 
 java {
@@ -42,7 +42,7 @@ tasks.withType(JavaCompile) {
 testing {
     suites {
         test {
-            useJUnitJupiter('5.8.2')
+            useJUnitJupiter('5.10.0')
         }
     }
 }
@@ -61,6 +61,13 @@ jacocoTestReport {
     }
 }
 
+sonar {
+  properties {
+    property("sonar.organization", "itsallcode")
+    property("sonar.host.url", "https://sonarcloud.io")
+  }
+}
+
 rootProject.tasks['sonarqube'].dependsOn(tasks['jacocoTestReport'])
 
 def getOptionalProperty(String name) {
@@ -120,10 +127,15 @@ signing {
     sign publishing.publications.mavenJava
 }
 
-nexusStaging {
+nexusPublishing {
     packageGroup = project.group
-    username = getOptionalProperty("ossrhUsername")
-    password = getOptionalProperty("ossrhPassword")
+    repositories {
+        sonatype {
+            stagingProfileId = "546ea6ce74787e"
+            username = getOptionalProperty("ossrhUsername")
+            password = getOptionalProperty("ossrhPassword")
+        }
+    }
 }
 
 def isNonStable = { String version ->

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.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

@@ -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,18 +198,28 @@ 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" \
         -classpath "$CLASSPATH" \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal