[RELEASE] [skip-ci]merging 'release-0.60.1' into 'master'

apache · Nov 27, 2018 · 7fbb72f · 7fbb72f
2 parents 3ead279 + 31636f9
commit 7fbb72f
Show file tree

Hide file tree

Showing 89 changed files with 694 additions and 224 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -84,7 +84,8 @@ docker-connect-container:
      - docker push $IMAGE_NAME/streampipes-connect-container:latest
      - docker push $HARBOR_IMAGE_NAME/streampipes-connect-container:$MVN_VERSION
      - docker push $HARBOR_IMAGE_NAME/streampipes-connect-container:latest
-
+   only:
+     - dev
 
 deploy:
   image: maven:3-jdk-8
@@ -163,7 +164,7 @@ finish release:
     - git push origin --tags
     - git checkout master
     - git push github master
-    - git push github version-$MVN_VERSION
+    - git push github $MVN_VERSION
     - git checkout dev
     - git push github dev
 
@@ -182,6 +183,9 @@ docker hub:
     - docker push streampipes/backend:$MVN_VERSION
     - docker build --pull -t streampipes/backend ./streampipes-backend/
     - docker push streampipes/backend
+    - docker build --pull -t streampipes/streampipes-connect-container:latest -t streampipes/streampipes-connect-container:$MVN_VERSION ./streampipes-connect-container/
+    - docker push streampipes/streampipes-connect-container:$MVN_VERSION
+    - docker push streampipes/streampipes-connect-container:latest
   when: manual
   only:
     - master

diff --git a/LICENSE b/LICENSE
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2017 FZI Forschungszentrum Informatik
+   Copyright 2018 FZI Forschungszentrum Informatik
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -199,4 +199,4 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.
diff --git a/archetypes/streampipes-archetype-pe-processors-flink/pom.xml b/archetypes/streampipes-archetype-pe-processors-flink/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.streampipes</groupId>
         <artifactId>streampipes-parent</artifactId>
-        <version>0.60.0</version>
+        <version>0.60.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>streampipes-archetype-pe-processors-flink</artifactId>
@@ -31,29 +31,4 @@
         </pluginManagement>
     </build>
 
-    <scm>
-        <developerConnection>
-            scm:git:ssh://[email protected]:2222/streampipes/ce-backend.git/archetypes/streampipes-archetype-pe-sinks-jvm
-        </developerConnection>
-    </scm>
-
-    <repositories>
-        <repository>
-            <id>deployment</id>
-            <name>Internal Releases</name>
-            <url>https://laus.fzi.de/nexus/content/repositories/public/</url>
-        </repository>
-    </repositories>
-    <distributionManagement>
-        <repository>
-            <id>deployment</id>
-            <name>Internal Releases</name>
-            <url>https://laus.fzi.de/nexus/content/repositories/releases/</url>
-        </repository>
-        <snapshotRepository>
-            <id>deployment</id>
-            <name>Internal Releases</name>
-            <url>https://laus.fzi.de/nexus/content/repositories/snapshots/</url>
-        </snapshotRepository>
-    </distributionManagement>
 </project>
