You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@flink.apache.org by GitBox <gi...@apache.org> on 2018/11/09 06:29:26 UTC
[GitHub] zentol closed pull request #7052: [FLINK-10814][examples] Add scala
suffix for Kafka example module
zentol closed pull request #7052: [FLINK-10814][examples] Add scala suffix for Kafka example module
URL: https://github.com/apache/flink/pull/7052
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-examples/flink-examples-streaming-kafka-0.10/pom.xml b/flink-examples/flink-examples-streaming-kafka-0.10/pom.xml
index ced3919da3e..539a1670a0f 100644
--- a/flink-examples/flink-examples-streaming-kafka-0.10/pom.xml
+++ b/flink-examples/flink-examples-streaming-kafka-0.10/pom.xml
@@ -27,12 +27,13 @@ under the License.
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>flink-examples-streaming-kafka-0.10</artifactId>
+ <artifactId>flink-examples-streaming-kafka-0.10_${scala.binary.version}</artifactId>
+ <name>flink-examples-streaming-kafka-0.10</name>
<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-examples-streaming-kafka-base</artifactId>
+ <artifactId>flink-examples-streaming-kafka-base_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>
@@ -48,6 +49,12 @@ under the License.
<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>
@@ -57,6 +64,44 @@ under the License.
<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>
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-examples/flink-examples-streaming-kafka-0.10/src/main/scala/org/apache/flink/streaming/scala/examples/kafka/Kafka010Example.scala
index c2ea5617a68..9f4fdc4c294 100644
--- a/flink-examples/flink-examples-streaming-kafka-0.10/src/main/scala/org/apache/flink/streaming/scala/examples/kafka/Kafka010Example.scala
+++ b/flink-examples/flink-examples-streaming-kafka-0.10/src/main/scala/org/apache/flink/streaming/scala/examples/kafka/Kafka010Example.scala
@@ -21,7 +21,7 @@ package org.apache.flink.streaming.scala.examples.kafka
import org.apache.flink.api.common.restartstrategy.RestartStrategies
import org.apache.flink.api.common.serialization.SimpleStringSchema
import org.apache.flink.api.java.utils.ParameterTool
-import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment
+import org.apache.flink.streaming.api.scala._
import org.apache.flink.streaming.connectors.kafka.{FlinkKafkaConsumer010, FlinkKafkaProducer010}
/**
diff --git a/flink-examples/flink-examples-streaming-kafka-0.11/pom.xml b/flink-examples/flink-examples-streaming-kafka-0.11/pom.xml
index 592929b1386..535d4c81749 100644
--- a/flink-examples/flink-examples-streaming-kafka-0.11/pom.xml
+++ b/flink-examples/flink-examples-streaming-kafka-0.11/pom.xml
@@ -27,14 +27,14 @@ under the License.
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>flink-examples-streaming-kafka-0.11</artifactId>
+ <artifactId>flink-examples-streaming-kafka-0.11_${scala.binary.version}</artifactId>
<name>flink-examples-streaming-kafka-0.11</name>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-examples-streaming-kafka-base</artifactId>
+ <artifactId>flink-examples-streaming-kafka-base_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/flink-examples/flink-examples-streaming-kafka-base/pom.xml b/flink-examples/flink-examples-streaming-kafka-base/pom.xml
index 3f389f843a1..463cd97adf6 100644
--- a/flink-examples/flink-examples-streaming-kafka-base/pom.xml
+++ b/flink-examples/flink-examples-streaming-kafka-base/pom.xml
@@ -27,7 +27,7 @@ under the License.
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>flink-examples-streaming-kafka-base</artifactId>
+ <artifactId>flink-examples-streaming-kafka-base_${scala.binary.version}</artifactId>
<name>flink-examples-streaming-kafka-base</name>
<packaging>jar</packaging>
diff --git a/flink-examples/flink-examples-streaming-kafka/pom.xml b/flink-examples/flink-examples-streaming-kafka/pom.xml
index 0434460e981..7f5d2c1770f 100644
--- a/flink-examples/flink-examples-streaming-kafka/pom.xml
+++ b/flink-examples/flink-examples-streaming-kafka/pom.xml
@@ -27,13 +27,13 @@ under the License.
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>flink-examples-streaming-kafka</artifactId>
+ <artifactId>flink-examples-streaming-kafka_${scala.binary.version}</artifactId>
<name>flink-examples-streaming-kafka</name>
<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-examples-streaming-kafka-base</artifactId>
+ <artifactId>flink-examples-streaming-kafka-base_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services