Merge pull request #151 from OpenNMS/cg/jira/MPLUG-91

cgorantla · web-flow · commit 5adc2256e2f4 · 2026-03-10T21:14:38.000-04:00
MPLUG-91: Upgrade to use integration api 2.0.0
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,13 +3,13 @@ version: 2.1
 executors:
   build-executor:
     docker:
-      - image: opennms/build-env:11.0.14_9-3.8.4-b8249
+      - image: opennms/build-env:17.0.6.0.10-3.8.8-b10459
         environment:
           MAVEN_OPTS: -Xmx2g
 
   build-debian-executor:
     docker:
-      - image: cimg/openjdk:11.0.13
+      - image: cimg/openjdk:17.0
         environment:
           MAVEN_OPTS: -Xmx2g
 
@@ -19,7 +19,7 @@ executors:
     machine:
       image: ubuntu-2204:current
     environment:
-      JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
+      JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64
       MAVEN_OPTS: -Xmx3200m
       TESTCONTAINERS_RYUK_DISABLED: true
       KEEP_TMP_OVERLAY: true
@@ -174,7 +174,7 @@ commands:
       - run:
           name: Run the tests
           command: |
-            sudo apt update && sudo apt install -y openjdk-11-jdk
+            sudo apt update && sudo apt install -y openjdk-17-jdk
             mkdir $TEST_RECORDING_DIR
             mvn install --projects org.opennms.alec:smoke-test --also-make -DskipTests=true
             cd smoke-test
@@ -241,13 +241,6 @@ jobs:
       - attach_workspace:
           at: ~/
 
-      - run:
-          name: Update Repo list
-          command: |
-            sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/CentOS-*.repo
-            sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/CentOS-*.repo
-            sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/CentOS-*.repo
-
       - sign-packages/install-rpm-dependencies:
           skip_if_forked_pr: true
       - sign-packages/setup-env:
@@ -321,6 +314,11 @@ jobs:
       - attach_workspace:
           at: ~/
 
+      - run:
+          name: Install build dependencies
+          command: |
+            sudo apt-get update && sudo apt-get install -y fakeroot dpkg-dev debhelper
+
       - sign-packages/install-deb-dependencies:
           skip_if_forked_pr: true
           use_sudo: true
diff --git a/datasource/opennms-direct/pom.xml b/datasource/opennms-direct/pom.xml
@@ -21,7 +21,7 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Version>${project.version}</Bundle-Version>
                         <Import-Package>
-                            org.opennms.integration.api.v1.model,
+                            org.opennms.integration.api.*;version="${opennms.api.version.range}",
                             org.opennms.alec.datasource.api,
                             org.opennms.alec.datasource.common,
                             org.opennms.alec.datasource.common.inventory,
