Skip to content

Commit

Permalink
Revert "[maven-release-plugin] rollback the release of streampipes-pa…
Browse files Browse the repository at this point in the history
…rent-0.67.1"

This reverts commit d4bfb14.
  • Loading branch information
dominikriemer committed Oct 1, 2020
1 parent d4bfb14 commit b75e4fd
Show file tree
Hide file tree
Showing 55 changed files with 202 additions and 185 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-parent</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>streampipes-archetype-pe-processors-flink</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/streampipes-archetype-pe-processors-jvm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-parent</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>streampipes-archetype-pe-processors-jvm</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/streampipes-archetype-pe-sinks-flink/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-parent</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>streampipes-archetype-pe-sinks-flink</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/streampipes-archetype-pe-sinks-jvm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-parent</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>streampipes-archetype-pe-sinks-jvm</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion archetypes/streampipes-archetype-pe-sources/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-parent</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>streampipes-archetype-pe-sources</artifactId>
Expand Down
5 changes: 2 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-parent</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
Expand Down Expand Up @@ -837,7 +837,6 @@
<module>archetypes/streampipes-archetype-pe-processors-jvm</module>
<module>archetypes/streampipes-archetype-pe-sinks-flink</module>
<module>archetypes/streampipes-archetype-pe-processors-flink</module>
<module>streampipes-app-file-export</module>
<module>streampipes-backend</module>
<module>streampipes-code-generation</module>
<module>streampipes-commons</module>
Expand Down Expand Up @@ -1243,7 +1242,7 @@
<developerConnection>scm:git:ssh://[email protected]/apache/incubator-streampipes.git</developerConnection>
<connection>scm:git:ssh://[email protected]/apache/incubator-streampipes.git</connection>
<url>https://github.com/apache/incubator-streampipes</url>
<tag>rel/VERSION</tag>
<tag>HEAD</tag>
</scm>

<issueManagement>
Expand Down
29 changes: 19 additions & 10 deletions streampipes-backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-parent</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</parent>

<artifactId>streampipes-backend</artifactId>
Expand All @@ -30,15 +30,10 @@

<dependencies>
<!-- StreamPipes dependencies -->
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-app-file-export</artifactId>
<version>0.67.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-container-base</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
Expand All @@ -49,17 +44,17 @@
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-config</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-messaging-kafka</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-rest</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</dependency>

<!-- External dependencies -->
Expand All @@ -83,8 +78,22 @@
<goals>
<goal>repackage</goal>
</goals>
<configuration>
<mainClass>org.apache.streampipes.backend.StreamPipesBackendApplication
</mainClass>
</configuration>
</execution>
</executions>
<configuration>
<environmentVariables>
<SP_COUCHDB_HOST>localhost</SP_COUCHDB_HOST>
<SP_BACKEND_HOST>localhost</SP_BACKEND_HOST>
<SP_INFLUX_HOST>localhost</SP_INFLUX_HOST>
<SP_INFLUX_PORT>8086</SP_INFLUX_PORT>
<SP_JMS_HOST>localhost</SP_JMS_HOST>
<SP_DEBUG>true</SP_DEBUG>
</environmentVariables>
</configuration>
</plugin>
</plugins>
<finalName>streampipes-backend</finalName>
Expand Down
8 changes: 4 additions & 4 deletions streampipes-code-generation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-parent</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</parent>

<artifactId>streampipes-code-generation</artifactId>
Expand All @@ -39,18 +39,18 @@
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-container-standalone</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-model-client</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-sdk</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</dependency>

<!-- External dependencies -->
Expand Down
2 changes: 1 addition & 1 deletion streampipes-commons/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-parent</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</parent>

<artifactId>streampipes-commons</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions streampipes-config/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>streampipes-parent</artifactId>
<groupId>org.apache.streampipes</groupId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-vocabulary</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</dependency>

<!-- External dependencies -->
Expand Down
19 changes: 14 additions & 5 deletions streampipes-connect-container-master/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>streampipes-parent</artifactId>
<groupId>org.apache.streampipes</groupId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -32,17 +32,17 @@
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-connect-container</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-storage-couchdb</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-user-management</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</dependency>

<!-- External dependencies -->
Expand Down Expand Up @@ -85,10 +85,19 @@
<goal>repackage</goal>
</goals>
<configuration>
<mainClass>org.apache.streampipes.connect.container.master.init.AdapterMasterContainer</mainClass>
<mainClass>org.apache.streampipes.connect.container.master.init.AdapterMasterContainer
</mainClass>
</configuration>
</execution>
</executions>
<configuration>
<environmentVariables>
<SP_BACKEND_HOST>localhost</SP_BACKEND_HOST>
<SP_KAFKA_HOST>localhost</SP_KAFKA_HOST>
<SP_CONNECT_CONTAINER_HOST>localhost</SP_CONNECT_CONTAINER_HOST>
<SP_COUCHDB_HOST>localhost</SP_COUCHDB_HOST>
</environmentVariables>
</configuration>
</plugin>
</plugins>
<finalName>streampipes-connect-container-master</finalName>
Expand Down
4 changes: 2 additions & 2 deletions streampipes-connect-container-worker/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>streampipes-parent</artifactId>
<groupId>org.apache.streampipes</groupId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-connect-container</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</dependency>

<!-- External dependencies -->
Expand Down
12 changes: 6 additions & 6 deletions streampipes-connect-container/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>streampipes-parent</artifactId>
<groupId>org.apache.streampipes</groupId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -32,27 +32,27 @@
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-config</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-connect</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-container-base</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-rest-shared</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-serializers</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</dependency>

<!-- External dependencies -->
Expand Down
26 changes: 13 additions & 13 deletions streampipes-connect/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-parent</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -32,62 +32,62 @@
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-config</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-container</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-dataformat-json</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-dataformat-smile</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-dataformat-cbor</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-dataformat-fst</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-measurement-units</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-messaging-kafka</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-model</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-sdk</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-rest-shared</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.streampipes</groupId>
<artifactId>streampipes-serializers</artifactId>
<version>0.67.1-SNAPSHOT</version>
<version>0.68.0-SNAPSHOT</version>
</dependency>

<!-- External dependencis -->
Expand Down
Loading

0 comments on commit b75e4fd

Please sign in to comment.