Skip to content

Commit e22ae6e

Browse files
srdosrdo
committed
STORM-3361: Include dependency license file in distributions, clean up license merges a bit, make storm-dist use NOTICE/LICENSE from project root
1 parent d1391dd commit e22ae6e

File tree

61 files changed

+12274
-983
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+12274
-983
lines changed

‎DEPENDENCY-LICENSES‎

Lines changed: 872 additions & 0 deletions
Large diffs are not rendered by default.

‎DEVELOPER.md‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,10 +311,23 @@ By default integration tests are not run in the test phase. To run Java and Cloj
311311
## Listing dependency licenses
312312

313313
You can generate a list of dependencies and their licenses by running `mvn generate-resources -Dlicense.skipAggregateAddThirdParty=false` in the project root.
314-
The list will be put in target/generated-sources/license/THIRD-PARTY.txt.
314+
The list will be put in DEPENDENCY_LICENSES.
315315

316316
The license aggregation plugin will use the license listed in a dependency's POM. If the license is missing, or incomplete (e.g. due to multiple licenses), you can override the license by describing the dependency in the THIRD-PARTY.properties file in the project root.
317317

318+
## Auditing licenses for LICENSE/NOTICE
319+
The LICENSE and NOTICE files contain licenses and notices for source distribution content. The LICENSE-binary and NOTICE-binary apply to the binary distributions.
320+
321+
When auditing the binary LICENSE-binary and NOTICE-binary, there are a couple of helper scripts available in dev-tools. `collect_license_files` can create an aggregate NOTICE from the libraries in an extracted distribution. The aggregate NOTICE should be adjusted to remove Storm notices and duplicates, and added to the NOTICE-binary.
322+
323+
`list_jars` can list the jars in an extracted binary distribution. Note that while listing all the jars in the binary distribution is helpful, special attention must be paid to shaded jars, as they may contain shaded dependencies that must be listed in LICENSE-binary separately.
324+
325+
The license plugin can generate a list of dependencies with licenses for the binary distribution with the following command: `mvn generate-resources -Dlicense.skipAggregateAddThirdParty=false` in the storm-dist/binary directory.
326+
327+
The generated list in target/generated-sources/license/THIRD-PARTY.txt is mostly complete, and a good input to the LICENSE-binary file. The major omission in it is the storm-shaded-deps dependencies, as they are shaded. These dependencies can be manually listed with `mvn dependency:list` in the storm-shaded-deps project, and then manually added.
328+
329+
You can download the dependency licenses by running `mvn package -Dlicense.skipAggregateDownloadLicenses=false -DskipTests` in the project root. This will put the licenses in target/generated-resources. Keep an eye on the Maven output, as some dependencies may not have licenses configured correctly. These will have to be downloaded manually.
330+
318331
<a name="packaging"></a>
319332

320333
## Create a Storm distribution (packaging)

‎LICENSE‎

Lines changed: 46 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@
203203

204204
-----------------------------------------------------------------------
205205

206-
For jQuery 1.11.1 (storm-core/src/ui/public/js/jquery-1.11.1.min.js)
206+
For jQuery 1.11.1 (storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/jquery-1.11.1.min.js)
207207

208208
Includes Sizzle.js
209209
http://sizzlejs.com/
@@ -233,7 +233,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
233233

234234
-----------------------------------------------------------------------
235235

236-
For jQuery Cookies 2.2.0 (storm-core/src/ui/public/js/jquery.cookies.2.2.0.min.js)
236+
For jQuery Cookies 2.2.0 (storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/jquery.cookies.2.2.0.min.js)
237237

238238
Copyright (c) 2005 - 2010, James Auldridge
239239

@@ -258,32 +258,31 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
258258

259259
-----------------------------------------------------------------------
260260

261-
For typeahead jquery 0.10.5 (storm-core/src/ui/public/js/typeahead.jquery.min.js)
261+
For typeahead jquery 0.10.5 (storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/typeahead.jquery.min.js)
262262

263263
Copyright (c) 2013-2014 Twitter, Inc
264264

