upgrade dependencies

zowe · May 10, 2024 · b1316e5 · b1316e5
1 parent 7a85238
commit b1316e5
Show file tree

Hide file tree

Showing 69 changed files with 249 additions and 189 deletions.
diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
@@ -171,7 +171,7 @@ jobs:
 
       - uses: ./.github/actions/setup
         with:
-          jdkVersion: 11
+          jdkVersion: 17
 
       - name: Sonar scan with Gradle
         run: >

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ group 'org.zowe.explorer.jobs'
 
 buildscript {
     ext {
-        licenseGradlePluginVersion = '0.13.1'
+        licenseGradlePluginVersion = '0.6.1'
     }
 
     ext.mavenRepositories = {
@@ -29,11 +29,11 @@ buildscript {
     repositories mavenRepositories
 
     dependencies {
-        classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7'
-        classpath 'net.researchgate:gradle-release:2.6.0'
-        classpath "gradle.plugin.nl.javadude.gradle.plugins:license-gradle-plugin:${licenseGradlePluginVersion}"
+        classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.8'
+        classpath 'net.researchgate:gradle-release:2.8.1'
+        classpath "gradle.plugin.org.cadixdev.gradle:licenser:${licenseGradlePluginVersion}"
         classpath 'org.owasp:dependency-check-gradle:3.3.4'
-        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.1'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
     }
 }
 
@@ -45,9 +45,9 @@ apply from: 'gradle/code-quality.gradle'
 
 allprojects {
     apply plugin: 'java'
+    apply plugin: 'java-library'
     apply plugin: 'idea'
-    apply plugin: 'maven'
-    apply plugin: 'com.github.hierynomus.license'
+    apply plugin: 'org.cadixdev.licenser'
     apply plugin: 'org.owasp.dependencycheck'
 
     repositories mavenRepositories
@@ -65,16 +65,32 @@ allprojects {
             downloadSources = true
         }
     }
+
+    dependencies {
+        constraints {
+            compileOnly libraries.values()
+            implementation libraries.values()
+            testImplementation libraries.values()
+            annotationProcessor libraries.values()
+        }
+    }
+
+    configurations.all {
+        exclude group: 'org.junit.jupiter'
+
+        resolutionStrategy.force libraries.mockito_core
+    }
+
 }
 
 subprojects {
     license {
-        header rootProject.file('.license/LICENSE_HEADER')
-        ext.year = Calendar.getInstance().get(Calendar.YEAR)
-        excludes(["**/*.yml", "**/*.yaml", "**/*.json", "**/static", "**/*.sh", "**/*.txt", "**/*.p12", "**/*.xml", "**/*.jsp", "**/*.html", "**/*.jks"])
-        mapping {
-            java = 'SLASHSTAR_STYLE'
+        header = rootProject.file('.license/LICENSE_HEADER')
+        properties {
+            name = 'Contributors to the Zowe Project'
+            year = Calendar.getInstance().get(Calendar.YEAR)
         }
+        exclude "**/*.yml", "**/*.yaml", "**/*.json", "**/static", "**/*.sh", "**/*.txt", "**/*.p12", "**/*.xml", "**/*.jsp", "**/*.html", "**/*.jks"
         skipExistingHeaders = true
     }
 

diff --git a/gradle/code-quality.gradle b/gradle/code-quality.gradle
@@ -2,7 +2,7 @@ allprojects {
     apply plugin: 'checkstyle'
 
     checkstyle {
-        toolVersion = '8.38'
+        toolVersion = '8.45.1'
         configFile = rootProject.file('codequality/checkstyle/checkstyle.xml')
         configProperties = [
             'configDir': rootProject.file('codequality/checkstyle'),

diff --git a/gradle/coverage.gradle b/gradle/coverage.gradle
@@ -44,7 +44,7 @@ configure(jacocoSubProjects) {
     test.dependsOn instrument
 
     jacoco {
-        toolVersion = '0.8.3'
+        toolVersion = '0.8.11'
     }
 
     jacocoTestReport {
@@ -82,14 +82,8 @@ task jacocoFullReport(type: JacocoReport) {
     )
 
     reports {
-        html.enabled = true
-        xml.enabled = true
-    }
-
-    doFirst {
-        getExecutionData().from(
-                files(executionData.findAll { it.exists() })
-        )
+        html.required = true
+        xml.required = true
     }
 }
 

diff --git a/gradle/publish.gradle b/gradle/publish.gradle
@@ -12,7 +12,6 @@ ext.publishTasksList = projectsToPublish.collect { ":" + it + ":publish" }
 
 
 configure(subprojects.findAll { it.name in projectsToPublish }) {
-    apply plugin: "maven"
     apply plugin: 'maven-publish'
     apply plugin: 'java'
 
@@ -39,7 +38,7 @@ configure(subprojects.findAll { it.name in projectsToPublish }) {
                 from components.java
                 pom.withXml {
                     asNode().dependencies.'*'.findAll() {
-                        it.scope.text() == 'runtime' && project.configurations.compile.allDependencies.find { dep ->
+                        it.scope.text() == 'runtime' && project.configurations.implementation.allDependencies.find { dep ->
                             dep.name == it.artifactId.text()
                         }
                     }.each { it.scope*.value = 'compile' }

diff --git a/gradle/versions.gradle b/gradle/versions.gradle
@@ -1,27 +1,30 @@
 ext {
-    springBootVersion = '2.7.12'
-    springSecurityVersion = '5.7.11!!'
-    springFrameworkVersion = '5.3.30!!'
-    springDocVersion = '1.6.9'
-    guavaVersion = '32.0.1-jre'
+    springBootVersion = '2.7.18'
+    springSecurityVersion = '5.8.12'
+    springFrameworkVersion = '5.3.34'
+    springDocVersion = '1.7.0'
     logbackVersion = '1.2.13'
-    lombokVersion = '1.18.20'
-    mockitoCoreVersion = '2.23.4'
-    powerMockVersion = "2.0.0-RC.1"
-    gsonVersion = '2.9.0'
-    httpClientVersion = '4.5.13'
-    httpCoreVersion = '4.4.10'
-    commonsCodecVersion = '1.15'
-    slf4jVersion = "1.7.25"
-    snakeYaml = "2.0"
-    jacksonCoreVersion = '2.13.2'
-    jacksonDatabindVersion = '2.14.0'
-    jsonPathVersion = "2.4.0"
-    junitVersion = "4.13.1"
-    restAssuredVersion = "4.3.0"
-    javaxValidationApiVersion= "2.0.1.Final"
-    explorerApiCommonVersion = "1.1.20"
-    tomcatVersion = "9.0.87"
+    lombokVersion = '1.18.32'
+    mockitoCoreVersion = '2.28.2'
+    powerMockVersion = "2.0.9"
+    gsonVersion = '2.10.1'
+    httpClientVersion = '4.5.14'
+    httpCoreVersion = '4.4.16'
+    commonsCodecVersion = '1.16.1'
+    slf4jVersion = "1.7.36"
+    snakeYaml = "2.2"
+    jacksonCoreVersion = '2.16.2'
+    jacksonDatabindVersion = '2.16.2'
+    jsonPathVersion = "2.9.0"
+    junitVersion = "4.13.2"
+    restAssuredVersion = "4.5.1"
+    explorerApiCommonVersion = "1.1.22"
+    tomcatVersion = "9.0.88"
+
+    activationApiVersion = "1.2.2"
+    xmlBindApiVersion = "2.3.3"
+    hamcrestVersion = "2.2"
+    commonsLang3Version = "3.14.0"
 
     libraries = [
             lombok                             : "org.projectlombok:lombok:${lombokVersion}",
@@ -68,19 +71,24 @@ ext {
 
             http_core                          : "org.apache.httpcomponents:httpcore:${httpCoreVersion}",
             http_client                        : "org.apache.httpcomponents:httpclient:${httpClientVersion}",
+            http_mime                          : "org.apache.httpcomponents:httpmime:${httpClientVersion}",
 
             powermock_api_mockito2             : "org.powermock:powermock-api-mockito2:${powerMockVersion}",
             power_mock_junit4                  : "org.powermock:powermock-module-junit4:${powerMockVersion}",
             power_mock_junit4_rule             : "org.powermock:powermock-module-junit4-rule:${powerMockVersion}",
 
             gson                               : "com.google.code.gson:gson:${gsonVersion}",
-            guava                              : "com.google.guava:guava:${guavaVersion}",
             mockito_core                       : "org.mockito:mockito-core:${mockitoCoreVersion}",
 
             junit                              : "junit:junit:${junitVersion}",
             restAssured						   : "io.rest-assured:rest-assured:${restAssuredVersion}",
 
             explorer_api_common                : "org.zowe.explorer.api:explorer-api-common:${explorerApiCommonVersion}",
-            explorer_api_common_test           : "org.zowe.explorer.api:explorer-api-common-test:${explorerApiCommonVersion}"
+            explorer_api_common_test           : "org.zowe.explorer.api:explorer-api-common-test:${explorerApiCommonVersion}",
+
+            activation_api                     : "jakarta.activation:jakarta.activation-api:${activationApiVersion}",
+            xml_bind_api                       : "jakarta.xml.bind:jakarta.xml.bind-api:${xmlBindApiVersion}",
+            hamcrest                           : "org.hamcrest:hamcrest:${hamcrestVersion}",
+            commonsLang3                       : "org.apache.commons:commons-lang3:${commonsLang3Version}"
     ]
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/jobs-api-server/build.gradle b/jobs-api-server/build.gradle
@@ -6,56 +6,53 @@ buildscript {
 }
 
 apply plugin: 'org.springframework.boot'
-apply plugin: 'io.spring.dependency-management'
 
 dependencies {
-    compile project(':jobs-model')
-    compile libraries.spring_boot_starter_actuator
-    compile libraries.spring_boot_starter_parent
-    compile libraries.spring_boot_starter_security
-    compile libraries.spring_security_config
-    compile libraries.spring_security_core
-    compile libraries.spring_security_crypto
-    compile libraries.spring_security_web
-    implementation(libraries.spring_boot_starter_web) {
-        exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-el"
-    }
-    compile libraries.spring_aop
-    compile libraries.spring_beans
-    compile libraries.spring_context
-    compile libraries.spring_core
-    compile libraries.spring_expression
-    compile libraries.spring_messaging
-    compile libraries.spring_jcl
-    compile libraries.spring_test
-    compile libraries.spring_web
-    compile libraries.spring_webmvc
-    compile libraries.http_core
-    compile libraries.http_client
-    compile libraries.commons_codec
-    compile libraries.jackson_annotations
-    compile libraries.jackson_core
-    compile libraries.jackson_databind
-    compile libraries.gson
-    compile libraries.guava
-    compile libraries.logback_classic
-    compile libraries.logback_core
-    compile libraries.snakeyaml
-    compile libraries.spring_doc
-    compile libraries.tomcat_annotations_api
-    compile libraries.tomcat_embed_core
-    compile libraries.tomcat_embed_el
-    compile libraries.tomcat_embed_websocket
-    compile libraries.lombok
+    api project(':jobs-model')
+    implementation libraries.spring_boot_starter_actuator
+    implementation libraries.spring_boot_starter_parent
+    implementation libraries.spring_boot_starter_security
+    implementation libraries.spring_security_config
+    implementation libraries.spring_security_core
+    implementation libraries.spring_security_crypto
+    implementation libraries.spring_security_web
+    implementation libraries.spring_boot_starter_web
+    implementation libraries.spring_aop
+    implementation libraries.spring_beans
+    implementation libraries.spring_context
+    implementation libraries.spring_core
+    implementation libraries.spring_expression
+    implementation libraries.spring_messaging
+    implementation libraries.spring_jcl
+    implementation libraries.spring_test
+    implementation libraries.spring_web
+    implementation libraries.spring_webmvc
+    implementation libraries.http_core
+    implementation libraries.http_client
+    implementation libraries.commons_codec
+    implementation libraries.jackson_annotations
+    implementation libraries.jackson_core
+    implementation libraries.jackson_databind
+    implementation libraries.gson
+    implementation libraries.logback_classic
+    implementation libraries.logback_core
+    implementation libraries.snakeyaml
+    implementation libraries.spring_doc
+    implementation libraries.tomcat_annotations_api
+    implementation libraries.tomcat_embed_core
+    implementation libraries.tomcat_embed_el
+    implementation libraries.tomcat_embed_websocket
+    compileOnly libraries.lombok
     annotationProcessor libraries.lombok
-    compile libraries.explorer_api_common
+    implementation libraries.explorer_api_common
 
-    testCompile libraries.spring_boot_starter_test
-    testCompile libraries.powermock_api_mockito2
-    testCompile libraries.power_mock_junit4
-    testCompile libraries.power_mock_junit4_rule
-    testCompile libraries.mockito_core
-    testCompile libraries.explorer_api_common_test
+    testImplementation libraries.spring_boot_starter_test
+    testImplementation libraries.powermock_api_mockito2
+    testImplementation libraries.power_mock_junit4
+    testImplementation libraries.power_mock_junit4_rule
+    testImplementation libraries.hamcrest
+    testImplementation libraries.mockito_core
+    testImplementation libraries.explorer_api_common_test
 }
 
 allprojects {

diff --git a/jobs-api-server/src/main/java/org/zowe/jobs/JesJobsApplication.java b/jobs-api-server/src/main/java/org/zowe/jobs/JesJobsApplication.java
@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2018
  */
+
 package org.zowe.jobs;
 
 import lombok.extern.slf4j.Slf4j;

diff --git a/jobs-api-server/src/main/java/org/zowe/jobs/controller/AbstractJobsController.java b/jobs-api-server/src/main/java/org/zowe/jobs/controller/AbstractJobsController.java
@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation "201"6, 2020
  */
+
 package org.zowe.jobs.controller;
 
 import io.swagger.v3.oas.annotations.Operation;

diff --git a/jobs-api-server/src/main/java/org/zowe/jobs/controller/JobsControllerV1.java b/jobs-api-server/src/main/java/org/zowe/jobs/controller/JobsControllerV1.java
@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2016, 2020
  */
+
 package org.zowe.jobs.controller;
 
 import io.swagger.v3.oas.annotations.tags.Tag;

diff --git a/jobs-api-server/src/main/java/org/zowe/jobs/controller/JobsControllerV2.java b/jobs-api-server/src/main/java/org/zowe/jobs/controller/JobsControllerV2.java
@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2016, 2020
  */
+
 package org.zowe.jobs.controller;
 
 import io.swagger.v3.oas.annotations.tags.Tag;

diff --git a/jobs-api-server/src/main/java/org/zowe/jobs/exceptions/InvalidOwnerException.java b/jobs-api-server/src/main/java/org/zowe/jobs/exceptions/InvalidOwnerException.java
@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2018, 2019
  */
+
 package org.zowe.jobs.exceptions;
 
 import org.springframework.http.HttpStatus;

diff --git a/jobs-api-server/src/main/java/org/zowe/jobs/exceptions/InvalidPrefixException.java b/jobs-api-server/src/main/java/org/zowe/jobs/exceptions/InvalidPrefixException.java
@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2018, 2019
  */
+
 package org.zowe.jobs.exceptions;
 
 import org.springframework.http.HttpStatus;

diff --git a/jobs-api-server/src/main/java/org/zowe/jobs/exceptions/JobFileIdNotFoundException.java b/jobs-api-server/src/main/java/org/zowe/jobs/exceptions/JobFileIdNotFoundException.java
@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2018
  */
+
 package org.zowe.jobs.exceptions;
 
 import org.springframework.http.HttpStatus;

diff --git a/jobs-api-server/src/main/java/org/zowe/jobs/exceptions/JobIdNotFoundException.java b/jobs-api-server/src/main/java/org/zowe/jobs/exceptions/JobIdNotFoundException.java
@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2018
  */
+
 package org.zowe.jobs.exceptions;
 
 import org.springframework.http.HttpStatus;

diff --git a/jobs-api-server/src/main/java/org/zowe/jobs/exceptions/JobJesjclNotFoundException.java b/jobs-api-server/src/main/java/org/zowe/jobs/exceptions/JobJesjclNotFoundException.java
@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2018
  */
+
 package org.zowe.jobs.exceptions;
 
 import org.springframework.http.HttpStatus;