Skip to content

Commit

Permalink
chore: Upgrade Java dependencies (#259)
Browse files Browse the repository at this point in the history
  • Loading branch information
pj892031 authored Nov 30, 2023
2 parents 210b7cc + 5a78a52 commit d519224
Show file tree
Hide file tree
Showing 69 changed files with 309 additions and 238 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
workflow_dispatch:

env:
MARIST_HOST: 'zzow04.zowe.marist.cloud'
MARIST_HOST: ${{ secrets.SSH_MARIST_RACF_HOST }}
ZOSMF_PORT: 10443
GATEWAY_PORT: 7554
JOBS_PORT: 8443
Expand Down
2 changes: 1 addition & 1 deletion .license/LICENSE_HEADER
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ https://www.eclipse.org/legal/epl-v20.html

SPDX-License-Identifier: EPL-2.0

Copyright Contributors to the Zowe Project.
Copyright ${name} ${year}.
40 changes: 28 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ group 'org.zowe.explorer.jobs'

buildscript {
ext {
licenseGradlePluginVersion = '0.13.1'
licenseGradlePluginVersion = '0.6.1'
}

ext.mavenRepositories = {
Expand All @@ -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'
}
}

Expand All @@ -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
Expand All @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/code-quality.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down
12 changes: 3 additions & 9 deletions gradle/coverage.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ configure(jacocoSubProjects) {
test.dependsOn instrument

jacoco {
toolVersion = '0.8.3'
toolVersion = '0.8.11'
}

jacocoTestReport {
Expand Down Expand Up @@ -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
}
}

Expand Down
3 changes: 1 addition & 2 deletions gradle/publish.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand All @@ -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' }
Expand Down
159 changes: 85 additions & 74 deletions gradle/versions.gradle
Original file line number Diff line number Diff line change
@@ -1,84 +1,95 @@
ext {
springBootVersion = '2.7.12'
springSecurityVersion = '5.7.11!!'
springFrameworkVersion = '5.3.30!!'
springDocVersion = '1.6.9'
logbackVersion = '1.2.9'
lombokVersion = '1.18.20'
mockitoCoreVersion = '2.23.4'
powerMockVersion = "2.0.0-RC.1"
gsonVersion = '2.9.0'
guavaVersion = '32.0.1-jre'
httpClientVersion = '4.5.13'
httpCoreVersion = '4.4.14'
commonsCodecVersion = '1.15'
slf4jVersion = "1.7.25"
snakeYaml = "2.0"
jacksonCoreVersion = '2.14.1'
jacksonDatabindVersion = '2.14.1'
jsonPathVersion = "2.4.0"
junitVersion = "4.13.1"
restAssuredVersion = "4.3.0"
explorerApiCommonVersion = "2.0.26"
tomcatVersion = "9.0.82"
ext {
springBootVersion = '2.7.18'
springSecurityVersion = '5.8.8'
springFrameworkVersion = '5.3.31'
springDocVersion = '1.6.15'
logbackVersion = '1.2.12'
lombokVersion = '1.18.30'
mockitoCoreVersion = '2.28.2'
powerMockVersion = "2.0.9"
gsonVersion = '2.10.1'
guavaVersion = '32.1.3-jre'
httpClientVersion = '4.5.14'
httpCoreVersion = '4.4.16'
commonsCodecVersion = '1.16.0'
slf4jVersion = "1.7.36"
snakeYaml = "2.2"
jacksonCoreVersion = '2.16.0'
jacksonDatabindVersion = '2.16.0'
jsonPathVersion = "2.8.0"
junitVersion = "4.13.2"
restAssuredVersion = "4.5.1"
explorerApiCommonVersion = "2.0.28"
tomcatVersion = "9.0.83"

libraries = [
lombok : "org.projectlombok:lombok:${lombokVersion}",
slf4j_simple : "org.slf4j:slf4j-simple:${slf4jVersion}",
slf4j_api : "org.slf4j:slf4j-api:${slf4jVersion}",
snakeyaml : "org.yaml:snakeyaml:${snakeYaml}",
spring_boot_gradle_plugin : "org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}",
spring_boot_starter_actuator : "org.springframework.boot:spring-boot-starter-actuator:${springBootVersion}",
spring_boot_starter_parent : "org.springframework.boot:spring-boot-starter-parent:${springBootVersion}",
spring_boot_starter_security : "org.springframework.boot:spring-boot-starter-security:${springBootVersion}",
spring_boot_starter_web : "org.springframework.boot:spring-boot-starter-web:${springBootVersion}",
spring_boot_start_validation : "org.springframework.boot:spring-boot-starter-validation:${springBootVersion}",
spring_boot_starter_test : "org.springframework.boot:spring-boot-starter-test:${springBootVersion}",
activationApiVersion = "1.2.2"
xmlBindApiVersion = "2.3.3"
hamcrestVersion = "2.2"
commonsLang3Version = "3.14.0"

spring_security_config : "org.springframework.security:spring-security-config:${springSecurityVersion}",
spring_security_core : "org.springframework.security:spring-security-core:${springSecurityVersion}",
spring_security_crypto : "org.springframework.security:spring-security-crypto:${springSecurityVersion}",
spring_security_web : "org.springframework.security:spring-security-web:${springSecurityVersion}",
libraries = [
lombok : "org.projectlombok:lombok:${lombokVersion}",
slf4j_simple : "org.slf4j:slf4j-simple:${slf4jVersion}",
slf4j_api : "org.slf4j:slf4j-api:${slf4jVersion}",
snakeyaml : "org.yaml:snakeyaml:${snakeYaml}",
spring_boot_gradle_plugin : "org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}",
spring_boot_starter_actuator : "org.springframework.boot:spring-boot-starter-actuator:${springBootVersion}",
spring_boot_starter_parent : "org.springframework.boot:spring-boot-starter-parent:${springBootVersion}",
spring_boot_starter_security : "org.springframework.boot:spring-boot-starter-security:${springBootVersion}",
spring_boot_starter_web : "org.springframework.boot:spring-boot-starter-web:${springBootVersion}",
spring_boot_start_validation : "org.springframework.boot:spring-boot-starter-validation:${springBootVersion}",
spring_boot_starter_test : "org.springframework.boot:spring-boot-starter-test:${springBootVersion}",

spring_aop : "org.springframework:spring-aop:${springFrameworkVersion}",
spring_beans : "org.springframework:spring-beans:${springFrameworkVersion}",
spring_context : "org.springframework:spring-context:${springFrameworkVersion}",
spring_core : "org.springframework:spring-core:${springFrameworkVersion}",
spring_expression : "org.springframework:spring-expression:${springFrameworkVersion}",
spring_messaging : "org.springframework:spring-messaging:${springFrameworkVersion}",
spring_jcl : "org.springframework:spring-jcl:${springFrameworkVersion}",
spring_test : "org.springframework:spring-test:${springFrameworkVersion}",
spring_web : "org.springframework:spring-web:${springFrameworkVersion}",
spring_webmvc : "org.springframework:spring-webmvc:${springFrameworkVersion}",
spring_security_config : "org.springframework.security:spring-security-config:${springSecurityVersion}",
spring_security_core : "org.springframework.security:spring-security-core:${springSecurityVersion}",
spring_security_crypto : "org.springframework.security:spring-security-crypto:${springSecurityVersion}",
spring_security_web : "org.springframework.security:spring-security-web:${springSecurityVersion}",

tomcat_annotations_api : "org.apache.tomcat:tomcat-annotations-api:${tomcatVersion}",
tomcat_embed_core : "org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}",
tomcat_embed_el : "org.apache.tomcat.embed:tomcat-embed-el:${tomcatVersion}",
tomcat_embed_websocket : "org.apache.tomcat.embed:tomcat-embed-websocket:${tomcatVersion}",
spring_aop : "org.springframework:spring-aop:${springFrameworkVersion}",
spring_beans : "org.springframework:spring-beans:${springFrameworkVersion}",
spring_context : "org.springframework:spring-context:${springFrameworkVersion}",
spring_core : "org.springframework:spring-core:${springFrameworkVersion}",
spring_expression : "org.springframework:spring-expression:${springFrameworkVersion}",
spring_messaging : "org.springframework:spring-messaging:${springFrameworkVersion}",
spring_jcl : "org.springframework:spring-jcl:${springFrameworkVersion}",
spring_test : "org.springframework:spring-test:${springFrameworkVersion}",
spring_web : "org.springframework:spring-web:${springFrameworkVersion}",
spring_webmvc : "org.springframework:spring-webmvc:${springFrameworkVersion}",

commons_codec : "commons-codec:commons-codec:${commonsCodecVersion}",
jackson_annotations : "com.fasterxml.jackson.core:jackson-annotations:${jacksonCoreVersion}",
jackson_core : "com.fasterxml.jackson.core:jackson-core:${jacksonCoreVersion}",
jackson_databind : "com.fasterxml.jackson.core:jackson-databind:${jacksonDatabindVersion}",
json_path : "com.jayway.jsonpath:json-path:${jsonPathVersion}",
logback_classic : "ch.qos.logback:logback-classic:${logbackVersion}",
logback_core : "ch.qos.logback:logback-core:${logbackVersion}",
spring_doc : "org.springdoc:springdoc-openapi-ui:${springDocVersion}",
tomcat_annotations_api : "org.apache.tomcat:tomcat-annotations-api:${tomcatVersion}",
tomcat_embed_core : "org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}",
tomcat_embed_el : "org.apache.tomcat.embed:tomcat-embed-el:${tomcatVersion}",
tomcat_embed_websocket : "org.apache.tomcat.embed:tomcat-embed-websocket:${tomcatVersion}",

http_core : "org.apache.httpcomponents:httpcore:${httpCoreVersion}",
http_client : "org.apache.httpcomponents:httpclient:${httpClientVersion}",
commons_codec : "commons-codec:commons-codec:${commonsCodecVersion}",
jackson_annotations : "com.fasterxml.jackson.core:jackson-annotations:${jacksonCoreVersion}",
jackson_core : "com.fasterxml.jackson.core:jackson-core:${jacksonCoreVersion}",
jackson_databind : "com.fasterxml.jackson.core:jackson-databind:${jacksonDatabindVersion}",
json_path : "com.jayway.jsonpath:json-path:${jsonPathVersion}",
logback_classic : "ch.qos.logback:logback-classic:${logbackVersion}",
logback_core : "ch.qos.logback:logback-core:${logbackVersion}",
spring_doc : "org.springdoc:springdoc-openapi-ui:${springDocVersion}",

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}",
http_core : "org.apache.httpcomponents:httpcore:${httpCoreVersion}",
http_client : "org.apache.httpcomponents:httpclient:${httpClientVersion}",
http_client : "org.apache.httpcomponents:httpmime:${httpClientVersion}",

gson : "com.google.code.gson:gson:${gsonVersion}",
mockito_core : "org.mockito:mockito-core:${mockitoCoreVersion}",
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}",

junit : "junit:junit:${junitVersion}",
restAssured : "io.rest-assured:rest-assured:${restAssuredVersion}",
gson : "com.google.code.gson:gson:${gsonVersion}",
mockito_core : "org.mockito:mockito-core:${mockitoCoreVersion}",

explorer_api_common : "org.zowe.explorer.api:explorer-api-common:${explorerApiCommonVersion}",
explorer_api_common_test : "org.zowe.explorer.api:explorer-api-common-test:${explorerApiCommonVersion}"
]
}
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}",

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}"
]
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit d519224

Please sign in to comment.