265-
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
266-
* 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.
267-
* Neither the name of Allan Jardine nor SpryMedia UK may be used to endorse or promote products derived from this software without specific prior written permission.
268-
269-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS "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 HOLDERS 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.
270-
271-
-----------------------------------------------------------------------
272-
273-
Copyright (c) 2008-2010, Allan Jardine
274-
All rights reserved.
275-
276-
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
265+
Permission is hereby granted, free of charge, to any person obtaining a copy
266+
of this software and associated documentation files (the "Software"), to deal
267+
in the Software without restriction, including without limitation the rights
268+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
269+
copies of the Software, and to permit persons to whom the Software is
270+
furnished to do so, subject to the following conditions:
277271

278-
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
279-
* 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.
280-
* Neither the name of Allan Jardine nor SpryMedia UK may be used to endorse or promote products derived from this software without specific prior written permission.
272+
The above copyright notice and this permission notice shall be included in
273+
all copies or substantial portions of the Software.
281274

282-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS "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 HOLDERS 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.
275+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
276+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
277+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
278+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
279+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
280+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
281+
THE SOFTWARE.
283282

284283
-----------------------------------------------------------------------
285284

286-
For js-yaml.min.js (storm-core/src/ui/public/js/)
285+
For js-yaml.min.js (storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/js-yaml.min.js)
287286

288287
(The MIT License)
289288

@@ -309,7 +308,7 @@ THE SOFTWARE.
309308

310309
-----------------------------------------------------------------------
311310

312-
For dagre.min.js (storm-core/src/ui/public/js/)
311+
For dagre.min.js (storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/dagre.min.js)
313312

314313
Copyright (c) 2012-2014 Chris Pettitt
315314

@@ -333,7 +332,7 @@ THE SOFTWARE.
333332

334333
-----------------------------------------------------------------------
335334

336-
For cytoscape.min.js and cytoscape-dagre.js (storm-core/src/ui/public/js/)
335+
For cytoscape.min.js and cytoscape-dagre.js (storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/cytoscape.min.js and storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/cytoscape-dagre.js)
337336

338337
Copyright (c) 2016 The Cytoscape Consortium
339338

@@ -357,7 +356,7 @@ SOFTWARE.
357356

358357
-----------------------------------------------------------------------
359358

360-
For esprima.js (storm-core/src/ui/public/js/)
359+
For esprima.js (storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/esprima.min.js)
361360

362361
Copyright JS Foundation and other contributors, https://js.foundation/
363362

@@ -383,7 +382,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
383382

384383
-----------------------------------------------------------------------
385384

386-
For mustache.js (storm-core/src/ui/public/js/jquery.mustache.js)
385+
For mustache.js (storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/jquery.mustache.js)
387386

388387
The MIT License
389388

@@ -410,7 +409,7 @@ THE SOFTWARE.
410409

411410
-----------------------------------------------------------------------
412411

413-
For moment.js (storm-core/src/ui/public/js/moment.min.js)
412+
For moment.js (storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/moment.min.js)
414413

415414
Copyright (c) 2011-2014 Tim Wood, Iskren Chernev, Moment.js contributors
416415

@@ -438,7 +437,7 @@ OTHER DEALINGS IN THE SOFTWARE.
438437

439438
-----------------------------------------------------------------------
440439

441-
For Jquery url plugin (storm-core/src/ui/public/js/url.min.js)
440+
For Jquery url plugin (storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/url.min.js)
442441

443442
Jquery Url (A Jquery plugin for URL parser) v1.8.6
444443
Source repository: https://github.com/websanova/js-url
@@ -447,7 +446,7 @@ Licensed under an MIT-style license. Seehttps://github.com/websanova/js-url#lice
447446
-----------------------------------------------------------------------
448447

449448

450-
For jquery.blockUI.min.js (storm-core/src/ui/public/js/jquery.blockUI.min.js)
449+
For jquery.blockUI.min.js (storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/jquery.blockUI.min.js)
451450

452451
jQuery BlockUI; v20131009
453452
http://jquery.malsup.com/block/
@@ -474,10 +473,10 @@ use the BlockUI plugin in commercial projects as long as the copyright header is
474473

