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 2021/12/05 17:52:38 UTC
[incubator-streampipes] 03/03: [STREAMPIPES-379] Fix dependency convergence
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
commit 06bc998dfff8c5bb1ca0c02852635b3d44c8be22
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Sun Dec 5 18:52:25 2021 +0100
[STREAMPIPES-379] Fix dependency convergence
---
pom.xml | 5 +++++
streampipes-container-base/pom.xml | 13 ++++++++++---
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7ed9727..a24f47f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -692,6 +692,11 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
</dependency>
diff --git a/streampipes-container-base/pom.xml b/streampipes-container-base/pom.xml
index c041cab..2759f51 100644
--- a/streampipes-container-base/pom.xml
+++ b/streampipes-container-base/pom.xml
@@ -71,13 +71,20 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-undertow</artifactId>
</dependency>
+
+ <!--dependency convergence-->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
- <version>${spring.version}</version>
</dependency>
-
- <!--dependency convergence-->
<dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>