zentol closed pull request #7055: [FLINK-10823] Add missing scala suffixes
URL: https://github.com/apache/flink/pull/7055
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/docs/monitoring/metrics.md b/docs/monitoring/metrics.md
index 04efdef26fc..e482df2e795 100644
--- a/docs/monitoring/metrics.md
+++ b/docs/monitoring/metrics.md
@@ -674,7 +674,7 @@ metrics.reporter.grph.protocol: TCP
### Prometheus (org.apache.flink.metrics.prometheus.PrometheusReporter)
-In order to use this reporter you must copy
`/opt/flink-metrics-prometheus-{{site.version}}.jar` into the `/lib` folder
+In order to use this reporter you must copy
`/opt/flink-metrics-prometheus{{site.scala_version_suffix}}-{{site.version}}.jar`
into the `/lib` folder
of your Flink distribution.
Parameters:
diff --git a/flink-connectors/flink-connector-kafka-0.10/pom.xml
b/flink-connectors/flink-connector-kafka-0.10/pom.xml
index e6d80eabb64..36475dfcb51 100644
--- a/flink-connectors/flink-connector-kafka-0.10/pom.xml
+++ b/flink-connectors/flink-connector-kafka-0.10/pom.xml
@@ -187,7 +187,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-metrics-jmx</artifactId>
+
<artifactId>flink-metrics-jmx_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/flink-connectors/flink-connector-kafka-0.11/pom.xml
b/flink-connectors/flink-connector-kafka-0.11/pom.xml
index 70ec8266417..0203c0ec625 100644
--- a/flink-connectors/flink-connector-kafka-0.11/pom.xml
+++ b/flink-connectors/flink-connector-kafka-0.11/pom.xml
@@ -196,7 +196,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-metrics-jmx</artifactId>
+
<artifactId>flink-metrics-jmx_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/flink-connectors/flink-connector-kafka-0.8/pom.xml
b/flink-connectors/flink-connector-kafka-0.8/pom.xml
index f386cba1a08..b3a65931869 100644
--- a/flink-connectors/flink-connector-kafka-0.8/pom.xml
+++ b/flink-connectors/flink-connector-kafka-0.8/pom.xml
@@ -176,7 +176,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-metrics-jmx</artifactId>
+
<artifactId>flink-metrics-jmx_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/flink-connectors/flink-connector-kafka-0.9/pom.xml
b/flink-connectors/flink-connector-kafka-0.9/pom.xml
index 1ef37c28abc..12ab7636830 100644
--- a/flink-connectors/flink-connector-kafka-0.9/pom.xml
+++ b/flink-connectors/flink-connector-kafka-0.9/pom.xml
@@ -137,7 +137,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-metrics-jmx</artifactId>
+
<artifactId>flink-metrics-jmx_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/flink-connectors/flink-connector-kafka-base/pom.xml
b/flink-connectors/flink-connector-kafka-base/pom.xml
index 2c9113a6afd..78ebfa6116c 100644
--- a/flink-connectors/flink-connector-kafka-base/pom.xml
+++ b/flink-connectors/flink-connector-kafka-base/pom.xml
@@ -153,7 +153,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-metrics-jmx</artifactId>
+
<artifactId>flink-metrics-jmx_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/flink-connectors/flink-connector-kafka/pom.xml
b/flink-connectors/flink-connector-kafka/pom.xml
index 617f1232e35..b90cea2093a 100644
--- a/flink-connectors/flink-connector-kafka/pom.xml
+++ b/flink-connectors/flink-connector-kafka/pom.xml
@@ -205,7 +205,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-metrics-jmx</artifactId>
+
<artifactId>flink-metrics-jmx_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/flink-connectors/flink-jdbc/pom.xml
b/flink-connectors/flink-jdbc/pom.xml
index 60cdb67d40a..165154e3819 100644
--- a/flink-connectors/flink-jdbc/pom.xml
+++ b/flink-connectors/flink-jdbc/pom.xml
@@ -30,7 +30,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-jdbc</artifactId>
+ <artifactId>flink-jdbc_${scala.binary.version}</artifactId>
<name>flink-jdbc</name>
<packaging>jar</packaging>
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index a4c67d7b8c0..99e57be7a65 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -106,7 +106,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-metrics-jmx</artifactId>
+
<artifactId>flink-metrics-jmx_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>
@@ -244,7 +244,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-metrics-prometheus</artifactId>
+
<artifactId>flink-metrics-prometheus_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/flink-dist/src/main/assemblies/opt.xml
b/flink-dist/src/main/assemblies/opt.xml
index 6fe661a6c46..8d153766bb6 100644
--- a/flink-dist/src/main/assemblies/opt.xml
+++ b/flink-dist/src/main/assemblies/opt.xml
@@ -106,7 +106,7 @@
</file>
<file>
-
<source>../flink-metrics/flink-metrics-prometheus/target/flink-metrics-prometheus-${project.version}.jar</source>
+
<source>../flink-metrics/flink-metrics-prometheus/target/flink-metrics-prometheus_${scala.binary.version}-${project.version}.jar</source>
<outputDirectory>opt/</outputDirectory>
<destName>flink-metrics-prometheus-${project.version}.jar</destName>
<fileMode>0644</fileMode>
diff --git a/flink-docs/pom.xml b/flink-docs/pom.xml
index 3e87c9356f5..848a6bde1bd 100644
--- a/flink-docs/pom.xml
+++ b/flink-docs/pom.xml
@@ -55,7 +55,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-metrics-prometheus</artifactId>
+
<artifactId>flink-metrics-prometheus_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git
a/flink-end-to-end-tests/flink-metrics-reporter-prometheus-test/pom.xml
b/flink-end-to-end-tests/flink-metrics-reporter-prometheus-test/pom.xml
index 1efb40ed38e..cb5d83e3ff8 100644
--- a/flink-end-to-end-tests/flink-metrics-reporter-prometheus-test/pom.xml
+++ b/flink-end-to-end-tests/flink-metrics-reporter-prometheus-test/pom.xml
@@ -39,7 +39,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-metrics-prometheus</artifactId>
+
<artifactId>flink-metrics-prometheus_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/flink-metrics/flink-metrics-jmx/pom.xml
b/flink-metrics/flink-metrics-jmx/pom.xml
index 330929b5637..568675e0767 100644
--- a/flink-metrics/flink-metrics-jmx/pom.xml
+++ b/flink-metrics/flink-metrics-jmx/pom.xml
@@ -29,7 +29,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-metrics-jmx</artifactId>
+ <artifactId>flink-metrics-jmx_${scala.binary.version}</artifactId>
<name>flink-metrics-jmx</name>
<dependencies>
diff --git a/flink-metrics/flink-metrics-prometheus/pom.xml
b/flink-metrics/flink-metrics-prometheus/pom.xml
index 4474dcaa8f3..e705f0e0f8e 100644
--- a/flink-metrics/flink-metrics-prometheus/pom.xml
+++ b/flink-metrics/flink-metrics-prometheus/pom.xml
@@ -29,7 +29,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-metrics-prometheus</artifactId>
+
<artifactId>flink-metrics-prometheus_${scala.binary.version}</artifactId>
<name>flink-metrics-prometheus</name>
<dependencies>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