475474
For jquery dataTables v1.10.4
476475

477-
(storm-core/src/ui/public/js/jquery.dataTables.1.10.4.min.js
478-
storm-core/src/ui/public/css/jquery.dataTables.1.10.4.min.css
479-
storm-core/src/ui/public/images/{{back, forward}_{disabled, enabled, enabled_hover}}.png
480-
storm-core/src/ui/public/images/{sort_{asc, asc_disabled, both, desc, desc_disabled}}.png)
476+
(storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/jquery.dataTables.1.10.4.min.js
477+
storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/css/jquery.dataTables.1.10.4.min.css
478+
storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/images/{{back, forward}_{disabled, enabled, enabled_hover}}.png
479+
storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/images/{sort_{asc, asc_disabled, both, desc, desc_disabled}}.png)
481480

482481
Copyright (c) 2008-2013 SpryMedia Limited
483482
http://datatables.net
@@ -504,8 +503,9 @@ THE SOFTWARE.
504503

505504
For jquery dataTables bootstrap integration
506505

507-
(storm-core/src/ui/public/js/jquery.dataTables.1.10.4.min.js
508-
torm-core/src/ui/public/css/dataTables.bootstrap.css)
506+
(storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/jquery.dataTables.1.10.4.min.js
507+
storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/dataTables.bootstrap.min.js
508+
storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/css/dataTables.bootstrap.css)
509509

510510
Copyright (c) 2013-2014 SpryMedia Limited
511511
http://datatables.net/license
@@ -533,8 +533,8 @@ THE SOFTWARE.
533533
-----------------------------------------------------------------------
534534

535535
For bootstrap v3.3.1
536-
(storm-core/src/ui/public/js/bootstrap-3.3.1.min.js
537-
storm-core/src/ui/public/css/bootstrap-3.3.1.min.css)
536+
(storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/bootstrap-3.3.1.min.js
537+
storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/css/bootstrap-3.3.1.min.css)
538538

539539
Bootstrap v3.3.1 (http://getbootstrap.com)
540540
Copyright 2011-2014 Twitter, Inc.
@@ -543,8 +543,8 @@ Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
543543
-----------------------------------------------------------------------
544544

545545
For jQuery JSONFormatter 1.0.1 2015-02-28
546-
(storm-core/src/ui/public/js/jsonFormatter.min.js
547-
storm-core/src/ui/public/css/jsonFormatter.min.css)
546+
(storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/jsonFormatter.min.js
547+
storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/css/jsonFormatter.min.css)
548548
http://www.jqueryscript.net/other/jQuery-Plugin-For-Pretty-JSON-Formatting-jsonFormatter.htmlA
549549

550550
The MIT License (MIT)
@@ -573,7 +573,7 @@ SOFTWARE.
573573

574574
For statistic image
575575

576-
storm-core/src/ui/public/images/statistic.png
576+
storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/images/statistic.png
577577

578578
Copyright (c) 2015 Github, Inc.
579579

@@ -598,16 +598,21 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
598598
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
599599
THE SOFTWARE.
600600

601+
-----------------------------------------------------------------------
602+
603+
For PMML sample files
601604

605+
examples/storm-pmml-examples/src/main/resources/KNIME_PMML_4.1_Examples_single_audit_logreg.xml
606+
examples/storm-pmml-examples/src/main/resources/Audit.50.csv
602607

603608
This product bundles PMML Sample Files, which are available under a
604-
"3-clause BSD" license. For details, see http://dmg.org/documents/dmg-pmml-license-2016.pdf.
609+
"3-clause BSD" license. For details, see http://dmg.org/documents/dmg-pmml-license-2016.pdf
605610

606611
-----------------------------------------------------------------------
607612

608613
For vis.js 4.16.1 2016-04-18
609-
(storm-core/src/ui/public/js/vis.min.js
610-
storm-core/src/ui/public/css/vis.min.css)
614+
(storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/js/vis.min.js
615+
storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/css/vis.min.css)
611616

612617
vis.js
613618
https://github.com/almende/vis

0 commit comments

Comments
 (0)