This is an automated email from the ASF dual-hosted git repository.

riemer pushed a commit to branch dev
in repository 
https://gitbox.apache.org/repos/asf/incubator-streampipes-extensions.git

commit f7d2bbd5eb5b5ce7b784272f2baf769aeda948aa
Author: Dominik Riemer <[email protected]>
AuthorDate: Wed Feb 24 08:25:29 2021 +0100

    [hotfix] Resolve dependency conflict
---
 pom.xml                                 | 11 ++++++++++-
 streampipes-sinks-databases-jvm/pom.xml |  8 ++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bcbb776..2781982 100644
--- a/pom.xml
+++ b/pom.xml
@@ -658,11 +658,20 @@
 
             <!-- dependency convergence -->
             <dependency>
+                <groupId>jakarta.activation</groupId>
+                <artifactId>jakarta.activation-api</artifactId>
+                <version>1.2.2</version>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.xml.bind</groupId>
+                <artifactId>jakarta.xml.bind-api</artifactId>
+                <version>2.3.3</version>
+            </dependency>
+            <dependency>
                 <groupId>org.glassfish.jaxb</groupId>
                 <artifactId>jaxb-runtime</artifactId>
                 <version>2.3.3</version>
             </dependency>
-
         </dependencies>
     </dependencyManagement>
 
diff --git a/streampipes-sinks-databases-jvm/pom.xml 
b/streampipes-sinks-databases-jvm/pom.xml
index 177d67c..1bce192 100644
--- a/streampipes-sinks-databases-jvm/pom.xml
+++ b/streampipes-sinks-databases-jvm/pom.xml
@@ -120,6 +120,14 @@
 
         <!-- dependency convergence -->
         <dependency>
+            <groupId>jakarta.activation</groupId>
+            <artifactId>jakarta.activation-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-runtime</artifactId>
         </dependency>

Reply via email to