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 2022/01/17 20:15:38 UTC
[incubator-streampipes] branch dev updated: [hotfix] Fix dependency conflict
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 091c19f [hotfix] Fix dependency conflict
091c19f is described below
commit 091c19fda3cc8c761e750bc3308eddaaa3e319f7
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Mon Jan 17 21:15:26 2022 +0100
[hotfix] Fix dependency conflict
---
.../streampipes-pipeline-elements-all-jvm/pom.xml | 21 +++++++++++++++------
streampipes-service-base/pom.xml | 6 ++++++
2 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/streampipes-extensions/streampipes-pipeline-elements-all-jvm/pom.xml b/streampipes-extensions/streampipes-pipeline-elements-all-jvm/pom.xml
index 6f8528e..85ba7ec 100644
--- a/streampipes-extensions/streampipes-pipeline-elements-all-jvm/pom.xml
+++ b/streampipes-extensions/streampipes-pipeline-elements-all-jvm/pom.xml
@@ -31,6 +31,16 @@
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.17</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.streampipes</groupId>
@@ -49,12 +59,6 @@
<artifactId>streampipes-processors-filters-siddhi</artifactId>
<version>0.69.0-SNAPSHOT</version>
<classifier>embed</classifier>
- <exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
@@ -124,6 +128,11 @@
<groupId>org.atteo.classindex</groupId>
<artifactId>classindex</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/streampipes-service-base/pom.xml b/streampipes-service-base/pom.xml
index 1dad0d8..fa54c04 100644
--- a/streampipes-service-base/pom.xml
+++ b/streampipes-service-base/pom.xml
@@ -76,6 +76,12 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-annotations</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>