Skip to content

Commit

Permalink
[FLINK-2933][maven] add suffix to Scala dependent modules
Browse files Browse the repository at this point in the history 
- add suffixes
- adapt change-scala-version script

This closes apache#1529.
  • Loading branch information
@mxm
mxm committed Jan 27, 2016
1 parent eaf540f commit 2c4e4d1
Show file tree
Hide file tree
Showing 47 changed files with 243 additions and 242 deletions.
6 changes: 3 additions & 3 deletions flink-batch-connectors/flink-avro/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ under the License.
<relativePath>..</relativePath>
</parent>

<artifactId>flink-avro</artifactId>
<artifactId>flink-avro_2.10</artifactId>
<name>flink-avro</name>

<packaging>jar</packaging>
Expand All @@ -45,7 +45,7 @@ under the License.

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients</artifactId>
<artifactId>flink-clients_2.10</artifactId>
<version>${project.version}</version>
</dependency>

Expand All @@ -65,7 +65,7 @@ under the License.

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-test-utils</artifactId>
<artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Expand Down
8 changes: 4 additions & 4 deletions flink-batch-connectors/flink-hadoop-compatibility/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ under the License.
<relativePath>..</relativePath>
</parent>

<artifactId>flink-hadoop-compatibility</artifactId>
<artifactId>flink-hadoop-compatibility_2.10</artifactId>
<name>flink-hadoop-compatibility</name>

<packaging>jar</packaging>
Expand All @@ -43,7 +43,7 @@ under the License.

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients</artifactId>
<artifactId>flink-clients_2.10</artifactId>
<version>${project.version}</version>
</dependency>

Expand All @@ -55,13 +55,13 @@ under the License.

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-tests</artifactId>
<artifactId>flink-tests_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-test-utils</artifactId>
<artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Expand Down
10 changes: 5 additions & 5 deletions flink-batch-connectors/flink-hbase/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ under the License.
<relativePath>..</relativePath>
</parent>

<artifactId>flink-hbase</artifactId>
<artifactId>flink-hbase_2.10</artifactId>
<name>flink-hbase</name>
<packaging>jar</packaging>

Expand Down Expand Up @@ -59,13 +59,13 @@ under the License.

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-java</artifactId>
<artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients</artifactId>
<artifactId>flink-clients_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<exclusions>
Expand All @@ -78,13 +78,13 @@ under the License.

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-hadoop-compatibility</artifactId>
<artifactId>flink-hadoop-compatibility_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-include-yarn</artifactId>
<artifactId>flink-shaded-include-yarn_2.10</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand Down
6 changes: 3 additions & 3 deletions flink-clients/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ under the License.
<relativePath>..</relativePath>
</parent>

<artifactId>flink-clients</artifactId>
<artifactId>flink-clients_2.10</artifactId>
<name>flink-clients</name>

<packaging>jar</packaging>
Expand All @@ -52,13 +52,13 @@ under the License.

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-runtime</artifactId>
<artifactId>flink-runtime_2.10</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-optimizer</artifactId>
<artifactId>flink-optimizer_2.10</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions flink-contrib/flink-connector-wikiedits/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ under the License.
<relativePath>..</relativePath>
</parent>

<artifactId>flink-connector-wikiedits</artifactId>
<artifactId>flink-connector-wikiedits_2.10</artifactId>
<name>flink-connector-wikiedits</name>

<packaging>jar</packaging>

<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-java</artifactId>
<artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions flink-contrib/flink-operator-stats/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ under the License.
<relativePath>..</relativePath>
</parent>

<artifactId>flink-operator-stats</artifactId>
<artifactId>flink-operator-stats_2.10</artifactId>
<name>flink-operator-stats</name>

<packaging>jar</packaging>
Expand All @@ -46,7 +46,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-test-utils</artifactId>
<artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Expand Down
22 changes: 11 additions & 11 deletions flink-contrib/flink-storm-examples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,35 +29,35 @@ under the License.
<relativePath>..</relativePath>
</parent>

<artifactId>flink-storm-examples</artifactId>
<artifactId>flink-storm-examples_2.10</artifactId>
<name>flink-storm-examples</name>

<packaging>jar</packaging>

<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-storm</artifactId>
<artifactId>flink-storm_2.10</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-examples-batch</artifactId>
<artifactId>flink-examples-batch_2.10</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-java</artifactId>
<artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-test-utils</artifactId>
<artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -89,7 +89,7 @@ under the License.
<artifactItems>
<artifactItem>
<groupId>org.apache.flink</groupId>
<artifactId>flink-examples-batch</artifactId>
<artifactId>flink-examples-batch_2.10</artifactId>
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
Expand All @@ -98,7 +98,7 @@ under the License.
</artifactItem>
<artifactItem>
<groupId>org.apache.flink</groupId>
<artifactId>flink-storm</artifactId>
<artifactId>flink-storm_2.10</artifactId>
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
Expand Down Expand Up @@ -282,8 +282,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</include>
<include>org.apache.flink:flink-storm-examples</include>
<include>org.apache.flink:flink-storm_2.10</include>
<include>org.apache.flink:flink-storm-examples_2.10</include>
</includes>
</artifactSet>
<filters>
Expand All @@ -308,7 +308,7 @@ under the License.
</includes>
</filter>
<filter>
<artifact>org.apache.flink:flink-storm-examples</artifact>
<artifact>org.apache.flink:flink-storm-examples_2.10</artifact>
<includes>
<include>org/apache/flink/storm/wordcount/WordCountRemoteBySubmitter.class</include>
<include>org/apache/flink/storm/wordcount/WordCountTopology.class</include>
Expand All @@ -318,7 +318,7 @@ under the License.
</includes>
</filter>
<filter>
<artifact>org.apache.flink:flink-storm</artifact>
<artifact>org.apache.flink:flink-storm_2.10</artifact>
<includes>
<include>org/apache/flink/storm/api/*.class</include>
<include>org/apache/flink/storm/util/*.class</include>
Expand Down
4 changes: 2 additions & 2 deletions flink-contrib/flink-storm/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ under the License.
<relativePath>..</relativePath>
</parent>

<artifactId>flink-storm</artifactId>
<artifactId>flink-storm_2.10</artifactId>
<name>flink-storm</name>

<packaging>jar</packaging>
Expand All @@ -44,7 +44,7 @@ under the License.

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-java</artifactId>
<artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down
10 changes: 5 additions & 5 deletions flink-contrib/flink-streaming-contrib/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,31 +31,31 @@ under the License.
<relativePath>..</relativePath>
</parent>

<artifactId>flink-streaming-contrib</artifactId>
<artifactId>flink-streaming-contrib_2.10</artifactId>
<name>flink-streaming-contrib</name>

<packaging>jar</packaging>

<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-java</artifactId>
<artifactId>flink-streaming-java_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients</artifactId>
<artifactId>flink-clients_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-test-utils</artifactId>
<artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-tests</artifactId>
<artifactId>flink-tests_2.10</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand Down
6 changes: 3 additions & 3 deletions flink-contrib/flink-tweet-inputformat/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ under the License.
<relativePath>..</relativePath>
</parent>

<artifactId>flink-tweet-inputformat</artifactId>
<artifactId>flink-tweet-inputformat_2.10</artifactId>
<name>flink-tweet-inputformat</name>

<packaging>jar</packaging>
Expand All @@ -44,12 +44,12 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients</artifactId>
<artifactId>flink-clients_2.10</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-test-utils</artifactId>
<artifactId>flink-test-utils_2.10</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Expand Down
Loading

0 comments on commit 2c4e4d1

Please sign in to comment.