Skip to content

Commit e71204f

Browse files
mohsenrezaeithemohsenrezaeithe
committed
migrated Hadoop 3.3/AWS modules to a new 3.3 parent
1 parent 7927a66 commit e71204f

File tree

8 files changed

+237
-329
lines changed

8 files changed

+237
-329
lines changed

‎flink-filesystems/flink-fs-hadoop-shaded/pom.xml‎

Lines changed: 2 additions & 139 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ under the License.
2222

2323
<parent>
2424
<groupId>org.apache.flink</groupId>
25-
<artifactId>flink-filesystems</artifactId>
25+
<artifactId>flink-hadoop33-fs-base</artifactId>
2626
<version>2.2-SNAPSHOT</version>
27+
<relativePath>../flink-hadoop33-fs-base</relativePath>
2728
</parent>
2829

2930
<artifactId>flink-fs-hadoop-shaded</artifactId>
@@ -35,150 +36,12 @@ under the License.
3536
<japicmp.skip>true</japicmp.skip>
3637
</properties>
3738

38-
<dependencyManagement>
39-
<dependencies>
40-
<dependency>
41-
<!-- Bumped for security purposes -->
42-
<groupId>commons-beanutils</groupId>
43-
<artifactId>commons-beanutils</artifactId>
44-
<version>1.9.4</version>
45-
</dependency>
46-
</dependencies>
47-
</dependencyManagement>
48-
4939
<dependencies>
5040
<!-- The Hadoop file system abstraction -->
5141
<dependency>
5242
<groupId>org.apache.hadoop</groupId>
5343
<artifactId>hadoop-common</artifactId>
54-
<version>${fs.hadoopshaded.version}</version>
5544
<optional>${flink.markBundledAsOptional}</optional>
56-
<exclusions>
57-
<exclusion>
58-
<groupId>jdk.tools</groupId>
59-
<artifactId>jdk.tools</artifactId>
60-
</exclusion>
61-
<exclusion>
62-
<groupId>com.jcraft</groupId>
63-
<artifactId>jsch</artifactId>
64-
</exclusion>
65-
<exclusion>
66-
<groupId>com.sun.jersey</groupId>
67-
<artifactId>jersey-core</artifactId>
68-
</exclusion>
69-
<exclusion>
70-
<groupId>com.sun.jersey</groupId>
71-
<artifactId>jersey-servlet</artifactId>
72-
</exclusion>
73-
<exclusion>
74-
<groupId>com.sun.jersey</groupId>
75-
<artifactId>jersey-json</artifactId>
76-
</exclusion>
77-
<exclusion>
78-
<groupId>com.sun.jersey</groupId>
79-
<artifactId>jersey-server</artifactId>
80-
</exclusion>
81-
<exclusion>
82-
<groupId>org.apache.avro</groupId>
83-
<artifactId>avro</artifactId>
84-
</exclusion>
85-
<exclusion>
86-
<groupId>org.slf4j</groupId>
87-
<artifactId>slf4j-log4j12</artifactId>
88-
</exclusion>
89-
<exclusion>
90-
<groupId>log4j</groupId>
91-
<artifactId>log4j</artifactId>
92-
</exclusion>
93-
<exclusion>
94-
<groupId>org.eclipse.jetty</groupId>
95-
<artifactId>jetty-server</artifactId>
96-
</exclusion>
97-
<exclusion>
98-
<groupId>org.eclipse.jetty</groupId>
99-
<artifactId>jetty-util</artifactId>
100-
</exclusion>
101-
<exclusion>
102-
<groupId>org.eclipse.jetty</groupId>
103-
<artifactId>jetty-servlet</artifactId>
104-
</exclusion>
105-
<exclusion>
106-
<groupId>org.eclipse.jetty</groupId>
107-
<artifactId>jetty-webapp</artifactId>
108-
</exclusion>
109-
<exclusion>
110-
<groupId>javax.servlet</groupId>
111-
<artifactId>javax.servlet-api</artifactId>
112-
</exclusion>
113-
<exclusion>
114-
<groupId>javax.servlet.jsp</groupId>
115-
<artifactId>jsp-api</artifactId>
116-
</exclusion>
117-
<exclusion>
118-
<groupId>org.apache.kerby</groupId>
119-
<artifactId>kerb-simplekdc</artifactId>
120-
</exclusion>
121-
<exclusion>
122-
<groupId>org.apache.curator</groupId>
123-
<artifactId>curator-client</artifactId>
124-
</exclusion>
125-
<exclusion>
126-
<groupId>org.apache.curator</groupId>
127-
<artifactId>curator-framework</artifactId>
128-
</exclusion>
129-
<exclusion>
130-
<groupId>org.apache.curator</groupId>
131-
<artifactId>curator-recipes</artifactId>
132-
</exclusion>
133-
<exclusion>
134-
<groupId>org.apache.zookeeper</groupId>
135-
<artifactId>zookeeper</artifactId>
136-
</exclusion>
137-
<exclusion>
138-
<groupId>commons-net</groupId>
139-
<artifactId>commons-net</artifactId>
140-
</exclusion>
141-
<exclusion>
142-
<groupId>commons-cli</groupId>
143-
<artifactId>commons-cli</artifactId>
144-
</exclusion>
145-
<exclusion>
146-
<groupId>commons-codec</groupId>
147-
<artifactId>commons-codec</artifactId>
148-
</exclusion>
149-
<exclusion>
150-
<groupId>com.google.protobuf</groupId>
151-
<artifactId>protobuf-java</artifactId>
152-
</exclusion>
153-
<exclusion>
154-
<groupId>com.google.code.gson</groupId>
155-
<artifactId>gson</artifactId>
156-
</exclusion>
157-
<exclusion>
158-
<groupId>org.apache.httpcomponents</groupId>
159-
<artifactId>httpclient</artifactId>
160-
</exclusion>
161-
<exclusion>
162-
<groupId>org.apache.commons</groupId>
163-
<artifactId>commons-math3</artifactId>
164-
</exclusion>
165-
<exclusion>
166-
<groupId>com.nimbusds</groupId>
167-
<artifactId>nimbus-jose-jwt</artifactId>
168-
</exclusion>
169-
<exclusion>
170-
<groupId>net.minidev</groupId>
171-
<artifactId>json-smart</artifactId>
172-
</exclusion>
173-
<exclusion>
174-
<groupId>ch.qos.reload4j</groupId>
175-
<artifactId>reload4j</artifactId>
176-
</exclusion>
177-
<exclusion>
178-
<groupId>org.slf4j</groupId>
179-
<artifactId>slf4j-reload4j</artifactId>
180-
</exclusion>
181-
</exclusions>
18245
</dependency>
18346
</dependencies>
18447