diff --git a/...es-archetype-pe-processors-flink/src/main/resources/META-INF/maven/archetype-metadata.xml b/...es-archetype-pe-processors-flink/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -17,12 +17,30 @@
                 <include>**/*.java</include>
             </includes>
         </fileSet>
-        <fileSet filtered="true" packaged="true" encoding="UTF-8">
+        <fileSet filtered="true" packaged="false" encoding="UTF-8">
             <directory></directory>
             <includes>
                 <include>Dockerfile</include>
             </includes>
         </fileSet>
+        <fileSet filtered="true" packaged="false" encoding="UTF-8">
+            <directory/>
+            <includes>
+                <include>deployment/docker-compose.yml</include>
+            </includes>
+        </fileSet>
+        <fileSet filtered="true" packaged="false" encoding="UTF-8">
+            <directory/>
+            <includes>
+                <include>deployment/system</include>
+            </includes>
+        </fileSet>
+        <fileSet filtered="true" packaged="false" encoding="UTF-8">
+            <directory/>
+            <includes>
+                <include>development/env</include>
+            </includes>
+        </fileSet>
     </fileSets>
     <requiredProperties>
         <requiredProperty key="classNamePrefix">

diff --git a/...-pe-processors-flink/src/main/resources/archetype-resources/deployment/docker-compose.yml b/...-pe-processors-flink/src/main/resources/archetype-resources/deployment/docker-compose.yml
@@ -0,0 +1,13 @@
+version: "2"
+services:
+  ${artifactId}:
+    image: ${artifactId}
+    depends_on:
+      - "consul"
+#    ports:
+#      - "8098:8090"
+    environment:
+      - SP_ICON_HOST=${SP_ICON_HOST}
+    networks:
+      spnet:
+
diff --git a/...es-archetype-pe-processors-flink/src/main/resources/archetype-resources/deployment/system b/...es-archetype-pe-processors-flink/src/main/resources/archetype-resources/deployment/system
@@ -0,0 +1,11 @@
+activemq
+kafka
+zookeeper
+swagger-ui
+connect-master
+connect-worker
+couchdb
+backend
+nginx
+kafka-rest
+testarchetype
diff --git a/...ipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/development/env b/...ipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/development/env
@@ -0,0 +1,10 @@
+# Those parameters are used by IntelliJ to set the default consul parameters for development
+SP_PORT=6666
+SP_HOST=localhost
+SP_ICON_HOST=localhost
+SP_KAFKA_HOST=localhost
+SP_ZOOKEEPER_HOST=localhost
+SP_COUCHDB_HOST=localhost
+SP_JMS_HOST=localhost
+SP_NGINX_HOST=localhost
+SP_NGINX_PORT=8082
diff --git a/.../streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/pom.xml b/.../streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/pom.xml
@@ -7,7 +7,7 @@
     <version>${version}</version>
 
     <properties>
-        <sp.version>0.55.3-SNAPSHOT</sp.version>
+        <sp.version>0.60.1</sp.version>
     </properties>
 
     <dependencies>

diff --git a/...-processors-flink/src/main/resources/archetype-resources/src/main/java/config/Config.java b/...-processors-flink/src/main/resources/archetype-resources/src/main/java/config/Config.java
@@ -13,15 +13,13 @@ public enum Config implements PeConfig {
   private SpConfig config;
   public static final String JAR_FILE = "./streampipes-processing-element-container.jar";
 
-  private final static String service_id = "pe/${package}";
-  private final static String service_name = "${packageName}";
-  private final static String service_container_name = "${artifactId}";
+  private final static String SERVICE_ID = "pe/${package}";
 
 
   Config() {
-    config = SpConfig.getSpConfig(service_id);
+    config = SpConfig.getSpConfig(SERVICE_ID);
 
-    config.register(ConfigKeys.HOST, service_container_name, "Hostname for the pe mixed flink component");
+    config.register(ConfigKeys.HOST, "${artifactId}", "Hostname for the pe mixed flink component");
     config.register(ConfigKeys.PORT, 8090, "Port for the pe mixed flink component");
     config.register(ConfigKeys.FLINK_HOST, "jobmanager", "Host for the flink cluster");
     config.register(ConfigKeys.FLINK_PORT, 6123, "Port for the flink cluster");
@@ -30,7 +28,7 @@ public enum Config implements PeConfig {
 
     config.register(ConfigKeys.DEBUG, false, "When set to true programs are not deployed to cluster, but executed locally");
 
-    config.register(ConfigKeys.SERVICE_NAME, service_name, "The name of the service");
+    config.register(ConfigKeys.SERVICE_NAME, "${packageName}", "The name of the service");
 
   }
 
@@ -73,7 +71,7 @@ public boolean getDebug() {
 
   @Override
   public String getId() {
-    return service_id;
+    return SERVICE_ID;
   }
 
   @Override

diff --git a/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml b/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.streampipes</groupId>
         <artifactId>streampipes-parent</artifactId>
-        <version>0.60.0</version>
+        <version>0.60.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>streampipes-archetype-pe-processors-jvm</artifactId>
@@ -30,30 +30,4 @@
             </plugins>
         </pluginManagement>
     </build>
-
-    <scm>
-        <developerConnection>
-            scm:git:ssh://[email protected]:2222/streampipes/ce-backend.git/archetypes/streampipes-archetype-pe-processors-jvm
-        </developerConnection>
-    </scm>
-
-    <repositories>
-        <repository>
-            <id>deployment</id>
-            <name>Internal Releases</name>
-            <url>https://laus.fzi.de/nexus/content/repositories/public/</url>
-        </repository>
-    </repositories>
-    <distributionManagement>
-        <repository>
-            <id>deployment</id>
-            <name>Internal Releases</name>
-            <url>https://laus.fzi.de/nexus/content/repositories/releases/</url>
-        </repository>
-        <snapshotRepository>
-            <id>deployment</id>
-            <name>Internal Releases</name>
-            <url>https://laus.fzi.de/nexus/content/repositories/snapshots/</url>
-        </snapshotRepository>
-    </distributionManagement>
 </project>
diff --git a/...ipes-archetype-pe-processors-jvm/src/main/resources/META-INF/maven/archetype-metadata.xml b/...ipes-archetype-pe-processors-jvm/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -17,12 +17,30 @@
                 <include>**/*.java</include>
             </includes>
         </fileSet>
