/
hadoop-upgrade-and-aws.patch
448 lines (442 loc) · 23.5 KB
/
hadoop-upgrade-and-aws.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 49a119096f..8a6400fe9e 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -155,14 +155,21 @@ org.apache.directory.server.version = 2.0.0-M15
/org.apache.directory.server/apacheds-protocol-shared = ${org.apache.directory.server.version}
/org.apache.directory.server/apacheds-xdbm-partition = ${org.apache.directory.server.version}
-org.apache.hadoop.version = 2.7.4
+org.apache.hadoop.version = 2.8.1
/org.apache.hadoop/hadoop-annotations = ${org.apache.hadoop.version}
/org.apache.hadoop/hadoop-auth = ${org.apache.hadoop.version}
/org.apache.hadoop/hadoop-common = ${org.apache.hadoop.version}
/org.apache.hadoop/hadoop-hdfs = ${org.apache.hadoop.version}
+/org.apache.hadoop/hadoop-hdfs-client = ${org.apache.hadoop.version}
/org.apache.hadoop/hadoop-minikdc = ${org.apache.hadoop.version}
+/org.apache.hadoop/hadoop-aws = ${org.apache.hadoop.version}
-/org.apache.htrace/htrace-core = 3.2.0-incubating
+com.amazonaws.version = 1.11.136
+/com.amazonaws/aws-java-sdk-s3 = ${com.amazonaws.version}
+/com.amazonaws/aws-java-sdk-kms = ${com.amazonaws.version}
+/com.amazonaws/aws-java-sdk-core = ${com.amazonaws.version}
+
+/org.apache.htrace/htrace-core4 = 4.2.0-incubating
# The httpcore version is often different from the httpclient and httpmime versions,
# so the httpcore version value should not share the same symbolic name with them.
diff --git a/solr/core/ivy.xml b/solr/core/ivy.xml
index ee6fe80db7..0e32194626 100644
--- a/solr/core/ivy.xml
+++ b/solr/core/ivy.xml
@@ -72,14 +72,20 @@
here as such so that they are included in the runtime distribution.
-->
<dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="${/org.apache.hadoop/hadoop-hdfs}" conf="compile.hadoop"/>
+ <dependency org="org.apache.hadoop" name="hadoop-hdfs-client" rev="${/org.apache.hadoop/hadoop-hdfs-client}" conf="compile.hadoop"/>
<dependency org="org.apache.hadoop" name="hadoop-annotations" rev="${/org.apache.hadoop/hadoop-annotations}" conf="compile.hadoop"/>
<dependency org="org.apache.hadoop" name="hadoop-auth" rev="${/org.apache.hadoop/hadoop-auth}" conf="compile.hadoop"/>
<dependency org="commons-configuration" name="commons-configuration" rev="${/commons-configuration/commons-configuration}" conf="compile.hadoop"/>
<dependency org="commons-collections" name="commons-collections" rev="${/commons-collections/commons-collections}" conf="compile.hadoop"/>
+ <dependency org="org.apache.hadoop" name="hadoop-aws" rev="${/org.apache.hadoop/hadoop-aws}" conf="compile.hadoop"/>
+ <dependency org="com.amazonaws" name="aws-java-sdk-s3" rev="${/com.amazonaws/aws-java-sdk-s3}" conf="compile.hadoop"/>
+ <dependency org="com.amazonaws" name="aws-java-sdk-kms" rev="${/com.amazonaws/aws-java-sdk-kms}" conf="compile.hadoop"/>
+ <dependency org="com.amazonaws" name="aws-java-sdk-core" rev="${/com.amazonaws/aws-java-sdk-core}" conf="compile.hadoop"/>
+
<dependency org="com.google.protobuf" name="protobuf-java" rev="${/com.google.protobuf/protobuf-java}" conf="compile.hadoop"/>
<dependency org="com.github.ben-manes.caffeine" name="caffeine" rev="${/com.github.ben-manes.caffeine/caffeine}" conf="compile.hadoop"/>
- <dependency org="org.apache.htrace" name="htrace-core" rev="${/org.apache.htrace/htrace-core}" conf="compile.hadoop"/>
+ <dependency org="org.apache.htrace" name="htrace-core4" rev="${/org.apache.htrace/htrace-core4}" conf="compile.hadoop"/>
<!-- Hadoop DfsMiniCluster Dependencies-->
<dependency org="org.apache.hadoop" name="hadoop-common" rev="${/org.apache.hadoop/hadoop-common}" conf="test.DfsMiniCluster">
@@ -96,7 +102,7 @@
<dependency org="com.sun.jersey" name="jersey-server" rev="${/com.sun.jersey/jersey-server}" conf="test.DfsMiniCluster"/>
<dependency org="commons-collections" name="commons-collections" rev="${/commons-collections/commons-collections}" conf="test.DfsMiniCluster"/>
<dependency org="io.netty" name="netty-all" rev="${/io.netty/netty-all}" conf="test.DfsMiniCluster"/>
- <dependency org="org.apache.htrace" name="htrace-core" rev="${/org.apache.htrace/htrace-core}" conf="test.DfsMiniCluster"/>
+ <dependency org="org.apache.htrace" name="htrace-core4" rev="${/org.apache.htrace/htrace-core4}" conf="test.DfsMiniCluster"/>
<dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="${/org.codehaus.jackson/jackson-core-asl}" conf="compile" />
<dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="${/org.codehaus.jackson/jackson-mapper-asl}" conf="compile" />
diff --git a/solr/licenses/hadoop-annotations-2.7.4.jar.sha1 b/solr/licenses/hadoop-annotations-2.7.4.jar.sha1
deleted file mode 100644
index 7add0f34e9..0000000000
--- a/solr/licenses/hadoop-annotations-2.7.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d8e0a3abcc3fb46e1418b99d6d1328a95d9bd7b1
diff --git a/solr/licenses/hadoop-annotations-2.8.1.jar.sha1 b/solr/licenses/hadoop-annotations-2.8.1.jar.sha1
new file mode 100644
index 0000000000..b42208ecd0
--- /dev/null
+++ b/solr/licenses/hadoop-annotations-2.8.1.jar.sha1
@@ -0,0 +1 @@
+335a867cf42bf789919bfc3229ff26747124e8f1
diff --git a/solr/licenses/hadoop-auth-2.7.4.jar.sha1 b/solr/licenses/hadoop-auth-2.7.4.jar.sha1
deleted file mode 100644
index 3c8ccea896..0000000000
--- a/solr/licenses/hadoop-auth-2.7.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a2d5d89a6acfb11dd1a125e86b84fcef549483ae
diff --git a/solr/licenses/hadoop-auth-2.8.1.jar.sha1 b/solr/licenses/hadoop-auth-2.8.1.jar.sha1
new file mode 100644
index 0000000000..c636b7a130
--- /dev/null
+++ b/solr/licenses/hadoop-auth-2.8.1.jar.sha1
@@ -0,0 +1 @@
+688ccccc0e0739d8737a93b0039a4a661e52084b
diff --git a/solr/licenses/hadoop-common-2.7.4-tests.jar.sha1 b/solr/licenses/hadoop-common-2.7.4-tests.jar.sha1
deleted file mode 100644
index d5852c6813..0000000000
--- a/solr/licenses/hadoop-common-2.7.4-tests.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a2aa0905c8f980d36f4e861283dccfcad6dd3dec
diff --git a/solr/licenses/hadoop-common-2.7.4.jar.sha1 b/solr/licenses/hadoop-common-2.7.4.jar.sha1
deleted file mode 100644
index 4ef5f58a6f..0000000000
--- a/solr/licenses/hadoop-common-2.7.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9afa8d2004a0bbd930d1ac10d221d927917067be
diff --git a/solr/licenses/hadoop-common-2.8.1-tests.jar.sha1 b/solr/licenses/hadoop-common-2.8.1-tests.jar.sha1
new file mode 100644
index 0000000000..537aca7e6f
--- /dev/null
+++ b/solr/licenses/hadoop-common-2.8.1-tests.jar.sha1
@@ -0,0 +1 @@
+e795bb8cfeaae285290f697b1f5c4fc3e077b6fa
diff --git a/solr/licenses/hadoop-common-2.8.1.jar.sha1 b/solr/licenses/hadoop-common-2.8.1.jar.sha1
new file mode 100644
index 0000000000..47de7c4653
--- /dev/null
+++ b/solr/licenses/hadoop-common-2.8.1.jar.sha1
@@ -0,0 +1 @@
+a4df18b79e4d0349ce4b58a52d314e7ae1d6be99
diff --git a/solr/licenses/hadoop-hdfs-2.7.4-tests.jar.sha1 b/solr/licenses/hadoop-hdfs-2.7.4-tests.jar.sha1
deleted file mode 100644
index 9107cf7ab2..0000000000
--- a/solr/licenses/hadoop-hdfs-2.7.4-tests.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3e5dbc6eb1d4d5d4c19a06c0a443f5bdc3740a35
diff --git a/solr/licenses/hadoop-hdfs-2.7.4.jar.sha1 b/solr/licenses/hadoop-hdfs-2.7.4.jar.sha1
deleted file mode 100644
index ed49c83a90..0000000000
--- a/solr/licenses/hadoop-hdfs-2.7.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3e1414e3ae47e97f66b2eb904d3ec6c50a3e29d0
diff --git a/solr/licenses/hadoop-hdfs-2.8.1-tests.jar.sha1 b/solr/licenses/hadoop-hdfs-2.8.1-tests.jar.sha1
new file mode 100644
index 0000000000..31a7c5e08f
--- /dev/null
+++ b/solr/licenses/hadoop-hdfs-2.8.1-tests.jar.sha1
@@ -0,0 +1 @@
+d1d52cb4beb678c110533eeda832f1b8b0078851
diff --git a/solr/licenses/hadoop-hdfs-2.8.1.jar.sha1 b/solr/licenses/hadoop-hdfs-2.8.1.jar.sha1
new file mode 100644
index 0000000000..6a866903fb
--- /dev/null
+++ b/solr/licenses/hadoop-hdfs-2.8.1.jar.sha1
@@ -0,0 +1 @@
+a378f4bc8e6cd779d779c9f512e0e31edd771633
diff --git a/solr/licenses/hadoop-hdfs-client-2.8.1.jar.sha1 b/solr/licenses/hadoop-hdfs-client-2.8.1.jar.sha1
new file mode 100644
index 0000000000..c8221e2f65
--- /dev/null
+++ b/solr/licenses/hadoop-hdfs-client-2.8.1.jar.sha1
@@ -0,0 +1 @@
+6b0100e4f58ecf7ce75817fce1ffdfbec947337a
diff --git a/solr/licenses/hadoop-hdfs-client-LICENSE-ASL.txt b/solr/licenses/hadoop-hdfs-client-LICENSE-ASL.txt
new file mode 100644
index 0000000000..59bcdbc978
--- /dev/null
+++ b/solr/licenses/hadoop-hdfs-client-LICENSE-ASL.txt
@@ -0,0 +1,244 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
+
+
+APACHE HADOOP SUBCOMPONENTS:
+
+The Apache Hadoop project contains subcomponents with separate copyright
+notices and license terms. Your use of the source code for the these
+subcomponents is subject to the terms and conditions of the following
+licenses.
+
+For the org.apache.hadoop.util.bloom.* classes:
+
+/**
+ *
+ * Copyright (c) 2005, European Commission project OneLab under contract
+ * 034819 (http://www.one-lab.org)
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the distribution.
+ * - Neither the name of the University Catholique de Louvain - UCL
+ * nor the names of its contributors may be used to endorse or
+ * promote products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
diff --git a/solr/licenses/hadoop-hdfs-client-NOTICE.txt b/solr/licenses/hadoop-hdfs-client-NOTICE.txt
new file mode 100644
index 0000000000..62fc5816c9
--- /dev/null
+++ b/solr/licenses/hadoop-hdfs-client-NOTICE.txt
@@ -0,0 +1,2 @@
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
diff --git a/solr/licenses/hadoop-minikdc-2.7.4.jar.sha1 b/solr/licenses/hadoop-minikdc-2.7.4.jar.sha1
deleted file mode 100644
index c15bf24c68..0000000000
--- a/solr/licenses/hadoop-minikdc-2.7.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3964a7984a19e553e090a2279569ec0060b87d5b
diff --git a/solr/licenses/hadoop-minikdc-2.8.1.jar.sha1 b/solr/licenses/hadoop-minikdc-2.8.1.jar.sha1
new file mode 100644
index 0000000000..ddc54c02f6
--- /dev/null
+++ b/solr/licenses/hadoop-minikdc-2.8.1.jar.sha1
@@ -0,0 +1 @@
+8f0897d1f024cd570cb6491cac10381bcd03e208
diff --git a/solr/licenses/htrace-core-3.2.0-incubating.jar.sha1 b/solr/licenses/htrace-core-3.2.0-incubating.jar.sha1
deleted file mode 100644
index 907ef9702a..0000000000
--- a/solr/licenses/htrace-core-3.2.0-incubating.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8797cf3230f01e8724ef27a0ed565dabb6998c64
diff --git a/solr/licenses/htrace-core4-4.2.0-incubating.jar.sha1 b/solr/licenses/htrace-core4-4.2.0-incubating.jar.sha1
new file mode 100644
index 0000000000..df3d421fac
--- /dev/null
+++ b/solr/licenses/htrace-core4-4.2.0-incubating.jar.sha1
@@ -0,0 +1 @@
+94b3f1966922bc45d0f8a86a2aa867a4b0df288b
diff --git a/solr/licenses/htrace-core-LICENSE-ASL.txt b/solr/licenses/htrace-core4-LICENSE-ASL.txt
similarity index 100%
rename from solr/licenses/htrace-core-LICENSE-ASL.txt
rename to solr/licenses/htrace-core4-LICENSE-ASL.txt
diff --git a/solr/licenses/htrace-core-NOTICE.txt b/solr/licenses/htrace-core4-NOTICE.txt
similarity index 100%
rename from solr/licenses/htrace-core-NOTICE.txt
rename to solr/licenses/htrace-core4-NOTICE.txt