Merge branch 'dev' of https://github.com/muyangye/streampipes into dev

apache · Oct 27, 2023 · 95802e7 · 95802e7
2 parents b914407 + a4065bd
commit 95802e7
Show file tree

Hide file tree

Showing 277 changed files with 3,871 additions and 4,917 deletions.
diff --git a/.github/pr-labeler-config.yml b/.github/pr-labeler-config.yml
@@ -50,7 +50,6 @@ javascript:
   - "streampipes-extensions/streampipes-pipeline-*/**/*"
   - "streampipes-extensions/streampipes-processors-*/**/*"
   - "streampipes-extensions/streampipes-sinks-*/**/*"
-  - "streampipes-extensions/streampipes-sources-*/**/*"
 
 python:
   - "**/*.py"

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -36,7 +36,7 @@ jobs:
           cache: 'maven'
 
       - name: Set up Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '16.x'
           cache: 'npm'
@@ -140,10 +140,3 @@ jobs:
           push: true
           tags: ${{ env.DOCKERHUB_APACHE_REPO }}/pipeline-elements-all-jvm:${{ env.MVN_VERSION }}
 
-      - name: Build and Push Docker Image sources-watertank-simulator
-        uses: docker/build-push-action@v5
-        with:
-          context: ./streampipes-extensions/streampipes-sources-watertank-simulator
-          platforms: linux/amd64,linux/arm64/v8,linux/arm/v7
-          push: true
-          tags: ${{ env.DOCKERHUB_APACHE_REPO }}/sources-watertank-simulator:${{ env.MVN_VERSION }}
diff --git a/.github/workflows/cypress-test.yml b/.github/workflows/cypress-test.yml
@@ -35,7 +35,7 @@ jobs:
           cache: 'maven'
 
       - name: Set up Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '16.x'
           cache: 'npm'

diff --git a/.github/workflows/pr-validation.yml b/.github/workflows/pr-validation.yml
@@ -42,7 +42,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '16.x'
           cache: 'npm'
@@ -74,7 +74,7 @@ jobs:
           cache: 'maven'
 
       - name: Set up Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '16.x'
           cache: 'npm'

