You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2020/09/05 21:10:31 UTC
[incubator-streampipes-extensions] branch dev updated: [hotfix] Fix
dependency convergence problem
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
The following commit(s) were added to refs/heads/dev by this push:
new c1f1d79 [hotfix] Fix dependency convergence problem
c1f1d79 is described below
commit c1f1d7906acf6bf369d5b107e371acb94fd87e7c
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Sat Sep 5 23:09:09 2020 +0200
[hotfix] Fix dependency convergence problem
---
pom.xml | 15 ++++++++++++++-
streampipes-connect-adapters/pom.xml | 10 ++++++++++
streampipes-sinks-databases-jvm/pom.xml | 6 ++++++
3 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 40a3088..255c493 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,6 +111,7 @@
<animal-sniffer-annotations.version>1.17</animal-sniffer-annotations.version>
<bcprov.version>1.61</bcprov.version>
<checker-qual.version>2.5.2</checker-qual.version>
+ <commons-collections4.version>4.4</commons-collections4.version>
<commons-compress.version>1.18</commons-compress.version>
<commons-text.version>1.8</commons-text.version>
<errorprone-annotations.version>2.2.0</errorprone-annotations.version>
@@ -120,7 +121,7 @@
<jsrosbridge.version>0.2.0</jsrosbridge.version>
<influxdb.java.version>2.14</influxdb.java.version>
<hadoop.version>3.2.1</hadoop.version>
- <eclipse.milo.version>0.4.0</eclipse.milo.version>
+ <eclipse.milo.version>0.4.3</eclipse.milo.version>
<mysql-binlog-connector.version>0.18.1</mysql-binlog-connector.version>
<mysql-connector-java.version>8.0.15</mysql-connector-java.version>
<netty.version>4.1.39.Final</netty.version>
@@ -154,6 +155,11 @@
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>${commons-collections4.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>${commons-compress.version}</version>
</dependency>
@@ -616,6 +622,13 @@
<scope>test</scope>
</dependency>
+ <!-- dependency convergence -->
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.4.0-b180725.0644</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
diff --git a/streampipes-connect-adapters/pom.xml b/streampipes-connect-adapters/pom.xml
index 29e23f9..0ef3234 100644
--- a/streampipes-connect-adapters/pom.xml
+++ b/streampipes-connect-adapters/pom.xml
@@ -233,6 +233,16 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+
+ <!-- dependency convergence -->
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/streampipes-sinks-databases-jvm/pom.xml b/streampipes-sinks-databases-jvm/pom.xml
index aad8ff2..bde459e 100644
--- a/streampipes-sinks-databases-jvm/pom.xml
+++ b/streampipes-sinks-databases-jvm/pom.xml
@@ -114,6 +114,12 @@
<artifactId>classindex</artifactId>
</dependency>
+ <!-- dependency convergence -->
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ </dependency>
+
</dependencies>
<build>