You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@flink.apache.org by GitBox <gi...@apache.org> on 2019/01/10 12:15:28 UTC
[GitHub] zentol closed pull request #7417: [FLINK-11268][release] Deploy
multiple flink-shaded-hadoop2 artifacts
zentol closed pull request #7417: [FLINK-11268][release] Deploy multiple flink-shaded-hadoop2 artifacts
URL: https://github.com/apache/flink/pull/7417
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/flink-connectors/flink-connector-filesystem/pom.xml b/flink-connectors/flink-connector-filesystem/pom.xml
index c375ac467d6..b49453034d8 100644
--- a/flink-connectors/flink-connector-filesystem/pom.xml
+++ b/flink-connectors/flink-connector-filesystem/pom.xml
@@ -53,7 +53,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-hadoop2</artifactId>
- <version>${project.version}</version>
+ <version>${project.version}-${hadoop.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/flink-connectors/flink-hadoop-compatibility/pom.xml b/flink-connectors/flink-hadoop-compatibility/pom.xml
index 8235bcabd09..fb61f6ae4b1 100644
--- a/flink-connectors/flink-hadoop-compatibility/pom.xml
+++ b/flink-connectors/flink-hadoop-compatibility/pom.xml
@@ -63,7 +63,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-hadoop2</artifactId>
- <version>${project.version}</version>
+ <version>${project.version}-${hadoop.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/flink-connectors/flink-hbase/pom.xml b/flink-connectors/flink-hbase/pom.xml
index 2ab0ec4c2aa..2692dc7b94d 100644
--- a/flink-connectors/flink-hbase/pom.xml
+++ b/flink-connectors/flink-hbase/pom.xml
@@ -105,7 +105,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-hadoop2</artifactId>
- <version>${project.version}</version>
+ <version>${project.version}-${hadoop.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/flink-connectors/flink-hcatalog/pom.xml b/flink-connectors/flink-hcatalog/pom.xml
index c7bfe2eeb4d..4bd377a2997 100644
--- a/flink-connectors/flink-hcatalog/pom.xml
+++ b/flink-connectors/flink-hcatalog/pom.xml
@@ -69,7 +69,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-hadoop2</artifactId>
- <version>${project.version}</version>
+ <version>${project.version}-${hadoop.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/flink-connectors/flink-orc/pom.xml b/flink-connectors/flink-orc/pom.xml
index 733049a4096..4fcfe6004f4 100644
--- a/flink-connectors/flink-orc/pom.xml
+++ b/flink-connectors/flink-orc/pom.xml
@@ -71,7 +71,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-hadoop2</artifactId>
- <version>${project.version}</version>
+ <version>${project.version}-${hadoop.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index e5991e12228..84339ebbeca 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -179,7 +179,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-hadoop2-uber</artifactId>
- <version>${project.version}</version>
+ <version>${project.version}-${hadoop.version}</version>
<!--
Exclusion of flink-shaded-hadoop2 not necessary, dependencies
are shaded away properly by flink-shaded-hadoop2-uber.
diff --git a/flink-dist/src/main/assemblies/hadoop.xml b/flink-dist/src/main/assemblies/hadoop.xml
index 27c562e047d..0a66d19ae58 100644
--- a/flink-dist/src/main/assemblies/hadoop.xml
+++ b/flink-dist/src/main/assemblies/hadoop.xml
@@ -31,9 +31,9 @@ under the License.
<files>
<!-- copy the Hadoop uber jar -->
<file>
- <source>../flink-shaded-hadoop/flink-shaded-hadoop2-uber/target/flink-shaded-hadoop2-uber-${project.version}.jar</source>
+ <source>../flink-shaded-hadoop/flink-shaded-hadoop2-uber/target/flink-shaded-hadoop2-uber-${project.version}-${hadoop.version}.jar</source>
<outputDirectory>lib/</outputDirectory>
- <destName>flink-shaded-hadoop2-uber-${project.version}.jar</destName>
+ <destName>flink-shaded-hadoop2-uber-${project.version}-${hadoop.version}.jar</destName>
<fileMode>0644</fileMode>
</file>
</files>
diff --git a/flink-end-to-end-tests/flink-bucketing-sink-test/pom.xml b/flink-end-to-end-tests/flink-bucketing-sink-test/pom.xml
index 808cef7500a..2b2a0acd7f4 100644
--- a/flink-end-to-end-tests/flink-bucketing-sink-test/pom.xml
+++ b/flink-end-to-end-tests/flink-bucketing-sink-test/pom.xml
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-hadoop2</artifactId>
- <version>${project.version}</version>
+ <version>${project.version}-${hadoop.version}</version>
<scope>provided</scope>
<exclusions>
<!-- Needed for proper dependency convergence -->
diff --git a/flink-filesystems/flink-hadoop-fs/pom.xml b/flink-filesystems/flink-hadoop-fs/pom.xml
index 12c686899ec..468e3550f5c 100644
--- a/flink-filesystems/flink-hadoop-fs/pom.xml
+++ b/flink-filesystems/flink-hadoop-fs/pom.xml
@@ -45,7 +45,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-hadoop2</artifactId>
- <version>${project.version}</version>
+ <version>${project.version}-${hadoop.version}</version>
<optional>true</optional>
</dependency>
diff --git a/flink-formats/flink-parquet/pom.xml b/flink-formats/flink-parquet/pom.xml
index 9caa5fb975e..46f1014011a 100644
--- a/flink-formats/flink-parquet/pom.xml
+++ b/flink-formats/flink-parquet/pom.xml
@@ -61,7 +61,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-hadoop2</artifactId>
- <version>${project.version}</version>
+ <version>${project.version}-${hadoop.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/flink-formats/flink-sequence-file/pom.xml b/flink-formats/flink-sequence-file/pom.xml
index 1a2f84e4629..c1b014596f1 100644
--- a/flink-formats/flink-sequence-file/pom.xml
+++ b/flink-formats/flink-sequence-file/pom.xml
@@ -47,7 +47,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-hadoop2</artifactId>
- <version>${project.version}</version>
+ <version>${project.version}-${hadoop.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/flink-fs-tests/pom.xml b/flink-fs-tests/pom.xml
index d9e5909cbc1..ba675737b8b 100644
--- a/flink-fs-tests/pom.xml
+++ b/flink-fs-tests/pom.xml
@@ -39,7 +39,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-hadoop2</artifactId>
- <version>${project.version}</version>
+ <version>${project.version}-${hadoop.version}</version>
<scope>test</scope>
</dependency>
diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml
index 415bc35c1e4..03b99530a3a 100644
--- a/flink-runtime/pom.xml
+++ b/flink-runtime/pom.xml
@@ -70,7 +70,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-hadoop2</artifactId>
- <version>${project.version}</version>
+ <version>${project.version}-${hadoop.version}</version>
<optional>true</optional>
</dependency>
diff --git a/flink-shaded-hadoop/flink-shaded-hadoop2-uber/pom.xml b/flink-shaded-hadoop/flink-shaded-hadoop2-uber/pom.xml
index 1196c513eb3..b9658670667 100644
--- a/flink-shaded-hadoop/flink-shaded-hadoop2-uber/pom.xml
+++ b/flink-shaded-hadoop/flink-shaded-hadoop2-uber/pom.xml
@@ -34,6 +34,7 @@ under the License.
<name>flink-shaded-hadoop2-uber</name>
<packaging>jar</packaging>
+ <version>1.8-SNAPSHOT-${hadoop.version}</version>
<!--
the only dependency of the 'flink-shaded-hadoop2' artifact, out
@@ -53,19 +54,6 @@ under the License.
<build>
<plugins>
- <!--
- Don't deploy this uber-jar. It is not referenced by any other artifact.
- Its sole purpose is to be included in the 'flink-dist' build.
- -->
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
-
<!--
Build an uber jar of the shaded-hadoop-dependency
and all its transitive dependencies
diff --git a/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml b/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml
index 4639af2b3cf..4f6634cf810 100644
--- a/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml
+++ b/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml
@@ -33,6 +33,7 @@ under the License.
<name>flink-shaded-hadoop2</name>
<packaging>jar</packaging>
+ <version>1.8-SNAPSHOT-${hadoop.version}</version>
<dependencies>
diff --git a/flink-tests/pom.xml b/flink-tests/pom.xml
index fbcbd6f682a..b1bc0e761e3 100644
--- a/flink-tests/pom.xml
+++ b/flink-tests/pom.xml
@@ -55,7 +55,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-hadoop2</artifactId>
- <version>${project.version}</version>
+ <version>${project.version}-${hadoop.version}</version>
<scope>test</scope>
</dependency>
diff --git a/flink-yarn-tests/pom.xml b/flink-yarn-tests/pom.xml
index 054b3c2d2f0..f31f7b2ebc2 100644
--- a/flink-yarn-tests/pom.xml
+++ b/flink-yarn-tests/pom.xml
@@ -119,7 +119,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-hadoop2</artifactId>
- <version>${project.version}</version>
+ <version>${project.version}-${hadoop.version}</version>
<scope>test</scope>
</dependency>
diff --git a/flink-yarn/pom.xml b/flink-yarn/pom.xml
index 38f0d0a862c..98bd52d8eb6 100644
--- a/flink-yarn/pom.xml
+++ b/flink-yarn/pom.xml
@@ -56,7 +56,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-hadoop2</artifactId>
- <version>${project.version}</version>
+ <version>${project.version}-${hadoop.version}</version>
</dependency>
<dependency>
diff --git a/tools/releasing/deploy_staging_jars.sh b/tools/releasing/deploy_staging_jars.sh
index 7fd08cffc4a..40c36625b1b 100755
--- a/tools/releasing/deploy_staging_jars.sh
+++ b/tools/releasing/deploy_staging_jars.sh
@@ -48,3 +48,11 @@ $MVN clean deploy $COMMON_OPTIONS -Dscala-2.11
echo "Deploying Scala 2.12 version"
$MVN clean deploy $COMMON_OPTIONS -Dscala-2.12
+COMMON_HADOOP_OPTIONS="-pl flink-shaded-hadoop/flink-shaded-hadoop2,flink-shaded-hadoop/flink-shaded-hadoop2-uber"
+
+HADOOP_VERSIONS=("2.4.1" "2.6.5" "2.7.5" "2.8.3")
+
+for i in "${!HADOOP_VERSIONS[@]}"; do
+echo "Deploying flink-shaded-hadoop $HADOOP_VERSIONS[$i] version"
+ $MVN clean deploy $COMMON_OPTIONS $COMMON_HADOOP_OPTIONS "-Dhadoop.version=${HADOOP_VERSIONS[$i]}"
+done
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services