NMS-16185: upgrade to latest protobuf

container/features/pom.xml

@@ -217,6 +217,8 @@
                           <feature>netty</feature>
                           <feature>org.json</feature>
                           <feature>pax-jetty</feature>
+                          <feature>protobuf</feature>
+                          <feature>protobuf-util</feature>
                           <feature>scv-api</feature>
                           <feature>scv-jceks-impl</feature>
                           <feature>scv-shell</feature>

container/features/src/main/resources/features-core.xml

@@ -168,6 +168,12 @@
         <bundle start-level="${earlyStartLevel}">mvn:com.google.guava/guava/31.1-jre</bundle>
     </feature>
 
+    <!-- don't rely on dependency="true" for things that want specific versions -->
+    <feature name="guava32" version="32.1.3" description="Google :: Guava">
+        <feature prerequisite="true">guava-dependencies</feature>
+        <bundle start-level="${earlyStartLevel}">mvn:com.google.guava/guava/32.1.3-jre</bundle>
+    </feature>
+
     <feature name="jackson1" version="${jacksonVersion}" description="Jackson 1">
         <bundle dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/${jacksonVersion}</bundle>
         <bundle dependency="true">mvn:org.codehaus.jackson/jackson-mapper-asl/${jacksonVersion}</bundle>
@@ -291,6 +297,17 @@
         <bundle>wrap:mvn:org.json/json/${jsonVersion}$Export-Package=org.json&amp;Bundle-Version=${jsonVersion}</bundle>
     </feature>
 
+    <feature name="protobuf" version="${protobufVersion}" description="Google :: Protocol Buffers">
+        <bundle>mvn:com.google.protobuf/protobuf-java/${protobufVersion}</bundle>
+    </feature>
+    <feature name="protobuf-util" version="${protobufVersion}" description="Google :: Protocol Buffers :: Utilities">
+        <feature>guava32</feature>
+        <feature version="${protobufVersion}">protobuf</feature>
+        <bundle>mvn:com.google.code.gson/gson/${gsonVersion}</bundle>
+        <bundle>mvn:com.google.protobuf/protobuf-java-util/${protobufVersion}</bundle>
+        <bundle>wrap:mvn:com.google.code.findbugs/jsr305/3.0.2</bundle>
+    </feature>
+
     <feature name="snakeyaml" version="${snakeyamlVersion}" description="SnakeYAML">
         <bundle dependency="true">mvn:org.yaml/snakeyaml/${snakeyamlVersion}</bundle>
     </feature>

container/features/src/main/resources/features-minion.xml

@@ -135,9 +135,9 @@
       <feature>commons-csv</feature>
       <feature>dropwizard-metrics</feature>
       <feature version="${netty4Version}">netty</feature>
+      <feature version="${protobufVersion}">protobuf</feature>
       <feature>opennms-dnsresolver-api</feature>
       <feature>opennms-util</feature>
-      <bundle>mvn:com.google.protobuf/protobuf-java/${protobufVersion}</bundle>
       <bundle>mvn:com.google.code.gson/gson/${gsonVersion}</bundle>
       <bundle>wrap:mvn:io.pkts/pkts-core/${pktsVersion}$Bundle-SymbolicName=io.pkts.core&amp;Bundle-Version=${pktsVersion}</bundle>
       <bundle>wrap:mvn:io.pkts/pkts-buffers/${pktsVersion}$Bundle-SymbolicName=io.pkts.buffers&amp;Bundle-Version=${pktsVersion}</bundle>

container/features/src/main/resources/features-sentinel.xml

@@ -104,6 +104,7 @@
         <feature>sentinel-timeseries-api</feature>
 
         <feature version="${netty4Version}">netty</feature>
+        <feature version="${protobufVersion}">protobuf</feature>
         <feature>dropwizard-metrics</feature>
         <!-- Needed to bootstrap opennms-core-ipc-sink-api Spring context -->
         <feature>camel-spring</feature>
@@ -116,8 +117,6 @@
         <feature>sentinel-thresholding-service</feature>
         <feature>opennms-util</feature>
 
-        <bundle dependency="true">mvn:com.google.protobuf/protobuf-java/${protobufVersion}</bundle>
-
         <bundle>mvn:org.opennms.features.telemetry/org.opennms.features.telemetry.api/${project.version}</bundle>
         <bundle>mvn:org.opennms.features.telemetry.config/org.opennms.features.telemetry.config.api/${project.version}</bundle>
 
@@ -135,6 +134,8 @@
         <feature>commons-csv</feature>
         <feature>dropwizard-metrics</feature>
         <feature version="${guavaOsgiVersion}" prerequisite="true">guava</feature>
