From c0aebdf1f43ed6f64fcc76e19cbc2dfee2e0f3df Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 9 Mar 2023 10:20:51 -0500 Subject: [PATCH] Code changes needed to resolve openjdk17 issues Upgraded groovy maven plugin for openjdk17. Changed parent version to latest snapshot to pick up grpc upgrade needed to allow local compiles on newer macbooks, based on apple silicon. Issue-ID: CCSDK-3861 Signed-off-by: Dan Timoney Change-Id: Ie11456682a3a038892a35a5ec3b3e0f2e8847b13 --- cds-ui/application/pom.xml | 6 +++--- cds-ui/server/pom.xml | 6 +++--- ms/blueprintsprocessor/application/pom.xml | 6 +++--- .../ccsdk/cds/blueprintsprocessor/uat/BlueprintsAcceptanceTest.kt | 2 +- .../designer/api/load/BluePrintCatalogLoadService.kt | 2 +- .../blueprintsprocessor/designer/api/load/ModelTypeLoadService.kt | 2 +- .../designer/api/load/ResourceDictionaryLoadService.kt | 2 +- ms/command-executor/pom.xml | 6 +++--- ms/py-executor/pom.xml | 6 +++--- ms/sdclistener/distribution/pom.xml | 6 +++--- pom.xml | 2 +- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/cds-ui/application/pom.xml b/cds-ui/application/pom.xml index 3a305a0dc..4f09b0c96 100644 --- a/cds-ui/application/pom.xml +++ b/cds-ui/application/pom.xml @@ -40,9 +40,9 @@ limitations under the License. - org.codehaus.groovy.maven - gmaven-plugin - 1.0 + org.codehaus.gmaven + groovy-maven-plugin + 2.1.1 validate diff --git a/cds-ui/server/pom.xml b/cds-ui/server/pom.xml index d07ea3a47..b0d155985 100644 --- a/cds-ui/server/pom.xml +++ b/cds-ui/server/pom.xml @@ -109,9 +109,9 @@ limitations under the License. - org.codehaus.groovy.maven - gmaven-plugin - 1.0 + org.codehaus.gmaven + groovy-maven-plugin + 2.1.1 validate diff --git a/ms/blueprintsprocessor/application/pom.xml b/ms/blueprintsprocessor/application/pom.xml index c0df4d998..319272a48 100755 --- a/ms/blueprintsprocessor/application/pom.xml +++ b/ms/blueprintsprocessor/application/pom.xml @@ -303,9 +303,9 @@ - org.codehaus.groovy.maven - gmaven-plugin - 1.0 + org.codehaus.gmaven + groovy-maven-plugin + 2.1.1 validate diff --git a/ms/blueprintsprocessor/application/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/BlueprintsAcceptanceTest.kt b/ms/blueprintsprocessor/application/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/BlueprintsAcceptanceTest.kt index 4a8da536f..6349b444c 100644 --- a/ms/blueprintsprocessor/application/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/BlueprintsAcceptanceTest.kt +++ b/ms/blueprintsprocessor/application/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/uat/BlueprintsAcceptanceTest.kt @@ -66,7 +66,7 @@ class BlueprintsAcceptanceTest( .map { file -> arrayOf( file.nameWithoutExtension, - FileSystems.newFileSystem(file.canonicalFile.toPath(), null) + FileSystems.newFileSystem(file.canonicalFile.toPath(), null as? ClassLoader) ) } } diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/load/BluePrintCatalogLoadService.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/load/BluePrintCatalogLoadService.kt index ceeeb05ba..813eeb52c 100644 --- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/load/BluePrintCatalogLoadService.kt +++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/load/BluePrintCatalogLoadService.kt @@ -53,7 +53,7 @@ open class BluePrintCatalogLoadService(private val controllerBlueprintsCatalogSe deferredResult.await() } - if (!errorBuilder.isEmpty) { + if (!errorBuilder.isEmpty()) { log.error(errorBuilder.toString()) } } diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/load/ModelTypeLoadService.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/load/ModelTypeLoadService.kt index e96daf9f0..5206e36e2 100644 --- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/load/ModelTypeLoadService.kt +++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/load/ModelTypeLoadService.kt @@ -98,7 +98,7 @@ open class ModelTypeLoadService(private val modelTypeHandler: ModelTypeHandler) deferred.awaitAll() } - if (!errorBuilder.isEmpty) { + if (!errorBuilder.isEmpty()) { log.error(errorBuilder.toString()) } } catch (e: Exception) { diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/load/ResourceDictionaryLoadService.kt b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/load/ResourceDictionaryLoadService.kt index 15cf3dcb0..dad43f64a 100644 --- a/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/load/ResourceDictionaryLoadService.kt +++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/designer/api/load/ResourceDictionaryLoadService.kt @@ -61,7 +61,7 @@ open class ResourceDictionaryLoadService(private val resourceDictionaryHandler: deferred.awaitAll() } - if (!errorBuilder.isEmpty) { + if (!errorBuilder.isEmpty()) { log.error(errorBuilder.toString()) } } diff --git a/ms/command-executor/pom.xml b/ms/command-executor/pom.xml index 944713641..22163b161 100755 --- a/ms/command-executor/pom.xml +++ b/ms/command-executor/pom.xml @@ -83,9 +83,9 @@ - org.codehaus.groovy.maven - gmaven-plugin - 1.0 + org.codehaus.gmaven + groovy-maven-plugin + 2.1.1 validate diff --git a/ms/py-executor/pom.xml b/ms/py-executor/pom.xml index 5fdcfcf1a..860b8a61e 100644 --- a/ms/py-executor/pom.xml +++ b/ms/py-executor/pom.xml @@ -82,9 +82,9 @@ - org.codehaus.groovy.maven - gmaven-plugin - 1.0 + org.codehaus.gmaven + groovy-maven-plugin + 2.1.1 validate diff --git a/ms/sdclistener/distribution/pom.xml b/ms/sdclistener/distribution/pom.xml index 289e0a66c..b5a64838f 100755 --- a/ms/sdclistener/distribution/pom.xml +++ b/ms/sdclistener/distribution/pom.xml @@ -108,9 +108,9 @@ - org.codehaus.groovy.maven - gmaven-plugin - 1.0 + org.codehaus.gmaven + groovy-maven-plugin + 2.1.1 validate diff --git a/pom.xml b/pom.xml index dcac38c06..e2cd05e90 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ limitations under the License. org.onap.ccsdk.parent spring-boot-26-starter-parent - 2.5.3 + 2.5.4-SNAPSHOT -- 2.16.6