Skip to content

Commit 0aaa6ce

Browse files
committed
HADOOP-19696. cos, huawei, aliyun cloud dependencies
* add the artifacts found with the relevant hadoop-* modules to the binary license * leave all three with cloud-storage dependencies such that they don't include these in a pull of hadoop-cloud-storage (regression?) * unless specific profiles cos, huawei and aliyun are declared, at which point they're exported by hadoop-cloud-storage and put into the assembly. This avoids dealing with complex dependencies we don't want (okio, more xml parsers,...), let making it straightforward to build a distro with it if you want. bundle.jar is always getting in. Do I do it here iff -Paws is set or do I delay it until the copy to the final distro artifact tree takes place. delay: keeps it as an export of hadoop-cloud-storage pom early: consistent with the rest
1 parent c9725ff commit 0aaa6ce

File tree

3 files changed

+126
-2
lines changed

3 files changed

+126
-2
lines changed

LICENSE-binary

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,10 @@
203203

204204
--------------------------------------------------------------------------------
205205
This project bundles some components that are also licensed under the Apache
206-
License Version 2.0:
206+
License Version 2.0.
207+
Note: some of the listed artifacts may not be included in a given build of the binary
208+
distribution; it depends on the build options. This list intends
209+
to be inclusive of all which may be included:
207210

208211

209212
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/nvd3-1.8.5.* (css and js files)
@@ -215,6 +218,7 @@ com.aliyun:aliyun-java-sdk-core:4.5.10
215218
com.aliyun:aliyun-java-sdk-kms:2.11.0
216219
com.aliyun:aliyun-java-sdk-ram:3.1.0
217220
com.aliyun:aliyun-java-sdk-sts:3.0.0
221+
com.aliyun:java-trace-api:0.2.11-beta.jar
218222
com.aliyun.oss:aliyun-sdk-oss:3.13.2
219223
com.cedarsoftware:java-util:1.9.0
220224
com.cedarsoftware:json-io:2.5.1
@@ -268,8 +272,13 @@ com.google.http-client:google-http-client-jackson2:1.46.3
268272
com.google.http-client:google-http-client:1.46.3
269273
com.google.j2objc:j2objc-annotations:3.0.0
270274
com.google.oauth-client:google-oauth-client:1.37.0
275+
com.huaweicloud:esdk-obs-java:3.20.4.2
276+
com.jamesmurty.utils:java-xmlbuilder-1.2.jar
271277
com.microsoft.azure:azure-storage:7.0.0
272278
com.nimbusds:nimbus-jose-jwt:10.4
279+
com.squareup.okhttp3:okhttp:jar:3.14.2
280+
com.squareup.okio:okio:jar:1.17.2
281+
com.volcengine:ve-tos-java-sdk-hadoop:2.8.9.jar
273282
com.zaxxer:HikariCP:4.0.3
274283
commons-beanutils:commons-beanutils:1.9.4
275284
commons-cli:commons-cli:1.9.0
@@ -346,6 +355,9 @@ io.opentelemetry:opentelemetry-sdk-logs:1.47.0
346355
io.opentelemetry:opentelemetry-sdk-metrics:1.47.0
347356
io.opentelemetry:opentelemetry-sdk-trace:1.47.0
348357
io.opentelemetry.semconv:opentelemetry-semconv:1.29.0-alpha
358+
io.opentracing:opentracing-api:0.33.0.jar
359+
io.opentracing:opentracing-noop:0.33.0.jar
360+
io.opentracing:opentracing-util:0.33.0.jar
349361
io.reactivex:rxjava:1.3.8
350362
io.reactivex:rxjava-string:1.1.1
351363
io.reactivex:rxnetty:0.4.20
@@ -496,6 +508,7 @@ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanage
496508
bootstrap v3.3.6
497509
broccoli-asset-rev v2.4.2
498510
broccoli-funnel v1.0.1
511+
cos_api-bundle-5.6.19.jar
499512
datatables v1.11.5
500513
em-helpers v0.5.13
501514
em-table v0.1.6
@@ -552,6 +565,7 @@ org.codehaus.mojo:animal-sniffer-annotations:1.24
552565
org.jruby.jcodings:jcodings:1.0.13
553566
org.jruby.joni:joni:2.1.2
554567
org.ojalgo:ojalgo:43.0
568+
org.reactivestreams:reactive-streams:1.0.3.jar
555569
org.slf4j:jul-to-slf4j:1.7.36
556570
org.slf4j:slf4j-api:1.7.36
557571
org.slf4j:slf4j-reload4j:1.7.36
@@ -622,3 +636,8 @@ Public Domain
622636
-------------
623637

624638
aopalliance:aopalliance:1.0
639+
640+
Dom4J license
641+
-------------
642+
643+
org.dom4j:dom4j:2.1.4.jar

hadoop-cloud-storage-project/hadoop-cloud-storage/pom.xml