-        <fileSet filtered="true" packaged="true" encoding="UTF-8">
-            <directory></directory>
+        <fileSet filtered="true" packaged="false" encoding="UTF-8">
+            <directory/>
             <includes>
                 <include>Dockerfile</include>
             </includes>
         </fileSet>
+        <fileSet filtered="true" packaged="false" encoding="UTF-8">
+            <directory/>
+            <includes>
+                <include>deployment/docker-compose.yml</include>
+            </includes>
+        </fileSet>
+        <fileSet filtered="true" packaged="false" encoding="UTF-8">
+            <directory/>
+            <includes>
+                <include>deployment/system</include>
+            </includes>
+        </fileSet>
+        <fileSet filtered="true" packaged="false" encoding="UTF-8">
+            <directory/>
+            <includes>
+                <include>development/env</include>
+            </includes>
+        </fileSet>
     </fileSets>
     <requiredProperties>
         <requiredProperty key="classNamePrefix">

diff --git a/...pe-pe-processors-jvm/src/main/resources/archetype-resources/deployment/docker-compose.yml b/...pe-pe-processors-jvm/src/main/resources/archetype-resources/deployment/docker-compose.yml
@@ -0,0 +1,13 @@
+version: "2"
+services:
+  ${artifactId}:
+    image: ${artifactId}
+    depends_on:
+      - "consul"
+#    ports:
+#      - "8098:8090"
+    environment:
+      - SP_ICON_HOST=${SP_ICON_HOST}
+    networks:
+      spnet:
+
diff --git a/...ipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/deployment/system b/...ipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/deployment/system
@@ -0,0 +1,11 @@
+activemq
+kafka
+zookeeper
+swagger-ui
+connect-master
+connect-worker
+couchdb
+backend
+nginx
+kafka-rest
+testarchetype
diff --git a/...mpipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/development/env b/...mpipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/development/env
@@ -0,0 +1,10 @@
+# Those parameters are used by IntelliJ to set the default consul parameters for development
+SP_PORT=6666
+SP_HOST=localhost
+SP_ICON_HOST=localhost
+SP_KAFKA_HOST=localhost
+SP_ZOOKEEPER_HOST=localhost
+SP_COUCHDB_HOST=localhost
+SP_JMS_HOST=localhost
+SP_NGINX_HOST=localhost
+SP_NGINX_PORT=8082
diff --git a/...es/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/pom.xml b/...es/streampipes-archetype-pe-processors-jvm/src/main/resources/archetype-resources/pom.xml
@@ -7,7 +7,7 @@
     <version>${version}</version>
 
     <properties>
-        <sp.version>0.55.3-SNAPSHOT</sp.version>
+        <sp.version>0.60.1</sp.version>
     </properties>
 
     <dependencies>

diff --git a/...pe-processors-jvm/src/main/resources/archetype-resources/src/main/java/config/Config.java b/...pe-processors-jvm/src/main/resources/archetype-resources/src/main/java/config/Config.java
@@ -22,7 +22,7 @@ public enum Config implements PeConfig {
   Config() {
     config = SpConfig.getSpConfig("pe/${package}");
 
-    config.register(HOST, "${projectName}", "Hostname for the pe sinks");
+    config.register(HOST, "${artifactId}", "Hostname for the pe sinks");
     config.register(PORT, 8090, "Port for the pe sinks");
     config.register(NGINX_HOST, System.getenv("STREAMPIPES_HOST"), "External hostname of " +
             "StreamPipes Nginx");

diff --git a/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml b/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.streampipes</groupId>
         <artifactId>streampipes-parent</artifactId>
-        <version>0.60.0</version>
+        <version>0.60.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>streampipes-archetype-pe-sinks-flink</artifactId>
@@ -30,30 +30,4 @@
             </plugins>
         </pluginManagement>
     </build>
-
-    <scm>
-        <developerConnection>
-            scm:git:ssh://[email protected]:2222/streampipes/ce-backend.git/archetypes/streampipes-archetype-pe-sinks-jvm
-        </developerConnection>
-    </scm>
-
-    <repositories>
-        <repository>
-            <id>deployment</id>
-            <name>Internal Releases</name>
-            <url>https://laus.fzi.de/nexus/content/repositories/public/</url>
-        </repository>
-    </repositories>
-    <distributionManagement>
-        <repository>
-            <id>deployment</id>
-            <name>Internal Releases</name>
-            <url>https://laus.fzi.de/nexus/content/repositories/releases/</url>
-        </repository>
-        <snapshotRepository>
-            <id>deployment</id>
-            <name>Internal Releases</name>
-            <url>https://laus.fzi.de/nexus/content/repositories/snapshots/</url>
-        </snapshotRepository>
-    </distributionManagement>
 </project>