Skip to content

Commit

Permalink
[FLINK-10922] Remove Scala Kafka010Example from flink-end-to-end-tests
Browse files Browse the repository at this point in the history
This commit removes the Scala based Kafka010Example from flink-end-to-end-tests/
flink-streaming-kafka010-test module. Moreover, it adds relative paths to their
parent pom's and cleans up the flink-streaming-kafka*/pom.xml.
  • Loading branch information
tillrohrmann committed Nov 19, 2018
1 parent b33e2c0 commit 5609868
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 150 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ under the License.
<artifactId>flink-end-to-end-tests</artifactId>
<groupId>org.apache.flink</groupId>
<version>1.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
7 changes: 1 addition & 6 deletions flink-end-to-end-tests/flink-streaming-kafka-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ under the License.
<artifactId>flink-end-to-end-tests</artifactId>
<groupId>org.apache.flink</groupId>
<version>1.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -48,12 +49,6 @@ under the License.
<artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-java</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

<build>
Expand Down
51 changes: 1 addition & 50 deletions flink-end-to-end-tests/flink-streaming-kafka010-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ under the License.
<artifactId>flink-end-to-end-tests</artifactId>
<groupId>org.apache.flink</groupId>
<version>1.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -48,60 +49,10 @@ under the License.
<artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-scala_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-java</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

<build>
<plugins>

<!-- Scala Compiler -->
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<executions>
<!-- Run scala compiler in the process-resources phase, so that dependencies on
scala classes can be resolved later in the (Java) compile phase -->
<execution>
<id>scala-compile-first</id>
<phase>process-resources</phase>
<goals>
<goal>add-source</goal>
<goal>compile</goal>
</goals>
</execution>

<!-- Run scala compiler in the process-test-resources phase, so that dependencies on
scala classes can be resolved later in the (Java) test-compile phase -->
<execution>
<id>scala-test-compile</id>
<phase>process-test-resources</phase>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
</plugin>

<!-- Scala Code Style, most of the configuration done via plugin management -->
<plugin>
<groupId>org.scalastyle</groupId>
<artifactId>scalastyle-maven-plugin</artifactId>
<configuration>
<configLocation>${project.basedir}/../../tools/maven/scalastyle-config.xml</configLocation>
</configuration>
</plugin>

<!-- Use the shade plugin to build a fat jar for the kafka connector test -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down

This file was deleted.

7 changes: 1 addition & 6 deletions flink-end-to-end-tests/flink-streaming-kafka011-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ under the License.
<artifactId>flink-end-to-end-tests</artifactId>
<groupId>org.apache.flink</groupId>
<version>1.8-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -49,12 +50,6 @@ under the License.
<artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-java</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

<build>
Expand Down

0 comments on commit 5609868

Please sign in to comment.