+        <feature version="${protobufVersion}">protobuf</feature>
+        <feature version="${protobufVersion}">protobuf-util</feature>
         <feature>rate-limited-logger</feature>
         <feature>sentinel-telemetry</feature>
         <feature>opennms-jest</feature>
@@ -143,7 +144,6 @@
         <feature>opennms-dnsresolver-netty</feature>
         <feature>sentinel-kvstore-api</feature>
         <feature>opennms-kafka</feature>
-        <bundle>mvn:com.google.protobuf/protobuf-java-util/${protobufVersion}</bundle>
         <bundle>mvn:org.opennms.features.flows/org.opennms.features.flows.kafka-persistence/${project.version}</bundle>
         <bundle>mvn:org.opennms.features.flows/org.opennms.features.flows.api/${project.version}</bundle>
         <bundle>mvn:org.opennms.features.flows.classification.engine/org.opennms.features.flows.classification.engine.api/${project.version}</bundle>

container/features/src/main/resources/features.xml

@@ -428,12 +428,12 @@
         <feature version="${guavaOsgiVersion}">guava</feature>
         <feature>javax.mail</feature>
         <feature>org.json</feature>
+        <feature version="${protobufVersion}">protobuf</feature>
         <feature>rate-limited-logger</feature>
         <feature>opennms-core</feature>
         <feature>opennms-distributed-core-api</feature>
         <feature>opennms-integration-api</feature>
         <feature>opennms-core-tracing</feature>
-        <bundle>mvn:com.google.protobuf/protobuf-java/${protobufVersion}</bundle>
         <bundle>mvn:org.opennms.core.ipc.sink/org.opennms.core.ipc.sink.api/${project.version}</bundle>
         <bundle>mvn:org.opennms.core.ipc.sink/org.opennms.core.ipc.sink.common/${project.version}</bundle>
         <bundle>mvn:org.opennms.core.ipc.sink/org.opennms.core.ipc.sink.xml/${project.version}</bundle>
@@ -948,30 +948,29 @@
     <feature name="opennms-kafka-producer" version="${project.version}" description="OpenNMS :: Kafka :: Producer">
         <feature version="${guavaOsgiVersion}">guava</feature>
         <feature version="${kafkaVersion}">kafka-streams</feature>
+        <feature version="${protobufVersion}">protobuf</feature>
         <feature>rate-limited-logger</feature>
         <feature>opennms-collection-api</feature>
         <feature>opennms-situation-feedback-api</feature>
-        <bundle>mvn:com.google.protobuf/protobuf-java/${protobufVersion}</bundle>
         <bundle>mvn:org.opennms.core.ipc.common/org.opennms.core.ipc.common.kafka/${project.version}</bundle>
         <bundle>mvn:org.opennms.features.kafka/org.opennms.features.kafka.producer/${project.version}</bundle>
     </feature>
     <feature name="opennms-kafka-consumer" version="${project.version}" description="OpenNMS :: Kafka :: Consumer">
+        <feature version="${protobufVersion}">protobuf</feature>
         <feature>opennms-kafka</feature>
         <feature>opennms-events-api</feature>
         <feature>opennms-model</feature>
-        <bundle>mvn:com.google.protobuf/protobuf-java/${protobufVersion}</bundle>
         <bundle>mvn:org.opennms.core.ipc.common/org.opennms.core.ipc.common.kafka/${project.version}</bundle>
         <bundle>mvn:org.opennms.features.kafka/org.opennms.features.kafka.consumer/${project.version}</bundle>
     </feature>
     <feature name="opennms-telemetry-collection" start-level="${earlyStartLevel}" version="${project.version}" description="OpenNMS :: Telemetry :: Collection">
         <feature version="${guavaOsgiVersion}">guava</feature>
         <feature version="${netty4Version}">netty</feature>
         <feature>dropwizard-metrics</feature>
+        <feature version="${protobufVersion}">protobuf</feature>
         <feature>opennms-collection-api</feature>
         <feature>opennms-thresholding-api</feature>
         <feature>opennms-osgi-jsr223</feature>
-        <bundle>mvn:com.google.protobuf/protobuf-java/${protobufVersion}</bundle>
-        <bundle>mvn:com.google.code.gson/gson/${gsonVersion}</bundle>
         <bundle>wrap:mvn:io.pkts/pkts-core/${pktsVersion}</bundle>
         <bundle>wrap:mvn:io.pkts/pkts-buffers/${pktsVersion}</bundle>
         <bundle>mvn:org.opennms.core/org.opennms.core.lib/${project.version}</bundle>
@@ -987,13 +986,13 @@
         <feature version="${netty4Version}">netty</feature>
         <feature>camel-spring</feature>
         <feature>dropwizard-metrics</feature>
