[FLINK-11268][release] Deploy multiple flink-shaded-hadoop2 artifacts

mbalassi · Jan 10, 2019 · 5fe918c · 5fe918c
1 parent 4adf23d
commit 5fe918c
Show file tree

Hide file tree

Showing 19 changed files with 27 additions and 30 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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