[FLINK-6414] [build] Use scala.binary.version in place of change-scala-version.sh
Use scala.binary.version as defined in the parent POM and remove the script to swap scala version identifiers. This closes #3800 Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/3990d75a Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/3990d75a Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/3990d75a Branch: refs/heads/release-1.3 Commit: 3990d75aaedc8e03ef2facf5732c4a0fe52a7cdc Parents: d88a62f Author: Greg Hogan <[email protected]> Authored: Thu Apr 27 14:43:18 2017 -0400 Committer: Stefan Richter <[email protected]> Committed: Sun May 14 14:07:26 2017 +0200 ---------------------------------------------------------------------- flink-clients/pom.xml | 6 +- flink-connectors/flink-avro/pom.xml | 6 +- .../flink-connector-cassandra/pom.xml | 12 +- .../flink-connector-elasticsearch-base/pom.xml | 10 +- .../flink-connector-elasticsearch/pom.xml | 12 +- .../flink-connector-elasticsearch2/pom.xml | 12 +- .../flink-connector-elasticsearch5/pom.xml | 12 +- .../flink-connector-filesystem/pom.xml | 14 +-- .../flink-connector-kafka-0.10/pom.xml | 20 ++-- .../flink-connector-kafka-0.8/pom.xml | 18 +-- .../flink-connector-kafka-0.9/pom.xml | 18 +-- .../flink-connector-kafka-base/pom.xml | 16 +-- .../flink-connector-kinesis/pom.xml | 12 +- flink-connectors/flink-connector-nifi/pom.xml | 10 +- .../flink-connector-rabbitmq/pom.xml | 8 +- .../flink-connector-twitter/pom.xml | 4 +- .../flink-hadoop-compatibility/pom.xml | 6 +- flink-connectors/flink-hbase/pom.xml | 18 +-- flink-connectors/flink-hcatalog/pom.xml | 2 +- flink-connectors/flink-jdbc/pom.xml | 4 +- flink-contrib/flink-connector-wikiedits/pom.xml | 4 +- .../flink-statebackend-rocksdb/pom.xml | 10 +- flink-contrib/flink-storm-examples/pom.xml | 24 ++-- flink-contrib/flink-storm/pom.xml | 6 +- flink-contrib/flink-streaming-contrib/pom.xml | 10 +- flink-contrib/flink-tweet-inputformat/pom.xml | 6 +- flink-dist/pom.xml | 42 +++---- flink-dist/src/main/assemblies/bin.xml | 4 +- flink-dist/src/main/assemblies/opt.xml | 24 ++-- flink-examples/flink-examples-batch/pom.xml | 22 ++-- flink-examples/flink-examples-streaming/pom.xml | 36 +++--- flink-examples/flink-examples-table/pom.xml | 10 +- flink-examples/pom.xml | 4 +- flink-fs-tests/pom.xml | 12 +- flink-java8/pom.xml | 12 +- flink-libraries/flink-cep-scala/pom.xml | 14 +-- flink-libraries/flink-cep/pom.xml | 12 +- flink-libraries/flink-gelly-examples/pom.xml | 14 +-- flink-libraries/flink-gelly-scala/pom.xml | 12 +- flink-libraries/flink-gelly/pom.xml | 8 +- flink-libraries/flink-ml/pom.xml | 8 +- flink-libraries/flink-python/pom.xml | 6 +- flink-libraries/flink-table/pom.xml | 14 +-- flink-mesos/pom.xml | 10 +- flink-metrics/flink-metrics-datadog/pom.xml | 2 +- flink-metrics/flink-metrics-dropwizard/pom.xml | 2 +- flink-metrics/flink-metrics-jmx/pom.xml | 4 +- flink-metrics/flink-metrics-statsd/pom.xml | 2 +- flink-optimizer/pom.xml | 4 +- .../main/resources/archetype-resources/pom.xml | 30 ++--- .../main/resources/archetype-resources/pom.xml | 34 +++--- flink-runtime-web/pom.xml | 8 +- flink-runtime/pom.xml | 2 +- flink-scala-shell/pom.xml | 14 +-- flink-scala/pom.xml | 8 +- flink-streaming-java/pom.xml | 8 +- flink-streaming-scala/pom.xml | 14 +-- .../flink-test-utils/pom.xml | 8 +- flink-tests/pom.xml | 36 +++--- flink-yarn-tests/pom.xml | 12 +- flink-yarn/pom.xml | 10 +- tools/change-scala-version.sh | 117 ------------------- tools/create_release_files.sh | 10 +- tools/deploy_to_maven.sh | 8 +- 64 files changed, 376 insertions(+), 501 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-clients/pom.xml ---------------------------------------------------------------------- diff --git a/flink-clients/pom.xml b/flink-clients/pom.xml index 8dde2e9..deac7fc 100644 --- a/flink-clients/pom.xml +++ b/flink-clients/pom.xml @@ -30,7 +30,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-clients_2.10</artifactId> + <artifactId>flink-clients_${scala.binary.version}</artifactId> <name>flink-clients</name> <packaging>jar</packaging> @@ -47,13 +47,13 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-runtime_2.10</artifactId> + <artifactId>flink-runtime_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-optimizer_2.10</artifactId> + <artifactId>flink-optimizer_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-connectors/flink-avro/pom.xml ---------------------------------------------------------------------- diff --git a/flink-connectors/flink-avro/pom.xml b/flink-connectors/flink-avro/pom.xml index 170b344..ed99eac 100644 --- a/flink-connectors/flink-avro/pom.xml +++ b/flink-connectors/flink-avro/pom.xml @@ -29,7 +29,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-avro_2.10</artifactId> + <artifactId>flink-avro_${scala.binary.version}</artifactId> <name>flink-avro</name> <packaging>jar</packaging> @@ -62,14 +62,14 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-test-utils_2.10</artifactId> + <artifactId>flink-test-utils_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-clients_2.10</artifactId> + <artifactId>flink-clients_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-connectors/flink-connector-cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/flink-connectors/flink-connector-cassandra/pom.xml b/flink-connectors/flink-connector-cassandra/pom.xml index d01c769..2722c30 100644 --- a/flink-connectors/flink-connector-cassandra/pom.xml +++ b/flink-connectors/flink-connector-cassandra/pom.xml @@ -30,7 +30,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-connector-cassandra_2.10</artifactId> + <artifactId>flink-connector-cassandra_${scala.binary.version}</artifactId> <name>flink-connector-cassandra</name> <packaging>jar</packaging> @@ -94,7 +94,7 @@ under the License. <dependencies> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> @@ -136,27 +136,27 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-runtime_2.10</artifactId> + <artifactId>flink-runtime_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> <type>test-jar</type> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> <type>test-jar</type> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-tests_2.10</artifactId> + <artifactId>flink-tests_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-test-utils_2.10</artifactId> + <artifactId>flink-test-utils_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-connectors/flink-connector-elasticsearch-base/pom.xml ---------------------------------------------------------------------- diff --git a/flink-connectors/flink-connector-elasticsearch-base/pom.xml b/flink-connectors/flink-connector-elasticsearch-base/pom.xml index e183354..79b4f50 100644 --- a/flink-connectors/flink-connector-elasticsearch-base/pom.xml +++ b/flink-connectors/flink-connector-elasticsearch-base/pom.xml @@ -30,7 +30,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-connector-elasticsearch-base_2.10</artifactId> + <artifactId>flink-connector-elasticsearch-base_${scala.binary.version}</artifactId> <name>flink-connector-elasticsearch-base</name> <packaging>jar</packaging> @@ -46,7 +46,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> @@ -61,14 +61,14 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-test-utils_2.10</artifactId> + <artifactId>flink-test-utils_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-runtime_2.10</artifactId> + <artifactId>flink-runtime_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> @@ -76,7 +76,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> <type>test-jar</type> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-connectors/flink-connector-elasticsearch/pom.xml ---------------------------------------------------------------------- diff --git a/flink-connectors/flink-connector-elasticsearch/pom.xml b/flink-connectors/flink-connector-elasticsearch/pom.xml index 07028df..93e4eb6 100644 --- a/flink-connectors/flink-connector-elasticsearch/pom.xml +++ b/flink-connectors/flink-connector-elasticsearch/pom.xml @@ -30,7 +30,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-connector-elasticsearch_2.10</artifactId> + <artifactId>flink-connector-elasticsearch_${scala.binary.version}</artifactId> <name>flink-connector-elasticsearch</name> <packaging>jar</packaging> @@ -46,14 +46,14 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-connector-elasticsearch-base_2.10</artifactId> + <artifactId>flink-connector-elasticsearch-base_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> @@ -61,14 +61,14 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-test-utils_2.10</artifactId> + <artifactId>flink-test-utils_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> <type>test-jar</type> @@ -76,7 +76,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-connector-elasticsearch-base_2.10</artifactId> + <artifactId>flink-connector-elasticsearch-base_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> <type>test-jar</type> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-connectors/flink-connector-elasticsearch2/pom.xml ---------------------------------------------------------------------- diff --git a/flink-connectors/flink-connector-elasticsearch2/pom.xml b/flink-connectors/flink-connector-elasticsearch2/pom.xml index ec1b7da..7e21b8f 100644 --- a/flink-connectors/flink-connector-elasticsearch2/pom.xml +++ b/flink-connectors/flink-connector-elasticsearch2/pom.xml @@ -30,7 +30,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-connector-elasticsearch2_2.10</artifactId> + <artifactId>flink-connector-elasticsearch2_${scala.binary.version}</artifactId> <name>flink-connector-elasticsearch2</name> <packaging>jar</packaging> @@ -46,14 +46,14 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-connector-elasticsearch-base_2.10</artifactId> + <artifactId>flink-connector-elasticsearch-base_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> @@ -68,14 +68,14 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-test-utils_2.10</artifactId> + <artifactId>flink-test-utils_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> <type>test-jar</type> @@ -83,7 +83,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-connector-elasticsearch-base_2.10</artifactId> + <artifactId>flink-connector-elasticsearch-base_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-connectors/flink-connector-elasticsearch5/pom.xml ---------------------------------------------------------------------- diff --git a/flink-connectors/flink-connector-elasticsearch5/pom.xml b/flink-connectors/flink-connector-elasticsearch5/pom.xml index 93d7bbe..72a0d18 100644 --- a/flink-connectors/flink-connector-elasticsearch5/pom.xml +++ b/flink-connectors/flink-connector-elasticsearch5/pom.xml @@ -30,7 +30,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-connector-elasticsearch5_2.10</artifactId> + <artifactId>flink-connector-elasticsearch5_${scala.binary.version}</artifactId> <name>flink-connector-elasticsearch5</name> <packaging>jar</packaging> @@ -46,14 +46,14 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-connector-elasticsearch-base_2.10</artifactId> + <artifactId>flink-connector-elasticsearch-base_${scala.binary.version}</artifactId> <version>${project.version}</version> <exclusions> <!-- Elasticsearch Java Client has been moved to a different module in 5.x --> @@ -88,14 +88,14 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-test-utils_2.10</artifactId> + <artifactId>flink-test-utils_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> <type>test-jar</type> @@ -103,7 +103,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-connector-elasticsearch-base_2.10</artifactId> + <artifactId>flink-connector-elasticsearch-base_${scala.binary.version}</artifactId> <version>${project.version}</version> <exclusions> <exclusion> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/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 28d9962..07b0ae1 100644 --- a/flink-connectors/flink-connector-filesystem/pom.xml +++ b/flink-connectors/flink-connector-filesystem/pom.xml @@ -30,7 +30,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-connector-filesystem_2.10</artifactId> + <artifactId>flink-connector-filesystem_${scala.binary.version}</artifactId> <name>flink-connector-filesystem</name> <packaging>jar</packaging> @@ -45,7 +45,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> @@ -68,21 +68,21 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-test-utils_2.10</artifactId> + <artifactId>flink-test-utils_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-hadoop-compatibility_2.10</artifactId> + <artifactId>flink-hadoop-compatibility_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> <type>test-jar</type> @@ -90,7 +90,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-tests_2.10</artifactId> + <artifactId>flink-tests_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> <type>test-jar</type> @@ -98,7 +98,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-runtime_2.10</artifactId> + <artifactId>flink-runtime_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> <type>test-jar</type> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/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 c17386d..231b22e 100644 --- a/flink-connectors/flink-connector-kafka-0.10/pom.xml +++ b/flink-connectors/flink-connector-kafka-0.10/pom.xml @@ -30,7 +30,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-connector-kafka-0.10_2.10</artifactId> + <artifactId>flink-connector-kafka-0.10_${scala.binary.version}</artifactId> <name>flink-connector-kafka-0.10</name> <packaging>jar</packaging> @@ -46,7 +46,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-connector-kafka-0.9_2.10</artifactId> + <artifactId>flink-connector-kafka-0.9_${scala.binary.version}</artifactId> <version>${project.version}</version> <exclusions> <exclusion> @@ -60,7 +60,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> @@ -75,7 +75,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-table_2.10</artifactId> + <artifactId>flink-table_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> <!-- Projects depending on this project, @@ -87,7 +87,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> <type>test-jar</type> @@ -95,7 +95,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-connector-kafka-0.9_2.10</artifactId> + <artifactId>flink-connector-kafka-0.9_${scala.binary.version}</artifactId> <version>${project.version}</version> <exclusions> <!-- exclude Kafka dependencies --> @@ -110,7 +110,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-connector-kafka-base_2.10</artifactId> + <artifactId>flink-connector-kafka-base_${scala.binary.version}</artifactId> <version>${project.version}</version> <exclusions> <!-- exclude Kafka dependencies --> @@ -133,7 +133,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-tests_2.10</artifactId> + <artifactId>flink-tests_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> @@ -141,14 +141,14 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-test-utils_2.10</artifactId> + <artifactId>flink-test-utils_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-runtime_2.10</artifactId> + <artifactId>flink-runtime_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/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 ceccb3e..5e2ed2d 100644 --- a/flink-connectors/flink-connector-kafka-0.8/pom.xml +++ b/flink-connectors/flink-connector-kafka-0.8/pom.xml @@ -30,7 +30,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-connector-kafka-0.8_2.10</artifactId> + <artifactId>flink-connector-kafka-0.8_${scala.binary.version}</artifactId> <name>flink-connector-kafka-0.8</name> <packaging>jar</packaging> @@ -46,7 +46,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> @@ -60,13 +60,13 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-connector-kafka-base_2.10</artifactId> + <artifactId>flink-connector-kafka-base_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-table_2.10</artifactId> + <artifactId>flink-table_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> <!-- Projects depending on this project, @@ -122,7 +122,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> <type>test-jar</type> @@ -144,7 +144,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-connector-kafka-base_2.10</artifactId> + <artifactId>flink-connector-kafka-base_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> @@ -152,7 +152,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-runtime_2.10</artifactId> + <artifactId>flink-runtime_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> @@ -160,14 +160,14 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-test-utils_2.10</artifactId> + <artifactId>flink-test-utils_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-tests_2.10</artifactId> + <artifactId>flink-tests_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/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 de4dedb..0140353 100644 --- a/flink-connectors/flink-connector-kafka-0.9/pom.xml +++ b/flink-connectors/flink-connector-kafka-0.9/pom.xml @@ -30,7 +30,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-connector-kafka-0.9_2.10</artifactId> + <artifactId>flink-connector-kafka-0.9_${scala.binary.version}</artifactId> <name>flink-connector-kafka-0.9</name> <packaging>jar</packaging> @@ -46,14 +46,14 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-connector-kafka-base_2.10</artifactId> + <artifactId>flink-connector-kafka-base_${scala.binary.version}</artifactId> <version>${project.version}</version> <exclusions> <exclusion> @@ -65,7 +65,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-table_2.10</artifactId> + <artifactId>flink-table_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> <!-- Projects depending on this project, @@ -83,7 +83,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> <type>test-jar</type> @@ -91,7 +91,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-connector-kafka-base_2.10</artifactId> + <artifactId>flink-connector-kafka-base_${scala.binary.version}</artifactId> <version>${project.version}</version> <exclusions> <!-- exclude 0.8 dependencies --> @@ -121,7 +121,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-tests_2.10</artifactId> + <artifactId>flink-tests_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> @@ -129,14 +129,14 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-test-utils_2.10</artifactId> + <artifactId>flink-test-utils_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-runtime_2.10</artifactId> + <artifactId>flink-runtime_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/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 a6b2349..2cc94b0 100644 --- a/flink-connectors/flink-connector-kafka-base/pom.xml +++ b/flink-connectors/flink-connector-kafka-base/pom.xml @@ -30,7 +30,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-connector-kafka-base_2.10</artifactId> + <artifactId>flink-connector-kafka-base_${scala.binary.version}</artifactId> <name>flink-connector-kafka-base</name> <packaging>jar</packaging> @@ -46,14 +46,14 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-table_2.10</artifactId> + <artifactId>flink-table_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> <!-- Projects depending on this project, @@ -132,7 +132,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> @@ -140,14 +140,14 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-test-utils_2.10</artifactId> + <artifactId>flink-test-utils_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-tests_2.10</artifactId> + <artifactId>flink-tests_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> @@ -155,7 +155,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-runtime_2.10</artifactId> + <artifactId>flink-runtime_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> @@ -163,7 +163,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-avro_2.10</artifactId> + <artifactId>flink-avro_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-connectors/flink-connector-kinesis/pom.xml ---------------------------------------------------------------------- diff --git a/flink-connectors/flink-connector-kinesis/pom.xml b/flink-connectors/flink-connector-kinesis/pom.xml index 7515f31..4628937 100644 --- a/flink-connectors/flink-connector-kinesis/pom.xml +++ b/flink-connectors/flink-connector-kinesis/pom.xml @@ -30,7 +30,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-connector-kinesis_2.10</artifactId> + <artifactId>flink-connector-kinesis_${scala.binary.version}</artifactId> <name>flink-connector-kinesis</name> <properties> <aws.sdk.version>1.10.71</aws.sdk.version> @@ -44,7 +44,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> @@ -57,7 +57,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-runtime_2.10</artifactId> + <artifactId>flink-runtime_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> @@ -65,7 +65,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-tests_2.10</artifactId> + <artifactId>flink-tests_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> <type>test-jar</type> @@ -73,7 +73,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> @@ -81,7 +81,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-test-utils_2.10</artifactId> + <artifactId>flink-test-utils_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-connectors/flink-connector-nifi/pom.xml ---------------------------------------------------------------------- diff --git a/flink-connectors/flink-connector-nifi/pom.xml b/flink-connectors/flink-connector-nifi/pom.xml index 67bfb29..efa7ae7 100644 --- a/flink-connectors/flink-connector-nifi/pom.xml +++ b/flink-connectors/flink-connector-nifi/pom.xml @@ -30,7 +30,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-connector-nifi_2.10</artifactId> + <artifactId>flink-connector-nifi_${scala.binary.version}</artifactId> <name>flink-connector-nifi</name> <packaging>jar</packaging> @@ -48,26 +48,26 @@ under the License. </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> <type>test-jar</type> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-tests_2.10</artifactId> + <artifactId>flink-tests_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-test-utils_2.10</artifactId> + <artifactId>flink-test-utils_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-connectors/flink-connector-rabbitmq/pom.xml ---------------------------------------------------------------------- diff --git a/flink-connectors/flink-connector-rabbitmq/pom.xml b/flink-connectors/flink-connector-rabbitmq/pom.xml index f26e57c..38337f4 100644 --- a/flink-connectors/flink-connector-rabbitmq/pom.xml +++ b/flink-connectors/flink-connector-rabbitmq/pom.xml @@ -30,7 +30,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-connector-rabbitmq_2.10</artifactId> + <artifactId>flink-connector-rabbitmq_${scala.binary.version}</artifactId> <name>flink-connector-rabbitmq</name> <packaging>jar</packaging> @@ -44,7 +44,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> @@ -57,7 +57,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> <type>test-jar</type> @@ -65,7 +65,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-runtime_2.10</artifactId> + <artifactId>flink-runtime_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-connectors/flink-connector-twitter/pom.xml ---------------------------------------------------------------------- diff --git a/flink-connectors/flink-connector-twitter/pom.xml b/flink-connectors/flink-connector-twitter/pom.xml index c683da1..38bfb30 100644 --- a/flink-connectors/flink-connector-twitter/pom.xml +++ b/flink-connectors/flink-connector-twitter/pom.xml @@ -30,7 +30,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-connector-twitter_2.10</artifactId> + <artifactId>flink-connector-twitter_${scala.binary.version}</artifactId> <name>flink-connector-twitter</name> <packaging>jar</packaging> @@ -43,7 +43,7 @@ under the License. <dependencies> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-connectors/flink-hadoop-compatibility/pom.xml ---------------------------------------------------------------------- diff --git a/flink-connectors/flink-hadoop-compatibility/pom.xml b/flink-connectors/flink-hadoop-compatibility/pom.xml index 003225b..2dee17d 100644 --- a/flink-connectors/flink-hadoop-compatibility/pom.xml +++ b/flink-connectors/flink-hadoop-compatibility/pom.xml @@ -29,7 +29,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-hadoop-compatibility_2.10</artifactId> + <artifactId>flink-hadoop-compatibility_${scala.binary.version}</artifactId> <name>flink-hadoop-compatibility</name> <packaging>jar</packaging> @@ -47,7 +47,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-scala_2.10</artifactId> + <artifactId>flink-scala_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> @@ -70,7 +70,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-test-utils_2.10</artifactId> + <artifactId>flink-test-utils_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-connectors/flink-hbase/pom.xml ---------------------------------------------------------------------- diff --git a/flink-connectors/flink-hbase/pom.xml b/flink-connectors/flink-hbase/pom.xml index 6a295a8..949e27a 100644 --- a/flink-connectors/flink-hbase/pom.xml +++ b/flink-connectors/flink-hbase/pom.xml @@ -29,7 +29,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-hbase_2.10</artifactId> + <artifactId>flink-hbase_${scala.binary.version}</artifactId> <name>flink-hbase</name> <packaging>jar</packaging> @@ -89,7 +89,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-scala_2.10</artifactId> + <artifactId>flink-scala_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> @@ -98,7 +98,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-scala_2.10</artifactId> + <artifactId>flink-streaming-scala_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> @@ -107,7 +107,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-table_2.10</artifactId> + <artifactId>flink-table_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> <!-- Projects depending on this project, @@ -124,7 +124,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> @@ -206,7 +206,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-clients_2.10</artifactId> + <artifactId>flink-clients_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> <exclusions> @@ -219,13 +219,13 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-hadoop-compatibility_2.10</artifactId> + <artifactId>flink-hadoop-compatibility_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> <exclusions> <exclusion> <groupId>org.apache.flink</groupId> - <artifactId>flink-shaded-include-yarn_2.10</artifactId> + <artifactId>flink-shaded-include-yarn_${scala.binary.version}</artifactId> </exclusion> </exclusions> </dependency> @@ -271,7 +271,7 @@ under the License. </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-test-utils_2.10</artifactId> + <artifactId>flink-test-utils_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-connectors/flink-hcatalog/pom.xml ---------------------------------------------------------------------- diff --git a/flink-connectors/flink-hcatalog/pom.xml b/flink-connectors/flink-hcatalog/pom.xml index a975e53..a9fbceb 100644 --- a/flink-connectors/flink-hcatalog/pom.xml +++ b/flink-connectors/flink-hcatalog/pom.xml @@ -44,7 +44,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-hadoop-compatibility_2.10</artifactId> + <artifactId>flink-hadoop-compatibility_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-connectors/flink-jdbc/pom.xml ---------------------------------------------------------------------- diff --git a/flink-connectors/flink-jdbc/pom.xml b/flink-connectors/flink-jdbc/pom.xml index 38a0163..a2bbaf4 100644 --- a/flink-connectors/flink-jdbc/pom.xml +++ b/flink-connectors/flink-jdbc/pom.xml @@ -39,7 +39,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-table_2.10</artifactId> + <artifactId>flink-table_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> <!-- Projects depending on this project, @@ -56,7 +56,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-clients_2.10</artifactId> + <artifactId>flink-clients_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-contrib/flink-connector-wikiedits/pom.xml ---------------------------------------------------------------------- diff --git a/flink-contrib/flink-connector-wikiedits/pom.xml b/flink-contrib/flink-connector-wikiedits/pom.xml index fed8656..20b6db4 100644 --- a/flink-contrib/flink-connector-wikiedits/pom.xml +++ b/flink-contrib/flink-connector-wikiedits/pom.xml @@ -29,7 +29,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-connector-wikiedits_2.10</artifactId> + <artifactId>flink-connector-wikiedits_${scala.binary.version}</artifactId> <name>flink-connector-wikiedits</name> <packaging>jar</packaging> @@ -37,7 +37,7 @@ under the License. <dependencies> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-contrib/flink-statebackend-rocksdb/pom.xml ---------------------------------------------------------------------- diff --git a/flink-contrib/flink-statebackend-rocksdb/pom.xml b/flink-contrib/flink-statebackend-rocksdb/pom.xml index 2148706..527ca18 100644 --- a/flink-contrib/flink-statebackend-rocksdb/pom.xml +++ b/flink-contrib/flink-statebackend-rocksdb/pom.xml @@ -31,7 +31,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-statebackend-rocksdb_2.10</artifactId> + <artifactId>flink-statebackend-rocksdb_${scala.binary.version}</artifactId> <name>flink-statebackend-rocksdb</name> <packaging>jar</packaging> @@ -42,14 +42,14 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-clients_2.10</artifactId> + <artifactId>flink-clients_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> @@ -78,7 +78,7 @@ under the License. </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> @@ -86,7 +86,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-runtime_2.10</artifactId> + <artifactId>flink-runtime_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-contrib/flink-storm-examples/pom.xml ---------------------------------------------------------------------- diff --git a/flink-contrib/flink-storm-examples/pom.xml b/flink-contrib/flink-storm-examples/pom.xml index 4d9d76c..6ef0f7b 100644 --- a/flink-contrib/flink-storm-examples/pom.xml +++ b/flink-contrib/flink-storm-examples/pom.xml @@ -29,7 +29,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-storm-examples_2.10</artifactId> + <artifactId>flink-storm-examples_${scala.binary.version}</artifactId> <name>flink-storm-examples</name> <packaging>jar</packaging> @@ -56,19 +56,19 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-storm_2.10</artifactId> + <artifactId>flink-storm_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-examples-batch_2.10</artifactId> + <artifactId>flink-examples-batch_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> @@ -95,14 +95,14 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-test-utils_2.10</artifactId> + <artifactId>flink-test-utils_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> <type>test-jar</type> @@ -128,7 +128,7 @@ under the License. <artifactItems> <artifactItem> <groupId>org.apache.flink</groupId> - <artifactId>flink-examples-batch_2.10</artifactId> + <artifactId>flink-examples-batch_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> @@ -138,7 +138,7 @@ under the License. </artifactItem> <artifactItem> <groupId>org.apache.flink</groupId> - <artifactId>flink-storm_2.10</artifactId> + <artifactId>flink-storm_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> @@ -326,8 +326,8 @@ under the License. <!-- Storm's recursive dependencies --> <include>org.yaml:snakeyaml</include> <include>com.googlecode.json-simple:json-simple</include> - <include>org.apache.flink:flink-storm_2.10</include> - <include>org.apache.flink:flink-storm-examples_2.10</include> + <include>org.apache.flink:flink-storm_${scala.binary.version}</include> + <include>org.apache.flink:flink-storm-examples_${scala.binary.version}</include> </includes> </artifactSet> <filters> @@ -354,7 +354,7 @@ under the License. </includes> </filter> <filter> - <artifact>org.apache.flink:flink-storm-examples_2.10</artifact> + <artifact>org.apache.flink:flink-storm-examples_${scala.binary.version}</artifact> <includes> <include>org/apache/flink/storm/wordcount/WordCountRemoteBySubmitter.class </include> @@ -366,7 +366,7 @@ under the License. </includes> </filter> <filter> - <artifact>org.apache.flink:flink-storm_2.10</artifact> + <artifact>org.apache.flink:flink-storm_${scala.binary.version}</artifact> <includes> <include>org/apache/flink/storm/api/*.class</include> <include>org/apache/flink/storm/util/*.class</include> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-contrib/flink-storm/pom.xml ---------------------------------------------------------------------- diff --git a/flink-contrib/flink-storm/pom.xml b/flink-contrib/flink-storm/pom.xml index 5189b3b..a10ff68 100644 --- a/flink-contrib/flink-storm/pom.xml +++ b/flink-contrib/flink-storm/pom.xml @@ -29,7 +29,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-storm_2.10</artifactId> + <artifactId>flink-storm_${scala.binary.version}</artifactId> <name>flink-storm</name> <packaging>jar</packaging> @@ -65,7 +65,7 @@ under the License. <!-- Core streaming API --> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> @@ -174,7 +174,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-runtime_2.10</artifactId> + <artifactId>flink-runtime_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-contrib/flink-streaming-contrib/pom.xml ---------------------------------------------------------------------- diff --git a/flink-contrib/flink-streaming-contrib/pom.xml b/flink-contrib/flink-streaming-contrib/pom.xml index 2df0231..2381d70 100644 --- a/flink-contrib/flink-streaming-contrib/pom.xml +++ b/flink-contrib/flink-streaming-contrib/pom.xml @@ -31,7 +31,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-streaming-contrib_2.10</artifactId> + <artifactId>flink-streaming-contrib_${scala.binary.version}</artifactId> <name>flink-streaming-contrib</name> <packaging>jar</packaging> @@ -42,19 +42,19 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-scala_2.10</artifactId> + <artifactId>flink-streaming-scala_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-clients_2.10</artifactId> + <artifactId>flink-clients_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> @@ -62,7 +62,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-test-utils_2.10</artifactId> + <artifactId>flink-test-utils_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-contrib/flink-tweet-inputformat/pom.xml ---------------------------------------------------------------------- diff --git a/flink-contrib/flink-tweet-inputformat/pom.xml b/flink-contrib/flink-tweet-inputformat/pom.xml index 5e0d79c..9328bb6 100644 --- a/flink-contrib/flink-tweet-inputformat/pom.xml +++ b/flink-contrib/flink-tweet-inputformat/pom.xml @@ -31,7 +31,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-tweet-inputformat_2.10</artifactId> + <artifactId>flink-tweet-inputformat_${scala.binary.version}</artifactId> <name>flink-tweet-inputformat</name> <packaging>jar</packaging> @@ -44,12 +44,12 @@ under the License. </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-clients_2.10</artifactId> + <artifactId>flink-clients_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-test-utils_2.10</artifactId> + <artifactId>flink-test-utils_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-dist/pom.xml ---------------------------------------------------------------------- diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml index 6d8debf..0493b98 100644 --- a/flink-dist/pom.xml +++ b/flink-dist/pom.xml @@ -29,7 +29,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-dist_2.10</artifactId> + <artifactId>flink-dist_${scala.binary.version}</artifactId> <name>flink-dist</name> <packaging>jar</packaging> @@ -51,61 +51,61 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-scala_2.10</artifactId> + <artifactId>flink-scala_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-runtime_2.10</artifactId> + <artifactId>flink-runtime_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-runtime-web_2.10</artifactId> + <artifactId>flink-runtime-web_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-optimizer_2.10</artifactId> + <artifactId>flink-optimizer_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-clients_2.10</artifactId> + <artifactId>flink-clients_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-avro_2.10</artifactId> + <artifactId>flink-avro_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-scala_2.10</artifactId> + <artifactId>flink-streaming-scala_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-python_2.10</artifactId> + <artifactId>flink-python_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-scala-shell_2.10</artifactId> + <artifactId>flink-scala-shell_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> @@ -123,19 +123,19 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-mesos_2.10</artifactId> + <artifactId>flink-mesos_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-statebackend-rocksdb_2.10</artifactId> + <artifactId>flink-statebackend-rocksdb_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-yarn_2.10</artifactId> + <artifactId>flink-yarn_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> @@ -163,7 +163,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-gelly-examples_2.10</artifactId> + <artifactId>flink-gelly-examples_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> @@ -214,42 +214,42 @@ under the License. <!-- start optional Flink libraries --> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-cep_2.10</artifactId> + <artifactId>flink-cep_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-cep-scala_2.10</artifactId> + <artifactId>flink-cep-scala_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-gelly_2.10</artifactId> + <artifactId>flink-gelly_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-gelly-scala_2.10</artifactId> + <artifactId>flink-gelly-scala_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-ml_2.10</artifactId> + <artifactId>flink-ml_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-table_2.10</artifactId> + <artifactId>flink-table_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-dist/src/main/assemblies/bin.xml ---------------------------------------------------------------------- diff --git a/flink-dist/src/main/assemblies/bin.xml b/flink-dist/src/main/assemblies/bin.xml index c3385e1..909beb4 100644 --- a/flink-dist/src/main/assemblies/bin.xml +++ b/flink-dist/src/main/assemblies/bin.xml @@ -39,7 +39,7 @@ under the License. <useTransitiveFiltering>true</useTransitiveFiltering> <includes> - <include>org.apache.flink:flink-python_2.10</include> + <include>org.apache.flink:flink-python_${scala.binary.version}</include> <include>org.slf4j:slf4j-log4j12</include> <include>log4j:log4j</include> </includes> @@ -49,7 +49,7 @@ under the License. <files> <!-- copy fat jar --> <file> - <source>target/flink-dist_2.10-${project.version}.jar</source> + <source>target/flink-dist_${scala.binary.version}-${project.version}.jar</source> <outputDirectory>lib/</outputDirectory> <fileMode>0644</fileMode> </file> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-dist/src/main/assemblies/opt.xml ---------------------------------------------------------------------- diff --git a/flink-dist/src/main/assemblies/opt.xml b/flink-dist/src/main/assemblies/opt.xml index 0386b92..23846be 100644 --- a/flink-dist/src/main/assemblies/opt.xml +++ b/flink-dist/src/main/assemblies/opt.xml @@ -31,47 +31,47 @@ <files> <!-- CEP --> <file> - <source>../flink-libraries/flink-cep/target/flink-cep_2.10-${project.version}.jar</source> + <source>../flink-libraries/flink-cep/target/flink-cep_${scala.binary.version}-${project.version}.jar</source> <outputDirectory>opt/</outputDirectory> - <destName>flink-cep_2.10-${project.version}.jar</destName> + <destName>flink-cep_${scala.binary.version}-${project.version}.jar</destName> <fileMode>0644</fileMode> </file> <file> - <source>../flink-libraries/flink-cep-scala/target/flink-cep-scala_2.10-${project.version}.jar</source> + <source>../flink-libraries/flink-cep-scala/target/flink-cep-scala_${scala.binary.version}-${project.version}.jar</source> <outputDirectory>opt/</outputDirectory> - <destName>flink-cep-scala_2.10-${project.version}.jar</destName> + <destName>flink-cep-scala_${scala.binary.version}-${project.version}.jar</destName> <fileMode>0644</fileMode> </file> <!-- Gelly --> <file> - <source>../flink-libraries/flink-gelly/target/flink-gelly_2.10-${project.version}.jar</source> + <source>../flink-libraries/flink-gelly/target/flink-gelly_${scala.binary.version}-${project.version}.jar</source> <outputDirectory>opt/</outputDirectory> - <destName>flink-gelly_2.10-${project.version}.jar</destName> + <destName>flink-gelly_${scala.binary.version}-${project.version}.jar</destName> <fileMode>0644</fileMode> </file> <file> - <source>../flink-libraries/flink-gelly-scala/target/flink-gelly-scala_2.10-${project.version}-jar-with-dependencies.jar</source> + <source>../flink-libraries/flink-gelly-scala/target/flink-gelly-scala_${scala.binary.version}-${project.version}-jar-with-dependencies.jar</source> <outputDirectory>opt/</outputDirectory> - <destName>flink-gelly-scala_2.10-${project.version}.jar</destName> + <destName>flink-gelly-scala_${scala.binary.version}-${project.version}.jar</destName> <fileMode>0644</fileMode> </file> <!-- TableAPI--> <file> - <source>../flink-libraries/flink-table/target/flink-table_2.10-${project.version}.jar</source> + <source>../flink-libraries/flink-table/target/flink-table_${scala.binary.version}-${project.version}.jar</source> <outputDirectory>opt/</outputDirectory> - <destName>flink-table_2.10-${project.version}.jar</destName> + <destName>flink-table_${scala.binary.version}-${project.version}.jar</destName> <fileMode>0644</fileMode> </file> <!-- ML --> <file> - <source>../flink-libraries/flink-ml/target/flink-ml_2.10-${project.version}-jar-with-dependencies.jar</source> + <source>../flink-libraries/flink-ml/target/flink-ml_${scala.binary.version}-${project.version}-jar-with-dependencies.jar</source> <outputDirectory>opt/</outputDirectory> - <destName>flink-ml_2.10-${project.version}.jar</destName> + <destName>flink-ml_${scala.binary.version}-${project.version}.jar</destName> <fileMode>0644</fileMode> </file> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-examples/flink-examples-batch/pom.xml ---------------------------------------------------------------------- diff --git a/flink-examples/flink-examples-batch/pom.xml b/flink-examples/flink-examples-batch/pom.xml index 269f5a6..cbff7e2 100644 --- a/flink-examples/flink-examples-batch/pom.xml +++ b/flink-examples/flink-examples-batch/pom.xml @@ -23,12 +23,12 @@ under the License. <parent> <groupId>org.apache.flink</groupId> - <artifactId>flink-examples_2.10</artifactId> + <artifactId>flink-examples_${scala.binary.version}</artifactId> <version>1.4-SNAPSHOT</version> <relativePath>..</relativePath> </parent> - <artifactId>flink-examples-batch_2.10</artifactId> + <artifactId>flink-examples-batch_${scala.binary.version}</artifactId> <name>flink-examples-batch</name> <packaging>jar</packaging> @@ -41,7 +41,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-scala_2.10</artifactId> + <artifactId>flink-scala_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> </dependencies> @@ -363,14 +363,14 @@ under the License. </goals> <configuration> <target> - <copy file="${project.basedir}/target/flink-examples-batch_2.10-${project.version}-KMeans.jar" tofile="${project.basedir}/target/KMeans.jar" /> - <copy file="${project.basedir}/target/flink-examples-batch_2.10-${project.version}-ConnectedComponents.jar" tofile="${project.basedir}/target/ConnectedComponents.jar" /> - <copy file="${project.basedir}/target/flink-examples-batch_2.10-${project.version}-EnumTriangles.jar" tofile="${project.basedir}/target/EnumTriangles.jar" /> - <copy file="${project.basedir}/target/flink-examples-batch_2.10-${project.version}-PageRank.jar" tofile="${project.basedir}/target/PageRank.jar" /> - <copy file="${project.basedir}/target/flink-examples-batch_2.10-${project.version}-TransitiveClosure.jar" tofile="${project.basedir}/target/TransitiveClosure.jar" /> - <copy file="${project.basedir}/target/flink-examples-batch_2.10-${project.version}-WebLogAnalysis.jar" tofile="${project.basedir}/target/WebLogAnalysis.jar" /> - <copy file="${project.basedir}/target/flink-examples-batch_2.10-${project.version}-WordCount.jar" tofile="${project.basedir}/target/WordCount.jar" /> - <copy file="${project.basedir}/target/flink-examples-batch_2.10-${project.version}-DistCp.jar" tofile="${project.basedir}/target/DistCp.jar" /> + <copy file="${project.basedir}/target/flink-examples-batch_${scala.binary.version}-${project.version}-KMeans.jar" tofile="${project.basedir}/target/KMeans.jar" /> + <copy file="${project.basedir}/target/flink-examples-batch_${scala.binary.version}-${project.version}-ConnectedComponents.jar" tofile="${project.basedir}/target/ConnectedComponents.jar" /> + <copy file="${project.basedir}/target/flink-examples-batch_${scala.binary.version}-${project.version}-EnumTriangles.jar" tofile="${project.basedir}/target/EnumTriangles.jar" /> + <copy file="${project.basedir}/target/flink-examples-batch_${scala.binary.version}-${project.version}-PageRank.jar" tofile="${project.basedir}/target/PageRank.jar" /> + <copy file="${project.basedir}/target/flink-examples-batch_${scala.binary.version}-${project.version}-TransitiveClosure.jar" tofile="${project.basedir}/target/TransitiveClosure.jar" /> + <copy file="${project.basedir}/target/flink-examples-batch_${scala.binary.version}-${project.version}-WebLogAnalysis.jar" tofile="${project.basedir}/target/WebLogAnalysis.jar" /> + <copy file="${project.basedir}/target/flink-examples-batch_${scala.binary.version}-${project.version}-WordCount.jar" tofile="${project.basedir}/target/WordCount.jar" /> + <copy file="${project.basedir}/target/flink-examples-batch_${scala.binary.version}-${project.version}-DistCp.jar" tofile="${project.basedir}/target/DistCp.jar" /> </target> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-examples/flink-examples-streaming/pom.xml ---------------------------------------------------------------------- diff --git a/flink-examples/flink-examples-streaming/pom.xml b/flink-examples/flink-examples-streaming/pom.xml index 2bacf25..b52116b 100644 --- a/flink-examples/flink-examples-streaming/pom.xml +++ b/flink-examples/flink-examples-streaming/pom.xml @@ -24,12 +24,12 @@ under the License. <parent> <groupId>org.apache.flink</groupId> - <artifactId>flink-examples_2.10</artifactId> + <artifactId>flink-examples_${scala.binary.version}</artifactId> <version>1.4-SNAPSHOT</version> <relativePath>..</relativePath> </parent> - <artifactId>flink-examples-streaming_2.10</artifactId> + <artifactId>flink-examples-streaming_${scala.binary.version}</artifactId> <name>flink-examples-streaming</name> <packaging>jar</packaging> @@ -40,31 +40,31 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-scala_2.10</artifactId> + <artifactId>flink-streaming-scala_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-examples-batch_2.10</artifactId> + <artifactId>flink-examples-batch_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-connector-twitter_2.10</artifactId> + <artifactId>flink-connector-twitter_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-connector-kafka-0.8_2.10</artifactId> + <artifactId>flink-connector-kafka-0.8_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> @@ -72,14 +72,14 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-test-utils_2.10</artifactId> + <artifactId>flink-test-utils_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> <type>test-jar</type> @@ -116,7 +116,7 @@ under the License. <!-- For WordCount example data --> <artifactItem> <groupId>org.apache.flink</groupId> - <artifactId>flink-examples-batch_2.10</artifactId> + <artifactId>flink-examples-batch_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> @@ -126,7 +126,7 @@ under the License. <!-- For JSON utilities --> <artifactItem> <groupId>org.apache.flink</groupId> - <artifactId>flink-connector-twitter_2.10</artifactId> + <artifactId>flink-connector-twitter_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> @@ -475,13 +475,13 @@ under the License. </goals> <configuration> <target> - <copy file="${project.basedir}/target/flink-examples-streaming_2.10-${project.version}-IncrementalLearning.jar" tofile="${project.basedir}/target/IncrementalLearning.jar" /> - <copy file="${project.basedir}/target/flink-examples-streaming_2.10-${project.version}-Iteration.jar" tofile="${project.basedir}/target/Iteration.jar" /> - <copy file="${project.basedir}/target/flink-examples-streaming_2.10-${project.version}-SessionWindowing.jar" tofile="${project.basedir}/target/SessionWindowing.jar" /> - <copy file="${project.basedir}/target/flink-examples-streaming_2.10-${project.version}-TopSpeedWindowing.jar" tofile="${project.basedir}/target/TopSpeedWindowing.jar" /> - <copy file="${project.basedir}/target/flink-examples-streaming_2.10-${project.version}-WindowJoin.jar" tofile="${project.basedir}/target/WindowJoin.jar" /> - <copy file="${project.basedir}/target/flink-examples-streaming_2.10-${project.version}-WordCount.jar" tofile="${project.basedir}/target/WordCount.jar" /> - <copy file="${project.basedir}/target/flink-examples-streaming_2.10-${project.version}-SocketWindowWordCount.jar" tofile="${project.basedir}/target/SocketWindowWordCount.jar" /> + <copy file="${project.basedir}/target/flink-examples-streaming_${scala.binary.version}-${project.version}-IncrementalLearning.jar" tofile="${project.basedir}/target/IncrementalLearning.jar" /> + <copy file="${project.basedir}/target/flink-examples-streaming_${scala.binary.version}-${project.version}-Iteration.jar" tofile="${project.basedir}/target/Iteration.jar" /> + <copy file="${project.basedir}/target/flink-examples-streaming_${scala.binary.version}-${project.version}-SessionWindowing.jar" tofile="${project.basedir}/target/SessionWindowing.jar" /> + <copy file="${project.basedir}/target/flink-examples-streaming_${scala.binary.version}-${project.version}-TopSpeedWindowing.jar" tofile="${project.basedir}/target/TopSpeedWindowing.jar" /> + <copy file="${project.basedir}/target/flink-examples-streaming_${scala.binary.version}-${project.version}-WindowJoin.jar" tofile="${project.basedir}/target/WindowJoin.jar" /> + <copy file="${project.basedir}/target/flink-examples-streaming_${scala.binary.version}-${project.version}-WordCount.jar" tofile="${project.basedir}/target/WordCount.jar" /> + <copy file="${project.basedir}/target/flink-examples-streaming_${scala.binary.version}-${project.version}-SocketWindowWordCount.jar" tofile="${project.basedir}/target/SocketWindowWordCount.jar" /> </target> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-examples/flink-examples-table/pom.xml ---------------------------------------------------------------------- diff --git a/flink-examples/flink-examples-table/pom.xml b/flink-examples/flink-examples-table/pom.xml index ce1c701..e59d8c6 100644 --- a/flink-examples/flink-examples-table/pom.xml +++ b/flink-examples/flink-examples-table/pom.xml @@ -24,27 +24,27 @@ under the License. <parent> <groupId>org.apache.flink</groupId> - <artifactId>flink-examples_2.10</artifactId> + <artifactId>flink-examples_${scala.binary.version}</artifactId> <version>1.4-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <name>flink-examples-table</name> - <artifactId>flink-examples-table_2.10</artifactId> + <artifactId>flink-examples-table_${scala.binary.version}</artifactId> <packaging>jar</packaging> <dependencies> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-table_2.10</artifactId> + <artifactId>flink-table_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-scala_2.10</artifactId> + <artifactId>flink-streaming-scala_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> @@ -78,7 +78,7 @@ under the License. <artifactId>maven-shade-plugin</artifactId> <executions> <execution> - <id>flink-table-examples_2.10</id> + <id>flink-table-examples_${scala.binary.version}</id> <phase>package</phase> <goals> <goal>shade</goal> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-examples/pom.xml ---------------------------------------------------------------------- diff --git a/flink-examples/pom.xml b/flink-examples/pom.xml index 409c8f1..644d9eb 100644 --- a/flink-examples/pom.xml +++ b/flink-examples/pom.xml @@ -28,7 +28,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-examples_2.10</artifactId> + <artifactId>flink-examples_${scala.binary.version}</artifactId> <name>flink-examples</name> <packaging>pom</packaging> @@ -44,7 +44,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-clients_2.10</artifactId> + <artifactId>flink-clients_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-fs-tests/pom.xml ---------------------------------------------------------------------- diff --git a/flink-fs-tests/pom.xml b/flink-fs-tests/pom.xml index c354c80..446d167 100644 --- a/flink-fs-tests/pom.xml +++ b/flink-fs-tests/pom.xml @@ -27,7 +27,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-fs-tests_2.10</artifactId> + <artifactId>flink-fs-tests_${scala.binary.version}</artifactId> <name>flink-fs-tests</name> <packaging>jar</packaging> @@ -45,7 +45,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> @@ -53,28 +53,28 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-examples-batch_2.10</artifactId> + <artifactId>flink-examples-batch_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-avro_2.10</artifactId> + <artifactId>flink-avro_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-test-utils_2.10</artifactId> + <artifactId>flink-test-utils_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-runtime_2.10</artifactId> + <artifactId>flink-runtime_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> <type>test-jar</type> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-java8/pom.xml ---------------------------------------------------------------------- diff --git a/flink-java8/pom.xml b/flink-java8/pom.xml index 8de3b92..fb7da02 100644 --- a/flink-java8/pom.xml +++ b/flink-java8/pom.xml @@ -30,7 +30,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-java8_2.10</artifactId> + <artifactId>flink-java8_${scala.binary.version}</artifactId> <name>flink-java8</name> <packaging>jar</packaging> @@ -51,13 +51,13 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-examples-batch_2.10</artifactId> + <artifactId>flink-examples-batch_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> @@ -65,14 +65,14 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-test-utils_2.10</artifactId> + <artifactId>flink-test-utils_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-cep_2.10</artifactId> + <artifactId>flink-cep_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> @@ -116,7 +116,7 @@ under the License. <artifactItems> <artifactItem> <groupId>org.apache.flink</groupId> - <artifactId>flink-examples-batch_2.10</artifactId> + <artifactId>flink-examples-batch_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>jar</type> <overWrite>false</overWrite> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-libraries/flink-cep-scala/pom.xml ---------------------------------------------------------------------- diff --git a/flink-libraries/flink-cep-scala/pom.xml b/flink-libraries/flink-cep-scala/pom.xml index ca5bbce..c9b4a46 100644 --- a/flink-libraries/flink-cep-scala/pom.xml +++ b/flink-libraries/flink-cep-scala/pom.xml @@ -30,7 +30,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-cep-scala_2.10</artifactId> + <artifactId>flink-cep-scala_${scala.binary.version}</artifactId> <name>flink-cep-scala</name> <packaging>jar</packaging> @@ -40,13 +40,13 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-cep_2.10</artifactId> + <artifactId>flink-cep_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-scala_2.10</artifactId> + <artifactId>flink-streaming-scala_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> @@ -83,14 +83,14 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-test-utils_2.10</artifactId> + <artifactId>flink-test-utils_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-tests_2.10</artifactId> + <artifactId>flink-tests_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> <type>test-jar</type> @@ -98,7 +98,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-scala_2.10</artifactId> + <artifactId>flink-streaming-scala_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> <type>test-jar</type> @@ -106,7 +106,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-cep_2.10</artifactId> + <artifactId>flink-cep_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> <type>test-jar</type> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-libraries/flink-cep/pom.xml ---------------------------------------------------------------------- diff --git a/flink-libraries/flink-cep/pom.xml b/flink-libraries/flink-cep/pom.xml index 7f89c24..35045c0 100644 --- a/flink-libraries/flink-cep/pom.xml +++ b/flink-libraries/flink-cep/pom.xml @@ -30,7 +30,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-cep_2.10</artifactId> + <artifactId>flink-cep_${scala.binary.version}</artifactId> <name>flink-cep</name> <packaging>jar</packaging> @@ -47,7 +47,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> @@ -62,14 +62,14 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-test-utils_2.10</artifactId> + <artifactId>flink-test-utils_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> @@ -77,7 +77,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-runtime_2.10</artifactId> + <artifactId>flink-runtime_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> @@ -85,7 +85,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-statebackend-rocksdb_2.10</artifactId> + <artifactId>flink-statebackend-rocksdb_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency>