‎flink-filesystems/flink-gs-fs-hadoop/pom.xml‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ under the License.
2222

2323
<parent>
2424
<groupId>org.apache.flink</groupId>
25-
<artifactId>flink-filesystems</artifactId>
25+
<artifactId>flink-hadoop33-fs-base</artifactId>
2626
<version>2.2-SNAPSHOT</version>
27+
<relativePath>../flink-hadoop33-fs-base</relativePath>
2728
</parent>
2829

2930
<artifactId>flink-gs-fs-hadoop</artifactId>
@@ -138,25 +139,6 @@ under the License.
138139

139140
<dependencyManagement>
140141
<dependencies>
141-
<!--
142-
Override the flink-parent dependencyManagement definition for hadoop-common to ensure
143-
${fs.hadoopshaded.version} is used for this file system
144-
-->
145-
<dependency>
146-
<groupId>org.apache.hadoop</groupId>
147-
<artifactId>hadoop-common</artifactId>
148-
<version>${fs.hadoopshaded.version}</version>
149-
<exclusions>
150-
<exclusion>
151-
<groupId>ch.qos.reload4j</groupId>
152-
<artifactId>reload4j</artifactId>
153-
</exclusion>
154-
<exclusion>
155-
<groupId>org.slf4j</groupId>
156-
<artifactId>slf4j-reload4j</artifactId>
157-
</exclusion>
158-
</exclusions>
159-
</dependency>
160142

161143
<!-- Force grpc dependencies to the same version -->
162144
<dependency>

0 commit comments

Comments
 (0)