summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSourabh Sourabh <sourabh.sourabh@est.tech>2024-07-17 12:28:54 +0000
committerGerrit Code Review <gerrit@onap.org>2024-07-17 12:28:54 +0000
commit0fe1b63d10a6ce4ec452d2089b9ffe101acd38f8 (patch)
tree1f15943de0054872238f2c5c69d19b157e827c21
parentf0f8d19771c85baec4407a0ce7ce83e25805c70b (diff)
parenteef4efe4709da9fd3e173ea68525ff506746bd3b (diff)
Merge "Fix DMI Stub dependency issues"
-rw-r--r--dmi-stub/dmi-plugin-demo-and-csit-stub-app/pom.xml26
-rw-r--r--dmi-stub/dmi-plugin-demo-and-csit-stub-service/pom.xml48
-rw-r--r--dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/DmiRestStubController.java2
-rw-r--r--dmi-stub/pom.xml12
4 files changed, 55 insertions, 33 deletions
diff --git a/dmi-stub/dmi-plugin-demo-and-csit-stub-app/pom.xml b/dmi-stub/dmi-plugin-demo-and-csit-stub-app/pom.xml
index 40455416..73105fd5 100644
--- a/dmi-stub/dmi-plugin-demo-and-csit-stub-app/pom.xml
+++ b/dmi-stub/dmi-plugin-demo-and-csit-stub-app/pom.xml
@@ -98,7 +98,24 @@
</profile>
</profiles>
<dependencies>
-
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion></exclusions>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion></exclusions>
+ </dependency>
<dependency>
<groupId>org.onap.cps</groupId>
<artifactId>dmi-plugin-demo-and-csit-stub-service</artifactId>
@@ -110,10 +127,7 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- <version>3.2.4</version>
- </dependency>
+
+
</dependencies>
</project> \ No newline at end of file
diff --git a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/pom.xml b/dmi-stub/dmi-plugin-demo-and-csit-stub-service/pom.xml
index 8ad8a9a2..78b56852 100644
--- a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/pom.xml
+++ b/dmi-stub/dmi-plugin-demo-and-csit-stub-service/pom.xml
@@ -25,11 +25,21 @@
</parent>
<artifactId>dmi-plugin-demo-and-csit-stub-service</artifactId>
+
+
<dependencies>
<dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion></exclusions>
+ </dependency>
+ <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
- <version>3.2.4</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
@@ -41,7 +51,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
- <version>3.2.4</version>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
@@ -57,32 +66,26 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
- <version>1.18.24</version>
</dependency>
<dependency>
<groupId>io.cloudevents</groupId>
<artifactId>cloudevents-kafka</artifactId>
- <version>2.5.0</version>
</dependency>
<dependency>
<groupId>io.cloudevents</groupId>
<artifactId>cloudevents-spring</artifactId>
- <version>2.5.0</version>
</dependency>
<dependency>
<groupId>org.springframework.kafka</groupId>
<artifactId>spring-kafka</artifactId>
- <version>3.1.3</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.11</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
- <version>6.0.0</version>
</dependency>
<dependency>
@@ -92,37 +95,32 @@
</dependency>
<!-- T E S T D E P E N D E N C I E S -->
<dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy</artifactId>
- <version>3.0.18</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-json</artifactId>
- <version>3.0.18</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.spockframework</groupId>
<artifactId>spock-core</artifactId>
- <version>2.4-M1-groovy-3.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.spockframework</groupId>
<artifactId>spock-spring</artifactId>
- <version>2.4-M1-groovy-3.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
- <version>3.2.4</version>
<scope>test</scope>
</dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-json</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
diff --git a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/DmiRestStubController.java b/dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/DmiRestStubController.java
index 8dbe9d23..d97173ce 100644
--- a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/DmiRestStubController.java
+++ b/dmi-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/DmiRestStubController.java
@@ -65,8 +65,8 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("${rest.api.dmi-stub-base-path}")
-@RequiredArgsConstructor
@Slf4j
+@RequiredArgsConstructor
public class DmiRestStubController {
private static final String DEFAULT_TAG = "tagD";
diff --git a/dmi-stub/pom.xml b/dmi-stub/pom.xml
index ba1ccd1b..379d873d 100644
--- a/dmi-stub/pom.xml
+++ b/dmi-stub/pom.xml
@@ -39,5 +39,15 @@
<module>dmi-plugin-demo-and-csit-stub-service</module>
<module>dmi-plugin-demo-and-csit-stub-app</module>
</modules>
-
+<dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.onap.cps</groupId>
+ <artifactId>cps-dependencies</artifactId>
+ <version>3.5.1</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
</project> \ No newline at end of file