Lines changed: 67 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,12 @@
9999
<groupId>org.apache.hadoop</groupId>
100100
<artifactId>hadoop-aliyun</artifactId>
101101
<scope>compile</scope>
102+
<exclusions>
103+
<exclusion>
104+
<groupId>*</groupId>
105+
<artifactId>*</artifactId>
106+
</exclusion>
107+
</exclusions>
102108
</dependency>
103109
<dependency>
104110
<groupId>org.apache.hadoop</groupId>
@@ -119,14 +125,20 @@
119125
<groupId>org.apache.hadoop</groupId>
120126
<artifactId>hadoop-cos</artifactId>
121127
<scope>compile</scope>
128+
<exclusions>
129+
<exclusion>
130+
<groupId>*</groupId>
131+
<artifactId>*</artifactId>
132+
</exclusion>
133+
</exclusions>
122134
</dependency>
123135
<dependency>
124136
<groupId>org.apache.hadoop</groupId>
125137
<artifactId>hadoop-huaweicloud</artifactId>
126138
<scope>compile</scope>
127139
<exclusions>
128140
<exclusion>
129-
<groupId>com.fasterxml.jackson</groupId>
141+
<groupId>*</groupId>
130142
<artifactId>*</artifactId>
131143
</exclusion>
132144
</exclusions>
@@ -169,7 +181,10 @@
169181
</plugin>
170182
</plugins>
171183
</build>
184+
172185
<profiles>
186+
187+
<!-- distribution profile builds the artifacts. -->
173188
<profile>
174189
<id>dist</id>
175190
<activation>
@@ -208,5 +223,56 @@
208223
</plugins>
209224
</build>
210225
</profile>
226+
227+
<!-- Pull in all the huaweicloud dependencies-->
228+
<profile>
229+
<id>huaweicloud</id>
230+
<activation>
231+
<activeByDefault>false</activeByDefault>
232+
</activation>
233+
<dependencies>
234+
<dependency>
235+
<groupId>org.apache.hadoop</groupId>
236+
<artifactId>hadoop-huaweicloud</artifactId>
237+
<scope>compile</scope>
238+
<exclusions>
239+
<exclusion>
240+
<groupId>com.fasterxml.jackson</groupId>
241+
<artifactId>*</artifactId>
242+
</exclusion>
243+
</exclusions>
244+
</dependency>
245+
</dependencies>
246+
</profile>
247+
248+
<!-- Pull in all the cos -->
249+
<profile>
250+
<id>cos</id>
251+
<activation>
252+
<activeByDefault>false</activeByDefault>
253+
</activation>
254+
<dependencies>
255+
<dependency>
256+
<groupId>org.apache.hadoop</groupId>
257+
<artifactId>hadoop-cos</artifactId>
258+
<scope>compile</scope>
259+
</dependency>
260+
</dependencies>
261+
</profile>
262+
<!-- Pull in all the cos -->
263+
<profile>
264+
<id>aliyun</id>
265+
<activation>
266+
<activeByDefault>false</activeByDefault>
267+
</activation>
268+
<dependencies>
269+
<dependency>
270+
<groupId>org.apache.hadoop</groupId>
271+
<artifactId>hadoop-aliyun</artifactId>
272+
<scope>compile</scope>
273+
</dependency>
274+
</dependencies>
275+
</profile>
276+
211277
</profiles>
212278
</project>

licenses-binary/LICENSE-dom4j.txt

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
Copyright 2001-2023 © MetaStuff, Ltd. and DOM4J contributors. All Rights Reserved.
2+
3+
Redistribution and use of this software and associated documentation
4+
("Software"), with or without modification, are permitted provided
5+
that the following conditions are met:
6+
7+
1. Redistributions of source code must retain copyright
8+
statements and notices. Redistributions must also contain a
9+
copy of this document.
10+
11+
2. Redistributions in binary form must reproduce the
12+
above copyright notice, this list of conditions and the
13+
following disclaimer in the documentation and/or other
14+
materials provided with the distribution.
15+
16+
3. The name "DOM4J" must not be used to endorse or promote
17+
products derived from this Software without prior written
18+
permission of MetaStuff, Ltd. For written permission,
19+
please contact [email protected].
20+
21+
4. Products derived from this Software may not be called "DOM4J"
22+
nor may "DOM4J" appear in their names without prior written
23+
permission of MetaStuff, Ltd. DOM4J is a registered
24+
trademark of MetaStuff, Ltd.
25+
26+
5. Due credit should be given to the DOM4J Project - https://dom4j.github.io/
27+
28+
THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
29+
``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
30+
NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
31+
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
32+
METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
33+
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
34+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
35+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
36+
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
37+
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
38+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
39+
OF THE POSSIBILITY OF SUCH DAMAGE.

0 commit comments

Comments
 (0)