diff --git a/.idea/runConfigurations/sources_watertank_simulator_jvm.xml b/.idea/runConfigurations/sources_watertank_simulator_jvm.xml
diff --git a/...types/streampipes-archetype-extensions-jvm/src/main/resources/archetype-resources/pom.xml b/...types/streampipes-archetype-extensions-jvm/src/main/resources/archetype-resources/pom.xml
@@ -39,11 +39,6 @@
             <artifactId>streampipes-wrapper-standalone</artifactId>
             <version>${sp.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.streampipes</groupId>
-            <artifactId>streampipes-sources</artifactId>
-            <version>${sp.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

diff --git a/...chetype-resources/src/main/java/pe/__packageName__/__classNamePrefix__GenericAdapter.java b/...chetype-resources/src/main/java/pe/__packageName__/__classNamePrefix__GenericAdapter.java
@@ -53,6 +53,7 @@ public IAdapterConfiguration declareConfig() {
           ${classNamePrefix}GenericAdapter::new
         )
         .withCategory(AdapterType.Manufacturing)
+        .withAssets(Assets.DOCUMENTATION, Assets.ICON)
         .withLocales(Locales.EN)
         .withSupportedParsers(Parsers.defaultParsers())
         .requiredTextParameter(Labels.withId(EXAMPLE_KEY))

diff --git a/...hetype-resources/src/main/java/pe/__packageName__/__classNamePrefix__SpecificAdapter.java b/...hetype-resources/src/main/java/pe/__packageName__/__classNamePrefix__SpecificAdapter.java
@@ -53,6 +53,7 @@ public IAdapterConfiguration declareConfig() {
         ${classNamePrefix}SpecificAdapter::new
       )
       .withCategory(AdapterType.Manufacturing)
+      .withAssets(Assets.DOCUMENTATION, Assets.ICON)
       .withLocales(Locales.EN)
       .requiredTextParameter(Labels.withId(EXAMPLE_KEY))
       .buildConfiguration();

diff --git a/installer/cli/deploy/standalone/sources-vehicle-simulator/docker-compose.dev.yml b/installer/cli/deploy/standalone/sources-vehicle-simulator/docker-compose.dev.yml
diff --git a/installer/cli/deploy/standalone/sources-vehicle-simulator/docker-compose.yml b/installer/cli/deploy/standalone/sources-vehicle-simulator/docker-compose.yml
diff --git a/installer/cli/deploy/standalone/sources-watertank-simulator/docker-compose.dev.yml b/installer/cli/deploy/standalone/sources-watertank-simulator/docker-compose.dev.yml
diff --git a/installer/cli/deploy/standalone/sources-watertank-simulator/docker-compose.yml b/installer/cli/deploy/standalone/sources-watertank-simulator/docker-compose.yml
diff --git a/installer/cli/environments/full b/installer/cli/environments/full
@@ -25,6 +25,5 @@ taskmanager
 zookeeper
 kafka
 influxdb
-sources-watertank-simulator
 pipeline-elements-all-jvm
 pipeline-elements-all-flink
diff --git a/installer/cli/environments/lite b/installer/cli/environments/lite
@@ -21,5 +21,4 @@ couchdb
 kafka
 zookeeper
 influxdb
-sources-watertank-simulator
 extensions-all-jvm
diff --git a/installer/cli/environments/lite-nats b/installer/cli/environments/lite-nats
@@ -19,6 +19,5 @@ backend
 consul
 couchdb
 influxdb
-sources-watertank-simulator
 extensions-all-jvm
 nats
diff --git a/installer/cli/environments/ui b/installer/cli/environments/ui
@@ -19,6 +19,5 @@ consul
 extensions-all-jvm
 couchdb
 kafka
-sources-watertank-simulator
 zookeeper
 influxdb
diff --git a/installer/compose/docker-compose.full.yml b/installer/compose/docker-compose.full.yml
@@ -207,16 +207,6 @@ services:
     networks:
       spnet:
 
-  sources-watertank-simulator:
-    image: "${SP_DOCKER_REGISTRY}/sources-watertank-simulator:${SP_VERSION}"
-    depends_on:
-      - consul
-      - kafka
-    logging: *default-logging
-    restart: unless-stopped
-    networks:
-      spnet:
-
   # Full version pipeline elements
   pipeline-elements-all-flink:
     image: "${SP_DOCKER_REGISTRY}/pipeline-elements-all-flink:${SP_VERSION}"

diff --git a/installer/compose/docker-compose.yml b/installer/compose/docker-compose.yml
@@ -154,16 +154,6 @@ services:
     networks:
       spnet:
 
-  sources-watertank-simulator:
-    image: "${SP_DOCKER_REGISTRY}/sources-watertank-simulator:${SP_VERSION}"
-    depends_on:
-      - consul
-      - kafka
-    logging: *default-logging
-    restart: unless-stopped
-    networks:
-      spnet:
-
 
 volumes:
   backend:

diff --git a/installer/scripts/epsg/Readme.md b/installer/scripts/epsg/Readme.md
@@ -45,7 +45,6 @@ extensions-all-jvm
 couchdb
 kafka
 ui
-sources-watertank-simulator
 zookeeper
 influxdb
 epsg

diff --git a/pom.xml b/pom.xml
@@ -135,7 +135,7 @@
 	<maven.compiler.source>17</maven.compiler.source>
 	<maven.compiler.target>17</maven.compiler.target>
 
-	<amqp-client.version>5.19.0</amqp-client.version>
+	<amqp-client.version>5.20.0</amqp-client.version>
 	<animal-sniffer-annotations.version>1.23</animal-sniffer-annotations.version>
 	<boofcv.version>1.1.0</boofcv.version>
 	<bcprov.version>1.70</bcprov.version>
@@ -183,7 +183,6 @@
 	<commons-collections4.version>4.4</commons-collections4.version>
 	<eclipse.milo.version>0.6.9</eclipse.milo.version>
 	<netty.version>4.1.72.Final</netty.version>
-	<nimbus-jose-jwt.version>9.36</nimbus-jose-jwt.version>
 	<opencsv.version>5.8</opencsv.version>
 	<plc4x.version>0.10.0</plc4x.version>
 	<protobuf.version>3.24.0</protobuf.version>
@@ -1100,11 +1099,6 @@
                 <artifactId>netty-transport</artifactId>
                 <version>${netty.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.nimbusds</groupId>
-                <artifactId>nimbus-jose-jwt</artifactId>
-                <version>${nimbus-jose-jwt.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.opencsv</groupId>
                 <artifactId>opencsv</artifactId>
@@ -1367,7 +1361,6 @@
         <module>streampipes-rest-shared</module>
         <module>streampipes-sdk</module>
 		<module>streampipes-sdk-bundle</module>
-		<module>streampipes-sources</module>
         <module>streampipes-security-jwt</module>
         <module>streampipes-serializers-json</module>
         <module>streampipes-service-base</module>
@@ -1556,6 +1549,7 @@
 				<artifactId>maven-assembly-plugin</artifactId>
 				<executions>
 					<execution>
+						<inherited>false</inherited>
 						<id>installer-files</id>
 						<phase>package</phase>
 						<goals>
@@ -1565,7 +1559,7 @@
 							<runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
 							<finalName>apache-streampipes-${project.version}-installer</finalName>
 							<descriptors>
-								<descriptor>tools/maven/installer.xml</descriptor>
+								<descriptor>${project.basedir}/tools/maven/installer.xml</descriptor>
 							</descriptors>
 						</configuration>
 					</execution>
@@ -1704,7 +1698,6 @@
                         <exclude>archetypes/streampipes-archetype-pe-processors-jvm/src/main/resources/**</exclude>
                         <exclude>archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/**</exclude>
                         <exclude>archetypes/streampipes-archetype-pe-sinks-jvm/src/main/resources/**</exclude>
-                        <exclude>archetypes/streampipes-archetype-pe-sources/src/main/resources/**</exclude>
 
                         <!-- External files -->
                         <exclude>
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,7 +45,6 @@ extensions-all-jvm @@
     couchdb
     kafka
     ui
-    sources-watertank-simulator
     zookeeper
     influxdb
     epsg
@@ Expand Down @@