diff options
author | Dan Timoney <dtimoney@att.com> | 2023-03-09 10:20:51 -0500 |
---|---|---|
committer | Dan Timoney <dtimoney@att.com> | 2023-03-09 10:20:51 -0500 |
commit | c0aebdf1f43ed6f64fcc76e19cbc2dfee2e0f3df (patch) | |
tree | d2882dfc040d7c54f8945e9556525dfc406acf27 /ms/blueprintsprocessor | |
parent | ddfd6749e7585581adad67878e0789967869a80a (diff) |
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 <dtimoney@att.com>
Change-Id: Ie11456682a3a038892a35a5ec3b3e0f2e8847b13
Diffstat (limited to 'ms/blueprintsprocessor')
5 files changed, 7 insertions, 7 deletions
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 @@ </executions> </plugin> <plugin> - <groupId>org.codehaus.groovy.maven</groupId> - <artifactId>gmaven-plugin</artifactId> - <version>1.0</version> + <groupId>org.codehaus.gmaven</groupId> + <artifactId>groovy-maven-plugin</artifactId> + <version>2.1.1</version> <executions> <execution> <phase>validate</phase> 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()) } } |