diff --git a/datasource/opennms-kafka/src/test/java/org/opennms/alec/datasource/opennms/OpennmsDatasourceIT.java b/datasource/opennms-kafka/src/test/java/org/opennms/alec/datasource/opennms/OpennmsDatasourceIT.java
@@ -71,6 +71,8 @@ public abstract class OpennmsDatasourceIT {
 
     @Before
     public void setUp() throws IOException {
+        System.setProperty("karaf.data", temporaryFolder.getRoot().getAbsolutePath());
+
         // Create the producer
         Map<String, Object> senderProps = KafkaTestUtils.producerProps(embeddedKafkaRule.getEmbeddedKafka());
         senderProps.put("key.serializer", StringSerializer.class.getCanonicalName());
diff --git a/datasource/opennms-kafka/src/test/java/org/opennms/alec/datasource/opennms/OpennmsDatasourceStoreTest.java b/datasource/opennms-kafka/src/test/java/org/opennms/alec/datasource/opennms/OpennmsDatasourceStoreTest.java
@@ -88,6 +88,7 @@ public void canBuildAndMaintainStores() throws IOException {
         datasource.setInventoryGcIntervalMs(step);
 
         Topology topology = datasource.getKTopology();
+        System.setProperty("karaf.data", temporaryFolder.getRoot().getAbsolutePath());
         Properties props = datasource.loadStreamsProperties();
         props.put(StreamsConfig.APPLICATION_ID_CONFIG, "test");
         props.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, "dummy:1234");
diff --git a/driver/main/pom.xml b/driver/main/pom.xml
@@ -20,6 +20,7 @@
                     <instructions>
                         <Bundle-RequiredExecutionEnvironment>JavaSE-${java.version}</Bundle-RequiredExecutionEnvironment>
                         <Import-Package>
+                            org.opennms.integration.api.*;version="${opennms.api.version.range}",
                             com.google.common.*;version="${guava.major.version}",
                             *
                         </Import-Package>
diff --git a/features/ui/pom.xml b/features/ui/pom.xml
@@ -23,6 +23,7 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Version>${project.version}</Bundle-Version>
                         <Import-Package>
+                            org.opennms.integration.api.*;version="${opennms.api.version.range}",
                             com.google.common.*;version="${guava.major.version}",
                             *
                         </Import-Package>
diff --git a/karaf-features/src/main/resources/features.xml b/karaf-features/src/main/resources/features.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features name="alec-features" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
+<features name="alec-features" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0">
 
     <!-- Datasources -->
 
diff --git a/pom.xml b/pom.xml
@@ -62,7 +62,7 @@
         <gson.version>2.8.2</gson.version>
         <hamcrest.version>1.3</hamcrest.version>
         <jakarta.version>2.3.3</jakarta.version>
-        <java.version>11</java.version>
+        <java.version>17</java.version>
         <jackson.version>2.12.3</jackson.version>
         <jaxrs.version>2.1.1</jaxrs.version>
         <jung.version>2.1.1</jung.version>
@@ -79,8 +79,9 @@
         <okhttp.version>3.10.0</okhttp.version>
         <okio.bundle.version>1.14.0_1</okio.bundle.version>
         <okhttp.bundle.version>3.10.0_2</okhttp.bundle.version>
-        <opennms.api.version>1.0.0</opennms.api.version>
-        <opennms.api.version.max>2.0.0</opennms.api.version.max><!-- exclusive ver. allowed for packages dependency rpm & deb-->
+        <opennms.api.version>2.0.0</opennms.api.version>
+        <opennms.api.version.max>3.0.0</opennms.api.version.max><!-- exclusive ver. allowed for packages dependency rpm & deb-->
+        <opennms.api.version.range>[1.6,3.0)</opennms.api.version.range>
         <sink.protobuf.version>2.6.1</sink.protobuf.version>
         <osgi.version>6.0.0</osgi.version>
         <osgi.compendium.version>5.0.0</osgi.compendium.version>
@@ -423,6 +424,10 @@
                     <configuration>
                         <instructions>
                             <Bundle-RequiredExecutionEnvironment>JavaSE-${java.version}</Bundle-RequiredExecutionEnvironment>
+                            <Import-Package>
+                                org.opennms.integration.api.*;version="${opennms.api.version.range}",
+                                *
+                            </Import-Package>
                         </instructions>
                     </configuration>
                 </plugin>
@@ -530,8 +535,7 @@
             <artifactId>maven-surefire-plugin</artifactId>
             <version>2.22.1</version>
             <configuration>
-                <!-- see: https://stackoverflow.com/questions/53010200/maven-surefire-could-not-find-forkedbooter-class -->
-                <argLine>-Xmx1024m -Xms1024m -XX:MaxPermSize=512m -Djdk.net.URLClassPath.disableClassPathURLCheck=true</argLine>
+                <argLine>-Xmx1024m -Xms1024m</argLine>
             </configuration>
           </plugin>
           <plugin>
diff --git a/processor/redundant/pom.xml b/processor/redundant/pom.xml
@@ -23,6 +23,7 @@
                         <Export-Package>org.opennms.alec.processor.redundant</Export-Package>
                         <Karaf-Commands>*</Karaf-Commands>
                         <Import-Package>
+                            org.opennms.integration.api.*;version="${opennms.api.version.range}",
                             com.google.common.*;version="${guava.major.version}",
                             *
                         </Import-Package>
diff --git a/smoke-test/src/main/java/org/opennms/alec/smoke/util/Karaf.java b/smoke-test/src/main/java/org/opennms/alec/smoke/util/Karaf.java
@@ -77,7 +77,7 @@ public static void waitForBundleActive(String bundleName, InetSocketAddress serv
                 .pollInterval(5, TimeUnit.SECONDS)
                 .ignoreExceptions()
                 .until(() -> {
-                    String[] output = runKarafCommands(serviceAddress, "bundle:list -s").split("\n");
+                    String[] output = runKarafCommands(serviceAddress, "bundle:list -s --no-format").split("\n");
                     return Arrays.stream(output).anyMatch(row -> row.contains(bundleName) &&
                             row.contains("Active"));
                 });
diff --git a/smoke-test/src/main/resources/docker_fixed_images b/smoke-test/src/main/resources/docker_fixed_images
@@ -1,12 +1,12 @@
 # Use this file for docker images/tags that are fixed to a specific version and aren't changing
 # These will be eligible for caching in the CI system
 
-alpine=alpine:3.5
+alpine=alpine:3.20
 helm=opennms/helm:2.0.0
 # Note the tag version should match the confluent version being used by the kafka container
 kafka=confluentinc/cp-kafka:7.0.0
-postgres=postgres:10.7-alpine
+postgres=postgres:15-alpine
 # Note this tag version should match the selenium version in the POM
 selenium=selenium/standalone-chrome-debug:3.4.0
-sentinel=opennms/sentinel:30.0.0
-opennms=opennms/horizon:30.0.0
+sentinel=opennms/sentinel:35.0.3
+opennms=opennms/horizon:35.0.3

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`<instructions>`
`21`	`21`	`<Bundle-RequiredExecutionEnvironment>JavaSE-${java.version}</Bundle-RequiredExecutionEnvironment>`
`22`	`22`	`<Import-Package>`
	`23`	`+ org.opennms.integration.api.*;version="${opennms.api.version.range}",`
`23`	`24`	`com.google.common.*;version="${guava.major.version}",`
`24`	`25`	`*`
`25`	`26`	`</Import-Package>`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>`
`24`	`24`	`<Bundle-Version>${project.version}</Bundle-Version>`
`25`	`25`	`<Import-Package>`
	`26`	`+ org.opennms.integration.api.*;version="${opennms.api.version.range}",`
`26`	`27`	`com.google.common.*;version="${guava.major.version}",`
`27`	`28`	`*`
`28`	`29`	`</Import-Package>`