diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index bb32b14..8928b8a 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -44,7 +44,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 index dc7a4f4..3234a07 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ group 'org.zowe.explorer' buildscript { ext { - licenseGradlePluginVersion = '0.14.0' + licenseGradlePluginVersion = '0.16.1' } ext.mavenRepositories = { @@ -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' } } @@ -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' diff --git a/explorer-api-common-test/build.gradle b/explorer-api-common-test/build.gradle index 68834ee..def9957 100644 --- a/explorer-api-common-test/build.gradle +++ b/explorer-api-common-test/build.gradle @@ -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 } diff --git a/explorer-api-common/build.gradle b/explorer-api-common/build.gradle index b05eb1c..869d8f5 100644 --- a/explorer-api-common/build.gradle +++ b/explorer-api-common/build.gradle @@ -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 } diff --git a/gradle/code-quality.gradle b/gradle/code-quality.gradle index 01cb42f..8420a97 100644 --- 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 index 3bcbad7..43028d5 100644 --- 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 { diff --git a/gradle/publish.gradle b/gradle/publish.gradle index d17f599..6ab5eda 100644 --- a/gradle/publish.gradle +++ b/gradle/publish.gradle @@ -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' diff --git a/gradle/versions.gradle b/gradle/versions.gradle index ab6cee3..89a192b 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -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' @@ -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" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 442d913..3994438 100644 --- 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