aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchandana.g.n <chandana.g.n@accenture.com>2024-10-09 13:17:38 +0000
committerchandana.g.n <chandana.g.n@accenture.com>2024-10-15 07:09:06 +0000
commitb992a32981f459249634daa1dfdeb26b060a4e80 (patch)
treece6f060c0d88aa5a447c4fbdb41bc15efe98314c
parent940a89a0b3e9f69fcb58101d8d4a7ab2763ba715 (diff)
Updated to Java-17HEADmaster
- Updated parent project and fixed security vulnerabilities Issue-ID: CCSDK-4059 Change-Id: Ie02ae86a578dd7732b7a71b6a9e9d3a5997c17b3 Signed-off-by: chandana.g.n <chandana.g.n@accenture.com>
-rw-r--r--components/model-catalog/blueprint-model/archetype-blueprint/pom.xml2
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint-kotlin-parent/pom.xml5
-rwxr-xr-xms/blueprintsprocessor/application/pom.xml38
-rwxr-xr-xms/blueprintsprocessor/application/src/main/docker/Dockerfile4
-rwxr-xr-xms/blueprintsprocessor/application/src/main/resources/application-dev.properties4
-rwxr-xr-xms/blueprintsprocessor/functions/pom.xml16
-rw-r--r--ms/blueprintsprocessor/functions/restconf-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/restconf/executor/RestconfExecutor.kt3
-rw-r--r--ms/blueprintsprocessor/functions/restful-executor/pom.xml1
-rw-r--r--ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/scripts/BluePrintCompileService.kt2
-rw-r--r--ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/service/BluePrintWorkflowService.kt1
-rw-r--r--ms/blueprintsprocessor/modules/blueprints/blueprint-validation/pom.xml1
-rw-r--r--ms/blueprintsprocessor/modules/commons/dmaap-lib/pom.xml5
-rw-r--r--ms/blueprintsprocessor/modules/commons/message-lib/pom.xml6
-rwxr-xr-xms/blueprintsprocessor/modules/commons/pom.xml10
-rw-r--r--ms/blueprintsprocessor/modules/commons/rest-lib/pom.xml10
-rw-r--r--ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml15
-rw-r--r--ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml1
-rw-r--r--ms/blueprintsprocessor/modules/inbounds/health-api-common/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/healthapi/configuration/HealthCheckProperties.kt7
-rw-r--r--ms/blueprintsprocessor/modules/inbounds/pom.xml1
-rw-r--r--ms/blueprintsprocessor/modules/inbounds/resource-api/pom.xml1
-rwxr-xr-xms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml16
-rw-r--r--ms/blueprintsprocessor/modules/inbounds/workflow-api/pom.xml1
-rwxr-xr-xms/blueprintsprocessor/parent/pom.xml10
-rw-r--r--ms/pom.xml13
-rw-r--r--ms/sdclistener/application/pom.xml1
-rwxr-xr-xms/sdclistener/parent/pom.xml31
-rw-r--r--pom.xml56
27 files changed, 239 insertions, 22 deletions
diff --git a/components/model-catalog/blueprint-model/archetype-blueprint/pom.xml b/components/model-catalog/blueprint-model/archetype-blueprint/pom.xml
index 4e651a192..48f005094 100644
--- a/components/model-catalog/blueprint-model/archetype-blueprint/pom.xml
+++ b/components/model-catalog/blueprint-model/archetype-blueprint/pom.xml
@@ -15,7 +15,7 @@
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.ccsdk.cds.components.cba</groupId>
diff --git a/components/model-catalog/blueprint-model/test-blueprint-kotlin-parent/pom.xml b/components/model-catalog/blueprint-model/test-blueprint-kotlin-parent/pom.xml
index c9fe99ced..4ab771148 100644
--- a/components/model-catalog/blueprint-model/test-blueprint-kotlin-parent/pom.xml
+++ b/components/model-catalog/blueprint-model/test-blueprint-kotlin-parent/pom.xml
@@ -36,6 +36,11 @@
<version>${project.parent.version}</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty.http2</groupId>
+ <artifactId>http2-common</artifactId>
+ <version>11.0.20</version>
+ </dependency>
+ <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
diff --git a/ms/blueprintsprocessor/application/pom.xml b/ms/blueprintsprocessor/application/pom.xml
index c44111daa..44c3c764b 100755
--- a/ms/blueprintsprocessor/application/pom.xml
+++ b/ms/blueprintsprocessor/application/pom.xml
@@ -50,6 +50,16 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>6.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.http2</groupId>
+ <artifactId>http2-common</artifactId>
+ <version>11.0.20</version>
+ </dependency>
+ <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
<exclusions>
@@ -167,6 +177,11 @@
<artifactId>snakeyaml</artifactId>
</dependency>
<dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>2.13.9</version>
+ </dependency>
+ <dependency>
<groupId>com.nhaarman.mockitokotlin2</groupId>
<artifactId>mockito-kotlin</artifactId>
<!-- It's unusual but 'compile' here is the right scope since mockito is being used at runtime by
@@ -192,11 +207,34 @@
<artifactId>wiremock-jre8</artifactId>
<version>2.35.1</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+
<!-- END UAT -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
+ <version>1.2.13</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.kafka</groupId>
+ <artifactId>spring-kafka</artifactId>
+ <version>2.9.13</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bitbucket.b_c</groupId>
+ <artifactId>jose4j</artifactId>
+ <version>0.9.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>3.9.2</version>
</dependency>
</dependencies>
diff --git a/ms/blueprintsprocessor/application/src/main/docker/Dockerfile b/ms/blueprintsprocessor/application/src/main/docker/Dockerfile
index 9bb56acc8..2bbcda976 100755
--- a/ms/blueprintsprocessor/application/src/main/docker/Dockerfile
+++ b/ms/blueprintsprocessor/application/src/main/docker/Dockerfile
@@ -1,6 +1,6 @@
# Prepare stage for multistage image build
## START OF STAGE0 ##
-FROM onap/ccsdk-alpine-j17-image:1.5.1 AS stage0
+FROM onap/ccsdk-alpine-j17-image:1.6.2 AS stage0
USER root
# add entrypoint
@@ -22,7 +22,7 @@ RUN tar -xzf /source.tar.gz -C /tmp \
## This will create actual image
-FROM onap/ccsdk-alpine-j17-image:1.5.1
+FROM onap/ccsdk-alpine-j17-image:1.6.2
USER root
COPY --from=stage0 /opt /opt
diff --git a/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties b/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties
index e20e2649d..29ea46adf 100755
--- a/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties
+++ b/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties
@@ -75,7 +75,7 @@ blueprintsprocessor.grpcclient.py-executor.trustCertCollection=src/main/resource
# db
-blueprintsprocessor.db.url=jdbc:mysql://localhost:3306/sdnctl
+blueprintsprocessor.db.url=jdbc:mariadb://localhost:3306/sdnctl
blueprintsprocessor.db.username=sdnctl
blueprintsprocessor.db.password=sdnctl
blueprintsprocessor.db.driverClassName=org.mariadb.jdbc.Driver
@@ -86,7 +86,7 @@ blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.MySQL5InnoDBDialec
# processor-db endpoint
blueprintsprocessor.db.processor-db.type=maria-db
-blueprintsprocessor.db.processor-db.url=jdbc:mysql://localhost:3306/sdnctl
+blueprintsprocessor.db.processor-db.url=jdbc:mariadb://localhost:3306/sdnctl
blueprintsprocessor.db.processor-db.username=root
blueprintsprocessor.db.processor-db.password=secretpassword
diff --git a/ms/blueprintsprocessor/functions/pom.xml b/ms/blueprintsprocessor/functions/pom.xml
index 7f8186298..7bb4ae068 100755
--- a/ms/blueprintsprocessor/functions/pom.xml
+++ b/ms/blueprintsprocessor/functions/pom.xml
@@ -65,6 +65,17 @@
<groupId>org.mock-server</groupId>
<artifactId>mockserver-netty</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.kafka</groupId>
+ <artifactId>spring-kafka</artifactId>
+ <version>2.9.13</version>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
@@ -87,6 +98,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>com.nimbusds</groupId>
+ <artifactId>nimbus-jose-jwt</artifactId>
+ <version>9.37.2</version>
+ </dependency>
+ <dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test-junit</artifactId>
<scope>test</scope>
diff --git a/ms/blueprintsprocessor/functions/restconf-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/restconf/executor/RestconfExecutor.kt b/ms/blueprintsprocessor/functions/restconf-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/restconf/executor/RestconfExecutor.kt
index 4b9333544..86e4058f2 100644
--- a/ms/blueprintsprocessor/functions/restconf-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/restconf/executor/RestconfExecutor.kt
+++ b/ms/blueprintsprocessor/functions/restconf-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/restconf/executor/RestconfExecutor.kt
@@ -192,6 +192,9 @@ open class Execute : AbstractScriptComponentFunction() {
action.get(ACTION_PAYLOAD)
?: throw BluePrintProcessorException("Failed to load action $actionType payload.")
}
+ RestconfRequestType.GET, RestconfRequestType.DELETE -> {
+ // No payload required for GET or DELETE
+ }
}
}
}
diff --git a/ms/blueprintsprocessor/functions/restful-executor/pom.xml b/ms/blueprintsprocessor/functions/restful-executor/pom.xml
index 2c93853f5..c779869b8 100644
--- a/ms/blueprintsprocessor/functions/restful-executor/pom.xml
+++ b/ms/blueprintsprocessor/functions/restful-executor/pom.xml
@@ -47,6 +47,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
+ <version>5.3.39</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
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 b093e8e47..34c62c629 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
@@ -95,7 +95,7 @@ open class BluePrintCompileService {
add("-d")
add(compiledJarFile.absolutePath)
add("-jvm-target")
- add("11")
+ add("17")
}
val deferredCompile = async {
val k2jvmCompiler = K2JVMCompiler()
diff --git a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/service/BluePrintWorkflowService.kt b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/service/BluePrintWorkflowService.kt
index f3e4e59aa..15f0504bc 100644
--- a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/service/BluePrintWorkflowService.kt
+++ b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/service/BluePrintWorkflowService.kt
@@ -347,6 +347,7 @@ abstract class AbstractBluePrintWorkFlowService<In, Out> : CoroutineScope, BlueP
}
}
}
+ else -> log.info("Handling other types of Message")
}
}
}
diff --git a/ms/blueprintsprocessor/modules/blueprints/blueprint-validation/pom.xml b/ms/blueprintsprocessor/modules/blueprints/blueprint-validation/pom.xml
index b8fad8be1..710a4a449 100644
--- a/ms/blueprintsprocessor/modules/blueprints/blueprint-validation/pom.xml
+++ b/ms/blueprintsprocessor/modules/blueprints/blueprint-validation/pom.xml
@@ -35,6 +35,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
+ <version>6.0.0</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/ms/blueprintsprocessor/modules/commons/dmaap-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/dmaap-lib/pom.xml
index 5215c834e..6c6116dd0 100644
--- a/ms/blueprintsprocessor/modules/commons/dmaap-lib/pom.xml
+++ b/ms/blueprintsprocessor/modules/commons/dmaap-lib/pom.xml
@@ -61,6 +61,11 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20231013</version>
+ </dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
diff --git a/ms/blueprintsprocessor/modules/commons/message-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/message-lib/pom.xml
index 40092b881..d971dae82 100644
--- a/ms/blueprintsprocessor/modules/commons/message-lib/pom.xml
+++ b/ms/blueprintsprocessor/modules/commons/message-lib/pom.xml
@@ -38,9 +38,15 @@
<groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId>
<artifactId>processor-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>2.13.9</version>
+ </dependency>
<dependency>
<groupId>org.springframework.kafka</groupId>
<artifactId>spring-kafka</artifactId>
+ <version>2.9.13</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
diff --git a/ms/blueprintsprocessor/modules/commons/pom.xml b/ms/blueprintsprocessor/modules/commons/pom.xml
index 3291b02ad..4eba5949d 100755
--- a/ms/blueprintsprocessor/modules/commons/pom.xml
+++ b/ms/blueprintsprocessor/modules/commons/pom.xml
@@ -80,6 +80,16 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.springframework.kafka</groupId>
+ <artifactId>spring-kafka</artifactId>
+ <version>2.9.13</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bitbucket.b_c</groupId>
+ <artifactId>jose4j</artifactId>
+ <version>0.9.4</version>
+ </dependency>
+ <dependency>
<groupId>org.jetbrains.kotlinx</groupId>
<artifactId>kotlinx-coroutines-test</artifactId>
<scope>test</scope>
diff --git a/ms/blueprintsprocessor/modules/commons/rest-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/rest-lib/pom.xml
index 16c48701d..74680ae14 100644
--- a/ms/blueprintsprocessor/modules/commons/rest-lib/pom.xml
+++ b/ms/blueprintsprocessor/modules/commons/rest-lib/pom.xml
@@ -53,6 +53,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
+ <version>5.3.39</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -64,5 +65,14 @@
<artifactId>spring-boot-starter-security</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>6.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-compiler-embeddable</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml
index 3fcfc7a18..002faa648 100644
--- a/ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml
+++ b/ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml
@@ -43,5 +43,20 @@
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.bitbucket.b_c</groupId>
+ <artifactId>jose4j</artifactId>
+ <version>0.9.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>3.9.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>2.13.9</version>
+ </dependency>
</dependencies>
</project>
diff --git a/ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml
index 64e32ac43..82d0bfe81 100644
--- a/ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml
+++ b/ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml
@@ -38,6 +38,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
+ <version>6.3.0</version>
</dependency>
<dependency>
<groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId>
diff --git a/ms/blueprintsprocessor/modules/inbounds/health-api-common/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/healthapi/configuration/HealthCheckProperties.kt b/ms/blueprintsprocessor/modules/inbounds/health-api-common/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/healthapi/configuration/HealthCheckProperties.kt
index c1532cd35..dfbacdbd3 100644
--- a/ms/blueprintsprocessor/modules/inbounds/health-api-common/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/healthapi/configuration/HealthCheckProperties.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/health-api-common/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/healthapi/configuration/HealthCheckProperties.kt
@@ -77,6 +77,13 @@ open class HealthCheckProperties {
}
private fun getServiceEndpoint(serviceEndpointInfo: List<String>): ServiceEndpoint {
+ // Ensure the list has at least 2 elements
+ if (serviceEndpointInfo.size < 2) {
+ // Use default values if the list is too short
+ return ServiceEndpoint("", "")
+ }
+
+ // Safely access elements assuming the list has at least 2 elements
return ServiceEndpoint(
removeSpecialCharacter(serviceEndpointInfo[0]), removeSpecialCharacter(serviceEndpointInfo[1])
)
diff --git a/ms/blueprintsprocessor/modules/inbounds/pom.xml b/ms/blueprintsprocessor/modules/inbounds/pom.xml
index 3afd50c11..ac73ca9ad 100644
--- a/ms/blueprintsprocessor/modules/inbounds/pom.xml
+++ b/ms/blueprintsprocessor/modules/inbounds/pom.xml
@@ -44,6 +44,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
+ <version>6.3.0</version>
</dependency>
<dependency>
<groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId>
diff --git a/ms/blueprintsprocessor/modules/inbounds/resource-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/resource-api/pom.xml
index 4eceb43a5..0f763faf5 100644
--- a/ms/blueprintsprocessor/modules/inbounds/resource-api/pom.xml
+++ b/ms/blueprintsprocessor/modules/inbounds/resource-api/pom.xml
@@ -34,6 +34,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
+ <version>6.3.0</version>
</dependency>
<dependency>
<groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId>
diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml
index 2fa80ef9a..ddc3e19cf 100755
--- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml
+++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml
@@ -63,6 +63,7 @@
<dependency>
<groupId>org.springframework.kafka</groupId>
<artifactId>spring-kafka</artifactId>
+ <version>2.9.13</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -71,6 +72,21 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.bitbucket.b_c</groupId>
+ <artifactId>jose4j</artifactId>
+ <version>0.9.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>3.9.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>2.13.9</version>
+ </dependency>
+ <dependency>
<groupId>org.springframework.kafka</groupId>
<artifactId>spring-kafka-test</artifactId>
<scope>test</scope>
diff --git a/ms/blueprintsprocessor/modules/inbounds/workflow-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/workflow-api/pom.xml
index 5ca29b78c..b956ff9f6 100644
--- a/ms/blueprintsprocessor/modules/inbounds/workflow-api/pom.xml
+++ b/ms/blueprintsprocessor/modules/inbounds/workflow-api/pom.xml
@@ -34,6 +34,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
+ <version>6.3.0</version>
</dependency>
<dependency>
<groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId>
diff --git a/ms/blueprintsprocessor/parent/pom.xml b/ms/blueprintsprocessor/parent/pom.xml
index 3d13447eb..1c0ba32ff 100755
--- a/ms/blueprintsprocessor/parent/pom.xml
+++ b/ms/blueprintsprocessor/parent/pom.xml
@@ -55,7 +55,7 @@
<json-smart.version>2.4.9</json-smart.version>
<commons-io-version>2.8.0</commons-io-version>
- <commons-compress-version>1.21</commons-compress-version>
+ <commons-compress-version>1.24.0</commons-compress-version>
<commons-collections-version>4.4</commons-collections-version>
</properties>
@@ -220,6 +220,12 @@
<version>${hazelcast.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>6.3.0</version>
+ </dependency>
+
<!-- Adaptors -->
<dependency>
<groupId>org.apache.sshd</groupId>
@@ -240,7 +246,7 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
- <version>${kafka.version}</version>
+ <version>3.8.0</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
diff --git a/ms/pom.xml b/ms/pom.xml
index d13a2931b..d99558b62 100644
--- a/ms/pom.xml
+++ b/ms/pom.xml
@@ -39,6 +39,19 @@
<module>sdclistener</module>
</modules>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ <version>1.10.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.kafka</groupId>
+ <artifactId>spring-kafka</artifactId>
+ <version>2.9.13</version>
+ </dependency>
+ </dependencies>
+
<build>
<pluginManagement>
<plugins>
diff --git a/ms/sdclistener/application/pom.xml b/ms/sdclistener/application/pom.xml
index 54a9e959e..7cc3b6e63 100644
--- a/ms/sdclistener/application/pom.xml
+++ b/ms/sdclistener/application/pom.xml
@@ -128,6 +128,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
+ <version>1.2.13</version>
</dependency>
<dependency>
<groupId>com.github.stefanbirkner</groupId>
diff --git a/ms/sdclistener/parent/pom.xml b/ms/sdclistener/parent/pom.xml
index e3182923a..a1a0335d9 100755
--- a/ms/sdclistener/parent/pom.xml
+++ b/ms/sdclistener/parent/pom.xml
@@ -76,9 +76,14 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.21</version>
+ <version>1.24.0</version>
</dependency>
- <dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>6.3.0</version>
+ </dependency>
+ <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
@@ -165,7 +170,27 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
- <version>${kafka.version}</version>
+ <version>3.8.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20231013</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.kafka</groupId>
+ <artifactId>spring-kafka</artifactId>
+ <version>2.9.13</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ <version>1.10.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-compiler-embeddable</artifactId>
+ <version>1.7.0</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/pom.xml b/pom.xml
index d63614c26..d30c8e22a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,8 +22,8 @@ limitations under the License.
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
- <artifactId>spring-boot-27-starter-parent</artifactId>
- <version>2.8.0</version>
+ <artifactId>spring-boot-27-jdk-17-starter-parent</artifactId>
+ <version>2.8.0-SNAPSHOT</version>
<relativePath/>
</parent>
@@ -56,13 +56,13 @@ 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.7</jacoco.version>
+ <jacoco.version>0.8.12</jacoco.version>
<!-- Properties for POM Format -->
<format.skipValidate>false</format.skipValidate>
<format.skipExecute>true</format.skipExecute>
- <java.version>11</java.version>
+ <java.version>17</java.version>
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
<maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version>
@@ -78,19 +78,53 @@ limitations under the License.
<ccsdk.cds.version>${project.version}</ccsdk.cds.version>
<kotlin.version>1.7.0</kotlin.version>
- <kotlin.maven.version>1.6.21</kotlin.maven.version>
- <kotlin.couroutines.version>1.6.4</kotlin.couroutines.version>
+ <kotlin.maven.version>1.7.0</kotlin.maven.version>
+ <kotlin.couroutines.version>1.7.0</kotlin.couroutines.version>
<kotlinpoet.version>1.11.0</kotlinpoet.version>
- <apache.httpcomponents.client.version>4.5.13</apache.httpcomponents.client.version>
+ <apache.httpcomponents.client.version>4.5.14</apache.httpcomponents.client.version>
<grpc.version>1.29.0</grpc.version>
- <netty-ssl>2.0.50.Final</netty-ssl>
- <protobuff.java.version>3.10.0</protobuff.java.version>
- <protobuff.java.utils.version>3.16.3</protobuff.java.utils.version>
- <mockk.version>1.12.8</mockk.version>
+ <netty-ssl>2.0.66.Final</netty-ssl>
+ <protobuff.java.version>3.21.7</protobuff.java.version>
+ <protobuff.java.utils.version>3.21.7</protobuff.java.utils.version>
+ <mockk.version>1.13.12</mockk.version>
</properties>
+ <dependencies>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.2.13</version>
+ </dependency>
+ <dependency>
+ <groupId>com.squareup.okio</groupId>
+ <artifactId>okio</artifactId>
+ <version>3.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.xerial.snappy</groupId>
+ <artifactId>snappy-java</artifactId>
+ <version>1.1.10.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka-clients</artifactId>
+ <version>3.8.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jsoup</groupId>
+ <artifactId>jsoup</artifactId>
+ <version>1.15.3</version>
+ </dependency>
+
+ </dependencies>
+
<build>
<pluginManagement>
<plugins>