You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2020/01/16 09:13:43 UTC
[flink-shaded] branch master updated: [FLINK-15540][hadoop] Move
depMgmt into parent module
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-shaded.git
The following commit(s) were added to refs/heads/master by this push:
new 01e95ca [FLINK-15540][hadoop] Move depMgmt into parent module
01e95ca is described below
commit 01e95ca2975b409d4b367c4c0c81614846797963
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Thu Jan 16 10:13:36 2020 +0100
[FLINK-15540][hadoop] Move depMgmt into parent module
---
.../flink-shaded-hadoop-2-uber}/pom.xml | 6 +-
.../src/main/resources/META-INF/NOTICE | 0
.../resources/META-INF/licenses/LICENSE.cddlv1.0 | 0
.../resources/META-INF/licenses/LICENSE.cddlv1.1 | 0
.../main/resources/META-INF/licenses/LICENSE.jsch | 0
.../resources/META-INF/licenses/LICENSE.paranamer | 0
.../resources/META-INF/licenses/LICENSE.xmlenc | 0
.../flink-shaded-hadoop-2/output.txt | Bin 0 -> 65416 bytes
.../flink-shaded-hadoop-2}/pom.xml | 135 +---------------
.../src/main/resources/META-INF/NOTICE | 0
.../resources/META-INF/licenses/LICENSE.protobuf | 0
flink-shaded-hadoop-2-parent/pom.xml | 178 +++++++++++++++++++++
pom.xml | 3 +-
tools/releasing/deploy_staging_jars.sh | 4 +-
14 files changed, 183 insertions(+), 143 deletions(-)
diff --git a/flink-shaded-hadoop-2-uber/pom.xml b/flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2-uber/pom.xml
similarity index 98%
rename from flink-shaded-hadoop-2-uber/pom.xml
rename to flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2-uber/pom.xml
index f15545b..a7ad978 100644
--- a/flink-shaded-hadoop-2-uber/pom.xml
+++ b/flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2-uber/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded</artifactId>
+ <artifactId>flink-shaded-hadoop-2-parent</artifactId>
<version>10.0</version>
<relativePath>..</relativePath>
</parent>
@@ -36,10 +36,6 @@ under the License.
<packaging>jar</packaging>
<version>${hadoop.version}-10.0</version>
- <properties>
- <hadoop.version>2.4.1</hadoop.version>
- </properties>
-
<!--
the only dependency of the 'flink-shaded-hadoop-2' artifact, out
of which we build a fat jar
diff --git a/flink-shaded-hadoop-2-uber/src/main/resources/META-INF/NOTICE b/flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2-uber/src/main/resources/META-INF/NOTICE
similarity index 100%
rename from flink-shaded-hadoop-2-uber/src/main/resources/META-INF/NOTICE
rename to flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2-uber/src/main/resources/META-INF/NOTICE
diff --git a/flink-shaded-hadoop-2-uber/src/main/resources/META-INF/licenses/LICENSE.cddlv1.0 b/flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2-uber/src/main/resources/META-INF/licenses/LICENSE.cddlv1.0
similarity index 100%
rename from flink-shaded-hadoop-2-uber/src/main/resources/META-INF/licenses/LICENSE.cddlv1.0
rename to flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2-uber/src/main/resources/META-INF/licenses/LICENSE.cddlv1.0
diff --git a/flink-shaded-hadoop-2-uber/src/main/resources/META-INF/licenses/LICENSE.cddlv1.1 b/flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2-uber/src/main/resources/META-INF/licenses/LICENSE.cddlv1.1
similarity index 100%
rename from flink-shaded-hadoop-2-uber/src/main/resources/META-INF/licenses/LICENSE.cddlv1.1
rename to flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2-uber/src/main/resources/META-INF/licenses/LICENSE.cddlv1.1
diff --git a/flink-shaded-hadoop-2-uber/src/main/resources/META-INF/licenses/LICENSE.jsch b/flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2-uber/src/main/resources/META-INF/licenses/LICENSE.jsch
similarity index 100%
rename from flink-shaded-hadoop-2-uber/src/main/resources/META-INF/licenses/LICENSE.jsch
rename to flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2-uber/src/main/resources/META-INF/licenses/LICENSE.jsch
diff --git a/flink-shaded-hadoop-2-uber/src/main/resources/META-INF/licenses/LICENSE.paranamer b/flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2-uber/src/main/resources/META-INF/licenses/LICENSE.paranamer
similarity index 100%
rename from flink-shaded-hadoop-2-uber/src/main/resources/META-INF/licenses/LICENSE.paranamer
rename to flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2-uber/src/main/resources/META-INF/licenses/LICENSE.paranamer
diff --git a/flink-shaded-hadoop-2-uber/src/main/resources/META-INF/licenses/LICENSE.xmlenc b/flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2-uber/src/main/resources/META-INF/licenses/LICENSE.xmlenc
similarity index 100%
rename from flink-shaded-hadoop-2-uber/src/main/resources/META-INF/licenses/LICENSE.xmlenc
rename to flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2-uber/src/main/resources/META-INF/licenses/LICENSE.xmlenc
diff --git a/flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2/output.txt b/flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2/output.txt
new file mode 100644
index 0000000..4ac8d0c
Binary files /dev/null and b/flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2/output.txt differ
diff --git a/flink-shaded-hadoop-2/pom.xml b/flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2/pom.xml
similarity index 88%
rename from flink-shaded-hadoop-2/pom.xml
rename to flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2/pom.xml
index db08b56..3d50db4 100644
--- a/flink-shaded-hadoop-2/pom.xml
+++ b/flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2/pom.xml
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded</artifactId>
+ <artifactId>flink-shaded-hadoop-2-parent</artifactId>
<version>10.0</version>
<relativePath>..</relativePath>
</parent>
@@ -35,139 +35,6 @@ under the License.
<packaging>jar</packaging>
<version>${hadoop.version}-10.0</version>
- <properties>
- <avro.version>1.8.2</avro.version>
- <slf4j.version>1.7.15</slf4j.version>
- <log4j.version>1.2.17</log4j.version>
- <hadoop.version>2.4.1</hadoop.version>
- <zookeeper.version>3.4.10</zookeeper.version>
- <findbugs.version>1.3.9</findbugs.version>
- </properties>
-
- <dependencyManagement>
- <!-- WARN:
- DO NOT put guava,
- protobuf,
- asm,
- netty
- here. It will overwrite Hadoop's guava dependency (even though we handle it
- separatly in this module).
- -->
- <dependencies>
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <version>${findbugs.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- <version>1.18</version>
- </dependency>
- <dependency>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro</artifactId>
- <version>${avro.version}</version>
- </dependency>
- <dependency>
- <groupId>org.xerial.snappy</groupId>
- <artifactId>snappy-java</artifactId>
- <version>1.1.4</version>
- </dependency>
- <dependency>
- <groupId>org.tukaani</groupId>
- <artifactId>xz</artifactId>
- <version>1.5</version>
- </dependency>
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.3.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math3</artifactId>
- <version>3.5</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.10</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.2</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>4.4.6</version>
- </dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>1.7</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- <version>${zookeeper.version}</version>
- <exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <!-- Netty is only needed for ZK servers, not clients -->
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
- <!-- jline is optional for ZK console shell -->
- <exclusion>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-
- </dependencyManagement>
-
<dependencies>
<!-- drop dependencies that are already provided by Flink from the shaded / uber jars -->
<!--This is provided by Flink -->
diff --git a/flink-shaded-hadoop-2/src/main/resources/META-INF/NOTICE b/flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2/src/main/resources/META-INF/NOTICE
similarity index 100%
rename from flink-shaded-hadoop-2/src/main/resources/META-INF/NOTICE
rename to flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2/src/main/resources/META-INF/NOTICE
diff --git a/flink-shaded-hadoop-2/src/main/resources/META-INF/licenses/LICENSE.protobuf b/flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2/src/main/resources/META-INF/licenses/LICENSE.protobuf
similarity index 100%
rename from flink-shaded-hadoop-2/src/main/resources/META-INF/licenses/LICENSE.protobuf
rename to flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2/src/main/resources/META-INF/licenses/LICENSE.protobuf
diff --git a/flink-shaded-hadoop-2-parent/pom.xml b/flink-shaded-hadoop-2-parent/pom.xml
new file mode 100644
index 0000000..2e429d8
--- /dev/null
+++ b/flink-shaded-hadoop-2-parent/pom.xml
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-shaded</artifactId>
+ <version>10.0</version>
+ <relativePath>..</relativePath>
+ </parent>
+
+ <artifactId>flink-shaded-hadoop-2-parent</artifactId>
+ <name>flink-shaded-hadoop-2-parent</name>
+ <packaging>pom</packaging>
+ <version>10.0</version>
+
+ <properties>
+ <!-- never use this in the parent module; otherwise it would need to be versioned by hadoop version; this must
+ not be done since the parent reference in child modules must not have dynamic elements as otherwise it
+ cannot be resolved -->
+ <hadoop.version>2.4.1</hadoop.version>
+ <!-- pinned transitive dependencies-->
+ <avro.version>1.8.2</avro.version>
+ <slf4j.version>1.7.15</slf4j.version>
+ <log4j.version>1.2.17</log4j.version>
+ <zookeeper.version>3.4.10</zookeeper.version>
+ <findbugs.version>1.3.9</findbugs.version>
+ </properties>
+
+ <modules>
+ <module>flink-shaded-hadoop-2</module>
+ <module>flink-shaded-hadoop-2-uber</module>
+ </modules>
+
+ <dependencyManagement>
+ <!-- WARN:
+ DO NOT put guava,
+ protobuf,
+ asm,
+ netty
+ here. It will overwrite Hadoop's guava dependency (even though we handle it
+ separately in this module).
+ -->
+ <dependencies>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>${findbugs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>1.18</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ <version>${avro.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.xerial.snappy</groupId>
+ <artifactId>snappy-java</artifactId>
+ <version>1.1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.tukaani</groupId>
+ <artifactId>xz</artifactId>
+ <version>1.5</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math3</artifactId>
+ <version>3.5</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.10</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.5.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.4.6</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>${zookeeper.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <!-- Netty is only needed for ZK servers, not clients -->
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ </exclusion>
+ <!-- jline is optional for ZK console shell -->
+ <exclusion>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 078e402..d5d8ce3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,8 +62,7 @@ under the License.
<module>flink-shaded-netty-4</module>
<module>flink-shaded-netty-tcnative-dynamic</module>
<module>flink-shaded-jackson-parent</module>
- <module>flink-shaded-hadoop-2</module>
- <module>flink-shaded-hadoop-2-uber</module>
+ <module>flink-shaded-hadoop-2-parent</module>
</modules>
<profiles>
diff --git a/tools/releasing/deploy_staging_jars.sh b/tools/releasing/deploy_staging_jars.sh
index 9504dae..81f3cb4 100755
--- a/tools/releasing/deploy_staging_jars.sh
+++ b/tools/releasing/deploy_staging_jars.sh
@@ -35,7 +35,7 @@ if [[ `basename $CURR_DIR` != "tools" ]] ; then
fi
###########################
-EXCLUDE_HADOOP_MODULE="-pl !flink-shaded-hadoop-2,!flink-shaded-hadoop-2-uber"
+EXCLUDE_HADOOP_MODULE="-pl !flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2,!flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2-uber"
COMMON_OPTIONS="-Prelease -DskipTests -DretryFailedDeploymentCount=10 "
@@ -45,7 +45,7 @@ echo "Deploying to repository.apache.org"
$MVN clean deploy $COMMON_OPTIONS $EXCLUDE_HADOOP_MODULE
-HADOOP_MODULE="-pl flink-shaded-hadoop-2,flink-shaded-hadoop-2-uber"
+HADOOP_MODULE="-pl flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2,flink-shaded-hadoop-2-parent/flink-shaded-hadoop-2-uber"
HADOOP_VERSIONS=("2.4.1" "2.6.5" "2.7.5" "2.8.3")