NMS-16180: Backport grpc client version update (#7436)

OpenNMS · Sep 24, 2024 · fb38d64 · fb38d64
1 parent e457f97
commit fb38d64
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 22 deletions.
diff --git a/container/features/src/main/resources/features-minion.xml b/container/features/src/main/resources/features-minion.xml
@@ -162,7 +162,8 @@
       <feature>dropwizard-metrics</feature>
       <feature>opennms-core-ipc-sink-api</feature>
       <feature>opennms-core-ipc-rpc-api</feature>
-      <bundle>mvn:org.opennms.core.grpc/org.opennms.core.grpc.osgi/${project.version}</bundle>
+        <bundle>wrap:mvn:org.opennms.core.grpc/org.opennms.core.grpc.osgi/${project.version}$overwrite=merge&amp;Karaf-Commands=none</bundle>
+        <bundle>mvn:com.google.protobuf/protobuf-java/${protobufVersion}</bundle>
       <bundle>mvn:org.opennms.core.ipc.grpc/org.opennms.core.ipc.grpc.common/${project.version}</bundle>
       <bundle>mvn:org.opennms.core.ipc.grpc/org.opennms.core.ipc.grpc.client/${project.version}</bundle>
       <feature>opennms-core-ipc-twin-grpc-subscriber</feature>

diff --git a/core/grpc/osgi/pom.xml b/core/grpc/osgi/pom.xml
@@ -22,18 +22,11 @@
         <version>${maven.shade.plugin.version}</version>
         <executions>
           <execution>
-            <phase>package</phase>
             <goals>
               <goal>shade</goal>
             </goals>
+            <phase>package</phase>
             <configuration>
-              <artifactSet>
-              </artifactSet>
-              <filters>
-                <filter>
-                  <artifact>*:*</artifact>
-                </filter>
-              </filters>
               <createDependencyReducedPom>true</createDependencyReducedPom>
             </configuration>
           </execution>
@@ -46,13 +39,14 @@
         <configuration>
           <instructions>
             <Import-Package>
+              com.google.protobuf;version="[3.19,5)",
+              javax.net,
               javax.net.ssl,
               javax.security.cert,
               javax.security.auth.x500,
             </Import-Package>
-            <Export-Package>
-              com.google.protobuf,
-              io.grpc,
+            <Export-Package>io.grpc,
+              io.grpc.core,
               io.grpc.stub,
               io.grpc.protobuf,
               io.grpc.internal,
@@ -72,7 +66,7 @@
   <dependencies>
     <dependency>
       <groupId>io.grpc</groupId>
-      <artifactId>grpc-netty-shaded</artifactId>
+      <artifactId>grpc-core</artifactId>
       <version>${grpcVersion}</version>
     </dependency>
     <dependency>
@@ -84,21 +78,22 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-protobuf</artifactId>
       <version>${grpcVersion}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.protobuf</groupId>
+          <artifactId>protobuf-java</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-stub</artifactId>
       <version>${grpcVersion}</version>
     </dependency>
     <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <version>${guavagRPCVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>${protobufVersion}</version>
+      <groupId>io.grpc</groupId>
+      <artifactId>grpc-netty-shaded</artifactId>
+      <version>${grpcVersion}</version>
     </dependency>
   </dependencies>
 

diff --git a/pom.xml b/pom.xml
@@ -1672,7 +1672,7 @@
     <geoipVersion>2.15.0</geoipVersion>
     <geronimoVersion>1.1.1</geronimoVersion>
     <groovyVersion>2.5.23</groovyVersion>
-    <grpcVersion>1.46.0</grpcVersion>
+    <grpcVersion>1.66.0</grpcVersion>
     <gsonVersion>2.9.1</gsonVersion>
     <guavaVersion>25.1-jre</guavaVersion>
     <guavaOsgiVersion>25.1.0</guavaOsgiVersion>