Move all experimental Flink extensions to experimental-flink module (… (

apache#1652) * Move all experimental Flink extensions to experimental-flink module (apache#1651) * Move boilerpipe package * Fix pom file
jjbiggins · Jul 5, 2023 · 33a6836 · 33a6836
1 parent 62c1dd9
commit 33a6836
Show file tree

Hide file tree

Showing 293 changed files with 1,647 additions and 2,205 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -108,13 +108,13 @@ jobs:
           push: true
           tags: ${{ env.DOCKERHUB_APACHE_REPO }}/extensions-all-jvm:${{ env.MVN_VERSION }}
 
-      - name: Build and Push Docker Image pipeline-elements-all-flink
+      - name: Build and Push Docker Image pipeline-elements-experimental-flink
         uses: docker/build-push-action@v4
         with:
-          context: ./streampipes-extensions/streampipes-pipeline-elements-all-flink
+          context: ./streampipes-extensions/streampipes-pipeline-elements-experimental-flink
           platforms: linux/amd64,linux/arm64/v8,linux/arm/v7
           push: true
-          tags: ${{ env.DOCKERHUB_APACHE_REPO }}/pipeline-elements-all-flink:${{ env.MVN_VERSION }}
+          tags: ${{ env.DOCKERHUB_APACHE_REPO }}/pipeline-elements-experimental-flink:${{ env.MVN_VERSION }}
 
       - name: Build and Push Docker Image extensions-all-iiot
         uses: docker/build-push-action@v4

diff --git a/.idea/runConfigurations/all_pipeline_elements_flink.xml b/.idea/runConfigurations/all_pipeline_elements_flink.xml
diff --git a/streampipes-extensions/pom.xml b/streampipes-extensions/pom.xml
@@ -38,30 +38,22 @@
         <module>streampipes-extensions-all-jvm</module>
 
         <module>streampipes-pipeline-elements-all-jvm</module>
-        <module>streampipes-pipeline-elements-all-flink</module>
+        <module>streampipes-pipeline-elements-experimental-flink</module>
         <module>streampipes-pipeline-elements-data-simulator</module>
         <module>streampipes-pipeline-elements-shared</module>
 
-        <module>streampipes-processors-aggregation-flink</module>
         <module>streampipes-processors-change-detection-jvm</module>
-        <module>streampipes-processors-enricher-flink</module>
         <module>streampipes-processors-enricher-jvm</module>
         <module>streampipes-processors-filters-jvm</module>
         <module>streampipes-processors-filters-siddhi</module>
-        <module>streampipes-processors-geo-flink</module>
         <module>streampipes-processors-geo-jvm</module>
         <module>streampipes-processors-image-processing-jvm</module>
-        <module>streampipes-processors-pattern-detection-flink</module>
-        <module>streampipes-processors-statistics-flink</module>
-        <module>streampipes-processors-transformation-flink</module>
-        <module>streampipes-processors-text-mining-flink</module>
         <module>streampipes-processors-text-mining-jvm</module>
         <module>streampipes-processors-transformation-jvm</module>
 
         <module>streampipes-sinks-brokers-jvm</module>
         <module>streampipes-sinks-databases-jvm</module>
         <module>streampipes-sinks-internal-jvm</module>
-        <module>streampipes-sinks-databases-flink</module>
         <module>streampipes-sinks-notifications-jvm</module>
 
         <module>streampipes-sources-watertank-simulator</module>

diff --git a/streampipes-extensions/streampipes-pipeline-elements-all-flink/pom.xml b/streampipes-extensions/streampipes-pipeline-elements-all-flink/pom.xml
diff --git a/...all-flink/src/main/java/org/apache/streampipes/pe/flink/AllFlinkPipelineElementsInit.java b/...all-flink/src/main/java/org/apache/streampipes/pe/flink/AllFlinkPipelineElementsInit.java
diff --git a/...es-pipeline-elements-all-flink/Dockerfile → ...ne-elements-experimental-flink/Dockerfile b/...es-pipeline-elements-all-flink/Dockerfile → ...ne-elements-experimental-flink/Dockerfile
diff --git a/...peline-elements-all-flink/development/env → ...ements-experimental-flink/development/env b/...peline-elements-all-flink/development/env → ...ements-experimental-flink/development/env
diff --git a/...rocessors-pattern-detection-flink/pom.xml → ...eline-elements-experimental-flink/pom.xml b/...rocessors-pattern-detection-flink/pom.xml → ...eline-elements-experimental-flink/pom.xml
@@ -25,15 +25,13 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>streampipes-processors-pattern-detection-flink</artifactId>
+    <artifactId>streampipes-pipeline-elements-experimental-flink</artifactId>
 
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
-        <elasticsearch.version>5.2.2</elasticsearch.version>
     </properties>
 
     <dependencies>
-        <!-- StreamPipes dependencies -->
         <dependency>
             <groupId>org.apache.streampipes</groupId>
             <artifactId>streampipes-sdk-bundle</artifactId>
@@ -43,22 +41,10 @@
             <groupId>org.apache.streampipes</groupId>
             <artifactId>streampipes-wrapper-flink</artifactId>
             <version>0.93.0-SNAPSHOT</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
-
-        <!-- External dependencies -->
         <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-to-slf4j</artifactId>
+            <groupId>org.atteo.classindex</groupId>
+            <artifactId>classindex</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
@@ -76,30 +62,47 @@
             <groupId>org.scala-lang.modules</groupId>
             <artifactId>scala-parser-combinators_2.11</artifactId>
         </dependency>
-
-        <!-- Dependency convergence -->
         <dependency>
-            <groupId>org.scala-lang.modules</groupId>
-            <artifactId>scala-xml_2.11</artifactId>
-            <scope>test</scope>
+            <groupId>org.elasticsearch.client</groupId>
+            <artifactId>elasticsearch-rest-high-level-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>net.sourceforge.nekohtml</groupId>
+            <artifactId>nekohtml</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.elasticsearch</groupId>
+            <artifactId>elasticsearch</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
         </dependency>
 
-        <!-- Test dependencies -->
+        <!-- 3rd party dependencies to avoid convergence errors -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
+            <groupId>io.dropwizard.metrics</groupId>
+            <artifactId>metrics-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.streampipes</groupId>
-            <artifactId>streampipes-test-utils</artifactId>
-            <version>0.93.0-SNAPSHOT</version>
+            <groupId>org.scala-lang.modules</groupId>
+            <artifactId>scala-xml_2.11</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
@@ -125,8 +128,7 @@
                                     <resource>reference.conf</resource>
                                 </transformer>
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>
-                                        org.apache.streampipes.processors.pattern.detection.flink.PatternDetectionFlinkInit
+                                    <mainClass>org.apache.streampipes.pe.flink.AllFlinkPipelineElementsInit
                                     </mainClass>
                                 </transformer>
                             </transformers>
@@ -135,11 +137,7 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-            </plugin>
         </plugins>
-        <finalName>streampipes-processors-pattern-detection-flink</finalName>
+        <finalName>streampipes-pipeline-elements-all-flink</finalName>
     </build>
 </project>