upgrades

build.gradle

@@ -5,7 +5,7 @@ group 'org.zowe.explorer.files'
 
 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
@@ -69,16 +69,32 @@ allprojects {
     configurations.all {
         exclude group: 'org.glassfish', module: 'jakarta.el'
     }
+
+    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
     }
 

data-sets-api-server/build.gradle

@@ -5,61 +5,55 @@ buildscript {
     }
 }
 
-
 apply plugin: 'org.springframework.boot'
-apply plugin: 'io.spring.dependency-management'
-
 
 dependencies {
-    compile project(':data-sets-model')
-    compile libraries.spring_boot_starter_actuator
-    compile libraries.spring_boot_starter_parent
-    compile libraries.spring_boot_starter_security
-    compile libraries.spring_security_config
-    compile libraries.spring_security_core
-    compile libraries.spring_security_crypto
-    compile libraries.spring_security_web
-    implementation(libraries.spring_boot_starter_web){
-        exclude group: "org.apache.tomcat.embed", module: "tomcat-embed-el"
-    }
-    compile libraries.spring_aop
-    compile libraries.spring_beans
-    compile libraries.spring_context
-    compile libraries.spring_core
-    compile libraries.spring_expression
-    compile libraries.spring_messaging
-    compile libraries.spring_jcl
-    compile libraries.spring_test
-    compile libraries.spring_web
-    compile libraries.spring_webmvc
-    compile libraries.http_core
-    compile libraries.http_client
-    compile libraries.commons_codec
-    compile libraries.jackson_annotations
-    compile libraries.jackson_core
-    compile libraries.jackson_databind
-    compile libraries.gson
-    compile libraries.guava
-    compile libraries.logback_classic
-    compile libraries.logback_core
-    compile libraries.snakeyaml
-    compile libraries.spring_doc
-    compile libraries.tomcat_annotations_api
-    compile libraries.tomcat_embed_core
-    compile libraries.tomcat_embed_el
-    compile libraries.tomcat_embed_websocket
-    compile libraries.explorer_api_common
-    compile libraries.lombok
+    api project(':data-sets-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
+    implementation libraries.explorer_api_common
+    compileOnly libraries.lombok
     annotationProcessor libraries.lombok
-    compile libraries.mapstruct
+    implementation libraries.mapstruct
     annotationProcessor libraries.mapstruct_processor
 
-    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
 }
 
 jar {

data-sets-api-server/src/main/java/org/zowe/DataSetsAndUnixFilesApplication.java

@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2018
  */
+
 package org.zowe;
 
 import lombok.extern.slf4j.Slf4j;

data-sets-api-server/src/main/java/org/zowe/data/sets/controller/AbstractDataSetsController.java

@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2016, 2020
  */
+
 package org.zowe.data.sets.controller;
 
 import io.swagger.v3.oas.annotations.Operation;

data-sets-api-server/src/main/java/org/zowe/data/sets/controller/DataSetsControllerV1.java

@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2016, 2020
  */
+
 package org.zowe.data.sets.controller;
 
 import io.swagger.v3.oas.annotations.tags.Tag;

data-sets-api-server/src/main/java/org/zowe/data/sets/controller/DataSetsControllerV2.java

@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2016, 2020
  */
+
 package org.zowe.data.sets.controller;
 
 import io.swagger.v3.oas.annotations.tags.Tag;

data-sets-api-server/src/main/java/org/zowe/data/sets/exceptions/DataSetAlreadyExists.java

@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2019
  */
+
 package org.zowe.data.sets.exceptions;
 
 import org.springframework.http.HttpStatus;

data-sets-api-server/src/main/java/org/zowe/data/sets/exceptions/DataSetLockedException.java

@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2019
  */
+
 package org.zowe.data.sets.exceptions;
 
 import org.springframework.http.HttpStatus;

data-sets-api-server/src/main/java/org/zowe/data/sets/exceptions/InvalidDirectoryBlockException.java

@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2019
  */
+
 package org.zowe.data.sets.exceptions;
 
 import org.springframework.http.HttpStatus;

data-sets-api-server/src/main/java/org/zowe/data/sets/exceptions/UnauthorisedDataSetException.java

@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2018
  */
+
 package org.zowe.data.sets.exceptions;
 
 import org.springframework.http.HttpStatus;

data-sets-api-server/src/main/java/org/zowe/data/sets/services/DataSetService.java

@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2018, 2020
  */
+
 package org.zowe.data.sets.services;
 
 import lombok.Setter;

data-sets-api-server/src/main/java/org/zowe/data/sets/services/zosmf/AbstractListDataSetsZosmfRequestRunner.java

@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2019
  */
+
 package org.zowe.data.sets.services.zosmf;
 
 import com.google.gson.JsonElement;

data-sets-api-server/src/main/java/org/zowe/data/sets/services/zosmf/AbstractZosmfDataSetService.java

@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2018, 2019
  */
+
 package org.zowe.data.sets.services.zosmf;
 
 import org.zowe.api.common.connectors.zosmf.ZosmfConnector;

data-sets-api-server/src/main/java/org/zowe/data/sets/services/zosmf/AbstractZosmfDataSetsRequestRunner.java

@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2019
  */
+
 package org.zowe.data.sets.services.zosmf;
 
 import com.google.gson.JsonArray;

data-sets-api-server/src/main/java/org/zowe/data/sets/services/zosmf/CreateDataSetZosmfRequestRunner.java

@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2019
  */
+
 package org.zowe.data.sets.services.zosmf;
 
 import com.google.gson.JsonObject;

data-sets-api-server/src/main/java/org/zowe/data/sets/services/zosmf/DeleteDataSetZosmfRequestRunner.java

@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2019
  */
+
 package org.zowe.data.sets.services.zosmf;
 
 import com.google.gson.JsonElement;

data-sets-api-server/src/main/java/org/zowe/data/sets/services/zosmf/GetDataSetContentZosmfRequestRunner.java

@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2019
  */
+
 package org.zowe.data.sets.services.zosmf;
 
 import com.google.gson.JsonObject;

data-sets-api-server/src/main/java/org/zowe/data/sets/services/zosmf/ListDataSetMembersZosmfRequestRunner.java

@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2019
  */
+
 package org.zowe.data.sets.services.zosmf;
 
 import com.google.gson.JsonElement;

data-sets-api-server/src/main/java/org/zowe/data/sets/services/zosmf/ListDataSetsAttributesZosmfRequestRunner.java

@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2019
  */
+
 package org.zowe.data.sets.services.zosmf;
 
 import com.google.gson.JsonElement;

data-sets-api-server/src/main/java/org/zowe/data/sets/services/zosmf/ListDataSetsZosmfRequestRunner.java

@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2019
  */
+
 package org.zowe.data.sets.services.zosmf;
 
 import com.google.gson.JsonElement;

data-sets-api-server/src/main/java/org/zowe/data/sets/services/zosmf/PutDataSetContentZosmfRequestRunner.java

@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2019
  */
+
 package org.zowe.data.sets.services.zosmf;
 
 import com.google.gson.JsonObject;

data-sets-api-server/src/main/java/org/zowe/data/sets/services/zosmf/PutDataSetRenameZosmfRequestRunner.java

@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2020
  */
+
 package org.zowe.data.sets.services.zosmf;
 
 import com.google.gson.JsonElement;

data-sets-api-server/src/main/java/org/zowe/data/sets/services/zosmf/ZosmfDataSetServiceV1.java

@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2018, 2020
  */
+
 package org.zowe.data.sets.services.zosmf;
 
 import org.springframework.beans.factory.annotation.Autowired;

data-sets-api-server/src/main/java/org/zowe/data/sets/services/zosmf/ZosmfDataSetServiceV2.java

@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2018, 2020
  */
+
 package org.zowe.data.sets.services.zosmf;
 
 import org.springframework.beans.factory.annotation.Autowired;

data-sets-api-server/src/main/java/org/zowe/spring/CookieConfig.java

@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2018, 2020
  */
+
 package org.zowe.spring;
 
 import org.apache.tomcat.util.http.LegacyCookieProcessor;

data-sets-api-server/src/main/java/org/zowe/spring/SwaggerConfig.java

@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2018
  */
+
 package org.zowe.spring;
 
 

data-sets-api-server/src/main/java/org/zowe/unix/files/controller/AbstractUnixFilesController.java

@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2019, 2020
  */
+
 package org.zowe.unix.files.controller;
 
 import io.swagger.v3.oas.annotations.Operation;

data-sets-api-server/src/main/java/org/zowe/unix/files/exceptions/AlreadyExistsException.java

@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2019
  */
+
 package org.zowe.unix.files.exceptions;
 
 import org.springframework.http.HttpStatus;

data-sets-api-server/src/main/java/org/zowe/unix/files/exceptions/FileNotFoundException.java

@@ -7,6 +7,7 @@
  *
  * Copyright IBM Corporation 2019
  */
+
 package org.zowe.unix.files.exceptions;
 
 import org.springframework.http.HttpStatus;