Updated dependencies

Author: depryf

.github/workflows/integration.yml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: '17'
+          java-version: '21'
           cache: 'gradle'
 
       - name: Cache SonarCloud packages

.github/workflows/publish.yml

@@ -20,15 +20,15 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: '17'
+          java-version: '21'
           cache: 'gradle'
 
       - name: Publish
         run: |
           chmod +x gradlew
-          ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
+          ./gradlew publishAndReleaseToMavenCentral --no-configuration-cache
         env:
-          ORG_GRADLE_PROJECT_nexusUsername: ${{ secrets.NEXUS_USERNAME }}
-          ORG_GRADLE_PROJECT_nexusPassword: ${{ secrets.NEXUS_PASSWORD }}
-          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SEER_GPG_SECRET_KEY }}
-          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SEER_GPG_PASSWORD }}
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_KEY }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASSWORD }}

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## NAACCR API Client Version History
 
+**Changes in version 1.2**
+
+- Updated dependencies.
+
 **Changes in version 1.1**
 
 - Updated dependencies.

build.gradle

@@ -1,16 +1,14 @@
-import java.time.Duration
+import com.vanniktech.maven.publish.*
 
 plugins {
     id 'java-library'
     id 'checkstyle'
     id 'jacoco'
-    id 'com.github.spotbugs' version '6.0.26'
-    id 'maven-publish'
-    id 'signing'
-    id 'io.github.gradle-nexus.publish-plugin' version '2.0.0' // publish to Maven Central
-    id 'com.github.ben-manes.versions' version '0.51.0' // check for out-of-date dependencies (run 'dependencyUpdates' manually)
-    id 'org.sonatype.gradle.plugins.scan' version '2.8.3' // scan for vulnerabilities
-    id 'org.sonarqube' version '5.1.0.4882' // sonarQube analysis
+    id 'com.vanniktech.maven.publish' version '0.32.0' // publish to Maven Central
+    id 'com.github.ben-manes.versions' version '0.52.0' // check for out-of-date dependencies (run 'dependencyUpdates' manually)
+    id 'com.github.spotbugs' version '6.1.11' // spotbugs code analysis
+    id 'org.sonatype.gradle.plugins.scan' version '3.1.1' // scan for vulnerabilities
+    id 'org.sonarqube' version '6.1.0.5360' // sonarQube analysis
 }
 
 group = 'com.imsweb'
@@ -33,36 +31,32 @@ dependencies {
 
     // retrofit will not update these dependencies to fix vulnerabilities
     api 'com.squareup.okhttp3:okhttp:4.12.0'
-    api 'com.squareup.okio:okio:3.9.1'
+    api 'com.squareup.okio:okio:3.11.0'
 
     // newer version of dependency to fix vulnerability until converter-jackson is updated
-    api 'com.fasterxml.jackson.core:jackson-databind:2.18.1'
+    api 'com.fasterxml.jackson.core:jackson-databind:2.19.0'
 
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'com.imsweb:seerutils:5.6'
 }
 
-// enforce UTF-8, display the compilation warnings
+java {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+}
+
 tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8'
-    options.compilerArgs << '-Xlint:unchecked' << '-Xlint:deprecation' << '-Xlint:rawtypes' << '-Werror'
+    options.compilerArgs << '-Xlint:unchecked' << '-Xlint:deprecation'
 }
 
-// the Javadoc was made way too strict in Java 8 and it's not worth the time fixing everything!
 tasks.withType(Javadoc).configureEach {
     options.addStringOption('Xdoclint:none', '-quiet')
+    options.addStringOption('encoding', 'UTF-8')
+    options.addStringOption('charSet', 'UTF-8')
+    options.addBooleanOption('html5', true)
 }
 
-// generate javadoc and sources (required by Nexus)
-java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
-
-    withJavadocJar()
-    withSourcesJar()
-}
-
-// customize the manifest
 jar {
     manifest {
         attributes('Implementation-Title': project.name,
@@ -84,22 +78,19 @@ ossIndexAudit {
 }
 check.dependsOn 'ossIndexAudit'
 
-// checkstyle plugin settings
 checkstyle {
     ignoreFailures = true
     configFile = project(':').file('config/checkstyle/checkstyle.xml')
     configProperties = ['suppressionFile': project(':').file('config/checkstyle/suppressions.xml')]
 }
 
-// jacoco plugin settings
 jacocoTestReport {
     reports {
         xml.required = true
     }
 }
 test.finalizedBy jacocoTestReport
 
-// spotbugs plugin settings
 spotbugs {
     ignoreFailures = true
     excludeFilter.set(project(':').file("config/spotbugs/spotbugs-exclude.xml"))
@@ -128,87 +119,46 @@ tasks.named("dependencyUpdates").configure {
     }
 }
 
-// needed to deploy to Maven Central
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            artifactId = 'naaccr-api-client'
-            from components.java
-            versionMapping {
-                usage('java-api') {
-                    fromResolutionOf('runtimeClasspath')
-                }
-                usage('java-runtime') {
-                    fromResolutionResult()
-                }
-            }
-            pom {
-                name = 'NAACCR API Client'
-                description = 'Wraps calls to the NAACCR API.'
-                url = 'https://github.com/imsweb/naaccr-api-client'
-                inceptionYear = '2023'
-
-                licenses {
-                    license {
-                        name = 'A modified BSD License (BSD)'
-                        url = 'https://github.com/imsweb/layout/blob/master/LICENSE'
-                        distribution = 'repo'
-                    }
-                }
-
-                developers {
-                    developer {
-                        id = 'depryf'
-                        name = 'Fabian Depry'
-                        email = '[email protected]'
-                    }
-                }
-
-                scm {
-                    url = 'https://github.com/imsweb/naaccr-api-client'
-                    connection = 'scm:https://github.com/imsweb/naaccr-api-client.git'
-                    developerConnection = 'scm:[email protected]:imsweb/naaccr-api-client.git'
-                }
-            }
-        }
-    }
-}
-
-// setup JAR signing
-signing {
-    required { !project.version.endsWith('-SNAPSHOT') }
-
-    String signingKey = project.findProperty('signingKey') ?: ''
-    String signingPassword = project.findProperty('signingPassword') ?: ''
-
-    useInMemoryPgpKeys(signingKey, signingPassword)
+// needed to deploy to Maven Central Portal
+mavenPublishing {
+    configure(new JavaLibrary(new JavadocJar.Javadoc(), true))
 
-    sign publishing.publications.mavenJava
-}
+    publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, true)
+    signAllPublications()
 
-// needed to release on maven central
-nexusPublishing {
-    repositories {
-        sonatype {
-            stagingProfileId = '63e5ddd3ab0d16'
+    pom {
+        name = 'NAACCR API Client'
+        description = 'Wraps calls to the NAACCR API.'
+        url = 'https://github.com/imsweb/naaccr-api-client'
+        inceptionYear = '2023'
 
-            username = project.findProperty("nexusUsername")
-            password = project.findProperty("nexusPassword")
+        licenses {
+            license {
+                name = 'A modified BSD License (BSD)'
+                url = 'https://github.com/imsweb/layout/blob/master/LICENSE'
+                distribution = 'repo'
+            }
         }
-    }
 
-    clientTimeout = Duration.ofSeconds(300)
-    connectTimeout = Duration.ofSeconds(60)
+        developers {
+            developer {
+                id = 'depryf'
+                name = 'Fabian Depry'
+                email = '[email protected]'
+            }
+        }
 
-    transitionCheckOptions {
-        maxRetries.set(50)
-        delayBetween.set(Duration.ofMillis(5000))
+        scm {
+            url = 'https://github.com/imsweb/naaccr-api-client'
+            connection = 'scm:https://github.com/imsweb/naaccr-api-client.git'
+            developerConnection = 'scm:[email protected]:imsweb/naaccr-api-client.git'
+        }
     }
 }
 
 // Gradle wrapper, this allows to build the project without having to install Gradle!
 wrapper {
-    gradleVersion = '8.11'
+    gradleVersion = '8.14'
     distributionType = Wrapper.DistributionType.ALL
 }
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # 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
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail