[
https://issues.apache.org/jira/browse/FLINK-9944?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16558286#comment-16558286
]
ASF GitHub Bot commented on FLINK-9944:
---------------------------------------
zentol closed pull request #6421: [FLINK-9944][tests] Cleanup end-to-end test
poms
URL: https://github.com/apache/flink/pull/6421
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/flink-end-to-end-tests/flink-bucketing-sink-test/pom.xml
b/flink-end-to-end-tests/flink-bucketing-sink-test/pom.xml
index 9f2a9a1d179..2fd04f5524e 100644
--- a/flink-end-to-end-tests/flink-bucketing-sink-test/pom.xml
+++ b/flink-end-to-end-tests/flink-bucketing-sink-test/pom.xml
@@ -35,12 +35,6 @@
<packaging>jar</packaging>
<dependencies>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-core</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
@@ -72,30 +66,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.0.0</version>
<executions>
<execution>
+
<id>BucketingSinkTestProgram</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<finalName>BucketingSinkTestProgram</finalName>
- <artifactSet>
- <excludes>
-
<exclude>com.google.code.findbugs:jsr305</exclude>
- </excludes>
- </artifactSet>
- <filters>
- <filter>
-
<artifact>*:*</artifact>
-
<excludes>
-
<exclude>META-INF/*.SF</exclude>
-
<exclude>META-INF/*.DSA</exclude>
-
<exclude>META-INF/*.RSA</exclude>
-
</excludes>
- </filter>
- </filters>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.apache.flink.streaming.tests.BucketingSinkTestProgram</mainClass>
diff --git a/flink-end-to-end-tests/flink-confluent-schema-registry/pom.xml
b/flink-end-to-end-tests/flink-confluent-schema-registry/pom.xml
index cdc3f959326..ea81997f36d 100644
--- a/flink-end-to-end-tests/flink-confluent-schema-registry/pom.xml
+++ b/flink-end-to-end-tests/flink-confluent-schema-registry/pom.xml
@@ -40,23 +40,11 @@ under the License.
</repositories>
<dependencies>
- <!-- Apache Flink dependencies -->
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <!-- This dependency is required to actually execute
jobs. It is currently pulled in by
- flink-streaming-java, but we explicitly depend on it to
safeguard against future changes. -->
- <groupId>org.apache.flink</groupId>
-
<artifactId>flink-clients_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<!--
https://mvnrepository.com/artifact/org.apache.flink/flink-connector-kafka-0.10
-->
<dependency>
@@ -81,30 +69,15 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.0.0</version>
<executions>
<execution>
+
<id>TestAvroConsumerConfluent</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<finalName>TestAvroConsumerConfluent</finalName>
- <artifactSet>
- <excludes>
-
<exclude>com.google.code.findbugs:jsr305</exclude>
- </excludes>
- </artifactSet>
- <filters>
- <filter>
-
<artifact>*:*</artifact>
-
<excludes>
-
<exclude>META-INF/*.SF</exclude>
-
<exclude>META-INF/*.DSA</exclude>
-
<exclude>META-INF/*.RSA</exclude>
-
</excludes>
- </filter>
- </filters>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.apache.flink.schema.registry.test.TestAvroConsumerConfluent</mainClass>
diff --git a/flink-end-to-end-tests/flink-dataset-allround-test/pom.xml
b/flink-end-to-end-tests/flink-dataset-allround-test/pom.xml
index 956b1b8f012..a79c7242bdb 100644
--- a/flink-end-to-end-tests/flink-dataset-allround-test/pom.xml
+++ b/flink-end-to-end-tests/flink-dataset-allround-test/pom.xml
@@ -34,12 +34,6 @@ under the License.
<packaging>jar</packaging>
<dependencies>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-core</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-java</artifactId>
@@ -52,29 +46,21 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
+ <artifactId>maven-shade-plugin</artifactId>
<executions>
- <!-- DataSetAllroundTestProgram -->
<execution>
<id>DataSetAllroundTestProgram</id>
<phase>package</phase>
<goals>
- <goal>jar</goal>
+ <goal>shade</goal>
</goals>
<configuration>
<finalName>DataSetAllroundTestProgram</finalName>
-
- <archive>
-
<manifestEntries>
-
<program-class>org.apache.flink.batch.tests.DataSetAllroundTestProgram</program-class>
-
</manifestEntries>
- </archive>
-
- <includes>
-
<include>org/apache/flink/batch/tests/DataSetAllroundTestProgram.class</include>
-
<include>org/apache/flink/batch/tests/DataSetAllroundTestProgram$*.class</include>
- </includes>
+ <transformers>
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+
<mainClass>org.apache.flink.batch.tests.DataSetAllroundTestProgram</mainClass>
+ </transformer>
+ </transformers>
</configuration>
</execution>
</executions>
diff --git a/flink-end-to-end-tests/flink-datastream-allround-test/pom.xml
b/flink-end-to-end-tests/flink-datastream-allround-test/pom.xml
index c898ca4490b..e37f70e60f8 100644
--- a/flink-end-to-end-tests/flink-datastream-allround-test/pom.xml
+++ b/flink-end-to-end-tests/flink-datastream-allround-test/pom.xml
@@ -34,12 +34,6 @@ under the License.
<packaging>jar</packaging>
<dependencies>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-core</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
@@ -48,8 +42,9 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-statebackend-rocksdb_2.11</artifactId>
+
<artifactId>flink-statebackend-rocksdb_${scala.binary.version}</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
@@ -62,24 +57,21 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
+ <artifactId>maven-shade-plugin</artifactId>
<executions>
- <!-- DataStreamAllroundTestProgram -->
<execution>
<id>DataStreamAllroundTestProgram</id>
<phase>package</phase>
<goals>
- <goal>jar</goal>
+ <goal>shade</goal>
</goals>
<configuration>
<finalName>DataStreamAllroundTestProgram</finalName>
-
- <archive>
-
<manifestEntries>
-
<program-class>org.apache.flink.streaming.tests.DataStreamAllroundTestProgram</program-class>
-
</manifestEntries>
- </archive>
+ <transformers>
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+
<mainClass>org.apache.flink.streaming.tests.DataStreamAllroundTestProgram</mainClass>
+ </transformer>
+ </transformers>
</configuration>
</execution>
</executions>
diff --git
a/flink-end-to-end-tests/flink-distributed-cache-via-blob-test/pom.xml
b/flink-end-to-end-tests/flink-distributed-cache-via-blob-test/pom.xml
index 3d8b33b9d3a..b6a2356f073 100644
--- a/flink-end-to-end-tests/flink-distributed-cache-via-blob-test/pom.xml
+++ b/flink-end-to-end-tests/flink-distributed-cache-via-blob-test/pom.xml
@@ -35,15 +35,11 @@
<packaging>jar</packaging>
<dependencies>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-core</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
@@ -51,29 +47,21 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
-
+ <artifactId>maven-shade-plugin</artifactId>
<executions>
- <!-- ClassLoaderTestProgram -->
<execution>
<id>DistributedCacheViaBlobTestProgram</id>
<phase>package</phase>
<goals>
- <goal>jar</goal>
+ <goal>shade</goal>
</goals>
<configuration>
<finalName>DistributedCacheViaBlobTestProgram</finalName>
-
- <archive>
-
<manifestEntries>
-
<program-class>org.apache.flink.streaming.tests.DistributedCacheViaBlobTestProgram</program-class>
-
</manifestEntries>
- </archive>
-
- <includes>
-
<include>org/apache/flink/streaming/tests/DistributedCacheViaBlobTestProgram*</include>
- </includes>
+ <transformers>
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+
<mainClass>org.apache.flink.streaming.tests.DistributedCacheViaBlobTestProgram</mainClass>
+ </transformer>
+ </transformers>
</configuration>
</execution>
</executions>
diff --git a/flink-end-to-end-tests/flink-elasticsearch1-test/pom.xml
b/flink-end-to-end-tests/flink-elasticsearch1-test/pom.xml
index 244bfcfe2b6..5b43e50ec4c 100644
--- a/flink-end-to-end-tests/flink-elasticsearch1-test/pom.xml
+++ b/flink-end-to-end-tests/flink-elasticsearch1-test/pom.xml
@@ -53,30 +53,15 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.0.0</version>
<executions>
<execution>
+
<id>DistributedCacheViaBlobElasticsearch1SinkExampleTestProgram</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<finalName>Elasticsearch1SinkExample</finalName>
- <artifactSet>
- <excludes>
-
<exclude>com.google.code.findbugs:jsr305</exclude>
- </excludes>
- </artifactSet>
- <filters>
- <filter>
-
<artifact>*:*</artifact>
-
<excludes>
-
<exclude>META-INF/*.SF</exclude>
-
<exclude>META-INF/*.DSA</exclude>
-
<exclude>META-INF/*.RSA</exclude>
-
</excludes>
- </filter>
- </filters>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.apache.flink.streaming.tests.Elasticsearch1SinkExample</mainClass>
diff --git a/flink-end-to-end-tests/flink-elasticsearch2-test/pom.xml
b/flink-end-to-end-tests/flink-elasticsearch2-test/pom.xml
index a6d3da2e649..9261e95a766 100644
--- a/flink-end-to-end-tests/flink-elasticsearch2-test/pom.xml
+++ b/flink-end-to-end-tests/flink-elasticsearch2-test/pom.xml
@@ -53,30 +53,15 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.0.0</version>
<executions>
<execution>
+
<id>Elasticsearch2SinkExample</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<finalName>Elasticsearch2SinkExample</finalName>
- <artifactSet>
- <excludes>
-
<exclude>com.google.code.findbugs:jsr305</exclude>
- </excludes>
- </artifactSet>
- <filters>
- <filter>
-
<artifact>*:*</artifact>
-
<excludes>
-
<exclude>META-INF/*.SF</exclude>
-
<exclude>META-INF/*.DSA</exclude>
-
<exclude>META-INF/*.RSA</exclude>
-
</excludes>
- </filter>
- </filters>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.apache.flink.streaming.tests.Elasticsearch2SinkExample</mainClass>
diff --git a/flink-end-to-end-tests/flink-elasticsearch5-test/pom.xml
b/flink-end-to-end-tests/flink-elasticsearch5-test/pom.xml
index 52b5e7dcfee..c820211822e 100644
--- a/flink-end-to-end-tests/flink-elasticsearch5-test/pom.xml
+++ b/flink-end-to-end-tests/flink-elasticsearch5-test/pom.xml
@@ -53,30 +53,15 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.0.0</version>
<executions>
<execution>
+
<id>Elasticsearch5SinkExample</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<finalName>Elasticsearch5SinkExample</finalName>
- <artifactSet>
- <excludes>
-
<exclude>com.google.code.findbugs:jsr305</exclude>
- </excludes>
- </artifactSet>
- <filters>
- <filter>
-
<artifact>*:*</artifact>
-
<excludes>
-
<exclude>META-INF/*.SF</exclude>
-
<exclude>META-INF/*.DSA</exclude>
-
<exclude>META-INF/*.RSA</exclude>
-
</excludes>
- </filter>
- </filters>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.apache.flink.streaming.tests.Elasticsearch5SinkExample</mainClass>
diff --git
a/flink-end-to-end-tests/flink-high-parallelism-iterations-test/pom.xml
b/flink-end-to-end-tests/flink-high-parallelism-iterations-test/pom.xml
index 380f5c239d5..c619225d6e1 100644
--- a/flink-end-to-end-tests/flink-high-parallelism-iterations-test/pom.xml
+++ b/flink-end-to-end-tests/flink-high-parallelism-iterations-test/pom.xml
@@ -58,28 +58,22 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.0.0</version>
<executions>
<execution>
+
<id>HighParallelismIterationsTestProgram</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<finalName>HighParallelismIterationsTestProgram</finalName>
- <artifactSet>
- <excludes>
-
<exclude>com.google.code.findbugs:jsr305</exclude>
- </excludes>
- </artifactSet>
<filters>
<filter>
-
<artifact>*:*</artifact>
-
<excludes>
-
<exclude>META-INF/*.SF</exclude>
-
<exclude>META-INF/*.DSA</exclude>
-
<exclude>META-INF/*.RSA</exclude>
-
</excludes>
+
<artifact>org.apache.flink:flink-examples-batch*</artifact>
+
<includes>
+
<include>org/apache/flink/examples/java/graph/ConnectedComponents*</include>
+
<include>org/apache/flink/examples/java/graph/util/ConnectedComponentsData*</include>
+
</includes>
</filter>
</filters>
<transformers>
diff --git
a/flink-end-to-end-tests/flink-local-recovery-and-allocation-test/pom.xml
b/flink-end-to-end-tests/flink-local-recovery-and-allocation-test/pom.xml
index da884856601..d0d7d2c5f64 100644
--- a/flink-end-to-end-tests/flink-local-recovery-and-allocation-test/pom.xml
+++ b/flink-end-to-end-tests/flink-local-recovery-and-allocation-test/pom.xml
@@ -33,28 +33,17 @@ under the License.
<packaging>jar</packaging>
<dependencies>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-core</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-statebackend-rocksdb_${scala.binary.version}</artifactId>
<version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>
@@ -62,29 +51,21 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
+ <artifactId>maven-shade-plugin</artifactId>
<executions>
- <!--
StickyAllocationAndLocalRecoveryTestJob -->
<execution>
<id>StickyAllocationAndLocalRecoveryTestJob</id>
<phase>package</phase>
<goals>
- <goal>jar</goal>
+ <goal>shade</goal>
</goals>
<configuration>
<finalName>StickyAllocationAndLocalRecoveryTestJob</finalName>
-
- <archive>
-
<manifestEntries>
-
<program-class>org.apache.flink.streaming.tests.StickyAllocationAndLocalRecoveryTestJob</program-class>
-
</manifestEntries>
- </archive>
-
- <includes>
-
<include>org/apache/flink/streaming/tests/StickyAllocationAndLocalRecoveryTestJob.class</include>
-
<include>org/apache/flink/streaming/tests/StickyAllocationAndLocalRecoveryTestJob$*.class</include>
- </includes>
+ <transformers>
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+
<mainClass>org.apache.flink.streaming.tests.StickyAllocationAndLocalRecoveryTestJob</mainClass>
+ </transformer>
+ </transformers>
</configuration>
</execution>
</executions>
diff --git
a/flink-end-to-end-tests/flink-parent-child-classloading-test/pom.xml
b/flink-end-to-end-tests/flink-parent-child-classloading-test/pom.xml
index 429691589c4..a153bb18d71 100644
--- a/flink-end-to-end-tests/flink-parent-child-classloading-test/pom.xml
+++ b/flink-end-to-end-tests/flink-parent-child-classloading-test/pom.xml
@@ -35,12 +35,6 @@
<packaging>jar</packaging>
<dependencies>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-core</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
@@ -53,31 +47,21 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
-
+ <artifactId>maven-shade-plugin</artifactId>
<executions>
- <!-- ClassLoaderTestProgram -->
<execution>
<id>ClassLoaderTestProgram</id>
<phase>package</phase>
<goals>
- <goal>jar</goal>
+ <goal>shade</goal>
</goals>
<configuration>
<finalName>ClassLoaderTestProgram</finalName>
-
- <archive>
-
<manifestEntries>
-
<program-class>org.apache.flink.streaming.tests.ClassLoaderTestProgram</program-class>
-
</manifestEntries>
- </archive>
-
- <includes>
-
<include>org/apache/flink/streaming/tests/ClassLoaderTestProgram.class</include>
-
<include>org/apache/flink/runtime/taskmanager/TaskManager.class</include>
-
<include>.version.properties</include>
- </includes>
+ <transformers>
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+
<mainClass>org.apache.flink.streaming.tests.ClassLoaderTestProgram</mainClass>
+ </transformer>
+ </transformers>
</configuration>
</execution>
</executions>
diff --git a/flink-end-to-end-tests/flink-queryable-state-test/pom.xml
b/flink-end-to-end-tests/flink-queryable-state-test/pom.xml
index 3a7515a3b15..6b9c79b2b41 100644
--- a/flink-end-to-end-tests/flink-queryable-state-test/pom.xml
+++ b/flink-end-to-end-tests/flink-queryable-state-test/pom.xml
@@ -37,16 +37,31 @@
<groupId>org.apache.flink</groupId>
<artifactId>flink-core</artifactId>
<version>${project.version}</version>
+ <!-- compile scope since it is used by the client jar
-->
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-java</artifactId>
+ <version>${project.version}</version>
+ <!-- compile scope since it is used by the client jar
-->
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+
<artifactId>flink-queryable-state-client-java_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ <!-- compile scope since it is used by the client jar
-->
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-statebackend-rocksdb_${scala.binary.version}</artifactId>
<version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
@@ -54,35 +69,28 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
-
+ <artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
<id>QsStateProducer</id>
<phase>package</phase>
<goals>
- <goal>jar</goal>
+ <goal>shade</goal>
</goals>
<configuration>
-
<classifier>QsStateProducer</classifier>
- <archive>
-
<manifestEntries>
-
<program-class>
-
org.apache.flink.streaming.tests.queryablestate.QsStateProducer
-
</program-class>
-
</manifestEntries>
- </archive>
+
<finalName>QsStateProducer</finalName>
+ <artifactSet>
+ <includes>
+
<include>org.apache.flink:flink-queryable-state-test*</include>
+ </includes>
+ </artifactSet>
+ <transformers>
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+
<mainClass>org.apache.flink.streaming.tests.queryablestate.QsStateProducer</mainClass>
+ </transformer>
+ </transformers>
</configuration>
</execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
-
<execution>
<id>QsStateClient</id>
<phase>package</phase>
@@ -90,41 +98,17 @@
<goal>shade</goal>
</goals>
<configuration>
-
<shadeTestJar>false</shadeTestJar>
-
<shadedArtifactAttached>false</shadedArtifactAttached>
-
<createDependencyReducedPom>false</createDependencyReducedPom>
+
<finalName>QsStateClient</finalName>
+ <artifactSet>
+ <excludes
combine.self="override">
+ <!--
not a Flink application so we have to bundle all dependencies -->
+ </excludes>
+ </artifactSet>
<transformers>
- <transformer
-
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-
<mainClass>
-
org.apache.flink.streaming.tests.queryablestate.QsStateClient
-
</mainClass>
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+
<mainClass>org.apache.flink.streaming.tests.queryablestate.QsStateClient</mainClass>
</transformer>
</transformers>
-
<finalName>QsStateClient</finalName>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <!--simplify the name of the testing JARs for referring
to them in the end-to-end test scripts-->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <id>rename</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <copy
-
file="${project.basedir}/target/flink-queryable-state-test_${scala.binary.version}-${project.version}-QsStateProducer.jar"
-
tofile="${project.basedir}/target/QsStateProducer.jar"/>
- </target>
</configuration>
</execution>
</executions>
diff --git a/flink-end-to-end-tests/flink-stream-sql-test/pom.xml
b/flink-end-to-end-tests/flink-stream-sql-test/pom.xml
index e05742bc3e2..bae46d021c1 100644
--- a/flink-end-to-end-tests/flink-stream-sql-test/pom.xml
+++ b/flink-end-to-end-tests/flink-stream-sql-test/pom.xml
@@ -35,12 +35,6 @@
<packaging>jar</packaging>
<dependencies>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-core</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-scala_${scala.binary.version}</artifactId>
@@ -65,32 +59,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.0.0</version>
<executions>
<execution>
+ <id>StreamSQLTestProgram</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<finalName>StreamSQLTestProgram</finalName>
- <artifactSet>
- <excludes>
-
<exclude>com.google.code.findbugs:jsr305</exclude>
-
<exclude>org.slf4j:*</exclude>
-
<exclude>log4j:*</exclude>
- </excludes>
- </artifactSet>
- <filters>
- <filter>
-
<artifact>*:*</artifact>
-
<excludes>
-
<exclude>META-INF/*.SF</exclude>
-
<exclude>META-INF/*.DSA</exclude>
-
<exclude>META-INF/*.RSA</exclude>
-
</excludes>
- </filter>
- </filters>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.apache.flink.sql.tests.StreamSQLTestProgram</mainClass>
diff --git a/flink-end-to-end-tests/flink-stream-state-ttl-test/pom.xml
b/flink-end-to-end-tests/flink-stream-state-ttl-test/pom.xml
index ad04f3ed776..ca967c532b3 100644
--- a/flink-end-to-end-tests/flink-stream-state-ttl-test/pom.xml
+++ b/flink-end-to-end-tests/flink-stream-state-ttl-test/pom.xml
@@ -34,23 +34,12 @@ under the License.
<packaging>jar</packaging>
<dependencies>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-core</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-statebackend-rocksdb_2.11</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-datastream-allround-test</artifactId>
@@ -63,32 +52,15 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.0.0</version>
<executions>
<execution>
+
<id>DataStreamStateTTLTestProgram</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<finalName>DataStreamStateTTLTestProgram</finalName>
- <artifactSet>
- <excludes>
-
<exclude>com.google.code.findbugs:jsr305</exclude>
-
<exclude>org.slf4j:*</exclude>
-
<exclude>log4j:*</exclude>
- </excludes>
- </artifactSet>
- <filters>
- <filter>
-
<artifact>*:*</artifact>
-
<excludes>
-
<exclude>META-INF/*.SF</exclude>
-
<exclude>META-INF/*.DSA</exclude>
-
<exclude>META-INF/*.RSA</exclude>
-
</excludes>
- </filter>
- </filters>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.apache.flink.streaming.tests.DataStreamStateTTLTestProgram</mainClass>
diff --git
a/flink-end-to-end-tests/flink-stream-stateful-job-upgrade-test/pom.xml
b/flink-end-to-end-tests/flink-stream-stateful-job-upgrade-test/pom.xml
index 9f60987cab0..3f28f2d5be8 100644
--- a/flink-end-to-end-tests/flink-stream-stateful-job-upgrade-test/pom.xml
+++ b/flink-end-to-end-tests/flink-stream-stateful-job-upgrade-test/pom.xml
@@ -32,12 +32,6 @@ under the License.
<packaging>jar</packaging>
<dependencies>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-core</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
@@ -56,32 +50,15 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.0.0</version>
<executions>
<execution>
+
<id>StatefulStreamJobUpgradeTestProgram</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<finalName>StatefulStreamJobUpgradeTestProgram</finalName>
- <artifactSet>
- <excludes>
-
<exclude>com.google.code.findbugs:jsr305</exclude>
-
<exclude>org.slf4j:*</exclude>
-
<exclude>log4j:*</exclude>
- </excludes>
- </artifactSet>
- <filters>
- <filter>
-
<artifact>*:*</artifact>
-
<excludes>
-
<exclude>META-INF/*.SF</exclude>
-
<exclude>META-INF/*.DSA</exclude>
-
<exclude>META-INF/*.RSA</exclude>
-
</excludes>
- </filter>
- </filters>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.apache.flink.streaming.tests.StatefulStreamJobUpgradeTestProgram</mainClass>
diff --git a/flink-end-to-end-tests/pom.xml b/flink-end-to-end-tests/pom.xml
index 4abf59509df..b429c0181e1 100644
--- a/flink-end-to-end-tests/pom.xml
+++ b/flink-end-to-end-tests/pom.xml
@@ -63,5 +63,33 @@ under the License.
</configuration>
</plugin>
</plugins>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-shade-plugin</artifactId>
+ <configuration>
+ <artifactSet>
+ <excludes>
+
<exclude>com.google.code.findbugs:jsr305</exclude>
+
<exclude>org.slf4j:slf4j-api</exclude>
+ </excludes>
+ </artifactSet>
+ <filters>
+ <filter>
+
<artifact>*:*</artifact>
+ <excludes>
+
<exclude>META-INF/*.SF</exclude>
+
<exclude>META-INF/*.DSA</exclude>
+
<exclude>META-INF/*.RSA</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
+
</project>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> Cleanup end-to-end test poms
> ----------------------------
>
> Key: FLINK-9944
> URL: https://issues.apache.org/jira/browse/FLINK-9944
> Project: Flink
> Issue Type: Improvement
> Components: Build System, Tests
> Affects Versions: 1.6.0
> Reporter: Chesnay Schepler
> Assignee: Chesnay Schepler
> Priority: Major
> Labels: pull-request-available
> Fix For: 1.6.0
>
>
> The poms for the various end-to-end modules require some attention.
> We can streamline the shade-plugin configuration by moving common elements to
> the parent pom.
> Most modules explicitly depend on flink-core; in the spirit of being similar
> to quickstart projects (i.e. the template for user-jars) we should remove
> this dependency. It is transitively pulled in by the API modules flink-java
> and flink-streaming-java.
> Other problems:
> * several flink dependencies are not set to provided
> * the datastream-allround-test has a hard-coded scala version in it's rocksdb
> dependency.
> * The ttl test depends on rocksdb but doesn't actually use it
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
