[
https://issues.apache.org/jira/browse/FLINK-10922?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16692313#comment-16692313
]
ASF GitHub Bot commented on FLINK-10922:
----------------------------------------
asfgit closed pull request #7140: [FLINK-10922] Refactor the placement of the
Flink Kafka connector end to end test module
URL: https://github.com/apache/flink/pull/7140
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-dist/src/main/assemblies/bin.xml
b/flink-dist/src/main/assemblies/bin.xml
index fa1e8048341..89228b39271 100644
--- a/flink-dist/src/main/assemblies/bin.xml
+++ b/flink-dist/src/main/assemblies/bin.xml
@@ -187,48 +187,6 @@ under the License.
</excludes>
</fileSet>
- <!-- copy jar files of the streaming kafka examples -->
- <fileSet>
-
<directory>../flink-examples/flink-examples-streaming-kafka/target</directory>
- <outputDirectory>examples/streaming</outputDirectory>
- <fileMode>0644</fileMode>
- <includes>
- <include>*.jar</include>
- </includes>
- <excludes>
-
<exclude>flink-examples-streaming-kafka*.jar</exclude>
- <exclude>original-*.jar</exclude>
- </excludes>
- </fileSet>
-
- <!-- copy jar files of the streaming kafka 0.10 examples -->
- <fileSet>
-
<directory>../flink-examples/flink-examples-streaming-kafka-0.10/target</directory>
- <outputDirectory>examples/streaming</outputDirectory>
- <fileMode>0644</fileMode>
- <includes>
- <include>*.jar</include>
- </includes>
- <excludes>
-
<exclude>flink-examples-streaming-kafka*.jar</exclude>
- <exclude>original-*.jar</exclude>
- </excludes>
- </fileSet>
-
- <!-- copy jar files of the streaming kafka 0.11 examples -->
- <fileSet>
-
<directory>../flink-examples/flink-examples-streaming-kafka-0.11/target</directory>
- <outputDirectory>examples/streaming</outputDirectory>
- <fileMode>0644</fileMode>
- <includes>
- <include>*.jar</include>
- </includes>
- <excludes>
-
<exclude>flink-examples-streaming-kafka*.jar</exclude>
- <exclude>original-*.jar</exclude>
- </excludes>
- </fileSet>
-
<!-- copy jar files of the gelly examples -->
<fileSet>
<directory>../flink-libraries/flink-gelly-examples/target</directory>
diff --git a/flink-examples/flink-examples-streaming-kafka-base/pom.xml
b/flink-end-to-end-tests/flink-streaming-kafka-test-base/pom.xml
similarity index 88%
rename from flink-examples/flink-examples-streaming-kafka-base/pom.xml
rename to flink-end-to-end-tests/flink-streaming-kafka-test-base/pom.xml
index 463cd97adf6..1a86544dbe3 100644
--- a/flink-examples/flink-examples-streaming-kafka-base/pom.xml
+++ b/flink-end-to-end-tests/flink-streaming-kafka-test-base/pom.xml
@@ -21,14 +21,14 @@ under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
- <artifactId>flink-examples</artifactId>
+ <artifactId>flink-end-to-end-tests</artifactId>
<groupId>org.apache.flink</groupId>
<version>1.8-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
-
<artifactId>flink-examples-streaming-kafka-base_${scala.binary.version}</artifactId>
- <name>flink-examples-streaming-kafka-base</name>
+
<artifactId>flink-streaming-kafka-test-base_${scala.binary.version}</artifactId>
+ <name>flink-streaming-kafka-test-base</name>
<packaging>jar</packaging>
diff --git
a/flink-examples/flink-examples-streaming-kafka-base/src/main/java/org/apache/flink/streaming/examples/kafka/base/CustomWatermarkExtractor.java
b/flink-end-to-end-tests/flink-streaming-kafka-test-base/src/main/java/org/apache/flink/streaming/kafka/test/base/CustomWatermarkExtractor.java
similarity index 97%
rename from
flink-examples/flink-examples-streaming-kafka-base/src/main/java/org/apache/flink/streaming/examples/kafka/base/CustomWatermarkExtractor.java
rename to
flink-end-to-end-tests/flink-streaming-kafka-test-base/src/main/java/org/apache/flink/streaming/kafka/test/base/CustomWatermarkExtractor.java
index 51de582dc0f..8b306ac9297 100644
---
a/flink-examples/flink-examples-streaming-kafka-base/src/main/java/org/apache/flink/streaming/examples/kafka/base/CustomWatermarkExtractor.java
+++
b/flink-end-to-end-tests/flink-streaming-kafka-test-base/src/main/java/org/apache/flink/streaming/kafka/test/base/CustomWatermarkExtractor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.streaming.examples.kafka.base;
+package org.apache.flink.streaming.kafka.test.base;
import org.apache.flink.streaming.api.functions.AssignerWithPeriodicWatermarks;
import
org.apache.flink.streaming.api.functions.timestamps.AscendingTimestampExtractor;
diff --git
a/flink-examples/flink-examples-streaming-kafka-base/src/main/java/org/apache/flink/streaming/examples/kafka/base/KafkaEvent.java
b/flink-end-to-end-tests/flink-streaming-kafka-test-base/src/main/java/org/apache/flink/streaming/kafka/test/base/KafkaEvent.java
similarity index 97%
rename from
flink-examples/flink-examples-streaming-kafka-base/src/main/java/org/apache/flink/streaming/examples/kafka/base/KafkaEvent.java
rename to
flink-end-to-end-tests/flink-streaming-kafka-test-base/src/main/java/org/apache/flink/streaming/kafka/test/base/KafkaEvent.java
index 7a8f84f8ca8..491228104e9 100644
---
a/flink-examples/flink-examples-streaming-kafka-base/src/main/java/org/apache/flink/streaming/examples/kafka/base/KafkaEvent.java
+++
b/flink-end-to-end-tests/flink-streaming-kafka-test-base/src/main/java/org/apache/flink/streaming/kafka/test/base/KafkaEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.streaming.examples.kafka.base;
+package org.apache.flink.streaming.kafka.test.base;
/**
* The event type used in the {@link Kafka010Example}.
diff --git
a/flink-examples/flink-examples-streaming-kafka-base/src/main/java/org/apache/flink/streaming/examples/kafka/base/KafkaEventSchema.java
b/flink-end-to-end-tests/flink-streaming-kafka-test-base/src/main/java/org/apache/flink/streaming/kafka/test/base/KafkaEventSchema.java
similarity index 97%
rename from
flink-examples/flink-examples-streaming-kafka-base/src/main/java/org/apache/flink/streaming/examples/kafka/base/KafkaEventSchema.java
rename to
flink-end-to-end-tests/flink-streaming-kafka-test-base/src/main/java/org/apache/flink/streaming/kafka/test/base/KafkaEventSchema.java
index ea9c12b6056..c2cc869e5d9 100644
---
a/flink-examples/flink-examples-streaming-kafka-base/src/main/java/org/apache/flink/streaming/examples/kafka/base/KafkaEventSchema.java
+++
b/flink-end-to-end-tests/flink-streaming-kafka-test-base/src/main/java/org/apache/flink/streaming/kafka/test/base/KafkaEventSchema.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.streaming.examples.kafka.base;
+package org.apache.flink.streaming.kafka.test.base;
import org.apache.flink.api.common.serialization.DeserializationSchema;
import org.apache.flink.api.common.serialization.SerializationSchema;
diff --git
a/flink-examples/flink-examples-streaming-kafka-base/src/main/java/org/apache/flink/streaming/examples/kafka/base/KafkaExampleUtil.java
b/flink-end-to-end-tests/flink-streaming-kafka-test-base/src/main/java/org/apache/flink/streaming/kafka/test/base/KafkaExampleUtil.java
similarity index 97%
rename from
flink-examples/flink-examples-streaming-kafka-base/src/main/java/org/apache/flink/streaming/examples/kafka/base/KafkaExampleUtil.java
rename to
flink-end-to-end-tests/flink-streaming-kafka-test-base/src/main/java/org/apache/flink/streaming/kafka/test/base/KafkaExampleUtil.java
index 447dec24648..eab23e6fcfa 100644
---
a/flink-examples/flink-examples-streaming-kafka-base/src/main/java/org/apache/flink/streaming/examples/kafka/base/KafkaExampleUtil.java
+++
b/flink-end-to-end-tests/flink-streaming-kafka-test-base/src/main/java/org/apache/flink/streaming/kafka/test/base/KafkaExampleUtil.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.streaming.examples.kafka.base;
+package org.apache.flink.streaming.kafka.test.base;
import org.apache.flink.api.common.restartstrategy.RestartStrategies;
import org.apache.flink.api.java.utils.ParameterTool;
diff --git
a/flink-examples/flink-examples-streaming-kafka-base/src/main/java/org/apache/flink/streaming/examples/kafka/base/RollingAdditionMapper.java
b/flink-end-to-end-tests/flink-streaming-kafka-test-base/src/main/java/org/apache/flink/streaming/kafka/test/base/RollingAdditionMapper.java
similarity index 97%
rename from
flink-examples/flink-examples-streaming-kafka-base/src/main/java/org/apache/flink/streaming/examples/kafka/base/RollingAdditionMapper.java
rename to
flink-end-to-end-tests/flink-streaming-kafka-test-base/src/main/java/org/apache/flink/streaming/kafka/test/base/RollingAdditionMapper.java
index e71f86cefba..927c3eacfae 100644
---
a/flink-examples/flink-examples-streaming-kafka-base/src/main/java/org/apache/flink/streaming/examples/kafka/base/RollingAdditionMapper.java
+++
b/flink-end-to-end-tests/flink-streaming-kafka-test-base/src/main/java/org/apache/flink/streaming/kafka/test/base/RollingAdditionMapper.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.streaming.examples.kafka.base;
+package org.apache.flink.streaming.kafka.test.base;
import org.apache.flink.api.common.functions.RichMapFunction;
import org.apache.flink.api.common.state.ValueState;
diff --git a/flink-examples/flink-examples-streaming-kafka/pom.xml
b/flink-end-to-end-tests/flink-streaming-kafka-test/pom.xml
similarity index 88%
rename from flink-examples/flink-examples-streaming-kafka/pom.xml
rename to flink-end-to-end-tests/flink-streaming-kafka-test/pom.xml
index 7f5d2c1770f..3b01859f13c 100644
--- a/flink-examples/flink-examples-streaming-kafka/pom.xml
+++ b/flink-end-to-end-tests/flink-streaming-kafka-test/pom.xml
@@ -21,19 +21,19 @@ under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
- <artifactId>flink-examples</artifactId>
+ <artifactId>flink-end-to-end-tests</artifactId>
<groupId>org.apache.flink</groupId>
<version>1.8-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
-
<artifactId>flink-examples-streaming-kafka_${scala.binary.version}</artifactId>
- <name>flink-examples-streaming-kafka</name>
+
<artifactId>flink-streaming-kafka-test_${scala.binary.version}</artifactId>
+ <name>flink-streaming-kafka-test</name>
<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
-
<artifactId>flink-examples-streaming-kafka-base_${scala.binary.version}</artifactId>
+
<artifactId>flink-streaming-kafka-test-base_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>
@@ -75,7 +75,7 @@ under the License.
<createDependencyReducedPom>false</createDependencyReducedPom>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-
<mainClass>org.apache.flink.streaming.examples.kafka.KafkaExample</mainClass>
+
<mainClass>org.apache.flink.streaming.kafka.test.KafkaExample</mainClass>
</transformer>
</transformers>
<finalName>KafkaExample</finalName>
diff --git
a/flink-examples/flink-examples-streaming-kafka/src/main/java/org/apache/flink/streaming/examples/kafka/KafkaExample.java
b/flink-end-to-end-tests/flink-streaming-kafka-test/src/main/java/org/apache/flink/streaming/kafka/test/KafkaExample.java
similarity index 87%
rename from
flink-examples/flink-examples-streaming-kafka/src/main/java/org/apache/flink/streaming/examples/kafka/KafkaExample.java
rename to
flink-end-to-end-tests/flink-streaming-kafka-test/src/main/java/org/apache/flink/streaming/kafka/test/KafkaExample.java
index 27e73d18c08..70885402b2a 100644
---
a/flink-examples/flink-examples-streaming-kafka/src/main/java/org/apache/flink/streaming/examples/kafka/KafkaExample.java
+++
b/flink-end-to-end-tests/flink-streaming-kafka-test/src/main/java/org/apache/flink/streaming/kafka/test/KafkaExample.java
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-package org.apache.flink.streaming.examples.kafka;
+package org.apache.flink.streaming.kafka.test;
import org.apache.flink.api.java.utils.ParameterTool;
import org.apache.flink.streaming.api.datastream.DataStream;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
import org.apache.flink.streaming.connectors.kafka.FlinkKafkaConsumer;
import org.apache.flink.streaming.connectors.kafka.FlinkKafkaProducer;
-import org.apache.flink.streaming.examples.kafka.base.CustomWatermarkExtractor;
-import org.apache.flink.streaming.examples.kafka.base.KafkaEvent;
-import org.apache.flink.streaming.examples.kafka.base.KafkaEventSchema;
-import org.apache.flink.streaming.examples.kafka.base.KafkaExampleUtil;
-import org.apache.flink.streaming.examples.kafka.base.RollingAdditionMapper;
+import org.apache.flink.streaming.kafka.test.base.CustomWatermarkExtractor;
+import org.apache.flink.streaming.kafka.test.base.KafkaEvent;
+import org.apache.flink.streaming.kafka.test.base.KafkaEventSchema;
+import org.apache.flink.streaming.kafka.test.base.KafkaExampleUtil;
+import org.apache.flink.streaming.kafka.test.base.RollingAdditionMapper;
import
org.apache.flink.streaming.util.serialization.KeyedSerializationSchemaWrapper;
/**
diff --git a/flink-examples/flink-examples-streaming-kafka-0.10/pom.xml
b/flink-end-to-end-tests/flink-streaming-kafka010-test/pom.xml
similarity index 92%
rename from flink-examples/flink-examples-streaming-kafka-0.10/pom.xml
rename to flink-end-to-end-tests/flink-streaming-kafka010-test/pom.xml
index 539a1670a0f..f1f7e232fbd 100644
--- a/flink-examples/flink-examples-streaming-kafka-0.10/pom.xml
+++ b/flink-end-to-end-tests/flink-streaming-kafka010-test/pom.xml
@@ -21,19 +21,19 @@ under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
- <artifactId>flink-examples</artifactId>
+ <artifactId>flink-end-to-end-tests</artifactId>
<groupId>org.apache.flink</groupId>
<version>1.8-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
-
<artifactId>flink-examples-streaming-kafka-0.10_${scala.binary.version}</artifactId>
- <name>flink-examples-streaming-kafka-0.10</name>
+
<artifactId>flink-streaming-kafka010-test_${scala.binary.version}</artifactId>
+ <name>flink-streaming-kafka010-test</name>
<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
-
<artifactId>flink-examples-streaming-kafka-base_${scala.binary.version}</artifactId>
+
<artifactId>flink-streaming-kafka-test-base_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>
@@ -119,7 +119,7 @@ under the License.
<createDependencyReducedPom>false</createDependencyReducedPom>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-
<mainClass>org.apache.flink.streaming.examples.kafka.Kafka010Example</mainClass>
+
<mainClass>org.apache.flink.streaming.kafka.test.Kafka010Example</mainClass>
</transformer>
</transformers>
<finalName>Kafka010Example</finalName>
diff --git
a/flink-examples/flink-examples-streaming-kafka-0.10/src/main/java/org/apache/flink/streaming/examples/kafka/Kafka010Example.java
b/flink-end-to-end-tests/flink-streaming-kafka010-test/src/main/java/org/apache/flink/streaming/kafka/test/Kafka010Example.java
similarity index 86%
rename from
flink-examples/flink-examples-streaming-kafka-0.10/src/main/java/org/apache/flink/streaming/examples/kafka/Kafka010Example.java
rename to
flink-end-to-end-tests/flink-streaming-kafka010-test/src/main/java/org/apache/flink/streaming/kafka/test/Kafka010Example.java
index 2df1f5d8496..0b971794258 100644
---
a/flink-examples/flink-examples-streaming-kafka-0.10/src/main/java/org/apache/flink/streaming/examples/kafka/Kafka010Example.java
+++
b/flink-end-to-end-tests/flink-streaming-kafka010-test/src/main/java/org/apache/flink/streaming/kafka/test/Kafka010Example.java
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-package org.apache.flink.streaming.examples.kafka;
+package org.apache.flink.streaming.kafka.test;
import org.apache.flink.api.java.utils.ParameterTool;
import org.apache.flink.streaming.api.datastream.DataStream;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
import org.apache.flink.streaming.connectors.kafka.FlinkKafkaConsumer010;
import org.apache.flink.streaming.connectors.kafka.FlinkKafkaProducer010;
-import org.apache.flink.streaming.examples.kafka.base.CustomWatermarkExtractor;
-import org.apache.flink.streaming.examples.kafka.base.KafkaEvent;
-import org.apache.flink.streaming.examples.kafka.base.KafkaEventSchema;
-import org.apache.flink.streaming.examples.kafka.base.KafkaExampleUtil;
-import org.apache.flink.streaming.examples.kafka.base.RollingAdditionMapper;
+import org.apache.flink.streaming.kafka.test.base.CustomWatermarkExtractor;
+import org.apache.flink.streaming.kafka.test.base.KafkaEvent;
+import org.apache.flink.streaming.kafka.test.base.KafkaEventSchema;
+import org.apache.flink.streaming.kafka.test.base.KafkaExampleUtil;
+import org.apache.flink.streaming.kafka.test.base.RollingAdditionMapper;
/**
* A simple example that shows how to read from and write to Kafka. This will
read String messages
diff --git
a/flink-examples/flink-examples-streaming-kafka-0.10/src/main/scala/org/apache/flink/streaming/scala/examples/kafka/Kafka010Example.scala
b/flink-end-to-end-tests/flink-streaming-kafka010-test/src/main/scala/org/apache/flink/streaming/scala/kafka/test/Kafka010Example.scala
similarity index 98%
rename from
flink-examples/flink-examples-streaming-kafka-0.10/src/main/scala/org/apache/flink/streaming/scala/examples/kafka/Kafka010Example.scala
rename to
flink-end-to-end-tests/flink-streaming-kafka010-test/src/main/scala/org/apache/flink/streaming/scala/kafka/test/Kafka010Example.scala
index 9f4fdc4c294..a35faf53d9d 100644
---
a/flink-examples/flink-examples-streaming-kafka-0.10/src/main/scala/org/apache/flink/streaming/scala/examples/kafka/Kafka010Example.scala
+++
b/flink-end-to-end-tests/flink-streaming-kafka010-test/src/main/scala/org/apache/flink/streaming/scala/kafka/test/Kafka010Example.scala
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.streaming.scala.examples.kafka
+package org.apache.flink.streaming.scala.kafka.test
import org.apache.flink.api.common.restartstrategy.RestartStrategies
import org.apache.flink.api.common.serialization.SimpleStringSchema
diff --git a/flink-examples/flink-examples-streaming-kafka-0.11/pom.xml
b/flink-end-to-end-tests/flink-streaming-kafka011-test/pom.xml
similarity index 88%
rename from flink-examples/flink-examples-streaming-kafka-0.11/pom.xml
rename to flink-end-to-end-tests/flink-streaming-kafka011-test/pom.xml
index 535d4c81749..cee1f5f3376 100644
--- a/flink-examples/flink-examples-streaming-kafka-0.11/pom.xml
+++ b/flink-end-to-end-tests/flink-streaming-kafka011-test/pom.xml
@@ -21,20 +21,20 @@ under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
- <artifactId>flink-examples</artifactId>
+ <artifactId>flink-end-to-end-tests</artifactId>
<groupId>org.apache.flink</groupId>
<version>1.8-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
-
<artifactId>flink-examples-streaming-kafka-0.11_${scala.binary.version}</artifactId>
- <name>flink-examples-streaming-kafka-0.11</name>
+
<artifactId>flink-streaming-kafka011-test_${scala.binary.version}</artifactId>
+ <name>flink-streaming-kafka011-test</name>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
-
<artifactId>flink-examples-streaming-kafka-base_${scala.binary.version}</artifactId>
+
<artifactId>flink-streaming-kafka-test-base_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>
@@ -76,7 +76,7 @@ under the License.
<createDependencyReducedPom>false</createDependencyReducedPom>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-
<mainClass>org.apache.flink.streaming.examples.kafka.Kafka011Example</mainClass>
+
<mainClass>org.apache.flink.streaming.kafka.test.Kafka011Example</mainClass>
</transformer>
</transformers>
<finalName>Kafka011Example</finalName>
diff --git
a/flink-examples/flink-examples-streaming-kafka-0.11/src/main/java/org/apache/flink/streaming/examples/kafka/Kafka011Example.java
b/flink-end-to-end-tests/flink-streaming-kafka011-test/src/main/java/org/apache/flink/streaming/kafka/test/Kafka011Example.java
similarity index 86%
rename from
flink-examples/flink-examples-streaming-kafka-0.11/src/main/java/org/apache/flink/streaming/examples/kafka/Kafka011Example.java
rename to
flink-end-to-end-tests/flink-streaming-kafka011-test/src/main/java/org/apache/flink/streaming/kafka/test/Kafka011Example.java
index 17b5d011f28..1f877c5a5b8 100644
---
a/flink-examples/flink-examples-streaming-kafka-0.11/src/main/java/org/apache/flink/streaming/examples/kafka/Kafka011Example.java
+++
b/flink-end-to-end-tests/flink-streaming-kafka011-test/src/main/java/org/apache/flink/streaming/kafka/test/Kafka011Example.java
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-package org.apache.flink.streaming.examples.kafka;
+package org.apache.flink.streaming.kafka.test;
import org.apache.flink.api.java.utils.ParameterTool;
import org.apache.flink.streaming.api.datastream.DataStream;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
import org.apache.flink.streaming.connectors.kafka.FlinkKafkaConsumer011;
import org.apache.flink.streaming.connectors.kafka.FlinkKafkaProducer011;
-import org.apache.flink.streaming.examples.kafka.base.CustomWatermarkExtractor;
-import org.apache.flink.streaming.examples.kafka.base.KafkaEvent;
-import org.apache.flink.streaming.examples.kafka.base.KafkaEventSchema;
-import org.apache.flink.streaming.examples.kafka.base.KafkaExampleUtil;
-import org.apache.flink.streaming.examples.kafka.base.RollingAdditionMapper;
+import org.apache.flink.streaming.kafka.test.base.CustomWatermarkExtractor;
+import org.apache.flink.streaming.kafka.test.base.KafkaEvent;
+import org.apache.flink.streaming.kafka.test.base.KafkaEventSchema;
+import org.apache.flink.streaming.kafka.test.base.KafkaExampleUtil;
+import org.apache.flink.streaming.kafka.test.base.RollingAdditionMapper;
/**
* A simple example that shows how to read from and write to Kafka. This will
read String messages
diff --git a/flink-end-to-end-tests/pom.xml b/flink-end-to-end-tests/pom.xml
index a2790092b8b..a942e744ac3 100644
--- a/flink-end-to-end-tests/pom.xml
+++ b/flink-end-to-end-tests/pom.xml
@@ -61,6 +61,10 @@ under the License.
<module>flink-metrics-availability-test</module>
<module>flink-metrics-reporter-prometheus-test</module>
<module>flink-heavy-deployment-stress-test</module>
+ <module>flink-streaming-kafka-test-base</module>
+ <module>flink-streaming-kafka-test</module>
+ <module>flink-streaming-kafka011-test</module>
+ <module>flink-streaming-kafka010-test</module>
</modules>
<build>
diff --git a/flink-end-to-end-tests/test-scripts/test_streaming_kafka.sh
b/flink-end-to-end-tests/test-scripts/test_streaming_kafka.sh
index ff36cf1d778..045bb0933f8 100755
--- a/flink-end-to-end-tests/test-scripts/test_streaming_kafka.sh
+++ b/flink-end-to-end-tests/test-scripts/test_streaming_kafka.sh
@@ -22,4 +22,4 @@ set -Eeuo pipefail
source "$(dirname "$0")"/common.sh
source "$(dirname "$0")"/kafka-common.sh 2.0.1 5.0.0 5.0
-source "$(dirname "$0")"/test_streaming_kafka_common.sh
$FLINK_DIR/examples/streaming/KafkaExample.jar
+source "$(dirname "$0")"/test_streaming_kafka_common.sh
${END_TO_END_DIR}/flink-streaming-kafka-test/target/KafkaExample.jar
diff --git a/flink-end-to-end-tests/test-scripts/test_streaming_kafka010.sh
b/flink-end-to-end-tests/test-scripts/test_streaming_kafka010.sh
index a55b0bc33c6..97a71f90052 100755
--- a/flink-end-to-end-tests/test-scripts/test_streaming_kafka010.sh
+++ b/flink-end-to-end-tests/test-scripts/test_streaming_kafka010.sh
@@ -22,5 +22,5 @@ set -Eeuo pipefail
source "$(dirname "$0")"/common.sh
source "$(dirname "$0")"/kafka-common.sh 0.10.2.0 3.2.0 3.2
-source "$(dirname "$0")"/test_streaming_kafka_common.sh
$FLINK_DIR/examples/streaming/Kafka010Example.jar
+source "$(dirname "$0")"/test_streaming_kafka_common.sh
${END_TO_END_DIR}/flink-streaming-kafka010-test/target/Kafka010Example.jar
diff --git a/flink-end-to-end-tests/test-scripts/test_streaming_kafka011.sh
b/flink-end-to-end-tests/test-scripts/test_streaming_kafka011.sh
index 2e6e6d93deb..84fa6edc90e 100755
--- a/flink-end-to-end-tests/test-scripts/test_streaming_kafka011.sh
+++ b/flink-end-to-end-tests/test-scripts/test_streaming_kafka011.sh
@@ -20,5 +20,5 @@
source "$(dirname "$0")"/common.sh
source "$(dirname "$0")"/kafka-common.sh 0.11.0.2 3.2.0 3.2
-source "$(dirname "$0")"/test_streaming_kafka_common.sh
$FLINK_DIR/examples/streaming/Kafka011Example.jar
+source "$(dirname "$0")"/test_streaming_kafka_common.sh
${END_TO_END_DIR}/flink-streaming-kafka011-test/target/Kafka011Example.jar
diff --git a/flink-examples/pom.xml b/flink-examples/pom.xml
index 0f8b253dc5e..165130d3bdf 100644
--- a/flink-examples/pom.xml
+++ b/flink-examples/pom.xml
@@ -35,11 +35,7 @@ under the License.
<modules>
<module>flink-examples-batch</module>
<module>flink-examples-streaming</module>
- <module>flink-examples-streaming-kafka-base</module>
- <module>flink-examples-streaming-kafka</module>
- <module>flink-examples-streaming-kafka-0.10</module>
<module>flink-examples-table</module>
- <module>flink-examples-streaming-kafka-0.11</module>
</modules>
<dependencies>
----------------------------------------------------------------
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
> Refactor the placement of the Flink Kafka connector end to end test module
> --------------------------------------------------------------------------
>
> Key: FLINK-10922
> URL: https://issues.apache.org/jira/browse/FLINK-10922
> Project: Flink
> Issue Type: Sub-task
> Components: E2E Tests
> Reporter: vinoyang
> Assignee: vinoyang
> Priority: Critical
> Labels: pull-request-available
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
