Skip to content

Commit

Permalink
chore: Upgrade dependencies for v1 (#156)
Browse files Browse the repository at this point in the history
  • Loading branch information
pj892031 committed May 10, 2024
2 parents 273feda + 2ff826e commit c355ec4
Show file tree
Hide file tree
Showing 9 changed files with 62 additions and 68 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:

- uses: ./.github/actions/setup
with:
jdkVersion: 11
jdkVersion: 17

- name: Sonar scan with Gradle
run: >
Expand Down
9 changes: 4 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ group 'org.zowe.explorer'

buildscript {
ext {
licenseGradlePluginVersion = '0.14.0'
licenseGradlePluginVersion = '0.16.1'
}

ext.mavenRepositories = {
Expand All @@ -29,9 +29,9 @@ buildscript {
repositories mavenRepositories

dependencies {
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7'
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.8'
classpath 'net.researchgate:gradle-release:2.6.0'
classpath "gradle.plugin.nl.javadude.gradle.plugins:license-gradle-plugin:${licenseGradlePluginVersion}"
classpath "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:${licenseGradlePluginVersion}"
classpath 'org.owasp:dependency-check-gradle:3.3.4'
}
}
Expand All @@ -43,9 +43,8 @@ apply from: 'gradle/versions.gradle'
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.owasp.dependencycheck'

Expand Down
24 changes: 10 additions & 14 deletions explorer-api-common-test/build.gradle
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
dependencies {
compile project(':explorer-api-common-lib')
compile libraries.spring_boot_starter_test
compile libraries.powermock_api_mockito2
compile libraries.power_mock_junit4
compile libraries.power_mock_junit4_rule
compile libraries.mockito_core
compile libraries.restAssured
api(project(':explorer-api-common-lib'))
implementation libraries.spring_boot_starter_test
implementation libraries.powermock_api_mockito2
implementation libraries.power_mock_junit4
implementation libraries.power_mock_junit4_rule
implementation libraries.mockito_core
implementation libraries.restAssured

compile libraries.spring_aop
compile libraries.spring_beans
compile libraries.spring_context
compile libraries.spring_core
compile libraries.spring_expression
compile libraries.spring_jcl
compile libraries.spring_test
implementation libraries.gson
implementation libraries.spring_web
implementation libraries.spring_webmvc
}
76 changes: 38 additions & 38 deletions explorer-api-common/build.gradle
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
dependencies {

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
compile libraries.spring_boot_starter_web
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

compile libraries.spring_aop
compile libraries.spring_beans
compile libraries.spring_context
compile libraries.spring_core
compile libraries.spring_expression
compile libraries.spring_jcl
compile libraries.spring_messaging
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.logback_classic
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
implementation libraries.spring_aop
implementation libraries.spring_beans
implementation libraries.spring_context
implementation libraries.spring_core
implementation libraries.spring_expression
implementation libraries.spring_jcl
implementation libraries.spring_messaging
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.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

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
testImplementation libraries.spring_boot_starter_test
testImplementation libraries.powermock_api_mockito2
testImplementation libraries.power_mock_junit4
testImplementation libraries.power_mock_junit4_rule
testImplementation libraries.mockito_core
}
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
2 changes: 1 addition & 1 deletion 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
1 change: 0 additions & 1 deletion gradle/publish.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ ext.publishTasksList = projectsToPublish.collect { ":" + it + ":publish" }


configure(subprojects.findAll { it.name in projectsToPublish }) {
apply plugin: "maven"
apply plugin: 'maven-publish'
// Java will already be applied elsewhere, but need it here for 'sourceSets'
apply plugin: 'java'
Expand Down
12 changes: 6 additions & 6 deletions gradle/versions.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
ext {
springBootVersion = '2.7.18'
springSecurityVersion = '5.8.10'
springFrameworkVersion = '5.3.32'
springSecurityVersion = '5.8.12'
springFrameworkVersion = '5.3.34'
springDocVersion = '1.7.0'
logbackVersion = '1.2.13'
lombokVersion = '1.18.30'
lombokVersion = '1.18.32'
mockitoCoreVersion = '2.28.2'
powerMockVersion = "2.0.9"
gsonVersion = '2.10.1'
Expand All @@ -13,13 +13,13 @@ ext {
commonsCodecVersion = '1.16.1'
slf4jVersion = "1.7.36"
snakeYaml = "2.2"
jacksonCoreVersion = '2.16.1'
jacksonDatabindVersion = '2.16.1'
jacksonCoreVersion = '2.16.2'
jacksonDatabindVersion = '2.16.2'
jsonPathVersion = "2.9.0"
junitVersion = "4.13.2"
restAssuredVersion = "4.5.1"
hamcrestJunitVersion = "2.0.0.0"
tomcatVersion = "9.0.85"
tomcatVersion = "9.0.88"
activationApiVersion = "1.2.2"
xmlBindApiVersion = "2.3.3"
objenesisVersion = "3.3"
Expand Down
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.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit c355ec4

Please sign in to comment.