http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-libraries/flink-gelly-examples/pom.xml ---------------------------------------------------------------------- diff --git a/flink-libraries/flink-gelly-examples/pom.xml b/flink-libraries/flink-gelly-examples/pom.xml index 009781f..68ad050 100644 --- a/flink-libraries/flink-gelly-examples/pom.xml +++ b/flink-libraries/flink-gelly-examples/pom.xml @@ -27,7 +27,7 @@ <relativePath>..</relativePath> </parent> - <artifactId>flink-gelly-examples_2.10</artifactId> + <artifactId>flink-gelly-examples_${scala.binary.version}</artifactId> <name>flink-gelly-examples</name> <packaging>jar</packaging> @@ -42,22 +42,22 @@ </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-scala_2.10</artifactId> + <artifactId>flink-scala_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-gelly_2.10</artifactId> + <artifactId>flink-gelly_${scala.binary.version}</artifactId> <version>${project.version}</version> </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> </dependency> @@ -94,14 +94,14 @@ <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> </dependency>
http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-libraries/flink-gelly-scala/pom.xml ---------------------------------------------------------------------- diff --git a/flink-libraries/flink-gelly-scala/pom.xml b/flink-libraries/flink-gelly-scala/pom.xml index 256fc53..35b2188 100644 --- a/flink-libraries/flink-gelly-scala/pom.xml +++ b/flink-libraries/flink-gelly-scala/pom.xml @@ -28,7 +28,7 @@ under the License. </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>flink-gelly-scala_2.10</artifactId> + <artifactId>flink-gelly-scala_${scala.binary.version}</artifactId> <name>flink-gelly-scala</name> <packaging>jar</packaging> @@ -38,21 +38,21 @@ under the License. <!-- core dependencies --> <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> <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> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-gelly_2.10</artifactId> + <artifactId>flink-gelly_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> @@ -87,7 +87,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> @@ -95,7 +95,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-libraries/flink-gelly/pom.xml ---------------------------------------------------------------------- diff --git a/flink-libraries/flink-gelly/pom.xml b/flink-libraries/flink-gelly/pom.xml index d656bb3..d620a66 100644 --- a/flink-libraries/flink-gelly/pom.xml +++ b/flink-libraries/flink-gelly/pom.xml @@ -29,7 +29,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-gelly_2.10</artifactId> + <artifactId>flink-gelly_${scala.binary.version}</artifactId> <name>flink-gelly</name> <packaging>jar</packaging> @@ -47,7 +47,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>provided</scope> </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> @@ -77,7 +77,7 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-optimizer_2.10</artifactId> + <artifactId>flink-optimizer_${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-libraries/flink-ml/pom.xml ---------------------------------------------------------------------- diff --git a/flink-libraries/flink-ml/pom.xml b/flink-libraries/flink-ml/pom.xml index 8aa84d2..0f203b9 100644 --- a/flink-libraries/flink-ml/pom.xml +++ b/flink-libraries/flink-ml/pom.xml @@ -28,7 +28,7 @@ <relativePath>..</relativePath> </parent> - <artifactId>flink-ml_2.10</artifactId> + <artifactId>flink-ml_${scala.binary.version}</artifactId> <name>flink-ml</name> <packaging>jar</packaging> @@ -39,7 +39,7 @@ <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> @@ -86,14 +86,14 @@ <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> <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-libraries/flink-python/pom.xml ---------------------------------------------------------------------- diff --git a/flink-libraries/flink-python/pom.xml b/flink-libraries/flink-python/pom.xml index 9d2f0c3..5b6405e 100644 --- a/flink-libraries/flink-python/pom.xml +++ b/flink-libraries/flink-python/pom.xml @@ -27,7 +27,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-python_2.10</artifactId> + <artifactId>flink-python_${scala.binary.version}</artifactId> <name>flink-python</name> <packaging>jar</packaging> @@ -69,7 +69,7 @@ under the License. </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>provided</scope> </dependency> @@ -78,7 +78,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-libraries/flink-table/pom.xml ---------------------------------------------------------------------- diff --git a/flink-libraries/flink-table/pom.xml b/flink-libraries/flink-table/pom.xml index 8fa2ed2..a34fa1b 100644 --- a/flink-libraries/flink-table/pom.xml +++ b/flink-libraries/flink-table/pom.xml @@ -27,7 +27,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-table_2.10</artifactId> + <artifactId>flink-table_${scala.binary.version}</artifactId> <name>flink-table</name> <packaging>jar</packaging> @@ -38,7 +38,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> @@ -114,14 +114,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> @@ -137,20 +137,20 @@ 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> <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> </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-mesos/pom.xml ---------------------------------------------------------------------- diff --git a/flink-mesos/pom.xml b/flink-mesos/pom.xml index d03144f..a1ef900 100644 --- a/flink-mesos/pom.xml +++ b/flink-mesos/pom.xml @@ -27,7 +27,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-mesos_2.10</artifactId> + <artifactId>flink-mesos_${scala.binary.version}</artifactId> <name>flink-mesos</name> <packaging>jar</packaging> @@ -38,13 +38,13 @@ under the License. <dependencies> <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-clients_2.10</artifactId> + <artifactId>flink-clients_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> @@ -130,7 +130,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> @@ -138,7 +138,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> <type>test-jar</type> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-metrics/flink-metrics-datadog/pom.xml ---------------------------------------------------------------------- diff --git a/flink-metrics/flink-metrics-datadog/pom.xml b/flink-metrics/flink-metrics-datadog/pom.xml index e2bd6fa..1b1d9ad 100644 --- a/flink-metrics/flink-metrics-datadog/pom.xml +++ b/flink-metrics/flink-metrics-datadog/pom.xml @@ -63,7 +63,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> </dependency> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-metrics/flink-metrics-dropwizard/pom.xml ---------------------------------------------------------------------- diff --git a/flink-metrics/flink-metrics-dropwizard/pom.xml b/flink-metrics/flink-metrics-dropwizard/pom.xml index 2ba12e6..631d68e 100644 --- a/flink-metrics/flink-metrics-dropwizard/pom.xml +++ b/flink-metrics/flink-metrics-dropwizard/pom.xml @@ -58,7 +58,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> </dependency> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-metrics/flink-metrics-jmx/pom.xml ---------------------------------------------------------------------- diff --git a/flink-metrics/flink-metrics-jmx/pom.xml b/flink-metrics/flink-metrics-jmx/pom.xml index d738fc4..1e8ecc8 100644 --- a/flink-metrics/flink-metrics-jmx/pom.xml +++ b/flink-metrics/flink-metrics-jmx/pom.xml @@ -49,7 +49,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>provided</scope> </dependency> @@ -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> <scope>test</scope> <type>test-jar</type> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-metrics/flink-metrics-statsd/pom.xml ---------------------------------------------------------------------- diff --git a/flink-metrics/flink-metrics-statsd/pom.xml b/flink-metrics/flink-metrics-statsd/pom.xml index 80cfa32..5b77f8d 100644 --- a/flink-metrics/flink-metrics-statsd/pom.xml +++ b/flink-metrics/flink-metrics-statsd/pom.xml @@ -51,7 +51,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> </dependency> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-optimizer/pom.xml ---------------------------------------------------------------------- diff --git a/flink-optimizer/pom.xml b/flink-optimizer/pom.xml index c347082..499487b 100644 --- a/flink-optimizer/pom.xml +++ b/flink-optimizer/pom.xml @@ -29,7 +29,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-optimizer_2.10</artifactId> + <artifactId>flink-optimizer_${scala.binary.version}</artifactId> <name>flink-optimizer</name> <packaging>jar</packaging> @@ -46,7 +46,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> </dependency> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/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 2fa1835..9991d2c 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 @@ -82,12 +82,12 @@ 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>${flink.version}</version> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-clients_2.10</artifactId> + <artifactId>flink-clients_${scala.binary.version}</artifactId> <version>${flink.version}</version> </dependency> @@ -124,13 +124,13 @@ 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>${flink.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>${flink.version}</version> <scope>provided</scope> </dependency> @@ -201,20 +201,20 @@ under the License. <exclude>org.apache.flink:flink-shaded-curator-recipes</exclude> <exclude>org.apache.flink:flink-core</exclude> <exclude>org.apache.flink:flink-java</exclude> - <exclude>org.apache.flink:flink-scala_2.10</exclude> - <exclude>org.apache.flink:flink-runtime_2.10</exclude> - <exclude>org.apache.flink:flink-optimizer_2.10</exclude> - <exclude>org.apache.flink:flink-clients_2.10</exclude> - <exclude>org.apache.flink:flink-avro_2.10</exclude> - <exclude>org.apache.flink:flink-examples-batch_2.10</exclude> - <exclude>org.apache.flink:flink-examples-streaming_2.10</exclude> - <exclude>org.apache.flink:flink-streaming-java_2.10</exclude> - <exclude>org.apache.flink:flink-streaming-scala_2.10</exclude> - <exclude>org.apache.flink:flink-scala-shell_2.10</exclude> + <exclude>org.apache.flink:flink-scala_${scala.binary.version}</exclude> + <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-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> + <exclude>org.apache.flink:flink-streaming-scala_${scala.binary.version}</exclude> + <exclude>org.apache.flink:flink-scala-shell_${scala.binary.version}</exclude> <exclude>org.apache.flink:flink-python</exclude> <exclude>org.apache.flink:flink-metrics-core</exclude> <exclude>org.apache.flink:flink-metrics-jmx</exclude> - <exclude>org.apache.flink:flink-statebackend-rocksdb_2.10</exclude> + <exclude>org.apache.flink:flink-statebackend-rocksdb_${scala.binary.version}</exclude> <!-- Also exclude very big transitive dependencies of Flink http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/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 189bbce..2139c6b 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 @@ -78,17 +78,17 @@ under the License. <!-- Apache Flink dependencies --> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-scala_2.10</artifactId> + <artifactId>flink-scala_${scala.binary.version}</artifactId> <version>${flink.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>${flink.version}</version> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-clients_2.10</artifactId> + <artifactId>flink-clients_${scala.binary.version}</artifactId> <version>${flink.version}</version> </dependency> @@ -116,19 +116,19 @@ under the License. <dependencies> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-scala_2.10</artifactId> + <artifactId>flink-scala_${scala.binary.version}</artifactId> <version>${flink.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>${flink.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>${flink.version}</version> <scope>provided</scope> </dependency> @@ -202,20 +202,20 @@ under the License. <exclude>org.apache.flink:flink-shaded-curator-recipes</exclude> <exclude>org.apache.flink:flink-core</exclude> <exclude>org.apache.flink:flink-java</exclude> - <exclude>org.apache.flink:flink-scala_2.10</exclude> - <exclude>org.apache.flink:flink-runtime_2.10</exclude> - <exclude>org.apache.flink:flink-optimizer_2.10</exclude> - <exclude>org.apache.flink:flink-clients_2.10</exclude> - <exclude>org.apache.flink:flink-avro_2.10</exclude> - <exclude>org.apache.flink:flink-examples-batch_2.10</exclude> - <exclude>org.apache.flink:flink-examples-streaming_2.10</exclude> - <exclude>org.apache.flink:flink-streaming-java_2.10</exclude> - <exclude>org.apache.flink:flink-streaming-scala_2.10</exclude> - <exclude>org.apache.flink:flink-scala-shell_2.10</exclude> + <exclude>org.apache.flink:flink-scala_${scala.binary.version}</exclude> + <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-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> + <exclude>org.apache.flink:flink-streaming-scala_${scala.binary.version}</exclude> + <exclude>org.apache.flink:flink-scala-shell_${scala.binary.version}</exclude> <exclude>org.apache.flink:flink-python</exclude> <exclude>org.apache.flink:flink-metrics-core</exclude> <exclude>org.apache.flink:flink-metrics-jmx</exclude> - <exclude>org.apache.flink:flink-statebackend-rocksdb_2.10</exclude> + <exclude>org.apache.flink:flink-statebackend-rocksdb_${scala.binary.version}</exclude> <!-- Also exclude very big transitive dependencies of Flink http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-runtime-web/pom.xml ---------------------------------------------------------------------- diff --git a/flink-runtime-web/pom.xml b/flink-runtime-web/pom.xml index e7870f3..8a4671b 100644 --- a/flink-runtime-web/pom.xml +++ b/flink-runtime-web/pom.xml @@ -29,7 +29,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-runtime-web_2.10</artifactId> + <artifactId>flink-runtime-web_${scala.binary.version}</artifactId> <name>flink-runtime-web</name> <packaging>jar</packaging> @@ -42,12 +42,12 @@ 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-clients_2.10</artifactId> + <artifactId>flink-clients_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> @@ -99,7 +99,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-runtime/pom.xml ---------------------------------------------------------------------- diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml index 8abdc3c..a13a985 100644 --- a/flink-runtime/pom.xml +++ b/flink-runtime/pom.xml @@ -29,7 +29,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-runtime_2.10</artifactId> + <artifactId>flink-runtime_${scala.binary.version}</artifactId> <name>flink-runtime</name> <packaging>jar</packaging> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-scala-shell/pom.xml ---------------------------------------------------------------------- diff --git a/flink-scala-shell/pom.xml b/flink-scala-shell/pom.xml index 0aadfc6..c9acbec 100644 --- a/flink-scala-shell/pom.xml +++ b/flink-scala-shell/pom.xml @@ -27,7 +27,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-scala-shell_2.10</artifactId> + <artifactId>flink-scala-shell_${scala.binary.version}</artifactId> <name>flink-scala-shell</name> <packaging>jar</packaging> @@ -44,19 +44,19 @@ 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> <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-streaming-scala_2.10</artifactId> + <artifactId>flink-streaming-scala_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> @@ -82,7 +82,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> @@ -214,14 +214,14 @@ under the License. <id>scala-2.10</id> <activation> <property> - <!-- this is the default scala profile --> + <!-- only required for Scala 2.10 --> <name>!scala-2.11</name> </property> </activation> <dependencies> <dependency> <groupId>org.scalamacros</groupId> - <artifactId>quasiquotes_${scala.binary.version}</artifactId> + <artifactId>quasiquotes_2.10</artifactId> <version>${scala.macros.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-scala/pom.xml ---------------------------------------------------------------------- diff --git a/flink-scala/pom.xml b/flink-scala/pom.xml index 7be1e29..7fad487 100644 --- a/flink-scala/pom.xml +++ b/flink-scala/pom.xml @@ -28,7 +28,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-scala_2.10</artifactId> + <artifactId>flink-scala_${scala.binary.version}</artifactId> <name>flink-scala</name> <packaging>jar</packaging> @@ -82,7 +82,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> <type>test-jar</type> <scope>test</scope> @@ -241,14 +241,14 @@ under the License. <id>scala-2.10</id> <activation> <property> - <!-- this is the default scala profile --> + <!-- only required for Scala 2.10 --> <name>!scala-2.11</name> </property> </activation> <dependencies> <dependency> <groupId>org.scalamacros</groupId> - <artifactId>quasiquotes_${scala.binary.version}</artifactId> + <artifactId>quasiquotes_2.10</artifactId> <version>${scala.macros.version}</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-streaming-java/pom.xml ---------------------------------------------------------------------- diff --git a/flink-streaming-java/pom.xml b/flink-streaming-java/pom.xml index ea987af..46142de 100644 --- a/flink-streaming-java/pom.xml +++ b/flink-streaming-java/pom.xml @@ -29,7 +29,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-streaming-java_2.10</artifactId> + <artifactId>flink-streaming-java_${scala.binary.version}</artifactId> <name>flink-streaming-java</name> <packaging>jar</packaging> @@ -46,13 +46,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-clients_2.10</artifactId> + <artifactId>flink-clients_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> @@ -85,7 +85,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-streaming-scala/pom.xml ---------------------------------------------------------------------- diff --git a/flink-streaming-scala/pom.xml b/flink-streaming-scala/pom.xml index 4ec12bd..586dca7 100644 --- a/flink-streaming-scala/pom.xml +++ b/flink-streaming-scala/pom.xml @@ -28,7 +28,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-streaming-scala_2.10</artifactId> + <artifactId>flink-streaming-scala_${scala.binary.version}</artifactId> <name>flink-streaming-scala</name> <packaging>jar</packaging> @@ -38,13 +38,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-scala_2.10</artifactId> + <artifactId>flink-scala_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> @@ -85,14 +85,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> @@ -100,7 +100,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> @@ -108,7 +108,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-test-utils-parent/flink-test-utils/pom.xml ---------------------------------------------------------------------- diff --git a/flink-test-utils-parent/flink-test-utils/pom.xml b/flink-test-utils-parent/flink-test-utils/pom.xml index 36bdceb..4f53794 100644 --- a/flink-test-utils-parent/flink-test-utils/pom.xml +++ b/flink-test-utils-parent/flink-test-utils/pom.xml @@ -29,7 +29,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-test-utils_2.10</artifactId> + <artifactId>flink-test-utils_${scala.binary.version}</artifactId> <name>flink-test-utils</name> <packaging>jar</packaging> @@ -45,21 +45,21 @@ 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>compile</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>compile</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>compile</scope> </dependency> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-tests/pom.xml ---------------------------------------------------------------------- diff --git a/flink-tests/pom.xml b/flink-tests/pom.xml index b67edbb..3c0b184 100644 --- a/flink-tests/pom.xml +++ b/flink-tests/pom.xml @@ -30,7 +30,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-tests_2.10</artifactId> + <artifactId>flink-tests_${scala.binary.version}</artifactId> <name>flink-tests</name> <packaging>jar</packaging> @@ -54,28 +54,28 @@ under the License. <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-optimizer_2.10</artifactId> + <artifactId>flink-optimizer_${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> </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> <scope>test</scope> </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> <scope>test</scope> <type>test-jar</type> @@ -83,7 +83,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> @@ -97,14 +97,14 @@ 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>test</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-scala_2.10</artifactId> + <artifactId>flink-scala_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> @@ -112,21 +112,21 @@ 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> </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-examples-batch_2.10</artifactId> + <artifactId>flink-examples-batch_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> @@ -141,14 +141,14 @@ 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> </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> <type>test-jar</type> <scope>test</scope> @@ -156,7 +156,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> @@ -164,14 +164,14 @@ 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> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-optimizer_2.10</artifactId> + <artifactId>flink-optimizer_${scala.binary.version}</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> @@ -179,7 +179,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> @@ -224,7 +224,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> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/flink-yarn-tests/pom.xml ---------------------------------------------------------------------- diff --git a/flink-yarn-tests/pom.xml b/flink-yarn-tests/pom.xml index f296e8d..626d886 100644 --- a/flink-yarn-tests/pom.xml +++ b/flink-yarn-tests/pom.xml @@ -33,7 +33,7 @@ under the License. We need the YARN fat jar build by flink-dist for the tests. --> - <artifactId>flink-yarn-tests_2.10</artifactId> + <artifactId>flink-yarn-tests_${scala.binary.version}</artifactId> <name>flink-yarn-tests</name> <packaging>jar</packaging> @@ -43,14 +43,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> <scope>test</scope> <type>test-jar</type> @@ -59,21 +59,21 @@ under the License. <!-- Needed for the streaming wordcount example --> <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> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-yarn_2.10</artifactId> + <artifactId>flink-yarn_${scala.binary.version}</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.flink</groupId> - <artifactId>flink-yarn_2.10</artifactId> + <artifactId>flink-yarn_${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-yarn/pom.xml ---------------------------------------------------------------------- diff --git a/flink-yarn/pom.xml b/flink-yarn/pom.xml index 5946094..e97fee5 100644 --- a/flink-yarn/pom.xml +++ b/flink-yarn/pom.xml @@ -27,7 +27,7 @@ under the License. <relativePath>..</relativePath> </parent> - <artifactId>flink-yarn_2.10</artifactId> + <artifactId>flink-yarn_${scala.binary.version}</artifactId> <name>flink-yarn</name> <packaging>jar</packaging> @@ -37,7 +37,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> <exclusions> <exclusion> @@ -49,7 +49,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> @@ -61,7 +61,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> <type>test-jar</type> <scope>test</scope> @@ -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> <type>test-jar</type> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/tools/change-scala-version.sh ---------------------------------------------------------------------- diff --git a/tools/change-scala-version.sh b/tools/change-scala-version.sh deleted file mode 100755 index 56c48c6..0000000 --- a/tools/change-scala-version.sh +++ /dev/null @@ -1,117 +0,0 @@ -#!/usr/bin/env bash - -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# This shell script is from Apache Spark with some modification. - -set -e - -VALID_VERSIONS=( 2.10 2.11 ) - -usage() { - echo "Usage: $(basename $0) [-h|--help] <scala version to be used> -where : - -h| --help Display this help text - valid scala version values : ${VALID_VERSIONS[*]} -" 1>&2 - exit 1 -} - -if [[ ($# -ne 1) || ( $1 == "--help") || $1 == "-h" ]]; then - usage -fi - -TO_VERSION=$1 - -check_scala_version() { - for i in ${VALID_VERSIONS[*]}; do [ $i = "$1" ] && return 0; done - echo "Invalid Scala version: $1. Valid versions: ${VALID_VERSIONS[*]}" 1>&2 - exit 1 -} - -check_scala_version "$TO_VERSION" - -if [ $TO_VERSION = "2.11" ]; then - FROM_SUFFIX="_2\.10" - TO_SUFFIX="_2\.11" -else - FROM_SUFFIX="_2\.11" - TO_SUFFIX="_2\.10" -fi - -sed_i() { - sed -e "$1" "$2" > "$2.tmp" && mv "$2.tmp" "$2" -} - -export -f sed_i - -echo "sed_i 's/\(artifactId>flink.*'$FROM_SUFFIX'\)<\/artifactId>/\1'$TO_SUFFIX'<\/artifactId>/g' {}"; - -BASEDIR=$(dirname $0)/.. -find "$BASEDIR" -name 'pom.xml' -not -path '*target*' -print \ - -exec bash -c "sed_i 's/\(artifactId>flink.*\)'$FROM_SUFFIX'<\/artifactId>/\1'$TO_SUFFIX'<\/artifactId>/g' {}" \; - -# fix for examples -find "$BASEDIR/flink-examples/flink-examples-batch" -name 'pom.xml' -not -path '*target*' -print \ - -exec bash -c "sed_i 's/\(<copy file=\".*flink-examples-batch\)'$FROM_SUFFIX'/\1'$TO_SUFFIX'/g' {}" \; - -find "$BASEDIR/flink-examples/flink-examples-streaming" -name 'pom.xml' -not -path '*target*' -print \ - -exec bash -c "sed_i 's/\(<copy file=\".*flink-examples-streaming\)'$FROM_SUFFIX'/\1'$TO_SUFFIX'/g' {}" \; - -# fix for quickstart -find "$BASEDIR/flink-quickstart" -name 'pom.xml' -not -path '*target*' -print \ - -exec bash -c "sed_i 's/\(<exclude>org\.apache\.flink:flink-.*\)'$FROM_SUFFIX'<\/exclude>/\1'$TO_SUFFIX'<\/exclude>/g' {}" \; - -# fix for flink-dist (bin.xml) -find "$BASEDIR/flink-dist" -name 'bin.xml' -not -path '*target*' -print \ - -exec bash -c "sed_i 's/\(<source>.*flink-dist\)'$FROM_SUFFIX'/\1'$TO_SUFFIX'/g' {}" \; -find "$BASEDIR/flink-dist" -name 'bin.xml' -not -path '*target*' -print \ - -exec bash -c "sed_i 's/\(<include>org\.apache\.flink:flink-.*\)'$FROM_SUFFIX'<\/include>/\1'$TO_SUFFIX'<\/include>/g' {}" \; - -# fix for flink-dist (opt.xml) -find "$BASEDIR/flink-dist" -name 'opt.xml' -not -path '*target*' -print \ - -exec bash -c "sed_i 's/\(<source>.*flink-.*\)'$FROM_SUFFIX'/\1'$TO_SUFFIX'/g' {}" \; -find "$BASEDIR/flink-dist" -name 'opt.xml' -not -path '*target*' -print \ - -exec bash -c "sed_i 's/\(<destName>flink-.*\)'$FROM_SUFFIX'/\1'$TO_SUFFIX'/g' {}" \; - -# fix for shading curator with Scala 2.11 -find "$BASEDIR/flink-runtime" -name 'pom.xml' -not -path '*target*' -print \ - -exec bash -c "sed_i 's/\(<include>org\.apache\.flink:flink-shaded-curator.*\)'$FROM_SUFFIX'<\/include>/\1'$TO_SUFFIX'<\/include>/g' {}" \; - -if [ "$TO_VERSION" == "2.11" ]; then - # set the profile activation to !scala-2.11 in parent pom, so that it activates by default - bash -c "sed_i 's/<name>scala-2.11<\/name>/<name>!scala-2.11<\/name>/g' $BASEDIR/pom.xml" \; - # set the profile activation in all sub modules to scala-2.11 (so that they are disabled by default) - find $BASEDIR/flink-* -name 'pom.xml' -not -path '*target*' -print \ - -exec bash -c "sed_i 's/<name>!scala-2.11<\/name>/<name>scala-2.11<\/name>/g' {}" \; - - # set the name of the shading artifact properly - bash -c "sed_i 's/\(shading-artifact.name>flink-shaded[a-z0-9\-]*\)'$FROM_SUFFIX'<\/shading-artifact.name>/\1'$TO_SUFFIX'<\/shading-artifact.name>/g' $BASEDIR/pom.xml" \; -fi - -if [ "$TO_VERSION" == "2.10" ]; then - # do the opposite as above - bash -c "sed_i 's/<name>!scala-2.11<\/name>/<name>scala-2.11<\/name>/g' $BASEDIR/pom.xml" \; - # also for the other files - find $BASEDIR/flink-* -name 'pom.xml' -not -path '*target*' -print \ - -exec bash -c "sed_i 's/<name>scala-2.11<\/name>/<name>!scala-2.11<\/name>/g' {}" \; - - # unset shading artifact name - bash -c "sed_i 's/\(shading-artifact.name>flink-shaded[a-z0-9\-]*\)'$FROM_SUFFIX'<\/shading-artifact.name>/\1'$TO_SUFFIX'<\/shading-artifact.name>/g' $BASEDIR/pom.xml" \; -fi - http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/tools/create_release_files.sh ---------------------------------------------------------------------- diff --git a/tools/create_release_files.sh b/tools/create_release_files.sh index f4c4673..40d038c 100755 --- a/tools/create_release_files.sh +++ b/tools/create_release_files.sh @@ -216,10 +216,9 @@ make_binary_release() { # make distribution cd "${dir_name}" - ./tools/change-scala-version.sh ${SCALA_VERSION} # enable release profile here (to check for the maven version) - $MVN clean package $FLAGS -DskipTests -Prelease -Dgpg.skip + $MVN clean package $FLAGS -DskipTests -Prelease,scala-${SCALA_VERSION} -Dgpg.skip cd flink-dist/target/flink-*-bin/ tar czf "${dir_name}.tgz" flink-* @@ -243,15 +242,12 @@ deploy_to_maven() { cp ../../deploysettings.xml . echo "Deploying Scala 2.11 version" - cd tools && ./change-scala-version.sh 2.11 && cd .. - - $MVN clean deploy -Prelease,docs-and-source --settings deploysettings.xml -DskipTests -Dgpg.executable=$GPG -Dgpg.keyname=$GPG_KEY -Dgpg.passphrase=$GPG_PASSPHRASE -DretryFailedDeploymentCount=10 + $MVN clean deploy -Prelease,docs-and-source,scala-2.11 --settings deploysettings.xml -DskipTests -Dgpg.executable=$GPG -Dgpg.keyname=$GPG_KEY -Dgpg.passphrase=$GPG_PASSPHRASE -DretryFailedDeploymentCount=10 # It is important to first deploy scala 2.11 and then scala 2.10 so that the quickstarts (which are independent of the scala version) # are depending on scala 2.10. echo "Deploying Scala 2.10 version" - cd tools && ./change-scala-version.sh 2.10 && cd .. - $MVN clean deploy -Dgpg.executable=$GPG -Prelease,docs-and-source --settings deploysettings.xml -DskipTests -Dgpg.keyname=$GPG_KEY -Dgpg.passphrase=$GPG_PASSPHRASE -DretryFailedDeploymentCount=10 + $MVN clean deploy -Prelease,docs-and-source,scala-2.10 --settings deploysettings.xml -DskipTests -Dgpg.executable=$GPG -Dgpg.keyname=$GPG_KEY -Dgpg.passphrase=$GPG_PASSPHRASE -DretryFailedDeploymentCount=10 } copy_data() { http://git-wip-us.apache.org/repos/asf/flink/blob/3990d75a/tools/deploy_to_maven.sh ---------------------------------------------------------------------- diff --git a/tools/deploy_to_maven.sh b/tools/deploy_to_maven.sh index 16d529e..32acc5a 100755 --- a/tools/deploy_to_maven.sh +++ b/tools/deploy_to_maven.sh @@ -89,18 +89,14 @@ if [[ $CURRENT_FLINK_VERSION == *SNAPSHOT* ]] ; then # hadoop2 scala 2.10 echo "deploy standard version (hadoop2) for scala 2.10" - mvn ${MVN_SNAPSHOT_OPTS} + mvn ${MVN_SNAPSHOT_OPTS} -Pscala-2.10 deploy_to_s3 $CURRENT_FLINK_VERSION "hadoop2" # hadoop2 scala 2.11 echo "deploy hadoop2 version (standard) for scala 2.11" - ./tools/change-scala-version.sh 2.11 - mvn ${MVN_SNAPSHOT_OPTS} + mvn ${MVN_SNAPSHOT_OPTS} -Pscala-2.11 deploy_to_s3 $CURRENT_FLINK_VERSION "hadoop2_2.11" - echo "Changing back to scala 2.10" - ./tools/change-scala-version.sh 2.10 - exit 0 else exit 1