+        <feature version="${protobufVersion}">protobuf</feature>
         <feature>opennms-core-daemon</feature>
         <feature>opennms-core-ipc-sink-api</feature>
         <feature>opennms-dao-api</feature>
         <feature>opennms-dao</feature>
         <feature>opennms-telemetry-collection</feature>
         <feature>opennms-util</feature>
-        <bundle dependency="true">mvn:com.google.protobuf/protobuf-java/${protobufVersion}</bundle>
         <bundle>mvn:org.opennms.features.telemetry/org.opennms.features.telemetry.api/${project.version}</bundle>
         <bundle>mvn:org.opennms.features.telemetry/org.opennms.features.telemetry.common/${project.version}</bundle>
         <bundle>mvn:org.opennms.features.telemetry/org.opennms.features.telemetry.registry/${project.version}</bundle>
@@ -1024,24 +1023,24 @@
         <feature>commons-net</feature>
     </feature>
     <feature name="opennms-telemetry-jti" start-level="${earlyStartLevel}" version="${project.version}" description="OpenNMS :: Telemetry :: JTI">
+        <feature version="${protobufVersion}">protobuf</feature>
         <feature>opennms-telemetry-collection</feature>
-        <bundle>mvn:com.google.protobuf/protobuf-java/${protobufVersion}</bundle>
         <bundle>mvn:org.opennms.features.telemetry.protocols.jti/org.opennms.features.telemetry.protocols.jti.adapter/${project.version}</bundle>
     </feature>
     <feature name="opennms-telemetry-nxos" start-level="${earlyStartLevel}" version="${project.version}" description="OpenNMS :: Telemetry :: NX-OS">
+        <feature version="${protobufVersion}">protobuf</feature>
         <feature>opennms-telemetry-collection</feature>
-        <bundle>mvn:com.google.protobuf/protobuf-java/${protobufVersion}</bundle>
         <bundle>mvn:org.opennms.features.telemetry.protocols.nxos/org.opennms.features.telemetry.protocols.nxos.adapter/${project.version}</bundle>
     </feature>
     <feature name="opennms-telemetry-graphite" start-level="${earlyStartLevel}" version="${project.version}" description="OpenNMS :: Telemetry :: Graphite">
         <feature>opennms-telemetry-collection</feature>
         <bundle>mvn:org.opennms.features.telemetry.protocols.graphite/org.opennms.features.telemetry.protocols.graphite.adapter/${project.version}</bundle>
     </feature>
     <feature name="opennms-telemetry-openconfig" start-level="${earlyStartLevel}" description="OpenNMS :: Telemetry :: OpenConfig" version="${project.version}">
+        <feature version="${protobufVersion}">protobuf</feature>
         <feature>opennms-telemetry-collection</feature>
         <feature>opennms-telemetry-openconfig-client</feature>
         <feature>opennms-rpc-utils</feature>
-        <bundle>mvn:com.google.protobuf/protobuf-java/${protobufVersion}</bundle>
         <bundle>mvn:org.opennms.core.grpc/org.opennms.core.grpc.osgi/${project.version}</bundle>
         <bundle>mvn:org.opennms.features.openconfig/org.opennms.features.openconfig.api/${project.version}</bundle>
         <bundle>mvn:org.opennms.features.openconfig/org.opennms.features.openconfig.common/${project.version}</bundle>
@@ -1097,18 +1096,20 @@
         <feature>bson</feature>
         <feature>commons-csv</feature>
         <feature>dropwizard-metrics</feature>
-        <feature>opennms-health</feature>
-        <feature>opennms-jest</feature>
         <feature version="${guavaOsgiVersion}">guava</feature>
         <feature version="${netty4Version}">netty</feature>
+        <feature version="${protobufVersion}">protobuf</feature>
+        <feature version="${protobufVersion}">protobuf-util</feature>
         <feature>quartz</feature>
+        <feature>rate-limited-logger</feature>
         <feature>opennms-core-tracing</feature>
         <feature>opennms-distributed-core-api</feature>
-        <feature>opennms-integration-api</feature>
-        <feature>opennms-telemetry-collection</feature>
         <feature>opennms-dnsresolver-api</feature>
+        <feature>opennms-health</feature>
+        <feature>opennms-integration-api</feature>
+        <feature>opennms-jest</feature>
         <feature>opennms-kafka</feature>
-        <feature>rate-limited-logger</feature>
+        <feature>opennms-telemetry-collection</feature>
         <bundle>mvn:org.opennms.features.flows/org.opennms.features.flows.api/${project.version}</bundle>
         <bundle>mvn:org.opennms.features.flows.classification.engine/org.opennms.features.flows.classification.engine.api/${project.version}</bundle>
         <bundle>mvn:org.opennms.features.flows.rest/org.opennms.features.flows.rest.api/${project.version}</bundle>
