From: Toine Siebelink <toine.siebelink@est.tech>
Date: Thu, 15 Jun 2023 16:44:02 +0000 (+0000)
Subject: Merge "Patch #2 : Introduce kafka template for cloud events"
X-Git-Tag: 3.3.3~39
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=75dff29f61825b44a8bf09a3a95cb8ceea2ce444;hp=-c;p=cps.git

Merge "Patch #2 : Introduce kafka template for cloud events"
---

75dff29f61825b44a8bf09a3a95cb8ceea2ce444
diff --combined cps-dependencies/pom.xml
index f27de9319,f792c9cfb..8003d30a4
--- a/cps-dependencies/pom.xml
+++ b/cps-dependencies/pom.xml
@@@ -27,7 -27,7 +27,7 @@@
      <modelVersion>4.0.0</modelVersion>
      <groupId>org.onap.cps</groupId>
      <artifactId>cps-dependencies</artifactId>
 -    <version>3.3.2-SNAPSHOT</version>
 +    <version>3.3.3-SNAPSHOT</version>
      <packaging>pom</packaging>
  
      <name>${project.groupId}:${project.artifactId}</name>
@@@ -146,6 -146,13 +146,13 @@@
                  <artifactId>cglib-nodep</artifactId>
                  <version>3.1</version>
              </dependency>
+             <dependency>
+                 <groupId>io.cloudevents</groupId>
+                 <artifactId>cloudevents-bom</artifactId>
+                 <version>2.5.0</version>
+                 <type>pom</type>
+                 <scope>import</scope>
+             </dependency>
              <dependency>
                  <groupId>org.apache.commons</groupId>
                  <artifactId>commons-lang3</artifactId>
diff --combined cps-ncmp-service/pom.xml
index 77f028085,bbcb6873c..19ef988d3
--- a/cps-ncmp-service/pom.xml
+++ b/cps-ncmp-service/pom.xml
@@@ -27,7 -27,7 +27,7 @@@
      <parent>
          <groupId>org.onap.cps</groupId>
          <artifactId>cps-parent</artifactId>
 -        <version>3.3.2-SNAPSHOT</version>
 +        <version>3.3.3-SNAPSHOT</version>
          <relativePath>../cps-parent/pom.xml</relativePath>
      </parent>
  
@@@ -41,6 -41,18 +41,18 @@@
              <groupId>org.apache.commons</groupId>
              <artifactId>commons-lang3</artifactId>
          </dependency>
+         <dependency>
+             <groupId>io.cloudevents</groupId>
+             <artifactId>cloudevents-json-jackson</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>io.cloudevents</groupId>
+             <artifactId>cloudevents-kafka</artifactId>
+         </dependency>
+         <dependency>
+             <groupId>io.cloudevents</groupId>
+             <artifactId>cloudevents-spring</artifactId>
+         </dependency>
          <dependency>
              <groupId>${project.groupId}</groupId>
              <artifactId>cps-service</artifactId>
@@@ -54,8 -66,8 +66,8 @@@
              <artifactId>cps-path-parser</artifactId>
          </dependency>
          <dependency>
-             <groupId>org.springframework</groupId>
-             <artifactId>spring-web</artifactId>
+             <groupId>com.hazelcast</groupId>
+             <artifactId>hazelcast-spring</artifactId>
          </dependency>
          <dependency>
              <groupId>org.mapstruct</groupId>
@@@ -66,8 -78,8 +78,8 @@@
              <artifactId>mapstruct-processor</artifactId>
          </dependency>
          <dependency>
-             <groupId>com.hazelcast</groupId>
-             <artifactId>hazelcast-spring</artifactId>
+             <groupId>org.springframework</groupId>
+             <artifactId>spring-web</artifactId>
          </dependency>
          <!-- T E S T - D E P E N D E N C I E S -->
          <dependency>