Skip to content

Commit 65c067e

Browse files
committed
MPLUG-91: Upgrade to use integration api 2.0.0
1 parent c1204cb commit 65c067e

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ version: 2.1
33
executors:
44
build-executor:
55
docker:
6-
- image: opennms/build-env:11.0.14_9-3.8.4-b8249
6+
- image: cimg/openjdk:17.0
77
environment:
88
MAVEN_OPTS: -Xmx2g
99

1010
build-debian-executor:
1111
docker:
12-
- image: cimg/openjdk:11.0.13
12+
- image: cimg/openjdk:17.0
1313
environment:
1414
MAVEN_OPTS: -Xmx2g
1515

@@ -19,7 +19,7 @@ executors:
1919
machine:
2020
image: ubuntu-2204:current
2121
environment:
22-
JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
22+
JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64
2323
MAVEN_OPTS: -Xmx3200m
2424
TESTCONTAINERS_RYUK_DISABLED: true
2525
KEEP_TMP_OVERLAY: true
@@ -174,7 +174,7 @@ commands:
174174
- run:
175175
name: Run the tests
176176
command: |
177-
sudo apt update && sudo apt install -y openjdk-11-jdk
177+
sudo apt update && sudo apt install -y openjdk-17-jdk
178178
mkdir $TEST_RECORDING_DIR
179179
mvn install --projects org.opennms.alec:smoke-test --also-make -DskipTests=true
180180
cd smoke-test

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<gson.version>2.8.2</gson.version>
6363
<hamcrest.version>1.3</hamcrest.version>
6464
<jakarta.version>2.3.3</jakarta.version>
65-
<java.version>11</java.version>
65+
<java.version>17</java.version>
6666
<jackson.version>2.12.3</jackson.version>
6767
<jaxrs.version>2.1.1</jaxrs.version>
6868
<jung.version>2.1.1</jung.version>
@@ -79,8 +79,8 @@
7979
<okhttp.version>3.10.0</okhttp.version>
8080
<okio.bundle.version>1.14.0_1</okio.bundle.version>
8181
<okhttp.bundle.version>3.10.0_2</okhttp.bundle.version>
82-
<opennms.api.version>1.0.0</opennms.api.version>
83-
<opennms.api.version.max>2.0.0</opennms.api.version.max><!-- exclusive ver. allowed for packages dependency rpm & deb-->
82+
<opennms.api.version>2.0.0</opennms.api.version>
83+
<opennms.api.version.max>3.0.0</opennms.api.version.max><!-- exclusive ver. allowed for packages dependency rpm & deb-->
8484
<sink.protobuf.version>2.6.1</sink.protobuf.version>
8585
<osgi.version>6.0.0</osgi.version>
8686
<osgi.compendium.version>5.0.0</osgi.compendium.version>

0 commit comments

Comments
 (0)