Update blueprints-proto in cds-client

- update blueprints-proto (1.1.5 -> 1.5.3)

Issue-ID: SO-4265
Change-Id: Iaf39a8caa25422ff27b89ab6367a7f1914717a04
Signed-off-by: Fiete Ostkamp <fiete.ostkamp@telekom.de>

diff --git a/common/clients/client-cds/pom.xml b/common/clients/client-cds/pom.xml
index 9a3c0ec..85a72a7 100644 (file)
--- a/common/clients/client-cds/pom.xml
+++ b/common/clients/client-cds/pom.xml
@@ -13,7 +13,7 @@
   <artifactId>client-cds</artifactId>
 
   <properties>
   <artifactId>client-cds</artifactId>
 
   <properties>

-    <ccsdk.version>1.1.5</ccsdk.version>
+    <ccsdk.version>1.5.3</ccsdk.version>

     <protobuf.version>3.22.2</protobuf.version>
     <grpc.netty.version>4.1.30.Final</grpc.netty.version>
   </properties>
     <protobuf.version>3.22.2</protobuf.version>
     <grpc.netty.version>4.1.30.Final</grpc.netty.version>
   </properties>


@@ -44,33 +44,6 @@
         </exclusion>
       </exclusions>
     </dependency>
         </exclusion>
       </exclusions>
     </dependency>

-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>${protobuf.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.grpc</groupId>
-      <artifactId>grpc-protobuf</artifactId>
-      <version>${grpc.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>com.google.code.findbugs</groupId>
-          <artifactId>jsr305</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>io.grpc</groupId>
-      <artifactId>grpc-netty</artifactId>
-      <version>${grpc.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.grpc</groupId>
-      <artifactId>grpc-testing</artifactId>
-      <version>${grpc.version}</version>
-      <scope>test</scope>
-    </dependency>

     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-junit-jupiter</artifactId>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-junit-jupiter</artifactId>


@@ -96,6 +69,12 @@
       <artifactId>junit-vintage-engine</artifactId>
       <scope>test</scope>
     </dependency>
       <artifactId>junit-vintage-engine</artifactId>
       <scope>test</scope>
     </dependency>

+    <dependency>
+      <groupId>io.grpc</groupId>
+      <artifactId>grpc-testing</artifactId>
+      <scope>test</scope>
+      <version>1.25.0</version>
+    </dependency>

   </dependencies>
 
 </project>
   </dependencies>
 
 </project>

diff --git a/pom.xml b/pom.xml
index 4262fef..10aa033 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
     <so-etsi-sol003-adapter-version>1.9.0-SNAPSHOT</so-etsi-sol003-adapter-version>
     <onap-logging-version>1.6.9</onap-logging-version>
     <jackson.version>2.14.3</jackson.version>
     <so-etsi-sol003-adapter-version>1.9.0-SNAPSHOT</so-etsi-sol003-adapter-version>
     <onap-logging-version>1.6.9</onap-logging-version>
     <jackson.version>2.14.3</jackson.version>

-    <grpc.version>1.25.0</grpc.version>
+    <grpc.version>1.29.0</grpc.version>

     <logback.version>1.2.11</logback.version>
     <kafka-clients.version>3.3.2</kafka-clients.version>
     <aai-schema.version>1.12.10</aai-schema.version>
     <logback.version>1.2.11</logback.version>
     <kafka-clients.version>3.3.2</kafka-clients.version>
     <aai-schema.version>1.12.10</aai-schema.version>


@@ -1119,6 +1119,7 @@
         <artifactId>grpc-bom</artifactId>
         <version>${grpc.version}</version>
         <type>pom</type>
         <artifactId>grpc-bom</artifactId>
         <version>${grpc.version}</version>
         <type>pom</type>

+        <scope>import</scope>

       </dependency>
     </dependencies>
   </dependencyManagement>
       </dependency>
     </dependencies>
   </dependencyManagement>