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/04/24 18:24:25 UTC
[incubator-streampipes-extensions] branch dev updated: Resolve some
dependency convergence issues
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 83ab3e7 Resolve some dependency convergence issues
83ab3e7 is described below
commit 83ab3e78e6341facbb67764597087daf6fc08015
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Fri Apr 24 20:24:10 2020 +0200
Resolve some dependency convergence issues
---
pom.xml | 24 +++++++++++++++++++-----
streampipes-pipeline-elements-all-jvm/pom.xml | 10 ++++++++++
streampipes-processors-filters-siddhi/pom.xml | 10 ++++++++++
streampipes-sinks-databases-jvm/pom.xml | 10 ++++++++++
4 files changed, 49 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 34f5b04..82a1883 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,6 +65,7 @@
<amqp-client.version>4.1.0</amqp-client.version>
<boofcv.version>0.33</boofcv.version>
+ <classindex.version>3.9</classindex.version>
<commons-math3.version>3.6.1</commons-math3.version>
<ditto-client.version>1.0.0</ditto-client.version>
<data-generator.version>1.4.1</data-generator.version>
@@ -73,6 +74,7 @@
<language-detector.version>0.6</language-detector.version>
<log4j-to-slf4j.version>2.8.2</log4j-to-slf4j.version>
<mailapi.version>1.4.3</mailapi.version>
+ <metrics-core.version>3.1.2</metrics-core.version>
<milo.version>2.22.1</milo.version>
<nekohtml.version>1.9.13</nekohtml.version>
<okhttp.version>3.13.1</okhttp.version>
@@ -212,6 +214,11 @@
<version>${slack-api.version}</version>
</dependency>
<dependency>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ <version>${metrics-core.version}</version>
+ </dependency>
+ <dependency>
<groupId>javax.mail</groupId>
<artifactId>mailapi</artifactId>
<version>${mailapi.version}</version>
@@ -277,11 +284,21 @@
<version>${pulsar.version}</version>
</dependency>
<dependency>
+ <groupId>org.atteo.classindex</groupId>
+ <artifactId>classindex</artifactId>
+ <version>${classindex.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.boofcv</groupId>
<artifactId>boofcv-core</artifactId>
<version>${boofcv.version}</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.ditto</groupId>
+ <artifactId>ditto-client</artifactId>
+ <version>${ditto-client.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<version>${elasticsearch.version}</version>
@@ -322,6 +339,8 @@
<version>${hawtbuf.version}</version>
</dependency>
+
+
<!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
@@ -346,11 +365,6 @@
<version>${streampipes.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.eclipse.ditto</groupId>
- <artifactId>ditto-client</artifactId>
- <version>${ditto-client.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/streampipes-pipeline-elements-all-jvm/pom.xml b/streampipes-pipeline-elements-all-jvm/pom.xml
index 45ca3cf..5285468 100644
--- a/streampipes-pipeline-elements-all-jvm/pom.xml
+++ b/streampipes-pipeline-elements-all-jvm/pom.xml
@@ -94,6 +94,16 @@
<version>0.65.1-SNAPSHOT</version>
<classifier>embed</classifier>
</dependency>
+
+ <!-- 3rd party dependencies to avoid convergence errors -->
+ <dependency>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.atteo.classindex</groupId>
+ <artifactId>classindex</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/streampipes-processors-filters-siddhi/pom.xml b/streampipes-processors-filters-siddhi/pom.xml
index 00a4821..8296164 100644
--- a/streampipes-processors-filters-siddhi/pom.xml
+++ b/streampipes-processors-filters-siddhi/pom.xml
@@ -76,6 +76,16 @@
</exclusions>
</dependency>
+ <!-- 3rd party dependencies to avoid convergence errors -->
+ <dependency>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.atteo.classindex</groupId>
+ <artifactId>classindex</artifactId>
+ </dependency>
+
<!-- Test dependencies -->
<dependency>
diff --git a/streampipes-sinks-databases-jvm/pom.xml b/streampipes-sinks-databases-jvm/pom.xml
index 9a0b3b5..afc0a5b 100644
--- a/streampipes-sinks-databases-jvm/pom.xml
+++ b/streampipes-sinks-databases-jvm/pom.xml
@@ -97,6 +97,16 @@
<version>${ditto-client.version}</version>
</dependency>
+ <!-- 3rd party dependencies to avoid convergence errors -->
+ <dependency>
+ <groupId>io.dropwizard.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.atteo.classindex</groupId>
+ <artifactId>classindex</artifactId>
+ </dependency>
+
</dependencies>
<build>