Skip to content

Commit a92c45f

Browse files
robertwbrobertwb
committed
Closes #3875 
2 parents ddc0a7d + e154843 commit a92c45f

7 files changed

Lines changed: 13 additions & 27 deletions

File tree

‎examples/java/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<dependencies>
9696
<dependency>
9797
<groupId>org.apache.beam</groupId>
98-
<artifactId>beam-runners-flink_${flink.scala.version}</artifactId>
98+
<artifactId>beam-runners-flink_2.10</artifactId>
9999
<scope>runtime</scope>
100100
<exclusions>
101101
<exclusion>

‎examples/java8/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<dependencies>
9696
<dependency>
9797
<groupId>org.apache.beam</groupId>
98-
<artifactId>beam-runners-flink_${flink.scala.version}</artifactId>
98+
<artifactId>beam-runners-flink_2.10</artifactId>
9999
<scope>runtime</scope>
100100
<exclusions>
101101
<exclusion>

‎pom.xml‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@
154154
<snappy-java.version>1.1.4</snappy-java.version>
155155
<kafka.clients.version>0.10.1.0</kafka.clients.version>
156156
<commons.csv.version>1.4</commons.csv.version>
157-
<flink.scala.version>2.11</flink.scala.version>
158157

159158
<os-maven-plugin.version>1.5.0.Final</os-maven-plugin.version>
160159
<groovy-maven-plugin.version>2.0</groovy-maven-plugin.version>
@@ -364,19 +363,6 @@
364363
</pluginManagement>
365364
</build>
366365
</profile>
367-
368-
<profile>
369-
<id>flink-scala-2.10</id>
370-
<activation>
371-
<property>
372-
<name>flink-scala-2.10</name>
373-
</property>
374-
</activation>
375-
<properties>
376-
<flink.scala.version>2.10</flink.scala.version>
377-
</properties>
378-
</profile>
379-
380366
</profiles>
381367

382368
<dependencyManagement>
@@ -620,7 +606,7 @@
620606

621607
<dependency>
622608
<groupId>org.apache.beam</groupId>
623-
<artifactId>beam-runners-flink_${flink.scala.version}</artifactId>
609+
<artifactId>beam-runners-flink_2.10</artifactId>
624610
<version>${project.version}</version>
625611
</dependency>
626612

‎runners/flink/pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<relativePath>../pom.xml</relativePath>
2727
</parent>
2828

29-
<artifactId>beam-runners-flink_${flink.scala.version}</artifactId>
29+
<artifactId>beam-runners-flink_2.10</artifactId>
3030
<name>Apache Beam :: Runners :: Flink</name>
3131
<packaging>jar</packaging>
3232

@@ -165,7 +165,7 @@
165165
<!-- Flink dependencies -->
166166
<dependency>
167167
<groupId>org.apache.flink</groupId>
168-
<artifactId>flink-clients_${flink.scala.version}</artifactId>
168+
<artifactId>flink-clients_2.10</artifactId>
169169
<version>${flink.version}</version>
170170
</dependency>
171171

@@ -189,13 +189,13 @@
189189

190190
<dependency>
191191
<groupId>org.apache.flink</groupId>
192-
<artifactId>flink-runtime_${flink.scala.version}</artifactId>
192+
<artifactId>flink-runtime_2.10</artifactId>
193193
<version>${flink.version}</version>
194194
</dependency>
195195

196196
<dependency>
197197
<groupId>org.apache.flink</groupId>
198-
<artifactId>flink-streaming-java_${flink.scala.version}</artifactId>
198+
<artifactId>flink-streaming-java_2.10</artifactId>
199199
<version>${flink.version}</version>
200200
</dependency>
201201

@@ -210,7 +210,7 @@
210210

211211
<dependency>
212212
<groupId>org.apache.flink</groupId>
213-
<artifactId>flink-runtime_${flink.scala.version}</artifactId>
213+
<artifactId>flink-runtime_2.10</artifactId>
214214
<version>${flink.version}</version>
215215
<type>test-jar</type>
216216
<scope>test</scope>
@@ -336,15 +336,15 @@
336336

337337
<dependency>
338338
<groupId>org.apache.flink</groupId>
339-
<artifactId>flink-streaming-java_${flink.scala.version}</artifactId>
339+
<artifactId>flink-streaming-java_2.10</artifactId>
340340
<version>${flink.version}</version>
341341
<scope>test</scope>
342342
<type>test-jar</type>
343343
</dependency>
344344

345345
<dependency>
346346
<groupId>org.apache.flink</groupId>
347-
<artifactId>flink-test-utils_${flink.scala.version}</artifactId>
347+
<artifactId>flink-test-utils_2.10</artifactId>
348348
<version>${flink.version}</version>
349349
<scope>test</scope>
350350
<exclusions>

‎sdks/java/javadoc/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464

6565
<dependency>
6666
<groupId>org.apache.beam</groupId>
67-
<artifactId>beam-runners-flink_${flink.scala.version}</artifactId>
67+
<artifactId>beam-runners-flink_2.10</artifactId>
6868
</dependency>
6969

7070
<dependency>

‎sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215
<dependencies>
216216
<dependency>
217217
<groupId>org.apache.beam</groupId>
218-
<artifactId>beam-runners-flink_@flink.scala.version@</artifactId>
218+
<artifactId>beam-runners-flink_2.10</artifactId>
219219
<version>${beam.version}</version>
220220
<scope>runtime</scope>
221221
</dependency>

‎sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@
214214
<dependencies>
215215
<dependency>
216216
<groupId>org.apache.beam</groupId>
217-
<artifactId>beam-runners-flink_@flink.scala.version@</artifactId>
217+
<artifactId>beam-runners-flink_2.10</artifactId>
218218
<version>${beam.version}</version>
219219
<scope>runtime</scope>
220220
</dependency>

0 commit comments

Comments
 (0)