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

apache · Nov 22, 2019 · 58007ad · 58007ad
2 parents 2b336d0 + d957f19
commit 58007ad
Show file tree

Hide file tree

Showing 180 changed files with 3,463 additions and 2,225 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,5 +26,5 @@ addons:
       - dev
 
 script:
-  - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar --quiet
+  - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package --quiet
 
diff --git a/README.md b/README.md
@@ -21,7 +21,9 @@
 [![Docker pulls](https://img.shields.io/docker/pulls/streampipes/backend.svg)](https://hub.docker.com/r/streampipes/backend/)
 [![Maven central](https://img.shields.io/maven-central/v/org.streampipes/streampipes-backend.svg)](https://img.shields.io/maven-central/v/org.streampipes/streampipes-backend.svg)
 [![License](https://img.shields.io/github/license/streampipes/streampipes-ce.svg)](https://docs.streampipes.org/license/)
-[![License](https://img.shields.io/github/last-commit/streampipes/streampipes-ce.svg)]()
+[![Last commit](https://img.shields.io/github/last-commit/streampipes/streampipes-ce.svg)]()
+[![Twitter](https://img.shields.io/twitter/follow/StreamPipes.svg?label=Follow&style=social)](https://twitter.com/StreamPipes)
+
 <h1 align="center">
   <br>
    <img src="https://docs.streampipes.org/img/logo.png" 
@@ -86,9 +88,10 @@ The quickest way to run StreamPipes is the Docker-based installer script availab
 It's easy to get started:
 1. Make sure you have [Docker](https://docs.docker.com/install/) and [Docker Compose](https://docs.docker.com/compose/install/) installed.
 2. Clone or download the installer script from [https://www.github.com/streampipes/streampipes-installer](https://www.github.com/streampipes/streampipes-installer)
-3. Execute ``./streampipes start`` to run a lightweight StreamPipes version with few pipelines elements (not including Big Data frameworks) or start the full version (16GB RAM recommended) by executing ``./streampipes start bigdata`` 
-4. Open your browser, navigate to ``http://YOUR_HOSTNAME_HERE`` and follow the installation instructions.
-5. Once finished, switch to the pipeline editor and start the interactive tour or check the [online tour](https://docs.streampipes.org/docs/user-guide-tour) to learn how to create your first pipeline!
+3. Execute ``./streampipes start`` 
+4. Enter the hostname and choose the version you'd like to run (the Lite version runs with less memory assigned to Docker (< 6 GB), use the full version if you have more memory available)
+5. Open your browser, navigate to ``http://YOUR_HOSTNAME_HERE`` and follow the installation instructions.
+6. Once finished, switch to the pipeline editor and start the interactive tour or check the [online tour](https://docs.streampipes.org/docs/user-guide-tour) to learn how to create your first pipeline!
 
 For a more in-depth manual, read the installation guide at [https://docs.streampipes.org/docs/user-guide-installation](https://docs.streampipes.org/docs/user-guide-installation)!
 

diff --git a/archetypes/streampipes-archetype-pe-processors-flink/pom.xml b/archetypes/streampipes-archetype-pe-processors-flink/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.streampipes</groupId>
         <artifactId>streampipes-parent</artifactId>
-        <version>0.64.0</version>
+        <version>0.65.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>streampipes-archetype-pe-processors-flink</artifactId>

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
@@ -1,5 +1,5 @@
 # Those parameters are used by IntelliJ to set the default consul parameters for development
 SP_PORT=8005
-SP_HOST=localhost
-SP_ICON_HOST=localhost
+SP_HOST=host.docker.internal
+SP_DEBUG=true
 SP_FLINK_DEBUG=true
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.64.0</sp.version>
+        <sp.version>0.65.0</sp.version>
     </properties>
 
     <dependencies>
@@ -81,7 +81,7 @@
             <artifactId>streampipes-config</artifactId>
             <version>${sp.version}</version>
         </dependency>
-                <dependency>
+        <dependency>
             <groupId>org.streampipes</groupId>
             <artifactId>streampipes-dataformat-json</artifactId>
             <version>${sp.version}</version>
@@ -134,6 +134,13 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
                 <version>2.3</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.springframework.boot</groupId>
+                        <artifactId>spring-boot-maven-plugin</artifactId>
+                        <version>2.2.0.RELEASE</version>
+                    </dependency>
+                </dependencies>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -144,11 +151,27 @@
                             <createDependencyReducedPom>false</createDependencyReducedPom>
                             <transformers>
                                 <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>${package}.main.Init</mainClass>
+                                        implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                    <resource>META-INF/spring.handlers</resource>
+                                </transformer>
+                                <transformer
+                                        implementation="org.springframework.boot.maven.PropertiesMergingResourceTransformer">
+                                    <resource>META-INF/spring.factories</resource>
+                                </transformer>
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                    <resource>META-INF/spring.schemas</resource>
                                 </transformer>
                                 <transformer
                                         implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                    <resource>reference.conf</resource>
+                                </transformer>
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>${package}.main.Init</mainClass>
+                                </transformer>
                             </transformers>
                             <filters>
 

diff --git a/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml b/archetypes/streampipes-archetype-pe-processors-jvm/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.streampipes</groupId>
         <artifactId>streampipes-parent</artifactId>
-        <version>0.64.0</version>
+        <version>0.65.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>streampipes-archetype-pe-processors-jvm</artifactId>

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
@@ -1,4 +1,4 @@
 # Those parameters are used by IntelliJ to set the default consul parameters for development
 SP_PORT=8005
-SP_HOST=localhost
-SP_ICON_HOST=localhost
+SP_HOST=host.docker.internal
+SP_DEBUG=true
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.64.0</sp.version>
+        <sp.version>0.65.0</sp.version>
     </properties>
 
     <dependencies>
@@ -81,39 +81,15 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>2.3</version>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>package</phase>
                         <goals>
-                            <goal>shade</goal>
+                            <goal>repackage</goal>
                         </goals>
                         <configuration>
-                            <createDependencyReducedPom>false</createDependencyReducedPom>
-                            <transformers>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>${package}.main.Init</mainClass>
-                                </transformer>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                            </transformers>
-                            <filters>
-
-                                <filter>
-                                    <artifact>*:*</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/*.SF</exclude>
-                                        <exclude>META-INF/*.DSA</exclude>
-                                        <exclude>META-INF/*.RSA</exclude>
-                                        <exclude>META-INF/maven/com.github.jsonld-java/jsonld-java/pom.xml</exclude>
-                                        <exclude>META-INF/maven/com.github.jsonld-java/jsonld-java-sesame/pom.xml
-                                        </exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
+                            <mainClass>${package}.main.Init</mainClass>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml b/archetypes/streampipes-archetype-pe-sinks-flink/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.streampipes</groupId>
         <artifactId>streampipes-parent</artifactId>
-        <version>0.64.0</version>
+        <version>0.65.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>streampipes-archetype-pe-sinks-flink</artifactId>

diff --git a/...reampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/development/env b/...reampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/development/env
@@ -1,5 +1,5 @@
 # Those parameters are used by IntelliJ to set the default consul parameters for development
 SP_PORT=8005
-SP_HOST=localhost
-SP_ICON_HOST=localhost
+SP_HOST=host.docker.internal
+SP_DEBUG=true
 SP_FLINK_DEBUG=true
diff --git a/...types/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/pom.xml b/...types/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/pom.xml
@@ -7,7 +7,7 @@
     <version>${version}</version>
 
     <properties>
-        <sp.version>0.64.0</sp.version>
+        <sp.version>0.65.0</sp.version>
     </properties>
 
     <dependencies>
@@ -134,6 +134,13 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
                 <version>2.3</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.springframework.boot</groupId>
+                        <artifactId>spring-boot-maven-plugin</artifactId>
+                        <version>2.2.0.RELEASE</version>
+                    </dependency>
+                </dependencies>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -144,11 +151,27 @@
                             <createDependencyReducedPom>false</createDependencyReducedPom>
                             <transformers>
                                 <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>${package}.main.Init</mainClass>
+                                        implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                    <resource>META-INF/spring.handlers</resource>
+                                </transformer>
+                                <transformer
+                                        implementation="org.springframework.boot.maven.PropertiesMergingResourceTransformer">
+                                    <resource>META-INF/spring.factories</resource>
+                                </transformer>
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                    <resource>META-INF/spring.schemas</resource>
                                 </transformer>
                                 <transformer
                                         implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                                    <resource>reference.conf</resource>
+                                </transformer>
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>${package}.main.Init</mainClass>
+                                </transformer>
                             </transformers>
                             <filters>
 

diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml b/archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.streampipes</groupId>
         <artifactId>streampipes-parent</artifactId>
-        <version>0.64.0</version>
+        <version>0.65.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>streampipes-archetype-pe-sinks-jvm</artifactId>

diff --git a/...streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/development/env b/...streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/development/env
@@ -1,4 +1,4 @@
 # Those parameters are used by IntelliJ to set the default consul parameters for development
 SP_PORT=8005
-SP_HOST=localhost
-SP_ICON_HOST=localhost
+SP_HOST=host.docker.internal
+SP_DEBUG=true
diff --git a/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/pom.xml b/archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/archetype-resources/pom.xml
@@ -7,7 +7,7 @@
     <version>${version}</version>
 
     <properties>
-        <sp.version>0.64.0</sp.version>
+        <sp.version>0.65.0</sp.version>
     </properties>
 
     <dependencies>
@@ -81,39 +81,15 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>2.3</version>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>package</phase>
                         <goals>
-                            <goal>shade</goal>
+                            <goal>repackage</goal>
                         </goals>
                         <configuration>
-                            <createDependencyReducedPom>false</createDependencyReducedPom>
-                            <transformers>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>${package}.main.Init</mainClass>
-                                </transformer>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                            </transformers>
-                            <filters>
-
-                                <filter>
-                                    <artifact>*:*</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/*.SF</exclude>
-                                        <exclude>META-INF/*.DSA</exclude>
-                                        <exclude>META-INF/*.RSA</exclude>
-                                        <exclude>META-INF/maven/com.github.jsonld-java/jsonld-java/pom.xml</exclude>
-                                        <exclude>META-INF/maven/com.github.jsonld-java/jsonld-java-sesame/pom.xml
-                                        </exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
+                            <mainClass>${package}.main.Init</mainClass>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/archetypes/streampipes-archetype-pe-sources/pom.xml b/archetypes/streampipes-archetype-pe-sources/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.streampipes</groupId>
         <artifactId>streampipes-parent</artifactId>
-        <version>0.64.0</version>
+        <version>0.65.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>streampipes-archetype-pe-sources</artifactId>

diff --git a/...s/streampipes-archetype-pe-sources/src/main/resources/archetype-resources/development/env b/...s/streampipes-archetype-pe-sources/src/main/resources/archetype-resources/development/env
@@ -1,5 +1,5 @@
 # Those parameters are used by IntelliJ to set the default consul parameters for development
 SP_PORT=8005
-SP_HOST=localhost
-SP_ICON_HOST=localhost
+SP_HOST=host.docker.internal
+SP_DEBUG=true
 SP_FLINK_DEBUG=true
diff --git a/archetypes/streampipes-archetype-pe-sources/src/main/resources/archetype-resources/pom.xml b/archetypes/streampipes-archetype-pe-sources/src/main/resources/archetype-resources/pom.xml
@@ -7,7 +7,7 @@
     <version>${version}</version>
 
     <properties>
-        <sp.version>0.64.0</sp.version>
+        <sp.version>0.65.0</sp.version>
     </properties>
 
     <dependencies>
@@ -91,39 +91,15 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>2.3</version>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>package</phase>
                         <goals>
-                            <goal>shade</goal>
+                            <goal>repackage</goal>
                         </goals>
                         <configuration>
-                            <createDependencyReducedPom>false</createDependencyReducedPom>
-                            <transformers>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>${package}.main.Init</mainClass>
-                                </transformer>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                            </transformers>
-                            <filters>
-
-                                <filter>
-                                    <artifact>*:*</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/*.SF</exclude>
-                                        <exclude>META-INF/*.DSA</exclude>
-                                        <exclude>META-INF/*.RSA</exclude>
-                                        <exclude>META-INF/maven/com.github.jsonld-java/jsonld-java/pom.xml</exclude>
-                                        <exclude>META-INF/maven/com.github.jsonld-java/jsonld-java-sesame/pom.xml
-                                        </exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
+                            <mainClass>${package}.main.Init</mainClass>
                         </configuration>
                     </execution>
                 </executions>