This is an automated email from the ASF dual-hosted git repository. riemer pushed a commit to branch dev in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-extensions.git
commit a56b5e97c87588c5aeb36ce40685709cbb729782 Author: Dominik Riemer <[email protected]> AuthorDate: Wed Feb 24 08:54:43 2021 +0100 [hotfix] Bump maven-shade-plugin version, restore spring configuration --- pom.xml | 2 +- streampipes-pipeline-elements-all-flink/pom.xml | 5 ++++- streampipes-processors-aggregation-flink/pom.xml | 5 ++++- streampipes-processors-enricher-flink/pom.xml | 5 ++++- streampipes-processors-geo-flink/pom.xml | 5 ++++- streampipes-processors-pattern-detection-flink/pom.xml | 5 ++++- streampipes-processors-statistics-flink/pom.xml | 5 ++++- streampipes-processors-text-mining-flink/pom.xml | 5 ++++- streampipes-processors-transformation-flink/pom.xml | 5 ++++- streampipes-sinks-databases-flink/pom.xml | 8 ++++---- 10 files changed, 37 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 2781982..001762b 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ <hawtbuf.version>1.11</hawtbuf.version> <mysql-connector-java.version>8.0.15</mysql-connector-java.version> - <maven-shade-plugin.version>3.0.0</maven-shade-plugin.version> + <maven-shade-plugin.version>3.2.4</maven-shade-plugin.version> <!-- Connect Dependencies--> <animal-sniffer-annotations.version>1.17</animal-sniffer-annotations.version> diff --git a/streampipes-pipeline-elements-all-flink/pom.xml b/streampipes-pipeline-elements-all-flink/pom.xml index fe3a0d1..5672ee8 100644 --- a/streampipes-pipeline-elements-all-flink/pom.xml +++ b/streampipes-pipeline-elements-all-flink/pom.xml @@ -96,6 +96,9 @@ <transformer 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> @@ -116,4 +119,4 @@ </plugins> <finalName>streampipes-pipeline-elements-all-flink</finalName> </build> -</project> \ No newline at end of file +</project> diff --git a/streampipes-processors-aggregation-flink/pom.xml b/streampipes-processors-aggregation-flink/pom.xml index 5405fd7..5cda14d 100644 --- a/streampipes-processors-aggregation-flink/pom.xml +++ b/streampipes-processors-aggregation-flink/pom.xml @@ -138,6 +138,9 @@ <transformer 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> @@ -158,4 +161,4 @@ </plugins> <finalName>streampipes-processors-aggregation-flink</finalName> </build> -</project> \ No newline at end of file +</project> diff --git a/streampipes-processors-enricher-flink/pom.xml b/streampipes-processors-enricher-flink/pom.xml index e97f70c..c18964f 100644 --- a/streampipes-processors-enricher-flink/pom.xml +++ b/streampipes-processors-enricher-flink/pom.xml @@ -94,6 +94,9 @@ <transformer 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> @@ -114,4 +117,4 @@ </plugins> <finalName>streampipes-processors-enricher-flink</finalName> </build> -</project> \ No newline at end of file +</project> diff --git a/streampipes-processors-geo-flink/pom.xml b/streampipes-processors-geo-flink/pom.xml index 71006dc..ccb2121 100644 --- a/streampipes-processors-geo-flink/pom.xml +++ b/streampipes-processors-geo-flink/pom.xml @@ -83,6 +83,9 @@ <transformer 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> @@ -103,4 +106,4 @@ </plugins> <finalName>streampipes-processors-geo-flink</finalName> </build> -</project> \ No newline at end of file +</project> diff --git a/streampipes-processors-pattern-detection-flink/pom.xml b/streampipes-processors-pattern-detection-flink/pom.xml index f8e666f..3b7b426 100644 --- a/streampipes-processors-pattern-detection-flink/pom.xml +++ b/streampipes-processors-pattern-detection-flink/pom.xml @@ -143,6 +143,9 @@ <transformer 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> @@ -165,4 +168,4 @@ <finalName>streampipes-processors-pattern-detection-flink</finalName> </build> -</project> \ No newline at end of file +</project> diff --git a/streampipes-processors-statistics-flink/pom.xml b/streampipes-processors-statistics-flink/pom.xml index 0a96aab..155b49a 100644 --- a/streampipes-processors-statistics-flink/pom.xml +++ b/streampipes-processors-statistics-flink/pom.xml @@ -95,6 +95,9 @@ <transformer 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> @@ -115,4 +118,4 @@ </plugins> <finalName>streampipes-processors-statistics-flink</finalName> </build> -</project> \ No newline at end of file +</project> diff --git a/streampipes-processors-text-mining-flink/pom.xml b/streampipes-processors-text-mining-flink/pom.xml index b9e1f7e..5cddd15 100644 --- a/streampipes-processors-text-mining-flink/pom.xml +++ b/streampipes-processors-text-mining-flink/pom.xml @@ -124,6 +124,9 @@ <transformer 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> @@ -144,4 +147,4 @@ </plugins> <finalName>streampipes-processors-textmining-flink</finalName> </build> -</project> \ No newline at end of file +</project> diff --git a/streampipes-processors-transformation-flink/pom.xml b/streampipes-processors-transformation-flink/pom.xml index 8199326..0eb264a 100644 --- a/streampipes-processors-transformation-flink/pom.xml +++ b/streampipes-processors-transformation-flink/pom.xml @@ -125,6 +125,9 @@ <transformer 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> @@ -146,4 +149,4 @@ <finalName>streampipes-processors-transformation-flink</finalName> </build> -</project> \ No newline at end of file +</project> diff --git a/streampipes-sinks-databases-flink/pom.xml b/streampipes-sinks-databases-flink/pom.xml index ac99517..632f304 100644 --- a/streampipes-sinks-databases-flink/pom.xml +++ b/streampipes-sinks-databases-flink/pom.xml @@ -111,9 +111,9 @@ <transformer 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.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> @@ -134,4 +134,4 @@ </plugins> <finalName>streampipes-sinks-databases-flink</finalName> </build> -</project> \ No newline at end of file +</project>
