[FLINK-10823][metrics][prometheus] Add scala suffix

Pance · Nov 9, 2018 · 73fc303 · 73fc303
1 parent 146467f
commit 73fc303
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git 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-dist/pom.xml b/flink-dist/pom.xml
@@ -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
@@ -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
@@ -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
@@ -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-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>