[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. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/eb99181d Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/eb99181d Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/eb99181d Branch: refs/heads/master Commit: eb99181ddd4851d2f4a64377ebd4fe0ac11e2581 Parents: ad1c607 Author: Stephan Ewen <[email protected]> Authored: Thu Nov 2 16:18:21 2017 +0100 Committer: Stephan Ewen <[email protected]> Committed: Fri Nov 3 16:40:35 2017 +0100 ---------------------------------------------------------------------- docs/dev/batch/connectors.md | 2 +- .../flink-connector-filesystem/pom.xml | 2 +- .../flink-connector-kafka-0.10/pom.xml | 4 +-- .../flink-connector-kafka-0.11/pom.xml | 4 +-- .../flink-connector-kafka-0.8/pom.xml | 18 ++++++------- .../flink-connector-kafka-0.9/pom.xml | 4 +-- .../flink-connector-kafka-base/pom.xml | 4 +-- flink-dist/pom.xml | 2 +- flink-formats/flink-avro/pom.xml | 28 ++++---------------- flink-fs-tests/pom.xml | 2 +- .../main/resources/archetype-resources/pom.xml | 2 +- .../main/resources/archetype-resources/pom.xml | 2 +- 12 files changed, 28 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/eb99181d/docs/dev/batch/connectors.md ---------------------------------------------------------------------- diff --git a/docs/dev/batch/connectors.md b/docs/dev/batch/connectors.md index 388b599..2391744 100644 --- 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> ~~~ http://git-wip-us.apache.org/repos/asf/flink/blob/eb99181d/flink-connectors/flink-connector-filesystem/pom.xml ---------------------------------------------------------------------- diff --git a/flink-connectors/flink-connector-filesystem/pom.xml b/flink-connectors/flink-connector-filesystem/pom.xml index 12a151e..7efe68e 100644 --- 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. --> http://git-wip-us.apache.org/repos/asf/flink/blob/eb99181d/flink-connectors/flink-connector-kafka-0.10/pom.xml ---------------------------------------------------------------------- diff --git a/flink-connectors/flink-connector-kafka-0.10/pom.xml b/flink-connectors/flink-connector-kafka-0.10/pom.xml index 3357591..a01431a 100644 --- 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> http://git-wip-us.apache.org/repos/asf/flink/blob/eb99181d/flink-connectors/flink-connector-kafka-0.11/pom.xml ---------------------------------------------------------------------- diff --git a/flink-connectors/flink-connector-kafka-0.11/pom.xml b/flink-connectors/flink-connector-kafka-0.11/pom.xml index 4f6be1d..f66a31d 100644 --- 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> http://git-wip-us.apache.org/repos/asf/flink/blob/eb99181d/flink-connectors/flink-connector-kafka-0.8/pom.xml ---------------------------------------------------------------------- diff --git a/flink-connectors/flink-connector-kafka-0.8/pom.xml b/flink-connectors/flink-connector-kafka-0.8/pom.xml index b96274a..c9a1770 100644 --- a/flink-connectors/flink-connector-kafka-0.8/pom.xml +++ b/flink-connectors/flink-connector-kafka-0.8/pom.xml @@ -75,7 +75,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. --> @@ -83,14 +83,6 @@ under the License. </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> <version>${kafka.version}</version> @@ -145,6 +137,14 @@ under the License. </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> <version>${curator.version}</version> http://git-wip-us.apache.org/repos/asf/flink/blob/eb99181d/flink-connectors/flink-connector-kafka-0.9/pom.xml ---------------------------------------------------------------------- diff --git a/flink-connectors/flink-connector-kafka-0.9/pom.xml b/flink-connectors/flink-connector-kafka-0.9/pom.xml index c711c5f..ed322d3 100644 --- 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> http://git-wip-us.apache.org/repos/asf/flink/blob/eb99181d/flink-connectors/flink-connector-kafka-base/pom.xml ---------------------------------------------------------------------- diff --git a/flink-connectors/flink-connector-kafka-base/pom.xml b/flink-connectors/flink-connector-kafka-base/pom.xml index 4f2fb45..9743a01 100644 --- 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> http://git-wip-us.apache.org/repos/asf/flink/blob/eb99181d/flink-dist/pom.xml ---------------------------------------------------------------------- diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml index 29f28ff..b2af9e8 100644 --- 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> http://git-wip-us.apache.org/repos/asf/flink/blob/eb99181d/flink-formats/flink-avro/pom.xml ---------------------------------------------------------------------- diff --git a/flink-formats/flink-avro/pom.xml b/flink-formats/flink-avro/pom.xml index 5080b82..8732a21 100644 --- 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> @@ -46,13 +46,6 @@ under the License. </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> <!-- managed version --> @@ -67,30 +60,18 @@ 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> <version>${project.version}</version> <scope>test</scope> @@ -158,6 +139,7 @@ under the License. </filesets> </configuration> </plugin> + <!-- Generate Test class from avro schema --> <plugin> <groupId>org.apache.avro</groupId> http://git-wip-us.apache.org/repos/asf/flink/blob/eb99181d/flink-fs-tests/pom.xml ---------------------------------------------------------------------- diff --git a/flink-fs-tests/pom.xml b/flink-fs-tests/pom.xml index 446d167..3ac62df 100644 --- 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> http://git-wip-us.apache.org/repos/asf/flink/blob/eb99181d/flink-quickstart/flink-quickstart-java/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- 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 index 740e64a..34e2abb 100644 --- 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> http://git-wip-us.apache.org/repos/asf/flink/blob/eb99181d/flink-quickstart/flink-quickstart-scala/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- 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 index e5f6821..d705e8c 100644 --- 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>
