Fix dependency convergence in sinks-databases modules (#1015)

apache · Jan 3, 2023 · e71e561 · e71e561
1 parent 0d42d9a
commit e71e561
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -75,6 +75,7 @@
 	<jakarta-servlet-api.version>6.0.0</jakarta-servlet-api.version>
 	<jakarta-validation.version>3.0.2</jakarta-validation.version>
 	<jakarta-xml-bind-api.version>4.0.0</jakarta-xml-bind-api.version>
+	<javax.xml.bind.version>2.4.0-b180725.0427</javax.xml.bind.version>
 	<javapoet.version>1.6.1</javapoet.version>
 	<jakarta-json.version>2.0.1</jakarta-json.version>
 	<jakarta-persistence-api.version>3.0.1</jakarta-persistence-api.version>
@@ -158,7 +159,7 @@
 	<errorprone-annotations.version>2.2.0</errorprone-annotations.version>
 	<google-maps-services.version>0.10.0</google-maps-services.version>
 	<graalvm.js.version>21.3.0</graalvm.js.version>
-	<iotdb.version>0.12.0</iotdb.version>
+	<iotdb.version>1.0.0</iotdb.version>
 	<java-websocket.version>1.5.0</java-websocket.version>
 	<jakarta-websocket-client-api.version>2.1.0</jakarta-websocket-client-api.version>
 	<jaxb-runtime.version>2.3.2</jaxb-runtime.version>
@@ -471,6 +472,11 @@
 					<artifactId>jakarta.ws.rs-api</artifactId>
 					<version>${jakarta.ws.rs.version}</version>
 				</dependency>
+				<dependency>
+					<groupId>javax.xml.bind</groupId>
+					<artifactId>jaxb-api</artifactId>
+					<version>${javax.xml.bind.version}</version>
+				</dependency>
 				<dependency>
 					<groupId>net.minidev</groupId>
 					<artifactId>json-smart</artifactId>

diff --git a/streampipes-extensions/streampipes-sinks-databases-jvm/pom.xml b/streampipes-extensions/streampipes-sinks-databases-jvm/pom.xml
@@ -111,6 +111,12 @@
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
         </dependency>
+
+        <!-- remove these javax dependencies whenever possible -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/streampipes-maven-plugin/pom.xml b/streampipes-maven-plugin/pom.xml
@@ -222,12 +222,6 @@
                             <goal>descriptor</goal>
                         </goals>
                     </execution>
-                    <execution>
-                        <id>help-goal</id>
-                        <goals>
-                            <goal>helpmojo</goal>
-                        </goals>
-                    </execution>
                 </executions>
             </plugin>
             <plugin>