This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch rel/0.68.0
in repository
https://gitbox.apache.org/repos/asf/incubator-streampipes-extensions.git
The following commit(s) were added to refs/heads/rel/0.68.0 by this push:
new dd7b350 [hotfix] Resolve dependency conflict
new 7587f3d Merge branch 'rel/0.68.0' of
github.com:apache/incubator-streampipes-extensions into rel/0.68.0
dd7b350 is described below
commit dd7b350ec06d12d797820187e58106c1f7817ad4
Author: Dominik Riemer <[email protected]>
AuthorDate: Sun Jul 4 14:19:53 2021 +0200
[hotfix] Resolve dependency conflict
---
pom.xml | 5 +++++
streampipes-extensions-all-jvm/pom.xml | 7 +++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6012efa..2205dc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -369,6 +369,11 @@
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
+ <artifactId>streampipes-container-extensions</artifactId>
+ <version>${streampipes.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-dataformat-json</artifactId>
<version>${streampipes.version}</version>
</dependency>
diff --git a/streampipes-extensions-all-jvm/pom.xml
b/streampipes-extensions-all-jvm/pom.xml
index 711a36c..f94cc7c 100644
--- a/streampipes-extensions-all-jvm/pom.xml
+++ b/streampipes-extensions-all-jvm/pom.xml
@@ -30,13 +30,12 @@
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-container-extensions</artifactId>
- <version>0.68.0-SNAPSHOT</version>
</dependency>
<!-- StreamPipes pipeline elements all (JVM) -->
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-pipeline-elements-all-jvm</artifactId>
- <version>0.68.0-SNAPSHOT</version>
+ <version>${streampipes.version}</version>
<classifier>embed</classifier>
</dependency>
@@ -44,7 +43,7 @@
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-connect-adapters</artifactId>
- <version>0.68.0-SNAPSHOT</version>
+ <version>${streampipes.version}</version>
<classifier>embed</classifier>
</dependency>
</dependencies>
@@ -69,4 +68,4 @@
<finalName>streampipes-extensions-all-jvm</finalName>
</build>
-</project>
\ No newline at end of file
+</project>
