[RELEASE] [skip-ci]merging 'release-0.60.1' into 'master'
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4ac7a5b..70aa3f5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
variables:
REGISTRY_HOST: ipe-wim-gitlab.fzi.de:5000
IMAGE_NAME: $REGISTRY_HOST/$CI_PROJECT_PATH
- DOCKER_HUB_IMAGE_NAME: streampipes/
+ DOCKER_HUB_IMAGE_NAME: streampipes
MAVEN_CLI_OPTS: -DskipTests --batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true
HARBOR_REGISTRY_HOST: laus.fzi.de:8201
HARBOR_IMAGE_NAME: $HARBOR_REGISTRY_HOST/$CI_PROJECT_PATH
@@ -12,8 +12,8 @@
stages:
- build
- github
-# - docker
-# - deploy
+ - docker
+ - deploy
- release
- docker-hub
@@ -50,22 +50,22 @@
- master
-#.docker_script: &docker_script
-# image: docker:17.06.0-ce
-# stage: docker
-# dependencies:
-# - build
-# script:
-# - export MVN_VERSION=$(cat ./target/mvn_version)
-# - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $REGISTRY_HOST
-# - docker login -u riemer -p $HARBOR_PASSWORD laus.fzi.de:8201
-# - docker build --no-cache --pull -t $IMAGE_NAME/$CONTAINER_NAME:latest -t $IMAGE_NAME/$CONTAINER_NAME:$MVN_VERSION -t $HARBOR_IMAGE_NAME/$CONTAINER_NAME:latest -t $HARBOR_IMAGE_NAME/$CONTAINER_NAME:$MVN_VERSION ./streampipes-$CONTAINER_NAME
-# - docker push $IMAGE_NAME/$CONTAINER_NAME:$MVN_VERSION
-# - docker push $IMAGE_NAME/$CONTAINER_NAME:latest
-# - docker push $HARBOR_IMAGE_NAME/$CONTAINER_NAME:$MVN_VERSION
-# - docker push $HARBOR_IMAGE_NAME/$CONTAINER_NAME:latest
-# only:
-# - dev
+.docker_script: &docker_script
+ image: docker:17.06.0-ce
+ stage: docker
+ dependencies:
+ - build
+ script:
+ - export MVN_VERSION=$(cat ./target/mvn_version)
+ - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $REGISTRY_HOST
+ - docker login -u riemer -p $HARBOR_PASSWORD laus.fzi.de:8201
+ - docker build --no-cache --pull -t $IMAGE_NAME/$CONTAINER_NAME:latest -t $IMAGE_NAME/$CONTAINER_NAME:$MVN_VERSION -t $HARBOR_IMAGE_NAME/$CONTAINER_NAME:latest -t $HARBOR_IMAGE_NAME/$CONTAINER_NAME:$MVN_VERSION ./streampipes-$CONTAINER_NAME
+ - docker push $IMAGE_NAME/$CONTAINER_NAME:$MVN_VERSION
+ - docker push $IMAGE_NAME/$CONTAINER_NAME:latest
+ - docker push $HARBOR_IMAGE_NAME/$CONTAINER_NAME:$MVN_VERSION
+ - docker push $HARBOR_IMAGE_NAME/$CONTAINER_NAME:latest
+ only:
+ - dev
.docker_hub: &docker_hub_script
image: docker:17.06.0-ce
@@ -81,18 +81,18 @@
only:
- master
-#deploy:
-# image: maven:3-jdk-8
-# stage: deploy
-# script:
-# - echo "$GPG_PRIVATE_KEY" | gpg --batch --import --passphrase "$GPG_PASSPHRASE"
-# - echo "$MAVEN_CREDENTIALS" > /root/.m2/settings.xml
-# - mvn deploy -DskipTests
-# artifacts:
-# paths:
-# - ./**/*.jar
-# only:
-# - dev
+deploy:
+ image: maven:3-jdk-8
+ stage: deploy
+ script:
+ - echo "$GPG_PRIVATE_KEY" | gpg --batch --import --passphrase "$GPG_PASSPHRASE"
+ - echo "$MAVEN_CREDENTIALS" > /root/.m2/settings.xml
+ - mvn deploy -DskipTests
+ artifacts:
+ paths:
+ - ./**/*.jar
+ only:
+ - dev
start release:
image: maven:3-jdk-8
@@ -140,107 +140,107 @@
- git push origin --tags
- git checkout master
- git push github master
- - git push github $MVN_VERSION
+ - git push github $CI_BUILD_REF_NAME
- git checkout dev
- git push github dev
when: manual
except:
- master
-#docker-processors-aggregation-flink:
-# <<: *docker_script
-# variables:
-# CONTAINER_NAME: "processors-aggregation-flink"
-#
-#docker-processors-enricher-flink:
-# <<: *docker_script
-# variables:
-# CONTAINER_NAME: "processors-enricher-flink"
-#
-#docker-processors-filters-jvm:
-# <<: *docker_script
-# variables:
-# CONTAINER_NAME: "processors-filters-jvm"
-#
-#docker-processors-geo-jvm:
-# <<: *docker_script
-# variables:
-# CONTAINER_NAME: "processors-geo-jvm"
-#
-#docker-processors-image-processing-jvm:
-# <<: *docker_script
-# variables:
-# CONTAINER_NAME: "processors-image-processing-jvm"
-#
-#docker-processors-pattern-detection-flink:
-# <<: *docker_script
-# variables:
-# CONTAINER_NAME: "processors-pattern-detection-flink"
-#
-#docker-processors-filters-siddhi:
-# <<: *docker_script
-# variables:
-# CONTAINER_NAME: "processors-filters-siddhi"
-#
-#docker-processors-statistics-flink:
-# <<: *docker_script
-# variables:
-# CONTAINER_NAME: "processors-statistics-flink"
-#
-#docker-processors-geo-flink:
-# <<: *docker_script
-# variables:
-# CONTAINER_NAME: "processors-geo-flink"
-#
-#docker-processors-transformation-flink:
-# <<: *docker_script
-# variables:
-# CONTAINER_NAME: "processors-transformation-flink"
-#
-#docker-processors-transformation-jvm:
-# <<: *docker_script
-# variables:
-# CONTAINER_NAME: "processors-transformation-jvm"
-#
-#docker-sinks-brokers-jvm:
-# <<: *docker_script
-# variables:
-# CONTAINER_NAME: "sinks-brokers-jvm"
-#
-#docker-sinks-databases-flink:
-# <<: *docker_script
-# variables:
-# CONTAINER_NAME: "sinks-databases-flink"
-#
-#docker-sinks-databases-jvm:
-# <<: *docker_script
-# variables:
-# CONTAINER_NAME: "sinks-databases-jvm"
-#
-#docker-sinks-notifications-jvm:
-# <<: *docker_script
-# variables:
-# CONTAINER_NAME: "sinks-notifications-jvm"
-#
-#docker-sinks-internal-jvm:
-# <<: *docker_script
-# variables:
-# CONTAINER_NAME: "sinks-internal-jvm"
-#
-#docker-sources-vehicle-simulator:
-# <<: *docker_script
-# variables:
-# CONTAINER_NAME: "sources-vehicle-simulator"
-#
-#docker-sources-random:
-# <<: *docker_script
-# variables:
-# CONTAINER_NAME: "sources-random-data-generator"
-#
-#docker-sources-watertank-simulator:
-# <<: *docker_script
-# variables:
-# CONTAINER_NAME: "sources-watertank-simulator"
+docker-processors-aggregation-flink:
+ <<: *docker_script
+ variables:
+ CONTAINER_NAME: "processors-aggregation-flink"
+
+docker-processors-enricher-flink:
+ <<: *docker_script
+ variables:
+ CONTAINER_NAME: "processors-enricher-flink"
+
+docker-processors-filters-jvm:
+ <<: *docker_script
+ variables:
+ CONTAINER_NAME: "processors-filters-jvm"
+
+docker-processors-geo-jvm:
+ <<: *docker_script
+ variables:
+ CONTAINER_NAME: "processors-geo-jvm"
+
+docker-processors-image-processing-jvm:
+ <<: *docker_script
+ variables:
+ CONTAINER_NAME: "processors-image-processing-jvm"
+
+docker-processors-pattern-detection-flink:
+ <<: *docker_script
+ variables:
+ CONTAINER_NAME: "processors-pattern-detection-flink"
+
+docker-processors-filters-siddhi:
+ <<: *docker_script
+ variables:
+ CONTAINER_NAME: "processors-filters-siddhi"
+
+docker-processors-statistics-flink:
+ <<: *docker_script
+ variables:
+ CONTAINER_NAME: "processors-statistics-flink"
+
+docker-processors-geo-flink:
+ <<: *docker_script
+ variables:
+ CONTAINER_NAME: "processors-geo-flink"
+
+docker-processors-transformation-flink:
+ <<: *docker_script
+ variables:
+ CONTAINER_NAME: "processors-transformation-flink"
+
+docker-processors-transformation-jvm:
+ <<: *docker_script
+ variables:
+ CONTAINER_NAME: "processors-transformation-jvm"
+
+docker-sinks-brokers-jvm:
+ <<: *docker_script
+ variables:
+ CONTAINER_NAME: "sinks-brokers-jvm"
+
+docker-sinks-databases-flink:
+ <<: *docker_script
+ variables:
+ CONTAINER_NAME: "sinks-databases-flink"
+
+docker-sinks-databases-jvm:
+ <<: *docker_script
+ variables:
+ CONTAINER_NAME: "sinks-databases-jvm"
+
+docker-sinks-notifications-jvm:
+ <<: *docker_script
+ variables:
+ CONTAINER_NAME: "sinks-notifications-jvm"
+
+docker-sinks-internal-jvm:
+ <<: *docker_script
+ variables:
+ CONTAINER_NAME: "sinks-internal-jvm"
+
+docker-sources-vehicle-simulator:
+ <<: *docker_script
+ variables:
+ CONTAINER_NAME: "sources-vehicle-simulator"
+
+docker-sources-random:
+ <<: *docker_script
+ variables:
+ CONTAINER_NAME: "sources-random-data-generator"
+
+docker-sources-watertank-simulator:
+ <<: *docker_script
+ variables:
+ CONTAINER_NAME: "sources-watertank-simulator"
docker-hub-processors-aggregation-flink:
diff --git a/pom.xml b/pom.xml
index 15866d1..4c08cb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<groupId>org.streampipes</groupId>
<artifactId>streampipes-pipeline-elements</artifactId>
<packaging>pom</packaging>
- <version>0.60.0</version>
+ <version>0.60.1</version>
<modules>
<module>streampipes-sinks-databases-jvm</module>
<module>streampipes-sinks-internal-jvm</module>
@@ -31,7 +31,7 @@
</modules>
<properties>
- <streampipes.version>0.60.0</streampipes.version>
+ <streampipes.version>0.60.1</streampipes.version>
<lightcouch.version>0.1.8</lightcouch.version>
</properties>
diff --git a/streampipes-pipeline-elements-shared/pom.xml b/streampipes-pipeline-elements-shared/pom.xml
index 21faf99..02f2d4d 100644
--- a/streampipes-pipeline-elements-shared/pom.xml
+++ b/streampipes-pipeline-elements-shared/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>streampipes-pipeline-elements</artifactId>
<groupId>org.streampipes</groupId>
- <version>0.60.0</version>
+ <version>0.60.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/streampipes-processors-aggregation-flink/pom.xml b/streampipes-processors-aggregation-flink/pom.xml
index a076765..489442d 100644
--- a/streampipes-processors-aggregation-flink/pom.xml
+++ b/streampipes-processors-aggregation-flink/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>streampipes-pipeline-elements</artifactId>
<groupId>org.streampipes</groupId>
- <version>0.60.0</version>
+ <version>0.60.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/streampipes-processors-enricher-flink/pom.xml b/streampipes-processors-enricher-flink/pom.xml
index fc2eca2..338be7c 100644
--- a/streampipes-processors-enricher-flink/pom.xml
+++ b/streampipes-processors-enricher-flink/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>streampipes-pipeline-elements</artifactId>
<groupId>org.streampipes</groupId>
- <version>0.60.0</version>
+ <version>0.60.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/streampipes-processors-filters-jvm/pom.xml b/streampipes-processors-filters-jvm/pom.xml
index 9a4bf1a..4e4c0a5 100644
--- a/streampipes-processors-filters-jvm/pom.xml
+++ b/streampipes-processors-filters-jvm/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>streampipes-pipeline-elements</artifactId>
<groupId>org.streampipes</groupId>
- <version>0.60.0</version>
+ <version>0.60.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/streampipes-processors-filters-siddhi/pom.xml b/streampipes-processors-filters-siddhi/pom.xml
index 989eb9a..dca70fc 100644
--- a/streampipes-processors-filters-siddhi/pom.xml
+++ b/streampipes-processors-filters-siddhi/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>streampipes-pipeline-elements</artifactId>
<groupId>org.streampipes</groupId>
- <version>0.60.0</version>
+ <version>0.60.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/streampipes-processors-geo-flink/pom.xml b/streampipes-processors-geo-flink/pom.xml
index a775e77..2ecfe54 100644
--- a/streampipes-processors-geo-flink/pom.xml
+++ b/streampipes-processors-geo-flink/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>streampipes-pipeline-elements</artifactId>
<groupId>org.streampipes</groupId>
- <version>0.60.0</version>
+ <version>0.60.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/streampipes-processors-geo-jvm/pom.xml b/streampipes-processors-geo-jvm/pom.xml
index d32ba6f..90c0694 100644
--- a/streampipes-processors-geo-jvm/pom.xml
+++ b/streampipes-processors-geo-jvm/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>streampipes-pipeline-elements</artifactId>
<groupId>org.streampipes</groupId>
- <version>0.60.0</version>
+ <version>0.60.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/streampipes-processors-image-processing-jvm/pom.xml b/streampipes-processors-image-processing-jvm/pom.xml
index 4470e21..c43f1ad 100644
--- a/streampipes-processors-image-processing-jvm/pom.xml
+++ b/streampipes-processors-image-processing-jvm/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>streampipes-pipeline-elements</artifactId>
<groupId>org.streampipes</groupId>
- <version>0.60.0</version>
+ <version>0.60.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/streampipes-processors-pattern-detection-flink/pom.xml b/streampipes-processors-pattern-detection-flink/pom.xml
index 8d86c94..e96946e 100644
--- a/streampipes-processors-pattern-detection-flink/pom.xml
+++ b/streampipes-processors-pattern-detection-flink/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>streampipes-pipeline-elements</artifactId>
<groupId>org.streampipes</groupId>
- <version>0.60.0</version>
+ <version>0.60.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/streampipes-processors-statistics-flink/pom.xml b/streampipes-processors-statistics-flink/pom.xml
index de1511e..865f8c2 100644
--- a/streampipes-processors-statistics-flink/pom.xml
+++ b/streampipes-processors-statistics-flink/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>streampipes-pipeline-elements</artifactId>
<groupId>org.streampipes</groupId>
- <version>0.60.0</version>
+ <version>0.60.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/streampipes-processors-text-mining-flink/pom.xml b/streampipes-processors-text-mining-flink/pom.xml
index cf112c8..86efb96 100644
--- a/streampipes-processors-text-mining-flink/pom.xml
+++ b/streampipes-processors-text-mining-flink/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>streampipes-pipeline-elements</artifactId>
<groupId>org.streampipes</groupId>
- <version>0.60.0</version>
+ <version>0.60.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/streampipes-processors-transformation-flink/pom.xml b/streampipes-processors-transformation-flink/pom.xml
index f2c45c6..1f600fd 100644
--- a/streampipes-processors-transformation-flink/pom.xml
+++ b/streampipes-processors-transformation-flink/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>streampipes-pipeline-elements</artifactId>
<groupId>org.streampipes</groupId>
- <version>0.60.0</version>
+ <version>0.60.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/streampipes-processors-transformation-jvm/pom.xml b/streampipes-processors-transformation-jvm/pom.xml
index d1b4d34..2269ac3 100644
--- a/streampipes-processors-transformation-jvm/pom.xml
+++ b/streampipes-processors-transformation-jvm/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>streampipes-pipeline-elements</artifactId>
<groupId>org.streampipes</groupId>
- <version>0.60.0</version>
+ <version>0.60.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/streampipes-sinks-brokers-jvm/pom.xml b/streampipes-sinks-brokers-jvm/pom.xml
index e9da60f..75301b2 100644
--- a/streampipes-sinks-brokers-jvm/pom.xml
+++ b/streampipes-sinks-brokers-jvm/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>streampipes-pipeline-elements</artifactId>
<groupId>org.streampipes</groupId>
- <version>0.60.0</version>
+ <version>0.60.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/streampipes-sinks-databases-flink/pom.xml b/streampipes-sinks-databases-flink/pom.xml
index 2610ea0..71ad6cf 100644
--- a/streampipes-sinks-databases-flink/pom.xml
+++ b/streampipes-sinks-databases-flink/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>streampipes-pipeline-elements</artifactId>
<groupId>org.streampipes</groupId>
- <version>0.60.0</version>
+ <version>0.60.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/streampipes-sinks-databases-jvm/pom.xml b/streampipes-sinks-databases-jvm/pom.xml
index 43cd673..a0b61ea 100644
--- a/streampipes-sinks-databases-jvm/pom.xml
+++ b/streampipes-sinks-databases-jvm/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>streampipes-pipeline-elements</artifactId>
<groupId>org.streampipes</groupId>
- <version>0.60.0</version>
+ <version>0.60.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/streampipes-sinks-internal-jvm/pom.xml b/streampipes-sinks-internal-jvm/pom.xml
index 0974816..5a3999f 100644
--- a/streampipes-sinks-internal-jvm/pom.xml
+++ b/streampipes-sinks-internal-jvm/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>streampipes-pipeline-elements</artifactId>
<groupId>org.streampipes</groupId>
- <version>0.60.0</version>
+ <version>0.60.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/streampipes-sinks-notifications-jvm/pom.xml b/streampipes-sinks-notifications-jvm/pom.xml
index ab9a21a..4814b58 100644
--- a/streampipes-sinks-notifications-jvm/pom.xml
+++ b/streampipes-sinks-notifications-jvm/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>streampipes-pipeline-elements</artifactId>
<groupId>org.streampipes</groupId>
- <version>0.60.0</version>
+ <version>0.60.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/streampipes-sources-random-data-generator/pom.xml b/streampipes-sources-random-data-generator/pom.xml
index 88aa25d..8781242 100644
--- a/streampipes-sources-random-data-generator/pom.xml
+++ b/streampipes-sources-random-data-generator/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>streampipes-pipeline-elements</artifactId>
<groupId>org.streampipes</groupId>
- <version>0.60.0</version>
+ <version>0.60.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/streampipes-sources-vehicle-simulator/pom.xml b/streampipes-sources-vehicle-simulator/pom.xml
index ca56f00..5639305 100644
--- a/streampipes-sources-vehicle-simulator/pom.xml
+++ b/streampipes-sources-vehicle-simulator/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>streampipes-pipeline-elements</artifactId>
<groupId>org.streampipes</groupId>
- <version>0.60.0</version>
+ <version>0.60.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/streampipes-sources-watertank-simulator/pom.xml b/streampipes-sources-watertank-simulator/pom.xml
index 371a146..9a7c122 100644
--- a/streampipes-sources-watertank-simulator/pom.xml
+++ b/streampipes-sources-watertank-simulator/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>streampipes-pipeline-elements</artifactId>
<groupId>org.streampipes</groupId>
- <version>0.60.0</version>
+ <version>0.60.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
