From daf509a1401aecd0fe7cb8432ca63e1baf9d1f5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Jare=C5=A1?= Date: Mon, 27 Nov 2023 21:31:12 +0100 Subject: [PATCH 01/11] update --- build.gradle | 31 +++-- gradle/code-quality.gradle | 2 +- gradle/coverage.gradle | 2 +- gradle/publish.gradle | 1 - gradle/versions.gradle | 157 ++++++++++++----------- gradle/wrapper/gradle-wrapper.properties | 2 +- jobs-api-server/build.gradle | 85 ++++++------ jobs-model/build.gradle | 75 ++++++----- jobs-tests/build.gradle | 76 +++++------ 9 files changed, 222 insertions(+), 209 deletions(-) diff --git a/build.gradle b/build.gradle index d5ef12f1..f598eed2 100644 --- 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,23 @@ allprojects { downloadSources = true } } + + dependencies { + constraints { + compileOnly libraries.values() + implementation libraries.values() + testImplementation libraries.values() + annotationProcessor libraries.values() + } + } + } subprojects { license { - header rootProject.file('.license/LICENSE_HEADER') + 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' - } + 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 index 01cb42fd..8420a97b 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 c8bd4be8..e5a0d608 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 4a4496e8..ec6c8d5f 100644 --- 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' diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 1cae1ff8..34c5d79e 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -1,84 +1,93 @@ -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.27" + 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" - 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}" + ] + } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 442d9132..068cdb2d 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.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/jobs-api-server/build.gradle b/jobs-api-server/build.gradle index 65fef5a3..420196f0 100644 --- a/jobs-api-server/build.gradle +++ b/jobs-api-server/build.gradle @@ -6,53 +6,52 @@ 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 - compile 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_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.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.mockito_core + testImplementation libraries.explorer_api_common_test } allprojects { diff --git a/jobs-model/build.gradle b/jobs-model/build.gradle index 9111b6c4..b1781874 100644 --- a/jobs-model/build.gradle +++ b/jobs-model/build.gradle @@ -1,42 +1,41 @@ 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_start_validation - compile 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_test - compile libraries.spring_web - compile libraries.spring_webmvc - compile libraries.http_core - compile libraries.http_client - compile libraries.commons_codec - compile libraries.jackson_databind - compile libraries.gson - 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 + 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_start_validation + 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_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_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 - 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/jobs-tests/build.gradle b/jobs-tests/build.gradle index b7110311..58b141b4 100644 --- a/jobs-tests/build.gradle +++ b/jobs-tests/build.gradle @@ -11,46 +11,46 @@ ext { } dependencies { - compile project(':jobs-model') - compile project(':jobs-api-server') - 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 - 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 - compile libraries.spring_web - compile libraries.spring_webmvc - compile libraries.http_core - compile libraries.http_client - compile libraries.commons_codec - compile libraries.gson - compile libraries.spring_messaging - compile libraries.snakeyaml - compile libraries.tomcat_annotations_api - compile libraries.tomcat_embed_core - compile libraries.tomcat_embed_websocket - compile libraries.explorer_api_common - compile libraries.restAssured - compile libraries.lombok + api project(':jobs-model') + api project(':jobs-api-server') + 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_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.gson + implementation libraries.spring_messaging + implementation libraries.snakeyaml + implementation libraries.tomcat_annotations_api + implementation libraries.tomcat_embed_core + implementation libraries.tomcat_embed_websocket + implementation libraries.explorer_api_common + implementation libraries.restAssured + 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 - testCompile libraries.explorer_api_common_test - testCompile 'org.hamcrest:hamcrest-junit:2.0.0.0' //TODO testCompile libraries.hamcrest + 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 + testImplementation libraries.explorer_api_common_test + testImplementation 'org.hamcrest:hamcrest-junit:2.0.0.0' } test { From 8f1a648cb2d9656f2ceaabb25a666ca38aefc79d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Jare=C5=A1?= Date: Mon, 27 Nov 2023 22:15:28 +0100 Subject: [PATCH 02/11] fix licenses --- .license/LICENSE_HEADER | 2 +- build.gradle | 5 ++++- jobs-model/src/main/java/org/zowe/jobs/model/JobFile.java | 2 +- .../src/main/java/org/zowe/jobs/model/JobFileContent.java | 2 +- jobs-model/src/main/java/org/zowe/jobs/model/JobStep.java | 2 +- .../java/org/zowe/jobs/model/JclStringValidatorTest.java | 2 +- .../java/org/zowe/jobs/tests/JobDeleteIntegrationTest.java | 2 +- .../java/org/zowe/jobs/tests/JobFilesIntegrationTest.java | 2 +- .../java/org/zowe/jobs/tests/JobModifyIntegrationTest.java | 2 +- .../java/org/zowe/jobs/tests/JobStepsIntegrationTest.java | 2 +- .../java/org/zowe/jobs/tests/JobSubmitIntegrationTest.java | 2 +- 11 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.license/LICENSE_HEADER b/.license/LICENSE_HEADER index f031c4e4..0520890a 100644 --- a/.license/LICENSE_HEADER +++ b/.license/LICENSE_HEADER @@ -4,4 +4,4 @@ https://www.eclipse.org/legal/epl-v20.html SPDX-License-Identifier: EPL-2.0 -Copyright Contributors to the Zowe Project. \ No newline at end of file +Copyright ${name} ${year}. \ No newline at end of file diff --git a/build.gradle b/build.gradle index f598eed2..9a6868a1 100644 --- a/build.gradle +++ b/build.gradle @@ -80,7 +80,10 @@ allprojects { subprojects { license { header = rootProject.file('.license/LICENSE_HEADER') - ext.year = Calendar.getInstance().get(Calendar.YEAR) + 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/jobs-model/src/main/java/org/zowe/jobs/model/JobFile.java b/jobs-model/src/main/java/org/zowe/jobs/model/JobFile.java index efaed9f0..f39aaf1e 100644 --- a/jobs-model/src/main/java/org/zowe/jobs/model/JobFile.java +++ b/jobs-model/src/main/java/org/zowe/jobs/model/JobFile.java @@ -1,4 +1,4 @@ -/** +/* * This program and the accompanying materials are made available under the terms of the * Eclipse Public License v2.0 which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-v20.html diff --git a/jobs-model/src/main/java/org/zowe/jobs/model/JobFileContent.java b/jobs-model/src/main/java/org/zowe/jobs/model/JobFileContent.java index 9cafc0a6..27542c4e 100644 --- a/jobs-model/src/main/java/org/zowe/jobs/model/JobFileContent.java +++ b/jobs-model/src/main/java/org/zowe/jobs/model/JobFileContent.java @@ -1,4 +1,4 @@ -/** +/* * This program and the accompanying materials are made available under the terms of the * Eclipse Public License v2.0 which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-v20.html diff --git a/jobs-model/src/main/java/org/zowe/jobs/model/JobStep.java b/jobs-model/src/main/java/org/zowe/jobs/model/JobStep.java index b2a09767..10bd6d44 100644 --- a/jobs-model/src/main/java/org/zowe/jobs/model/JobStep.java +++ b/jobs-model/src/main/java/org/zowe/jobs/model/JobStep.java @@ -1,4 +1,4 @@ -/** +/* * This program and the accompanying materials are made available under the terms of the * Eclipse Public License v2.0 which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-v20.html diff --git a/jobs-model/src/test/java/org/zowe/jobs/model/JclStringValidatorTest.java b/jobs-model/src/test/java/org/zowe/jobs/model/JclStringValidatorTest.java index 319c6e7b..b20c93a0 100644 --- a/jobs-model/src/test/java/org/zowe/jobs/model/JclStringValidatorTest.java +++ b/jobs-model/src/test/java/org/zowe/jobs/model/JclStringValidatorTest.java @@ -1,4 +1,4 @@ -/** +/* * This program and the accompanying materials are made available under the terms of the * Eclipse Public License v2.0 which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-v20.html diff --git a/jobs-tests/src/test/java/org/zowe/jobs/tests/JobDeleteIntegrationTest.java b/jobs-tests/src/test/java/org/zowe/jobs/tests/JobDeleteIntegrationTest.java index d2944708..1304f413 100644 --- a/jobs-tests/src/test/java/org/zowe/jobs/tests/JobDeleteIntegrationTest.java +++ b/jobs-tests/src/test/java/org/zowe/jobs/tests/JobDeleteIntegrationTest.java @@ -1,4 +1,4 @@ -/** +/* * This program and the accompanying materials are made available under the terms of the * Eclipse Public License v2.0 which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-v20.html diff --git a/jobs-tests/src/test/java/org/zowe/jobs/tests/JobFilesIntegrationTest.java b/jobs-tests/src/test/java/org/zowe/jobs/tests/JobFilesIntegrationTest.java index 39cde480..39e449a9 100644 --- a/jobs-tests/src/test/java/org/zowe/jobs/tests/JobFilesIntegrationTest.java +++ b/jobs-tests/src/test/java/org/zowe/jobs/tests/JobFilesIntegrationTest.java @@ -1,4 +1,4 @@ -/** +/* * This program and the accompanying materials are made available under the terms of the * Eclipse Public License v2.0 which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-v20.html diff --git a/jobs-tests/src/test/java/org/zowe/jobs/tests/JobModifyIntegrationTest.java b/jobs-tests/src/test/java/org/zowe/jobs/tests/JobModifyIntegrationTest.java index fdf882ad..7ee78807 100644 --- a/jobs-tests/src/test/java/org/zowe/jobs/tests/JobModifyIntegrationTest.java +++ b/jobs-tests/src/test/java/org/zowe/jobs/tests/JobModifyIntegrationTest.java @@ -1,4 +1,4 @@ -/** +/* * This program and the accompanying materials are made available under the terms of the * Eclipse Public License v2.0 which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-v20.html diff --git a/jobs-tests/src/test/java/org/zowe/jobs/tests/JobStepsIntegrationTest.java b/jobs-tests/src/test/java/org/zowe/jobs/tests/JobStepsIntegrationTest.java index fbed6f84..e8b87d03 100644 --- a/jobs-tests/src/test/java/org/zowe/jobs/tests/JobStepsIntegrationTest.java +++ b/jobs-tests/src/test/java/org/zowe/jobs/tests/JobStepsIntegrationTest.java @@ -1,4 +1,4 @@ -/** +/* * This program and the accompanying materials are made available under the terms of the * Eclipse Public License v2.0 which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-v20.html diff --git a/jobs-tests/src/test/java/org/zowe/jobs/tests/JobSubmitIntegrationTest.java b/jobs-tests/src/test/java/org/zowe/jobs/tests/JobSubmitIntegrationTest.java index 93c8bdbd..b4a8f808 100644 --- a/jobs-tests/src/test/java/org/zowe/jobs/tests/JobSubmitIntegrationTest.java +++ b/jobs-tests/src/test/java/org/zowe/jobs/tests/JobSubmitIntegrationTest.java @@ -1,4 +1,4 @@ -/** +/* * This program and the accompanying materials are made available under the terms of the * Eclipse Public License v2.0 which accompanies this distribution, and is available at * https://www.eclipse.org/legal/epl-v20.html From b77aa40d4fd062ffab4a5fcbc0aa2d6def785606 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Jare=C5=A1?= Date: Tue, 28 Nov 2023 13:33:45 +0100 Subject: [PATCH 03/11] upgrade versions --- build.gradle | 6 ++++++ gradle/versions.gradle | 6 ++++-- jobs-api-server/build.gradle | 1 + jobs-tests/build.gradle | 3 ++- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 9a6868a1..921e0ef1 100644 --- a/build.gradle +++ b/build.gradle @@ -75,6 +75,12 @@ allprojects { } } + configurations.all { + exclude group: 'org.junit.jupiter' + + resolutionStrategy.force libraries.mockito_core + } + } subprojects { diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 34c5d79e..573fc7ad 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -19,12 +19,13 @@ jsonPathVersion = "2.8.0" junitVersion = "4.13.2" restAssuredVersion = "4.5.1" - explorerApiCommonVersion = "2.0.27" + explorerApiCommonVersion = "2.0.28" tomcatVersion = "9.0.83" activationApiVersion = "1.2.2" xmlBindApiVersion = "2.3.3" hamcrestVersion = "2.2" + commonsLang3Version = "3.14.0" libraries = [ lombok : "org.projectlombok:lombok:${lombokVersion}", @@ -88,6 +89,7 @@ activation_api : "jakarta.activation:jakarta.activation-api:${activationApiVersion}", xml_bind_api : "jakarta.xml.bind:jakarta.xml.bind-api:${xmlBindApiVersion}", - hamcrest : "org.hamcrest:hamcrest:${hamcrestVersion}" + hamcrest : "org.hamcrest:hamcrest:${hamcrestVersion}", + commonsLang3 : "org.apache.commons:commons-lang3:${commonsLang3Version}" ] } diff --git a/jobs-api-server/build.gradle b/jobs-api-server/build.gradle index 420196f0..f18e0e10 100644 --- a/jobs-api-server/build.gradle +++ b/jobs-api-server/build.gradle @@ -50,6 +50,7 @@ dependencies { 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 } diff --git a/jobs-tests/build.gradle b/jobs-tests/build.gradle index 58b141b4..43638776 100644 --- a/jobs-tests/build.gradle +++ b/jobs-tests/build.gradle @@ -41,13 +41,14 @@ dependencies { implementation libraries.tomcat_embed_websocket implementation libraries.explorer_api_common implementation libraries.restAssured - compileOnly libraries.lombok + compileOnly libraries.lombok annotationProcessor libraries.lombok 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 testImplementation 'org.hamcrest:hamcrest-junit:2.0.0.0' From 9d645f291b14aff4f782a33bd3876d7f1372d012 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Jare=C5=A1?= Date: Tue, 28 Nov 2023 13:36:50 +0100 Subject: [PATCH 04/11] fix licenses --- .../src/main/java/org/zowe/jobs/JesJobsApplication.java | 1 + .../org/zowe/jobs/controller/AbstractJobsController.java | 1 + .../java/org/zowe/jobs/controller/JobsControllerV1.java | 1 + .../java/org/zowe/jobs/controller/JobsControllerV2.java | 1 + .../org/zowe/jobs/exceptions/InvalidOwnerException.java | 1 + .../org/zowe/jobs/exceptions/InvalidPrefixException.java | 1 + .../zowe/jobs/exceptions/JobFileIdNotFoundException.java | 1 + .../org/zowe/jobs/exceptions/JobIdNotFoundException.java | 1 + .../zowe/jobs/exceptions/JobJesjclNotFoundException.java | 1 + .../org/zowe/jobs/exceptions/JobNameNotFoundException.java | 1 + .../zowe/jobs/exceptions/JobStepsNotFoundException.java | 1 + .../src/main/java/org/zowe/jobs/services/JobsService.java | 1 + .../services/zosmf/AbstractZosmfJobsRequestRunner.java | 1 + .../zowe/jobs/services/zosmf/AbstractZosmfJobsService.java | 1 + .../zosmf/GetJobFileContentZosmfRequestRunner.java | 1 + .../jobs/services/zosmf/GetJobFilesZosmfRequestRunner.java | 1 + .../zowe/jobs/services/zosmf/GetJobZosmfRequestRunner.java | 1 + .../jobs/services/zosmf/GetJobsZosmfRequestRunner.java | 1 + .../jobs/services/zosmf/ModifyJobZosmfRequestRunner.java | 1 + .../jobs/services/zosmf/PurgeJobZosmfRequestRunner.java | 1 + .../services/zosmf/SubmitJobFileZosmfRequestRunner.java | 1 + .../services/zosmf/SubmitJobStringZosmfRequestRunner.java | 1 + .../org/zowe/jobs/services/zosmf/ZosmfJobsServiceV1.java | 1 + .../org/zowe/jobs/services/zosmf/ZosmfJobsServiceV2.java | 1 + .../src/main/java/org/zowe/jobs/spring/CookieConfig.java | 1 + .../src/main/java/org/zowe/jobs/spring/SwaggerConfig.java | 1 + .../java/org/zowe/jobs/controller/JobsControllerTest.java | 1 + .../services/zosmf/AbstractZosmfJobsRequestRunnerTest.java | 1 + .../zosmf/GetJobFileContentZosmfRequestRunnerTest.java | 7 +++++-- .../services/zosmf/GetJobFilesZosmfRequestRunnerTest.java | 1 + .../jobs/services/zosmf/GetJobZosmfRequestRunnerTest.java | 1 + .../jobs/services/zosmf/GetJobsZosmfRequestRunnerTest.java | 1 + .../services/zosmf/ModifyJobZosmfRequestRunnerTest.java | 1 + .../services/zosmf/PurgeJobZosmfRequestRunnerTest.java | 1 + .../zosmf/SubmitJobFileZosmfRequestRunnerTest.java | 1 + .../zosmf/SubmitJobStringZosmfRequestRunnerTest.java | 1 + .../org/zowe/jobs/services/zosmf/ZosmfJobsServiceTest.java | 1 + jobs-model/src/main/java/org/zowe/jobs/model/Job.java | 1 + .../src/main/java/org/zowe/jobs/model/JobStatus.java | 1 + .../main/java/org/zowe/jobs/model/ModifyJobRequest.java | 1 + .../org/zowe/jobs/model/ModifyMultipleJobsRequest.java | 1 + .../src/main/java/org/zowe/jobs/model/SimpleJob.java | 1 + .../java/org/zowe/jobs/model/SubmitJobFileRequest.java | 1 + .../java/org/zowe/jobs/model/SubmitJobStringRequest.java | 1 + .../src/main/java/org/zowe/jobs/model/ValidJclString.java | 1 + .../org/zowe/jobs/tests/AbstractJobsIntegrationTest.java | 1 + .../src/test/java/org/zowe/jobs/tests/JobGetByIdTest.java | 1 + .../java/org/zowe/jobs/tests/JobsGetIntegrationTest.java | 1 + .../org/zowe/jobs/tests/JobsLogoutIntegrationTest.java | 1 + 49 files changed, 53 insertions(+), 2 deletions(-) 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 index dd9f7279..979cd8e1 100644 --- 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 index 8f1f5334..c4f2f641 100644 --- 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 2016, 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 index d8aa117c..a6dd8e56 100644 --- 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 index bcd76e60..6215519a 100644 --- 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 index b91328c6..0bebed61 100644 --- 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 index a0cec0b1..2f3d6085 100644 --- 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 index 8e37b054..c1abea0c 100644 --- 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 index f7db345e..13626661 100644 --- 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 index ca938dc3..8eb6b45d 100644 --- 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; diff --git a/jobs-api-server/src/main/java/org/zowe/jobs/exceptions/JobNameNotFoundException.java b/jobs-api-server/src/main/java/org/zowe/jobs/exceptions/JobNameNotFoundException.java index 457c1396..4a691a93 100644 --- a/jobs-api-server/src/main/java/org/zowe/jobs/exceptions/JobNameNotFoundException.java +++ b/jobs-api-server/src/main/java/org/zowe/jobs/exceptions/JobNameNotFoundException.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/JobStepsNotFoundException.java b/jobs-api-server/src/main/java/org/zowe/jobs/exceptions/JobStepsNotFoundException.java index e3b1115a..d721d734 100644 --- a/jobs-api-server/src/main/java/org/zowe/jobs/exceptions/JobStepsNotFoundException.java +++ b/jobs-api-server/src/main/java/org/zowe/jobs/exceptions/JobStepsNotFoundException.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/services/JobsService.java b/jobs-api-server/src/main/java/org/zowe/jobs/services/JobsService.java index 35772d5c..63994771 100644 --- a/jobs-api-server/src/main/java/org/zowe/jobs/services/JobsService.java +++ b/jobs-api-server/src/main/java/org/zowe/jobs/services/JobsService.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2018, 2020 */ + package org.zowe.jobs.services; import lombok.Setter; diff --git a/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/AbstractZosmfJobsRequestRunner.java b/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/AbstractZosmfJobsRequestRunner.java index 7182fc22..76c1973d 100644 --- a/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/AbstractZosmfJobsRequestRunner.java +++ b/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/AbstractZosmfJobsRequestRunner.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2019 */ + package org.zowe.jobs.services.zosmf; import com.google.gson.JsonObject; diff --git a/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/AbstractZosmfJobsService.java b/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/AbstractZosmfJobsService.java index 4b7bf139..b8bc660a 100644 --- a/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/AbstractZosmfJobsService.java +++ b/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/AbstractZosmfJobsService.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2016, 2020 */ + package org.zowe.jobs.services.zosmf; import lombok.extern.slf4j.Slf4j; diff --git a/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/GetJobFileContentZosmfRequestRunner.java b/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/GetJobFileContentZosmfRequestRunner.java index fe22423d..975a34bd 100644 --- a/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/GetJobFileContentZosmfRequestRunner.java +++ b/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/GetJobFileContentZosmfRequestRunner.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2019 */ + package org.zowe.jobs.services.zosmf; import com.google.gson.JsonObject; diff --git a/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/GetJobFilesZosmfRequestRunner.java b/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/GetJobFilesZosmfRequestRunner.java index 1682674b..614b6421 100644 --- a/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/GetJobFilesZosmfRequestRunner.java +++ b/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/GetJobFilesZosmfRequestRunner.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2019 */ + package org.zowe.jobs.services.zosmf; import com.google.gson.JsonElement; diff --git a/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/GetJobZosmfRequestRunner.java b/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/GetJobZosmfRequestRunner.java index 2dbebcb5..63a0a3bf 100644 --- a/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/GetJobZosmfRequestRunner.java +++ b/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/GetJobZosmfRequestRunner.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2019, 2020 */ + package org.zowe.jobs.services.zosmf; import com.google.gson.JsonObject; diff --git a/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/GetJobsZosmfRequestRunner.java b/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/GetJobsZosmfRequestRunner.java index 785fbf18..4a0e5b02 100644 --- a/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/GetJobsZosmfRequestRunner.java +++ b/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/GetJobsZosmfRequestRunner.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2019 */ + package org.zowe.jobs.services.zosmf; import com.google.gson.JsonElement; diff --git a/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/ModifyJobZosmfRequestRunner.java b/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/ModifyJobZosmfRequestRunner.java index 20a81809..72f9c9a8 100644 --- a/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/ModifyJobZosmfRequestRunner.java +++ b/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/ModifyJobZosmfRequestRunner.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2019 */ + package org.zowe.jobs.services.zosmf; import com.google.gson.JsonObject; diff --git a/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/PurgeJobZosmfRequestRunner.java b/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/PurgeJobZosmfRequestRunner.java index 9d9ddf2e..bf220e14 100644 --- a/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/PurgeJobZosmfRequestRunner.java +++ b/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/PurgeJobZosmfRequestRunner.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2019 */ + package org.zowe.jobs.services.zosmf; import com.google.gson.JsonObject; diff --git a/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/SubmitJobFileZosmfRequestRunner.java b/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/SubmitJobFileZosmfRequestRunner.java index 805fb552..f924ec90 100644 --- a/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/SubmitJobFileZosmfRequestRunner.java +++ b/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/SubmitJobFileZosmfRequestRunner.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2019 */ + package org.zowe.jobs.services.zosmf; import com.google.gson.JsonObject; diff --git a/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/SubmitJobStringZosmfRequestRunner.java b/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/SubmitJobStringZosmfRequestRunner.java index 78470e23..b8fb7801 100644 --- a/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/SubmitJobStringZosmfRequestRunner.java +++ b/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/SubmitJobStringZosmfRequestRunner.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2019 */ + package org.zowe.jobs.services.zosmf; import org.apache.http.Header; diff --git a/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/ZosmfJobsServiceV1.java b/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/ZosmfJobsServiceV1.java index a21ae572..be08663b 100644 --- a/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/ZosmfJobsServiceV1.java +++ b/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/ZosmfJobsServiceV1.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2018, 2020 */ + package org.zowe.jobs.services.zosmf; import org.springframework.beans.factory.annotation.Autowired; diff --git a/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/ZosmfJobsServiceV2.java b/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/ZosmfJobsServiceV2.java index f2cd147c..0f640731 100644 --- a/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/ZosmfJobsServiceV2.java +++ b/jobs-api-server/src/main/java/org/zowe/jobs/services/zosmf/ZosmfJobsServiceV2.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2018, 2020 */ + package org.zowe.jobs.services.zosmf; import org.springframework.beans.factory.annotation.Autowired; diff --git a/jobs-api-server/src/main/java/org/zowe/jobs/spring/CookieConfig.java b/jobs-api-server/src/main/java/org/zowe/jobs/spring/CookieConfig.java index d93056ed..9c874609 100644 --- a/jobs-api-server/src/main/java/org/zowe/jobs/spring/CookieConfig.java +++ b/jobs-api-server/src/main/java/org/zowe/jobs/spring/CookieConfig.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2018, 2020 */ + package org.zowe.jobs.spring; import org.apache.tomcat.util.http.LegacyCookieProcessor; diff --git a/jobs-api-server/src/main/java/org/zowe/jobs/spring/SwaggerConfig.java b/jobs-api-server/src/main/java/org/zowe/jobs/spring/SwaggerConfig.java index ddcf6d0d..ac72dd2a 100644 --- a/jobs-api-server/src/main/java/org/zowe/jobs/spring/SwaggerConfig.java +++ b/jobs-api-server/src/main/java/org/zowe/jobs/spring/SwaggerConfig.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2018, 2020 */ + package org.zowe.jobs.spring; import io.swagger.v3.oas.models.OpenAPI; diff --git a/jobs-api-server/src/test/java/org/zowe/jobs/controller/JobsControllerTest.java b/jobs-api-server/src/test/java/org/zowe/jobs/controller/JobsControllerTest.java index c6abc9e1..489ae28c 100644 --- a/jobs-api-server/src/test/java/org/zowe/jobs/controller/JobsControllerTest.java +++ b/jobs-api-server/src/test/java/org/zowe/jobs/controller/JobsControllerTest.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2018, 2020 */ + package org.zowe.jobs.controller; import org.junit.Ignore; diff --git a/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/AbstractZosmfJobsRequestRunnerTest.java b/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/AbstractZosmfJobsRequestRunnerTest.java index 445716bb..56f166eb 100644 --- a/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/AbstractZosmfJobsRequestRunnerTest.java +++ b/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/AbstractZosmfJobsRequestRunnerTest.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2019 */ + package org.zowe.jobs.services.zosmf; import org.zowe.api.common.test.services.zosmf.AbstractZosmfRequestRunnerTest; diff --git a/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/GetJobFileContentZosmfRequestRunnerTest.java b/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/GetJobFileContentZosmfRequestRunnerTest.java index b598a468..4c422b0b 100644 --- a/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/GetJobFileContentZosmfRequestRunnerTest.java +++ b/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/GetJobFileContentZosmfRequestRunnerTest.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2019, 2020 */ + package org.zowe.jobs.services.zosmf; import org.apache.http.HttpStatus; @@ -33,8 +34,10 @@ public void get_job_file_content_should_call_zosmf_and_parse_response_correctly( String fileId = "3"; JobFileContent expected = new JobFileContent( - " 1 //ATLJ0000 JOB (ADL),'ATLAS',MSGCLASS=X,CLASS=A,TIME=1440 JOB21849\n" - + " //* TEST JOB\n 2 //UNIT EXEC PGM=IEFBR14\n" + ""); + " 1 //ATLJ0000 JOB (ADL),'ATLAS',MSGCLASS=X,CLASS=A,TIME=1440 JOB21849" + System.lineSeparator() + + " //* TEST JOB" + System.lineSeparator() + + " 2 //UNIT EXEC PGM=IEFBR14" + System.lineSeparator() + ); mockTextResponse(HttpStatus.SC_OK, loadTestFile("zosmf_getJobFileRecordsResponse.txt")); diff --git a/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/GetJobFilesZosmfRequestRunnerTest.java b/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/GetJobFilesZosmfRequestRunnerTest.java index 019c722c..a382a83f 100644 --- a/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/GetJobFilesZosmfRequestRunnerTest.java +++ b/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/GetJobFilesZosmfRequestRunnerTest.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2019, 2020 */ + package org.zowe.jobs.services.zosmf; import org.apache.http.HttpStatus; diff --git a/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/GetJobZosmfRequestRunnerTest.java b/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/GetJobZosmfRequestRunnerTest.java index 70139dff..a20d8cf5 100644 --- a/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/GetJobZosmfRequestRunnerTest.java +++ b/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/GetJobZosmfRequestRunnerTest.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2019, 2020 */ + package org.zowe.jobs.services.zosmf; import org.apache.http.HttpStatus; diff --git a/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/GetJobsZosmfRequestRunnerTest.java b/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/GetJobsZosmfRequestRunnerTest.java index 3c638645..71c3b561 100644 --- a/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/GetJobsZosmfRequestRunnerTest.java +++ b/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/GetJobsZosmfRequestRunnerTest.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2019, 2020 */ + package org.zowe.jobs.services.zosmf; import org.apache.http.HttpResponse; diff --git a/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/ModifyJobZosmfRequestRunnerTest.java b/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/ModifyJobZosmfRequestRunnerTest.java index bd912e6e..765642ce 100644 --- a/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/ModifyJobZosmfRequestRunnerTest.java +++ b/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/ModifyJobZosmfRequestRunnerTest.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2019, 2020 */ + package org.zowe.jobs.services.zosmf; import com.google.gson.JsonObject; diff --git a/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/PurgeJobZosmfRequestRunnerTest.java b/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/PurgeJobZosmfRequestRunnerTest.java index 9b162c42..54e79f3c 100644 --- a/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/PurgeJobZosmfRequestRunnerTest.java +++ b/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/PurgeJobZosmfRequestRunnerTest.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2019, 2020 */ + package org.zowe.jobs.services.zosmf; import org.apache.http.HttpStatus; diff --git a/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/SubmitJobFileZosmfRequestRunnerTest.java b/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/SubmitJobFileZosmfRequestRunnerTest.java index 61e00ea6..a89d75de 100644 --- a/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/SubmitJobFileZosmfRequestRunnerTest.java +++ b/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/SubmitJobFileZosmfRequestRunnerTest.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2019, 2020 */ + package org.zowe.jobs.services.zosmf; import com.google.gson.JsonObject; diff --git a/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/SubmitJobStringZosmfRequestRunnerTest.java b/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/SubmitJobStringZosmfRequestRunnerTest.java index 7ce2240a..17aa4a85 100644 --- a/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/SubmitJobStringZosmfRequestRunnerTest.java +++ b/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/SubmitJobStringZosmfRequestRunnerTest.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2019, 2020 */ + package org.zowe.jobs.services.zosmf; import org.apache.http.HttpStatus; diff --git a/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/ZosmfJobsServiceTest.java b/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/ZosmfJobsServiceTest.java index 224b3d7c..6e3a3572 100644 --- a/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/ZosmfJobsServiceTest.java +++ b/jobs-api-server/src/test/java/org/zowe/jobs/services/zosmf/ZosmfJobsServiceTest.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2018, 2020 */ + package org.zowe.jobs.services.zosmf; import org.apache.http.Header; diff --git a/jobs-model/src/main/java/org/zowe/jobs/model/Job.java b/jobs-model/src/main/java/org/zowe/jobs/model/Job.java index dc4f9759..bb4310e5 100644 --- a/jobs-model/src/main/java/org/zowe/jobs/model/Job.java +++ b/jobs-model/src/main/java/org/zowe/jobs/model/Job.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2016, 2018 */ + package org.zowe.jobs.model; import lombok.AllArgsConstructor; diff --git a/jobs-model/src/main/java/org/zowe/jobs/model/JobStatus.java b/jobs-model/src/main/java/org/zowe/jobs/model/JobStatus.java index 76c1c0b3..2d24762d 100644 --- a/jobs-model/src/main/java/org/zowe/jobs/model/JobStatus.java +++ b/jobs-model/src/main/java/org/zowe/jobs/model/JobStatus.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2018 */ + package org.zowe.jobs.model; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/jobs-model/src/main/java/org/zowe/jobs/model/ModifyJobRequest.java b/jobs-model/src/main/java/org/zowe/jobs/model/ModifyJobRequest.java index f4592502..58dde844 100644 --- a/jobs-model/src/main/java/org/zowe/jobs/model/ModifyJobRequest.java +++ b/jobs-model/src/main/java/org/zowe/jobs/model/ModifyJobRequest.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2019 */ + package org.zowe.jobs.model; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/jobs-model/src/main/java/org/zowe/jobs/model/ModifyMultipleJobsRequest.java b/jobs-model/src/main/java/org/zowe/jobs/model/ModifyMultipleJobsRequest.java index 39c09e1b..3309633e 100644 --- a/jobs-model/src/main/java/org/zowe/jobs/model/ModifyMultipleJobsRequest.java +++ b/jobs-model/src/main/java/org/zowe/jobs/model/ModifyMultipleJobsRequest.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2019 */ + package org.zowe.jobs.model; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/jobs-model/src/main/java/org/zowe/jobs/model/SimpleJob.java b/jobs-model/src/main/java/org/zowe/jobs/model/SimpleJob.java index 02635552..8e7d9843 100644 --- a/jobs-model/src/main/java/org/zowe/jobs/model/SimpleJob.java +++ b/jobs-model/src/main/java/org/zowe/jobs/model/SimpleJob.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2019 */ + package org.zowe.jobs.model; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/jobs-model/src/main/java/org/zowe/jobs/model/SubmitJobFileRequest.java b/jobs-model/src/main/java/org/zowe/jobs/model/SubmitJobFileRequest.java index 5411791c..107108b2 100644 --- a/jobs-model/src/main/java/org/zowe/jobs/model/SubmitJobFileRequest.java +++ b/jobs-model/src/main/java/org/zowe/jobs/model/SubmitJobFileRequest.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2018 */ + package org.zowe.jobs.model; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/jobs-model/src/main/java/org/zowe/jobs/model/SubmitJobStringRequest.java b/jobs-model/src/main/java/org/zowe/jobs/model/SubmitJobStringRequest.java index c47afef0..2b50a148 100644 --- a/jobs-model/src/main/java/org/zowe/jobs/model/SubmitJobStringRequest.java +++ b/jobs-model/src/main/java/org/zowe/jobs/model/SubmitJobStringRequest.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2018 */ + package org.zowe.jobs.model; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/jobs-model/src/main/java/org/zowe/jobs/model/ValidJclString.java b/jobs-model/src/main/java/org/zowe/jobs/model/ValidJclString.java index 81d4b8b7..a7d8600c 100644 --- a/jobs-model/src/main/java/org/zowe/jobs/model/ValidJclString.java +++ b/jobs-model/src/main/java/org/zowe/jobs/model/ValidJclString.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2018 */ + package org.zowe.jobs.model; import javax.validation.Constraint; diff --git a/jobs-tests/src/test/java/org/zowe/jobs/tests/AbstractJobsIntegrationTest.java b/jobs-tests/src/test/java/org/zowe/jobs/tests/AbstractJobsIntegrationTest.java index 2f71c7c3..768e32da 100644 --- a/jobs-tests/src/test/java/org/zowe/jobs/tests/AbstractJobsIntegrationTest.java +++ b/jobs-tests/src/test/java/org/zowe/jobs/tests/AbstractJobsIntegrationTest.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2016, 2020 */ + package org.zowe.jobs.tests; import io.restassured.RestAssured; diff --git a/jobs-tests/src/test/java/org/zowe/jobs/tests/JobGetByIdTest.java b/jobs-tests/src/test/java/org/zowe/jobs/tests/JobGetByIdTest.java index 6a61d6f2..f3fd3a3e 100644 --- a/jobs-tests/src/test/java/org/zowe/jobs/tests/JobGetByIdTest.java +++ b/jobs-tests/src/test/java/org/zowe/jobs/tests/JobGetByIdTest.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2016, 2020 */ + package org.zowe.jobs.tests; import io.restassured.http.ContentType; diff --git a/jobs-tests/src/test/java/org/zowe/jobs/tests/JobsGetIntegrationTest.java b/jobs-tests/src/test/java/org/zowe/jobs/tests/JobsGetIntegrationTest.java index 61b1b3b3..d33aff99 100644 --- a/jobs-tests/src/test/java/org/zowe/jobs/tests/JobsGetIntegrationTest.java +++ b/jobs-tests/src/test/java/org/zowe/jobs/tests/JobsGetIntegrationTest.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2016, 2019 */ + package org.zowe.jobs.tests; import io.restassured.http.ContentType; diff --git a/jobs-tests/src/test/java/org/zowe/jobs/tests/JobsLogoutIntegrationTest.java b/jobs-tests/src/test/java/org/zowe/jobs/tests/JobsLogoutIntegrationTest.java index 3e7bb5d6..a9afed4f 100644 --- a/jobs-tests/src/test/java/org/zowe/jobs/tests/JobsLogoutIntegrationTest.java +++ b/jobs-tests/src/test/java/org/zowe/jobs/tests/JobsLogoutIntegrationTest.java @@ -7,6 +7,7 @@ * * Copyright IBM Corporation 2019, 2020 */ + package org.zowe.jobs.tests; import io.restassured.RestAssured; From 35bd5e07bfc95af69e21ad6e84da3aa920ee93a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Jare=C5=A1?= Date: Wed, 29 Nov 2023 11:55:50 +0100 Subject: [PATCH 05/11] fix jacoco --- gradle/coverage.gradle | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/gradle/coverage.gradle b/gradle/coverage.gradle index e5a0d608..3af7d281 100644 --- a/gradle/coverage.gradle +++ b/gradle/coverage.gradle @@ -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 } } From acc60a17a521c4f053dc553657863f109e9e5306 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Jare=C5=A1?= Date: Wed, 29 Nov 2023 12:11:58 +0100 Subject: [PATCH 06/11] fix releasing --- gradle/publish.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/publish.gradle b/gradle/publish.gradle index ec6c8d5f..48567f05 100644 --- a/gradle/publish.gradle +++ b/gradle/publish.gradle @@ -38,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' } From a8179248ad457cd7a49f96d9dd2da4f5fdb48a14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Jare=C5=A1?= Date: Wed, 29 Nov 2023 14:28:46 +0100 Subject: [PATCH 07/11] update marist hostname --- .github/workflows/ci-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index c0604120..86f2291b 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -12,7 +12,7 @@ on: workflow_dispatch: env: - MARIST_HOST: 'zzow04.zowe.marist.cloud' + MARIST_HOST: 'zzow08.zowe.marist.cloud' ZOSMF_PORT: 10443 GATEWAY_PORT: 7554 JOBS_PORT: 8443 From 8296cc2b0b81c5bad48a03b283bf2b748b36c064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Jare=C5=A1?= Date: Wed, 29 Nov 2023 19:54:54 +0100 Subject: [PATCH 08/11] update marist hostname --- .github/workflows/ci-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 86f2291b..f769bce3 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -12,7 +12,7 @@ on: workflow_dispatch: env: - MARIST_HOST: 'zzow08.zowe.marist.cloud' + MARIST_HOST: ${{ secrets.SSH_MARIST_RACF_HOST }} ZOSMF_PORT: 10443 GATEWAY_PORT: 7554 JOBS_PORT: 8443 From 84d959848a78e3bac9c246ac6e249970f2677e3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Jare=C5=A1?= Date: Wed, 29 Nov 2023 19:58:12 +0100 Subject: [PATCH 09/11] replace required by requiredMode --- .../src/main/java/org/zowe/jobs/model/ModifyJobRequest.java | 2 +- .../java/org/zowe/jobs/model/ModifyMultipleJobsRequest.java | 4 ++-- jobs-model/src/main/java/org/zowe/jobs/model/SimpleJob.java | 4 ++-- .../main/java/org/zowe/jobs/model/SubmitJobStringRequest.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jobs-model/src/main/java/org/zowe/jobs/model/ModifyJobRequest.java b/jobs-model/src/main/java/org/zowe/jobs/model/ModifyJobRequest.java index 58dde844..dac96657 100644 --- a/jobs-model/src/main/java/org/zowe/jobs/model/ModifyJobRequest.java +++ b/jobs-model/src/main/java/org/zowe/jobs/model/ModifyJobRequest.java @@ -20,6 +20,6 @@ @NoArgsConstructor @AllArgsConstructor public class ModifyJobRequest { - @Schema(description = "The modify command, e.g. cancel, hold, release", required = true, example = "cancel") + @Schema(description = "The modify command, e.g. cancel, hold, release", requiredMode = Schema.RequiredMode.REQUIRED, example = "cancel") private String command; } diff --git a/jobs-model/src/main/java/org/zowe/jobs/model/ModifyMultipleJobsRequest.java b/jobs-model/src/main/java/org/zowe/jobs/model/ModifyMultipleJobsRequest.java index 3309633e..daf55dca 100644 --- a/jobs-model/src/main/java/org/zowe/jobs/model/ModifyMultipleJobsRequest.java +++ b/jobs-model/src/main/java/org/zowe/jobs/model/ModifyMultipleJobsRequest.java @@ -22,8 +22,8 @@ @AllArgsConstructor @NoArgsConstructor public class ModifyMultipleJobsRequest { - @Schema(description = "The modify command, e.g. cancel, hold, release", required = true, example = "cancel") + @Schema(description = "The modify command, e.g. cancel, hold, release", requiredMode = Schema.RequiredMode.REQUIRED, example = "cancel") private String command; - @Schema(description = "The list of jobs to receive the modify command", type = "string", required = true, example = "[{\"jobId\":\"job1234\", \"jobName\":\"TestJob\"}]") + @Schema(description = "The list of jobs to receive the modify command", type = "string", requiredMode = Schema.RequiredMode.REQUIRED, example = "[{\"jobId\":\"job1234\", \"jobName\":\"TestJob\"}]") private ArrayList jobs; } diff --git a/jobs-model/src/main/java/org/zowe/jobs/model/SimpleJob.java b/jobs-model/src/main/java/org/zowe/jobs/model/SimpleJob.java index 8e7d9843..9f073216 100644 --- a/jobs-model/src/main/java/org/zowe/jobs/model/SimpleJob.java +++ b/jobs-model/src/main/java/org/zowe/jobs/model/SimpleJob.java @@ -22,8 +22,8 @@ @NoArgsConstructor @AllArgsConstructor public class SimpleJob { - @Schema(description = "The name of a job", required = true, example = "TESTJOB") + @Schema(description = "The name of a job", requiredMode = Schema.RequiredMode.REQUIRED, example = "TESTJOB") private String jobName; - @Schema(description = "The id of a job", required = true, example = "JOB00001") + @Schema(description = "The id of a job", requiredMode = Schema.RequiredMode.REQUIRED, example = "JOB00001") private String jobId; } diff --git a/jobs-model/src/main/java/org/zowe/jobs/model/SubmitJobStringRequest.java b/jobs-model/src/main/java/org/zowe/jobs/model/SubmitJobStringRequest.java index 2b50a148..4ef9c0cc 100644 --- a/jobs-model/src/main/java/org/zowe/jobs/model/SubmitJobStringRequest.java +++ b/jobs-model/src/main/java/org/zowe/jobs/model/SubmitJobStringRequest.java @@ -21,7 +21,7 @@ @AllArgsConstructor public class SubmitJobStringRequest { - @Schema(description = "The jcl to be submitted, with \\n for new lines", required = true, example = "//TESTJOBX JOB (),MSGCLASS=H\n// EXEC PGM=IEFBR14") + @Schema(description = "The jcl to be submitted, with \\n for new lines", requiredMode = Schema.RequiredMode.REQUIRED, example = "//TESTJOBX JOB (),MSGCLASS=H\n// EXEC PGM=IEFBR14") @ValidJclString private String jcl; } From 7af46655bde248721843f9b2f0eaea6fcc5577a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Jare=C5=A1?= Date: Wed, 29 Nov 2023 20:04:32 +0100 Subject: [PATCH 10/11] replace required by requiredMode --- .../main/java/org/zowe/jobs/model/SubmitJobFileRequest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jobs-model/src/main/java/org/zowe/jobs/model/SubmitJobFileRequest.java b/jobs-model/src/main/java/org/zowe/jobs/model/SubmitJobFileRequest.java index 107108b2..30bf225a 100644 --- a/jobs-model/src/main/java/org/zowe/jobs/model/SubmitJobFileRequest.java +++ b/jobs-model/src/main/java/org/zowe/jobs/model/SubmitJobFileRequest.java @@ -11,7 +11,6 @@ package org.zowe.jobs.model; import io.swagger.v3.oas.annotations.media.Schema; - import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -21,6 +20,6 @@ @AllArgsConstructor public class SubmitJobFileRequest { - @Schema(description = "The data set, or z/OS unix file to submit in form: in the form: 'ATLAS.TEST.JCL(TSTJ0001)' for a data set, or /u/myjobs/job1 for z/OS unix file", required = true, example = "'ATLAS.TEST.JCL(TSTJ0001)'") + @Schema(description = "The data set, or z/OS unix file to submit in form: in the form: 'ATLAS.TEST.JCL(TSTJ0001)' for a data set, or /u/myjobs/job1 for z/OS unix file", requiredMode = Schema.RequiredMode.REQUIRED, example = "'ATLAS.TEST.JCL(TSTJ0001)'") private String file; } From 5a78a525f7e9c55f8e0831dac2e12ed8f82e49d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Jare=C5=A1?= Date: Wed, 29 Nov 2023 20:38:30 +0100 Subject: [PATCH 11/11] fix checkstyle --- .../src/main/java/org/zowe/jobs/model/SubmitJobFileRequest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jobs-model/src/main/java/org/zowe/jobs/model/SubmitJobFileRequest.java b/jobs-model/src/main/java/org/zowe/jobs/model/SubmitJobFileRequest.java index 30bf225a..533460f4 100644 --- a/jobs-model/src/main/java/org/zowe/jobs/model/SubmitJobFileRequest.java +++ b/jobs-model/src/main/java/org/zowe/jobs/model/SubmitJobFileRequest.java @@ -11,6 +11,7 @@ package org.zowe.jobs.model; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor;