[FLINK-7420] [avro] Make flink-avro Scala independent

This removes all dependencies on Scala-dependent projects. This commit introduces a hard wired test dependency to 'flink-test-utils_2.11' to avoid introducing a Scala version dependency due to a non-exported test utility.
InfinitiesLoop · Nov 3, 2017 · eb99181 · eb99181
1 parent ad1c607
commit eb99181
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 46 deletions.
diff --git a/docs/dev/batch/connectors.md b/docs/dev/batch/connectors.md
@@ -92,7 +92,7 @@ Also, the serialization framework of Flink is able to handle classes generated f
 ~~~xml
 <dependency>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-avro{{ site.scala_version_suffix }}</artifactId>
+ <artifactId>flink-avro</artifactId>
  <version>{{site.version }}</version>
 </dependency>
 ~~~

diff --git a/flink-connectors/flink-connector-filesystem/pom.xml b/flink-connectors/flink-connector-filesystem/pom.xml
@@ -59,7 +59,7 @@ under the License.
 
  <dependency>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-avro_${scala.binary.version}</artifactId>
+ <artifactId>flink-avro</artifactId>
  <version>${project.version}</version>
  <scope>provided</scope>
  <!-- Projects depending on this project, won't depend on flink-avro. -->

diff --git a/flink-connectors/flink-connector-kafka-0.10/pom.xml b/flink-connectors/flink-connector-kafka-0.10/pom.xml
@@ -84,7 +84,7 @@ under the License.
 
  <dependency>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-avro_${scala.binary.version}</artifactId>
+ <artifactId>flink-avro</artifactId>
  <version>${project.version}</version>
  <scope>provided</scope>
  <!-- Projects depending on this project, won't depend on flink-avro. -->
@@ -95,7 +95,7 @@ under the License.
 
  <dependency>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-avro_${scala.binary.version}</artifactId>
+ <artifactId>flink-avro</artifactId>
  <version>${project.version}</version>
  <scope>test</scope>
  <type>test-jar</type>

diff --git a/flink-connectors/flink-connector-kafka-0.11/pom.xml b/flink-connectors/flink-connector-kafka-0.11/pom.xml
@@ -84,7 +84,7 @@ under the License.
 
  <dependency>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-avro_${scala.binary.version}</artifactId>
+ <artifactId>flink-avro</artifactId>
  <version>${project.version}</version>
  <scope>provided</scope>
  <!-- Projects depending on this project, won't depend on flink-avro. -->
@@ -104,7 +104,7 @@ under the License.
 
  <dependency>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-avro_${scala.binary.version}</artifactId>
+ <artifactId>flink-avro</artifactId>
  <version>${project.version}</version>
  <scope>test</scope>
  <type>test-jar</type>

diff --git a/flink-connectors/flink-connector-kafka-0.8/pom.xml b/flink-connectors/flink-connector-kafka-0.8/pom.xml
@@ -75,21 +75,13 @@ under the License.
 
  <dependency>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-avro_${scala.binary.version}</artifactId>
+ <artifactId>flink-avro</artifactId>
  <version>${project.version}</version>
  <scope>provided</scope>
  <!-- Projects depending on this project, won't depend on flink-avro. -->
  <optional>true</optional>
  </dependency>
 
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-avro_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
-
  <dependency>
  <groupId>org.apache.kafka</groupId>
  <artifactId>kafka_${scala.binary.version}</artifactId>
@@ -144,6 +136,14 @@ under the License.
  <type>test-jar</type>
  </dependency>
 
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-avro</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+
  <dependency>
  <groupId>org.apache.curator</groupId>
  <artifactId>curator-test</artifactId>

diff --git a/flink-connectors/flink-connector-kafka-0.9/pom.xml b/flink-connectors/flink-connector-kafka-0.9/pom.xml
@@ -74,7 +74,7 @@ under the License.
 
  <dependency>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-avro_${scala.binary.version}</artifactId>
+ <artifactId>flink-avro</artifactId>
  <version>${project.version}</version>
  <scope>provided</scope>
  <!-- Projects depending on this project, won't depend on flink-avro. -->
@@ -91,7 +91,7 @@ under the License.
 
  <dependency>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-avro_${scala.binary.version}</artifactId>
+ <artifactId>flink-avro</artifactId>
  <version>${project.version}</version>
  <scope>test</scope>
  <type>test-jar</type>

