diff --git a/.circleci/config.yml b/.circleci/config.yml index d718b0d2..828cab55 100644 --- 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 index 898fbab1..a27a42d3 100644 --- a/datasource/opennms-direct/pom.xml +++ b/datasource/opennms-direct/pom.xml @@ -21,7 +21,7 @@ ${project.artifactId} ${project.version} - 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 index b16cb43e..50b9215a 100644 --- 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 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 index 33da1ab5..3b51b659 100644 --- 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 index f396a22b..f426194d 100644 --- a/driver/main/pom.xml +++ b/driver/main/pom.xml @@ -20,6 +20,7 @@ JavaSE-${java.version} + org.opennms.integration.api.*;version="${opennms.api.version.range}", com.google.common.*;version="${guava.major.version}", * diff --git a/features/ui/pom.xml b/features/ui/pom.xml index bd492f5b..a2bdecb9 100644 --- a/features/ui/pom.xml +++ b/features/ui/pom.xml @@ -23,6 +23,7 @@ ${project.artifactId} ${project.version} + org.opennms.integration.api.*;version="${opennms.api.version.range}", com.google.common.*;version="${guava.major.version}", * diff --git a/karaf-features/src/main/resources/features.xml b/karaf-features/src/main/resources/features.xml index cff6da97..3509a165 100644 --- a/karaf-features/src/main/resources/features.xml +++ b/karaf-features/src/main/resources/features.xml @@ -1,5 +1,5 @@ - + diff --git a/pom.xml b/pom.xml index f947142a..7880cfb4 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 2.8.2 1.3 2.3.3 - 11 + 17 2.12.3 2.1.1 2.1.1 @@ -79,8 +79,9 @@ 3.10.0 1.14.0_1 3.10.0_2 - 1.0.0 - 2.0.0 + 2.0.0 + 3.0.0 + [1.6,3.0) 2.6.1 6.0.0 5.0.0 @@ -423,6 +424,10 @@ JavaSE-${java.version} + + org.opennms.integration.api.*;version="${opennms.api.version.range}", + * + @@ -530,8 +535,7 @@ maven-surefire-plugin 2.22.1 - - -Xmx1024m -Xms1024m -XX:MaxPermSize=512m -Djdk.net.URLClassPath.disableClassPathURLCheck=true + -Xmx1024m -Xms1024m diff --git a/processor/redundant/pom.xml b/processor/redundant/pom.xml index 9cacb384..187cfd57 100644 --- a/processor/redundant/pom.xml +++ b/processor/redundant/pom.xml @@ -23,6 +23,7 @@ org.opennms.alec.processor.redundant * + org.opennms.integration.api.*;version="${opennms.api.version.range}", com.google.common.*;version="${guava.major.version}", * 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 index 39bdfead..9fe3339b 100644 --- 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 index 3783ba67..0a7406e0 100644 --- 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