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 23:11:50 UTC
[incubator-streampipes] branch dev updated: [hotfix] Resolve
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.git
The following commit(s) were added to refs/heads/dev by this push:
new 23ca38a [hotfix] Resolve dependency convergence issues
23ca38a is described below
commit 23ca38a9ce326ad56fce2e4cf0c66ddfc5743142
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Sun Sep 6 01:11:06 2020 +0200
[hotfix] Resolve dependency convergence issues
---
pom.xml | 20 +++++++++++++++++++-
streampipes-app-file-export/pom.xml | 6 ++++++
streampipes-container-base/pom.xml | 10 ++++++++++
3 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 8aa227a..5853729 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,6 +55,7 @@
<fst.version>2.56</fst.version>
<geojson-jackson.version>1.8</geojson-jackson.version>
<guava.version>27.1-jre</guava.version>
+ <hibernate-validator.version>6.1.5.Final</hibernate-validator.version>
<httpclient.version>4.5.10</httpclient.version>
<httpcore.version>4.4.9</httpcore.version>
<httpcore-osgi.version>4.4.9</httpcore-osgi.version>
@@ -72,7 +73,7 @@
<javassist.version>3.19.0-GA</javassist.version>
<jaxb-api.version>2.3.1</jaxb-api.version>
<jboss-logging.version>3.4.0.Final</jboss-logging.version>
- <jersey.version>2.29.1</jersey.version>
+ <jersey.version>2.30.1</jersey.version>
<jetty.version>9.4.19.v20190610</jetty.version>
<jgrapht.version>1.3.1</jgrapht.version>
<json-path.version>3.1.0</json-path.version>
@@ -94,12 +95,14 @@
<shiro.version>1.2.3</shiro.version>
<siddhi.version>5.1.12</siddhi.version>
<slf4j.version>1.7.25</slf4j.version>
+ <snakeyaml.version>1.26</snakeyaml.version>
<snappy-java.version>1.1.7.2</snappy-java.version>
<spark.version>2.1.2</spark.version>
<spring.version>5.2.8.RELEASE</spring.version>
<spring-boot.version>2.3.3.RELEASE</spring-boot.version>
<type-parser.version>0.6.0</type-parser.version>
<underscore.version>1.47</underscore.version>
+ <wildfly-common.version>1.5.2.Final</wildfly-common.version>
<!-- Test dependencies -->
<junit.version>4.12</junit.version>
@@ -621,6 +624,11 @@
<version>${jersey.version}</version>
</dependency>
<dependency>
+ <groupId>org.hibernate.validator</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>${hibernate-validator.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.influxdb</groupId>
<artifactId>influxdb-java</artifactId>
<version>${influxdb.version}</version>
@@ -706,6 +714,16 @@
<version>${spring-boot.version}</version>
</dependency>
<dependency>
+ <groupId>org.wildfly.common</groupId>
+ <artifactId>wildfly-common</artifactId>
+ <version>${wildfly-common.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>1.26</version>
+ </dependency>
+ <dependency>
<groupId>io.fogsy</groupId>
<artifactId>empire-annotations</artifactId>
<version>${empire-rdf4j.version}</version>
diff --git a/streampipes-app-file-export/pom.xml b/streampipes-app-file-export/pom.xml
index a261262..211640b 100644
--- a/streampipes-app-file-export/pom.xml
+++ b/streampipes-app-file-export/pom.xml
@@ -67,6 +67,12 @@
<artifactId>lightcouch</artifactId>
</dependency>
+ <!-- dependency convergence -->
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ </dependency>
+
<!-- Test dependencies -->
</dependencies>
diff --git a/streampipes-container-base/pom.xml b/streampipes-container-base/pom.xml
index 8b2eb57..09be997 100644
--- a/streampipes-container-base/pom.xml
+++ b/streampipes-container-base/pom.xml
@@ -81,5 +81,15 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-undertow</artifactId>
</dependency>
+
+ <!--dependency convergence-->
+ <dependency>
+ <groupId>org.hibernate.validator</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.wildfly.common</groupId>
+ <artifactId>wildfly-common</artifactId>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file