diff --git a/flink-connectors/flink-connector-kafka-base/pom.xml b/flink-connectors/flink-connector-kafka-base/pom.xml
@@ -68,7 +68,7 @@ under the License.
 
  <dependency>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-avro_${scala.binary.version}</artifactId>
+ <artifactId>flink-avro</artifactId>
  <version>${project.version}</version>
  <scope>provided</scope>
  <!-- Projects depending on this project, won't depend on flink-avro. -->
@@ -177,7 +177,7 @@ under the License.
 
  <dependency>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-avro_${scala.binary.version}</artifactId>
+ <artifactId>flink-avro</artifactId>
  <version>${project.version}</version>
  <type>test-jar</type>
  <scope>test</scope>

diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
@@ -81,7 +81,7 @@ under the License.
 
  <dependency>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-avro_${scala.binary.version}</artifactId>
+ <artifactId>flink-avro</artifactId>
  <version>${project.version}</version>
  </dependency>
 

diff --git a/flink-formats/flink-avro/pom.xml b/flink-formats/flink-avro/pom.xml
@@ -29,7 +29,7 @@ under the License.
  <relativePath>..</relativePath>
  </parent>
 
- <artifactId>flink-avro_${scala.binary.version}</artifactId>
+ <artifactId>flink-avro</artifactId>
  <name>flink-avro</name>
 
  <packaging>jar</packaging>
@@ -45,13 +45,6 @@ under the License.
  <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.avro</groupId>
  <artifactId>avro</artifactId>
@@ -67,28 +60,16 @@ under the License.
  <scope>test</scope>
  </dependency>
 
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
+ <!-- To avoid having to have the 'flink-avro' project dependent on a particular
+ Scala version, we hard-refer the flink-test-utils_2.11 here -->
 
  <dependency>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-clients_${scala.binary.version}</artifactId>
+ <artifactId>flink-test-utils_2.11</artifactId>
  <version>${project.version}</version>
  <scope>test</scope>
  </dependency>
 
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
  <dependency>
  <groupId>org.apache.flink</groupId>
  <artifactId>flink-core</artifactId>
@@ -158,6 +139,7 @@ under the License.
  </filesets>
  </configuration>
  </plugin>
+
  <!-- Generate Test class from avro schema -->
  <plugin>
  <groupId>org.apache.avro</groupId>

diff --git a/flink-fs-tests/pom.xml b/flink-fs-tests/pom.xml
@@ -60,7 +60,7 @@ under the License.
 
  <dependency>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-avro_${scala.binary.version}</artifactId>
+ <artifactId>flink-avro</artifactId>
  <version>${project.version}</version>
  <scope>test</scope>
  </dependency>

diff --git a/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml b/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml
@@ -205,7 +205,7 @@ under the License.
  <exclude>org.apache.flink:flink-runtime_${scala.binary.version}</exclude>
  <exclude>org.apache.flink:flink-optimizer_${scala.binary.version}</exclude>
  <exclude>org.apache.flink:flink-clients_${scala.binary.version}</exclude>
- <exclude>org.apache.flink:flink-avro_${scala.binary.version}</exclude>
+ <exclude>org.apache.flink:flink-avro</exclude>
  <exclude>org.apache.flink:flink-examples-batch_${scala.binary.version}</exclude>
  <exclude>org.apache.flink:flink-examples-streaming_${scala.binary.version}</exclude>
  <exclude>org.apache.flink:flink-streaming-java_${scala.binary.version}</exclude>

diff --git a/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml b/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml
@@ -207,7 +207,7 @@ under the License.
  <exclude>org.apache.flink:flink-runtime_${scala.binary.version}</exclude>
  <exclude>org.apache.flink:flink-optimizer_${scala.binary.version}</exclude>
  <exclude>org.apache.flink:flink-clients_${scala.binary.version}</exclude>
- <exclude>org.apache.flink:flink-avro_${scala.binary.version}</exclude>
+ <exclude>org.apache.flink:flink-avro</exclude>
  <exclude>org.apache.flink:flink-examples-batch_${scala.binary.version}</exclude>
  <exclude>org.apache.flink:flink-examples-streaming_${scala.binary.version}</exclude>
  <exclude>org.apache.flink:flink-streaming-java_${scala.binary.version}</exclude>