Bump OIA and add support for compiling on JDK11

OpenNMS · Jan 12, 2022 · abcbb3a · abcbb3a
1 parent 988eddf
commit abcbb3a
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 6 deletions.
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:1.8.0.252.b09-3.6.3-b5231
+      - image: opennms/build-env:11.0.12.0.7-3.6.3-b7295
         environment:
           MAVEN_OPTS: -Xmx2g
 
   build-debian-executor:
     docker:
-      - image: circleci/openjdk:8u212-jdk-stretch
+      - image: cimg/openjdk:11.0.13
         environment:
           MAVEN_OPTS: -Xmx2g
 

diff --git a/datasource/jaxb/pom.xml b/datasource/jaxb/pom.xml
@@ -16,7 +16,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxb2-maven-plugin</artifactId>
-                <version>2.3.1</version>
+                <version>2.5.0</version>
                 <executions>
                     <execution>
                         <id>xjc</id>
@@ -42,6 +42,11 @@
                         <artifactId>jaxb2-basics</artifactId>
                         <version>0.11.1</version>
                     </dependency>
+                    <dependency>
+                        <groupId>jakarta.xml.bind</groupId>
+                        <artifactId>jakarta.xml.bind-api</artifactId>
+                        <version>${jakarta.version}</version>
+                    </dependency>
                 </dependencies>
             </plugin>
             <plugin>
@@ -90,6 +95,10 @@
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
         </dependency>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+        </dependency>
 
         <!-- Test -->
         <dependency>

diff --git a/datasource/opennms-kafka/pom.xml b/datasource/opennms-kafka/pom.xml
@@ -123,6 +123,10 @@
             <artifactId>resilience4j-retry</artifactId>
             <version>${resilience4j.version}</version>
         </dependency>
+        <dependency>
+           <groupId>jakarta.xml.bind</groupId>
+           <artifactId>jakarta.xml.bind-api</artifactId>
+        </dependency>
 
         <!-- Test -->
         <dependency>

diff --git a/features/graph/graphml/pom.xml b/features/graph/graphml/pom.xml
@@ -46,6 +46,10 @@
       <groupId>org.eclipse.persistence</groupId>
       <artifactId>org.eclipse.persistence.moxy</artifactId>
     </dependency>
+    <dependency>
+       <groupId>jakarta.xml.bind</groupId>
+       <artifactId>jakarta.xml.bind-api</artifactId>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/pom.xml b/pom.xml
@@ -59,7 +59,8 @@
         <groovy.version>2.4.16</groovy.version>
         <gson.version>2.8.2</gson.version>
         <hamcrest.version>1.3</hamcrest.version>
-        <java.version>1.8</java.version>
+        <jakarta.version>2.3.3</jakarta.version>
+        <java.version>11</java.version>
         <jackson.version>2.9.9</jackson.version>
         <jackson-annotations.version>2.9.0</jackson-annotations.version>
         <jung.version>2.1.1</jung.version>
@@ -76,7 +77,7 @@
         <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>0.4.1</opennms.api.version>
+        <opennms.api.version>0.8.0-SNAPSHOT</opennms.api.version>
         <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>
@@ -377,6 +378,11 @@
                 <artifactId>org.apache.karaf.shell.core</artifactId>
                 <version>${karaf.version}</version>
             </dependency>
+            <dependency>
+                <groupId>jakarta.xml.bind</groupId>
+                <artifactId>jakarta.xml.bind-api</artifactId>
+                <version>${jakarta.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -386,7 +392,7 @@
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>5.1.4</version>
                     <extensions>true</extensions>
                     <configuration>
                         <instructions>