Skip to content

Commit

Permalink
[FLINK-4337] [build] Remove unnecessary Scala Suffix from Hadoop 1 sh…
Browse files Browse the repository at this point in the history
…aded artifact

This closes apache#2343
  • Loading branch information
StephanEwen committed Aug 9, 2016
1 parent 490e7eb commit aed7a28
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
2 changes: 1 addition & 1 deletion flink-shaded-hadoop/flink-shaded-hadoop1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ under the License.
<relativePath>..</relativePath>
</parent>

<artifactId>flink-shaded-hadoop1_2.10</artifactId>
<artifactId>flink-shaded-hadoop1</artifactId>
<name>flink-shaded-hadoop1</name>

<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion flink-shaded-hadoop/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ under the License.
<packaging>pom</packaging>

<modules>
<module>${shading-artifact-module.name}</module>
<module>${shading-artifact.name}</module>
</modules>

<profiles>
Expand Down
6 changes: 1 addition & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,6 @@ under the License.
<shading-artifact.name>error</shading-artifact.name>
<!-- Internal property to reduce build times on TravisCi -->
<flink-fast-tests-pattern>never-match-me</flink-fast-tests-pattern>
<!-- The shading artifact module name can be used as a module name. it does not get a scala version suffix -->
<shading-artifact-module.name>error</shading-artifact-module.name>
<hadoop-one.version>1.2.1</hadoop-one.version>
<hadoop-two.version>2.3.0</hadoop-two.version>
<!-- Need to use a user property here because the surefire
Expand Down Expand Up @@ -430,8 +428,7 @@ under the License.
</activation>
<properties>
<hadoop.version>${hadoop-one.version}</hadoop.version>
<shading-artifact.name>flink-shaded-hadoop1_2.10</shading-artifact.name>
<shading-artifact-module.name>flink-shaded-hadoop1</shading-artifact-module.name>
<shading-artifact.name>flink-shaded-hadoop1</shading-artifact.name>
</properties>
</profile>

Expand All @@ -447,7 +444,6 @@ under the License.
<properties>
<hadoop.version>${hadoop-two.version}</hadoop.version>
<shading-artifact.name>flink-shaded-hadoop2</shading-artifact.name>
<shading-artifact-module.name>flink-shaded-hadoop2</shading-artifact-module.name>
</properties>
<modules>
<module>flink-yarn</module>
Expand Down

0 comments on commit aed7a28

Please sign in to comment.