summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/scripts/BluePrintCompileService.kt6
-rwxr-xr-xms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/BluePrintArchiveUtils.kt2
-rw-r--r--ms/blueprintsprocessor/modules/commons/processor-core/src/main/resources/application.properties2
-rw-r--r--ms/blueprintsprocessor/modules/commons/rest-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/rest/service/RestLoggerService.kt2
-rw-r--r--ms/blueprintsprocessor/modules/commons/rest-lib/src/main/resources/application.properties2
-rwxr-xr-xms/blueprintsprocessor/parent/pom.xml2
-rw-r--r--pom.xml8
7 files changed, 12 insertions, 12 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.
diff --git a/ms/blueprintsprocessor/parent/pom.xml b/ms/blueprintsprocessor/parent/pom.xml
index fb5f7dcb6..b6369302c 100755
--- a/ms/blueprintsprocessor/parent/pom.xml
+++ b/ms/blueprintsprocessor/parent/pom.xml
@@ -36,7 +36,7 @@
<springfox.swagger2.version>3.0.0</springfox.swagger2.version>
<eelf.version>1.0.0</eelf.version>
<onap.logger.slf4j>1.2.2</onap.logger.slf4j>
- <hazelcast.version>4.2.2</hazelcast.version>
+ <hazelcast.version>4.2.5</hazelcast.version>
<h2database.version>1.4.197</h2database.version>
<powermock.version>1.7.4</powermock.version>
diff --git a/pom.xml b/pom.xml
index 103e1bcc4..15ab6fab8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,8 +21,8 @@ limitations under the License.
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
- <artifactId>spring-boot-starter-parent</artifactId>
- <version>2.4.2</version>
+ <artifactId>spring-boot-26-starter-parent</artifactId>
+ <version>2.4.4</version>
<relativePath/>
</parent>
@@ -55,7 +55,7 @@ limitations under the License.
<sonar.inclusions>**/*.java,**/*.kt</sonar.inclusions>
<!--Specify path to load jacoco XLM report, as Sonar can't load Kotlin coverage from binary report-->
<sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
- <jacoco.version>0.8.3</jacoco.version>
+ <jacoco.version>0.8.7</jacoco.version>
<!-- Properties for POM Format -->
<format.skipValidate>false</format.skipValidate>
@@ -73,7 +73,7 @@ limitations under the License.
<ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
- <ccsdk.sli.version>1.5.1</ccsdk.sli.version>
+ <ccsdk.sli.version>1.5.2-SNAPSHOT</ccsdk.sli.version>
<ccsdk.cds.version>${project.version}</ccsdk.cds.version>
</properties>