Upgrade spring boot parent and hazelcast

The code changes are required for kotlin upgrade.
New kotlin version is 1.5.32 (defined in spring-boot-parent)

Issue-ID: CCSDK-3701
Issue-ID: CCSDK-3762
Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>
Change-Id: I0d6ecc7bee8c21d2ecd3ac4364845c5c8e0e9738

5 files changed, 7 insertions, 7 deletions

diff --git a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/scripts/BluePrintCompileService.kt b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/scripts/BluePrintCompileService.kt
index 0c43eef78..b093e8e47 100644
--- a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/scripts/BluePrintCompileService.kt
+++ b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/scripts/BluePrintCompileService.kt
@@ -25,8 +25,8 @@ import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import org.jetbrains.kotlin.cli.common.ExitCode
 import org.jetbrains.kotlin.cli.common.arguments.parseCommandLineArguments
-import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
+import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSourceLocation
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
 import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
 import org.jetbrains.kotlin.config.Services
@@ -160,7 +160,7 @@ open class BluePrintSourceCode : SourceCode {
 data class CompiledMessageData(
     val severity: CompilerMessageSeverity,
     val message: String,
-    val location: CompilerMessageLocation?
+    val location: CompilerMessageSourceLocation?
 )
 
 /** Class to collect compilation results */
@@ -168,7 +168,7 @@ class CompilationMessageCollector : MessageCollector {
 
     private val compiledMessages: MutableList<CompiledMessageData> = arrayListOf()
 
-    override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageLocation?) {
+    override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageSourceLocation?) {
         synchronized(compiledMessages) {
             compiledMessages.add(CompiledMessageData(severity, message, location))
         }
diff --git a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/BluePrintArchiveUtils.kt b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/BluePrintArchiveUtils.kt
index 1a7c23cf1..4e2271b6d 100755
--- a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/BluePrintArchiveUtils.kt
+++ b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/BluePrintArchiveUtils.kt
@@ -250,7 +250,7 @@ class BluePrintArchiveUtils {
 
         override fun hasMoreElements(): Boolean {
             if (zipEnumeration != null)
-                return zipEnumeration?.hasMoreElements()
+                return zipEnumeration.hasMoreElements()
             else if (archiveStream != null) {
                 nextEntry = archiveStream.nextEntry
                 if (nextEntry != null && !archiveStream.canReadEntryData(nextEntry))
diff --git a/ms/blueprintsprocessor/modules/commons/processor-core/src/main/resources/application.properties b/ms/blueprintsprocessor/modules/commons/processor-core/src/main/resources/application.properties
index c10e96ee2..1231194c3 100644
--- a/ms/blueprintsprocessor/modules/commons/processor-core/src/main/resources/application.properties
+++ b/ms/blueprintsprocessor/modules/commons/processor-core/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 #
-#  Copyright © 2017-2018 AT&T Intellectual Property.
+#  Copyright © 2017-2018 AT&T Intellectual Property.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
diff --git a/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/service/RestLoggerService.kt b/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/service/RestLoggerService.kt
index 4b9bbb19f..744236685 100644
--- a/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/service/RestLoggerService.kt
+++ b/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/service/RestLoggerService.kt
@@ -178,7 +178,7 @@ fun <T> monoMdc(
 class MonoMDCCoroutine<in T>(
     parentContext: CoroutineContext,
     private val sink: MonoSink<T>
-) : AbstractCoroutine<T>(parentContext, true), Disposable {
+) : AbstractCoroutine<T>(parentContext, true, true), Disposable {
 
     private var disposed = false
 
diff --git a/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/resources/application.properties b/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/resources/application.properties
index c10e96ee2..1231194c3 100644
--- a/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/resources/application.properties
+++ b/ms/blueprintsprocessor/modules/commons/rest-lib/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 #
-#  Copyright © 2017-2018 AT&T Intellectual Property.
+#  Copyright © 2017-2018 AT&T Intellectual Property.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.