@@ -1123,8 +1124,6 @@
         <bundle>mvn:org.opennms.features.telemetry/org.opennms.features.telemetry.api/${project.version}</bundle>
         <bundle>mvn:org.opennms.features.telemetry/org.opennms.features.telemetry.common/${project.version}</bundle>
         <bundle>mvn:org.opennms.features.telemetry/org.opennms.features.telemetry.listeners/${project.version}</bundle>
-        <bundle>mvn:com.google.protobuf/protobuf-java/${protobufVersion}</bundle>
-        <bundle>mvn:com.google.protobuf/protobuf-java-util/${protobufVersion}</bundle>
         <bundle>mvn:org.opennms.features.telemetry.protocols/org.opennms.features.telemetry.protocols.common/${project.version}</bundle>
         <bundle>mvn:org.opennms.features.telemetry.protocols/org.opennms.features.telemetry.protocols.flows/${project.version}</bundle>
         <bundle>mvn:org.opennms.features.telemetry.protocols.netflow/org.opennms.features.telemetry.protocols.netflow.parser/${project.version}</bundle>
@@ -1786,7 +1785,7 @@
     <feature name="opennms-core-ipc-twin-common" description="OpenNMS :: Core :: IPC :: Twin :: Common" version="${project.version}">
         <feature version="${guavaOsgiVersion}">guava</feature>
         <feature>json-patch</feature>
-        <bundle>mvn:com.google.protobuf/protobuf-java/${protobufVersion}</bundle>
+        <feature version="${protobufVersion}">protobuf</feature>
         <bundle>mvn:org.opennms.core.ipc.twin/org.opennms.core.ipc.twin.api/${project.version}</bundle>
         <bundle>mvn:org.opennms.core.ipc.twin/org.opennms.core.ipc.twin.common/${project.version}</bundle>
     </feature>
@@ -1812,12 +1811,12 @@
     </feature>
 
     <feature name="opennms-core-ipc-twin-kafka-common" version="${project.version}" description="OpenNMS :: Core :: IPC :: Twin :: Kafka :: Common">
+        <feature version="${protobufVersion}">protobuf</feature>
         <feature>opennms-kafka</feature>
         <feature>opennms-core-ipc-twin-common</feature>
         <bundle>mvn:org.opennms.core.ipc.common/org.opennms.core.ipc.common.kafka/${project.version}</bundle>
         <bundle>mvn:org.opennms.core.ipc.twin.kafka/org.opennms.core.ipc.twin.kafka.common/${project.version}</bundle>
         <bundle>mvn:org.opennms.core/org.opennms.core.sysprops/${project.version}</bundle>
-        <bundle>mvn:com.google.protobuf/protobuf-java/${protobufVersion}</bundle>
     </feature>
     <feature name="opennms-core-ipc-twin-kafka" version="${project.version}" description="OpenNMS :: Core :: IPC :: Twin :: Kafka :: Subscriber">
         <feature>opennms-core-ipc-twin-kafka-common</feature>

core/ipc/rpc/kafka/pom.xml

@@ -12,12 +12,11 @@
     <packaging>bundle</packaging>
     <build>
       <!-- Enable below extension and plugin when you need to generate java source files from proto -->
-
-<!--      <extensions>
+      <!--<extensions>
         <extension>
           <groupId>kr.motd.maven</groupId>
           <artifactId>os-maven-plugin</artifactId>
-          <version>1.6.2</version>
+          <version>${maven.os.plugin.version}</version>
         </extension>
       </extensions>-->
         <plugins>
@@ -33,14 +32,13 @@
                     </instructions>
                 </configuration>
             </plugin>
-<!--            <plugin>
+            <!--<plugin>
               <groupId>org.xolstice.maven.plugins</groupId>
               <artifactId>protobuf-maven-plugin</artifactId>
-              <version>0.6.1</version>
               <configuration>
-                <protocArtifact>com.google.protobuf:protoc:3.6.1:exe:${os.detected.classifier}</protocArtifact>
+                <protocArtifact>com.google.protobuf:protoc:${protobufVersion}:exe:${os.detected.classifier}</protocArtifact>
                 <pluginId>grpc-java</pluginId>
-                <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.24.0:exe:${os.detected.classifier}</pluginArtifact>
+                <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpcVersion}:exe:${os.detected.classifier}</pluginArtifact>
               </configuration>
               <executions>
                 <execution>
@@ -65,10 +63,10 @@
         <version>${project.version}</version>
       </dependency>
       <dependency>
-	    <groupId>org.opennms.features.distributed</groupId>
-	    <artifactId>core-api</artifactId>
-	    <version>${project.version}</version>
-	    <scope>provided</scope>
+        <groupId>org.opennms.features.distributed</groupId>
+        <artifactId>core-api</artifactId>
+        <version>${project.version}</version>
+        <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.opennms.core</groupId>