NMS-17001 Successfully installed ALEC Develop in OPENNMS Develop. Mod…

…ified some versions and added a new dependency
OpenNMS · Feb 6, 2025 · b11e856 · b11e856
1 parent 2a2dcbd
commit b11e856
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/karaf-features/src/main/resources/features.xml b/karaf-features/src/main/resources/features.xml
@@ -31,6 +31,7 @@
         <feature version="${kafka.version}">alec-dependency-kafka-streams</feature>
         <feature version="${project.version}">alec-integrations-opennms-sink</feature>
         <bundle dependency="true">mvn:com.google.guava/guava/${guava.version}</bundle>
+        <bundle dependency="true">mvn:com.google.guava/failureaccess/${failureaccess.version}</bundle>
         <bundle dependency="true">mvn:com.google.protobuf/protobuf-java/${protobuf.version}</bundle>
         <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/${okio.bundle.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/${okhttp.bundle.version}</bundle>
@@ -44,6 +45,7 @@
         <feature dependency="true">aries-blueprint</feature>
         <feature version="${opennms.api.version}" dependency="true">opennms-integration-api</feature>
         <bundle dependency="true">mvn:com.google.guava/guava/${guava.version}</bundle>
+        <bundle dependency="true">mvn:com.google.guava/failureaccess/${failureaccess.version}</bundle>
         <feature dependency="true" version="${project.version}">alec-datasource-opennms-common</feature>
         <!-- Automatically install the standalone processor when using the direct datasource -->
         <feature version="${project.version}">alec-processor-standalone</feature>
@@ -122,11 +124,13 @@
         <bundle>mvn:org.opennms.alec.wrap/org.opennms.alec.wrap.jung/${project.version}</bundle>
         <bundle>mvn:org.opennms.alec.features.graph/org.opennms.alec.features.graph.api/${project.version}</bundle>
         <bundle dependency="true">mvn:com.google.guava/guava/${guava.version}</bundle>
+        <bundle dependency="true">mvn:com.google.guava/failureaccess/${failureaccess.version}</bundle>
     </feature>
 
     <feature name="alec-features-graph-graphml" description="ALEC :: Features :: Graph :: GraphML" version="${project.version}">
         <feature version="${moxy.version}" dependency="true">alec-dependency-moxy</feature>
         <bundle dependency="true">mvn:com.google.guava/guava/${guava.version}</bundle>
+        <bundle dependency="true">mvn:com.google.guava/failureaccess/${failureaccess.version}</bundle>
         <bundle>mvn:org.opennms.alec.features.graph/org.opennms.alec.features.graph.graphml/${project.version}</bundle>
     </feature>
 
@@ -176,6 +180,7 @@
         <bundle>mvn:org.opennms.alec.features/org.opennms.alec.features.score/${project.version}</bundle>
         <bundle dependency="true">mvn:org.apache.commons/commons-math3/${commons.math.version}</bundle>
         <bundle dependency="true">mvn:com.google.guava/guava/${guava.version}</bundle>
+        <bundle dependency="true">mvn:com.google.guava/failureaccess/${failureaccess.version}</bundle>
     </feature>
 
     <feature name="alec-features-shell" description="ALEC :: Features :: Shell" version="${project.version}">
@@ -209,6 +214,7 @@
         <feature version="${opennms.api.version}" dependency="true">opennms-integration-api</feature>
         <bundle dependency="true">wrap:mvn:com.google.code.gson/gson/${gson.version}</bundle>
         <bundle dependency="true">mvn:com.google.guava/guava/${guava.version}</bundle>
+        <bundle dependency="true">mvn:com.google.guava/failureaccess/${failureaccess.version}</bundle>
         <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.snmp4j/${snmp4j.bundle.version}</bundle>
         <bundle>mvn:org.opennms.alec.integrations.opennms/config/${project.version}</bundle>
         <bundle>mvn:org.opennms.alec.integrations.opennms/extension/${project.version}</bundle>

diff --git a/pom.xml b/pom.xml
@@ -55,8 +55,9 @@
         <commons.text.version>1.3</commons.text.version>
         <cxf.version>3.2.6</cxf.version>
         <drools.version>7.7.0.Final</drools.version>
-        <guava.major.version>24</guava.major.version>
-        <guava.version>24.1.1-jre</guava.version>
+        <guava.major.version>30</guava.major.version>
+        <guava.version>30.1.1-jre</guava.version>
+        <failureaccess.version>1.0.1</failureaccess.version>
         <groovy.version>2.4.16</groovy.version>
         <gson.version>2.8.2</gson.version>
         <hamcrest.version>1.3</hamcrest.version>
@@ -69,7 +70,7 @@
         <kafka.bundle.version>3.1.0_1</kafka.bundle.version>
         <kafka.scala.version>2.13</kafka.scala.version>
         <kafka.version>3.1.0</kafka.version>
-        <karaf.version>4.3.6</karaf.version>
+        <karaf.version>4.3.10</karaf.version>
         <log4j.version>2.17.0</log4j.version>
         <lz4.version>1.6.0</lz4.version>
         <metrics.version>4.1.0</metrics.version>