You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2016/08/09 17:59:04 UTC
flink git commit: [FLINK-4337] [build] Remove unnecessary Scala
Suffix from Hadoop 1 shaded artifact
Repository: flink
Updated Branches:
refs/heads/master 490e7ebb6 -> aed7a2872
[FLINK-4337] [build] Remove unnecessary Scala Suffix from Hadoop 1 shaded artifact
This closes #2343
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/aed7a287
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/aed7a287
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/aed7a287
Branch: refs/heads/master
Commit: aed7a2872a475f1d69b0fa11d837d0d56c06e825
Parents: 490e7eb
Author: Stephan Ewen <se...@apache.org>
Authored: Tue Aug 9 13:01:33 2016 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Tue Aug 9 19:58:02 2016 +0200
----------------------------------------------------------------------
flink-shaded-hadoop/flink-shaded-hadoop1/pom.xml | 2 +-
flink-shaded-hadoop/pom.xml | 2 +-
pom.xml | 6 +-----
3 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/aed7a287/flink-shaded-hadoop/flink-shaded-hadoop1/pom.xml
----------------------------------------------------------------------
diff --git a/flink-shaded-hadoop/flink-shaded-hadoop1/pom.xml b/flink-shaded-hadoop/flink-shaded-hadoop1/pom.xml
index f46d973..891ab7d 100644
--- a/flink-shaded-hadoop/flink-shaded-hadoop1/pom.xml
+++ b/flink-shaded-hadoop/flink-shaded-hadoop1/pom.xml
@@ -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>
http://git-wip-us.apache.org/repos/asf/flink/blob/aed7a287/flink-shaded-hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/flink-shaded-hadoop/pom.xml b/flink-shaded-hadoop/pom.xml
index 9564bdd..d3c80f9 100644
--- a/flink-shaded-hadoop/pom.xml
+++ b/flink-shaded-hadoop/pom.xml
@@ -35,7 +35,7 @@ under the License.
<packaging>pom</packaging>
<modules>
- <module>${shading-artifact-module.name}</module>
+ <module>${shading-artifact.name}</module>
</modules>
<profiles>
http://git-wip-us.apache.org/repos/asf/flink/blob/aed7a287/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 32e7730..9e9958f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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
@@ -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>
@@ -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>