Michael Blow has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/1463
Change subject: ASTERIXDB-1320, ASTERIXDB-1323: License Fixes
......................................................................
ASTERIXDB-1320, ASTERIXDB-1323: License Fixes
ASTERIXDB-1320:
- LICENSE lists a large number of CDDL licensed bits of software.
CDDL is Category B we should provide a link to the source code
(see 3.1. Availability of Source Code in (1))
ASTERIXDB-1323:
- Missing normalize.css (MIT) ./asterix-examples/src/main/resources
/admaql101-demo/static/css/bootstrap.min.css
- Missing license for second bottle file (MIT) ./asterix-examples
/src/main/resources/tweetbook-demo/bottle.py
- Bootstrap version bundled is Apache licensed not MIT licensed
./asterix-app/src/main/resources/webui/static/js/bootstrap.min.js
- It’s also not mentioned for all licenses what each license is
(MIT/BSD etc) that can be helpful. The version of the bundled
software is also helpful.
- Should include text of RainbowVis-JS license (or better still
a pointer to a copy of the license file) [5] not a pointer to
a URL on github
Change-Id: Ie9fe9c18f63624896ccda420e1bf83ae0127021e
---
M asterixdb/LICENSE
M asterixdb/asterix-app/pom.xml
M asterixdb/asterix-examples/src/main/appended-resources/META-INF/LICENSE
M asterixdb/asterix-installer/pom.xml
M asterixdb/asterix-metadata/pom.xml
M asterixdb/asterix-server/pom.xml
M asterixdb/asterix-yarn/pom.xml
M asterixdb/pom.xml
M asterixdb/src/main/appended-resources/supplemental-models.xml
R asterixdb/src/main/licenses/content/paranamer-2.3_LICENSE.txt
M asterixdb/src/main/licenses/content/protobuf_2.5.0_LICENSE.txt
M asterixdb/src/main/licenses/templates/asterix-license.ftl
M asterixdb/src/main/licenses/templates/source_licenses.ftl
M asterixdb/src/main/licenses/templates/source_only_licenses.ftl
M
hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/pom.xml
M
hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java
M
hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseMojo.java
M
hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/project/Project.java
18 files changed, 624 insertions(+), 42 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/63/1463/1
diff --git a/asterixdb/LICENSE b/asterixdb/LICENSE
index 7896416..abca26a 100644
--- a/asterixdb/LICENSE
+++ b/asterixdb/LICENSE
@@ -268,7 +268,7 @@
and
asterix-app/src/main/resources/feed/smoothie.js
- are available under the following license:
+ are available under The MIT License:
---
Copyright (c) 2010-2013, Joe Walnes
@@ -449,7 +449,9 @@
---
Portions of the AsterixDB API examples
located at:
- asterix-examples/src/main/resources/admaql101-demo/bottle.py
+ asterix-examples/src/main/resources/admaql101-demo/bottle.py,
+ and
+ asterix-examples/src/main/resources/tweetbook-demo/bottle.py
are available under The MIT License:
---
@@ -504,5 +506,105 @@
are available under The MIT License:
---
- See https://opensource.org/licenses/mit-license.php
+ RainbowVis-JS
+ Released under MIT License
+
+ (text of The MIT License follows for convenience)
+
+ Copyright <YEAR> <COPYRIGHT HOLDER>
+
+ Permission is hereby granted, free of charge, to any person obtaining a
copy of
+ this software and associated documentation files (the "Software"), to deal
in
+ the Software without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of
+ the Software, and to permit persons to whom the Software is furnished to do
so,
+ subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
all
+ copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS
+ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
OR
+ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER
+ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+---
+ Portions of the AsterixDB API examples
+ located at:
+
asterix-examples/src/main/resources/admaql101-demo/static/js/jquery.min.js
+
+ are available under The MIT License:
+---
+ (https://github.com/jquery/jquery/blob/2.0.3/MIT-LICENSE.txt)
+ Copyright 2013 jQuery Foundation and other contributors
+ http://jquery.com/
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+---
+ Portions of the AsterixDB API examples
+ located at:
+
asterix-examples/src/main/resources/admaql101-demo/static/js/bootstrap.min.js
+
+ are available under The Apache Software License, Version 2.0:
+---
+ bootstrap.js v3.0.0 by @fat and @mdo
+
+ Copyright 2013 Twitter Inc.
+
+ http://www.apache.org/licenses/LICENSE-2.0
+---
+ Portions of the AsterixDB API examples
+ located at:
+
asterix-examples/src/main/resources/admaql101-demo/static/css/bootstrap.min.css
+
+ are available under The Apache Software License, Version 2.0:
+---
+ Bootstrap v3.0.0
+
+ Copyright 2013 Twitter, Inc
+
+ Licensed under the Apache License v2.0
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Designed and built with all the love in the world by @mdo and @fat.
+
+ also contains normalize.css v2.1.0, under the following license:
+ (https://github.com/necolas/normalize.css/blob/v2.1.0/LICENSE.md)
+
+ Copyright (c) Nicolas Gallagher and Jonathan Neal
+
+ Permission is hereby granted, free of charge, to any person obtaining a
copy of
+ this software and associated documentation files (the "Software"), to deal
in
+ the Software without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of
+ the Software, and to permit persons to whom the Software is furnished to do
so,
+ subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
all
+ copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS
+ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
OR
+ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER
+ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
---
diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml
index b6e6be1..6dfbe9d 100644
--- a/asterixdb/asterix-app/pom.xml
+++ b/asterixdb/asterix-app/pom.xml
@@ -348,7 +348,6 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.2.2</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/asterixdb/asterix-examples/src/main/appended-resources/META-INF/LICENSE
b/asterixdb/asterix-examples/src/main/appended-resources/META-INF/LICENSE
index 811623a..f694cb5 100644
--- a/asterixdb/asterix-examples/src/main/appended-resources/META-INF/LICENSE
+++ b/asterixdb/asterix-examples/src/main/appended-resources/META-INF/LICENSE
@@ -7,25 +7,164 @@
subcomponents is subject to the terms and condition of the following
licenses.
+---
+ Portions of the AsterixDB API examples
+ located at:
+ src/main/resources/admaql101-demo/bottle.py,
+ and
+ src/main/resources/tweetbook-demo/bottle.py
------------------------------------------------------------------------
- The MIT License
------------------------------------------------------------------------
+ are available under The MIT License:
+---
+ Copyright (c) 2014, Marcel Hellkamp.
- - jQuery (src/main/resources/admaql101-demo/static/js)
- - Bootstrap (src/main/resources/admaql101-demo/static/js/bootstrap.min.js),
- (src/main/resources/tweetbook-demo/static/js/bootstrap.min.js)
- - Bottle (src/main/resources/tweetbook-demo/bottle.py,
src/main/resources/admaql101-demo/bottle.py)
- - geostats (src/main/resources/tweetbook-demo/static/js/geostats.js)
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to
deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
-The text of The MIT License is below for convenience. Refer to the website of
each project for exact details.
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
-The MIT License (MIT)
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+---
+ Portions of the AsterixDB API examples
+ located at:
+ src/main/resources/tweetbook-demo/static/js/geostats.js
-Copyright (c) <year> <copyright holders>
+ are available under The MIT License:
+---
+ Copyright (c) 2011 Simon Georget
-Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
+ Permission is hereby granted, free of charge, to any person obtaining a
copy of
+ this software and associated documentation files (the "Software"), to deal
in
+ the Software without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of
+ the Software, and to permit persons to whom the Software is furnished to do
so,
+ subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
+ The above copyright notice and this permission notice shall be included in
all
+ copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS
+ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
OR
+ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER
+ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ Portions of the AsterixDB API examples
+ located at:
+ src/main/resources/tweetbook-demo/static/js/rainbowvis.js
+
+ are available under The MIT License:
+---
+ RainbowVis-JS
+ Released under MIT License
+
+ (text of The MIT License follows for convenience)
+
+ Copyright <YEAR> <COPYRIGHT HOLDER>
+
+ Permission is hereby granted, free of charge, to any person obtaining a
copy of
+ this software and associated documentation files (the "Software"), to deal
in
+ the Software without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of
+ the Software, and to permit persons to whom the Software is furnished to do
so,
+ subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
all
+ copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS
+ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
OR
+ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER
+ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+---
+ Portions of the AsterixDB API examples
+ located at:
+ src/main/resources/admaql101-demo/static/js/jquery.min.js
+
+ are available under The MIT License:
+---
+ (https://github.com/jquery/jquery/blob/2.0.3/MIT-LICENSE.txt)
+ Copyright 2013 jQuery Foundation and other contributors
+ http://jquery.com/
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+---
+ Portions of the AsterixDB API examples
+ located at:
+ src/main/resources/admaql101-demo/static/js/bootstrap.min.js
+
+ are available under The Apache Software License, Version 2.0:
+---
+ bootstrap.js v3.0.0 by @fat and @mdo
+
+ Copyright 2013 Twitter Inc.
+
+ http://www.apache.org/licenses/LICENSE-2.0
+---
+ Portions of the AsterixDB API examples
+ located at:
+ src/main/resources/admaql101-demo/static/css/bootstrap.min.css
+
+ are available under The Apache Software License, Version 2.0:
+---
+ Bootstrap v3.0.0
+
+ Copyright 2013 Twitter, Inc
+
+ Licensed under the Apache License v2.0
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Designed and built with all the love in the world by @mdo and @fat.
+
+ also contains normalize.css v2.1.0, under the following license:
+ (https://github.com/necolas/normalize.css/blob/v2.1.0/LICENSE.md)
+
+ Copyright (c) Nicolas Gallagher and Jonathan Neal
+
+ Permission is hereby granted, free of charge, to any person obtaining a
copy of
+ this software and associated documentation files (the "Software"), to deal
in
+ the Software without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of
+ the Software, and to permit persons to whom the Software is furnished to do
so,
+ subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
all
+ copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS
+ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
OR
+ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER
+ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+---
diff --git a/asterixdb/asterix-installer/pom.xml
b/asterixdb/asterix-installer/pom.xml
index 496ff8c..34fa7ea 100644
--- a/asterixdb/asterix-installer/pom.xml
+++ b/asterixdb/asterix-installer/pom.xml
@@ -458,7 +458,6 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.2.2</version>
</dependency>
<dependency>
<groupId>org.apache.hyracks</groupId>
diff --git a/asterixdb/asterix-metadata/pom.xml
b/asterixdb/asterix-metadata/pom.xml
index b39713f..95cadc7 100644
--- a/asterixdb/asterix-metadata/pom.xml
+++ b/asterixdb/asterix-metadata/pom.xml
@@ -119,7 +119,6 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.2.2</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml
index 31778ba..caea161 100644
--- a/asterixdb/asterix-server/pom.xml
+++ b/asterixdb/asterix-server/pom.xml
@@ -94,7 +94,7 @@
</override>
<override>
<gav>com.thoughtworks.paranamer:paranamer:2.3</gav>
-
<url>https://raw.githubusercontent.com/codehaus/paranamer-git/master/LICENSE.txt</url>
+
<url>https://github.com/codehaus/paranamer-git/blob/paranamer-2.3/LICENSE.txt</url>
</override>
<override>
<gav>org.codehaus.jettison:jettison:1.1</gav>
@@ -118,25 +118,32 @@
</override>
<override>
<gav>com.google.protobuf:protobuf-java:2.5.0</gav>
-
<url>https://raw.githubusercontent.com/google/protobuf/master/LICENSE</url>
+
<url>https://github.com/google/protobuf/blob/v2.5.0/COPYING.txt</url>
</override>
<override>
<gav>xmlenc:xmlenc:0.52</gav>
- <url>xmlenc_0.52_LICENSE</url>
+
<url>https://cytranet.dl.sourceforge.net/project/xmlenc/xmlenc/0.52/xmlenc-0.52.tgz?xmlenc-0.52/COPYRIGHT</url>
</override>
</overrides>
<licenses>
<license>
-
<url>https://raw.githubusercontent.com/google/protobuf/master/LICENSE</url>
+ <displayName>a BSD 3-clause license</displayName>
+ <url>http://asm.objectweb.org/license.html</url>
+ </license>
+ <license>
+ <displayName>a BSD 3-clause license</displayName>
+
<url>https://github.com/google/protobuf/blob/v2.5.0/COPYING.txt</url>
<contentFile>protobuf_2.5.0_LICENSE.txt</contentFile>
</license>
<license>
- <url>xmlenc_0.52_LICENSE</url>
- <contentFile>xmlenc_0.52_LICENSE.txt</contentFile>
+ <displayName>a BSD 3-clause license</displayName>
+
<url>https://github.com/codehaus/paranamer-git/blob/paranamer-2.3/LICENSE.txt</url>
+ <contentFile>paranamer-2.3_LICENSE.txt</contentFile>
</license>
<license>
-
<url>https://raw.githubusercontent.com/hamcrest/JavaHamcrest/1260407ae3d2786cb54b8be52ebe041e54ccd6ac/LICENSE.txt</url>
- <contentFile>hamcrest_1.3_LICENSE.txt</contentFile>
+ <displayName>a BSD 3-clause license</displayName>
+
<url>https://cytranet.dl.sourceforge.net/project/xmlenc/xmlenc/0.52/xmlenc-0.52.tgz?xmlenc-0.52/COPYRIGHT</url>
+ <contentFile>xmlenc_0.52_LICENSE.txt</contentFile>
</license>
<license>
<displayName>The Apache Software License, Version
2.0</displayName>
@@ -151,7 +158,7 @@
<license>
<url>https://java.net/projects/stax-utils/sources/svn/content/trunk/LICENSE</url>
<contentFile>stax-utils_LICENSE.txt</contentFile>
- <displayName>a BSD-style License</displayName>
+ <displayName>a BSD 3-clause license</displayName>
<aliasUrls>
<aliasUrl>https://stax-utils.dev.java.net/source/browse/*checkout*/stax-utils/LICENSE</aliasUrl>
</aliasUrls>
diff --git a/asterixdb/asterix-yarn/pom.xml b/asterixdb/asterix-yarn/pom.xml
index 29b3edb..0a29902 100644
--- a/asterixdb/asterix-yarn/pom.xml
+++ b/asterixdb/asterix-yarn/pom.xml
@@ -430,7 +430,6 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.2.2</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 51f8789..9fcfc47 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -1058,6 +1058,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.2.12</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml
b/asterixdb/src/main/appended-resources/supplemental-models.xml
index f87a1a7..aa57859 100644
--- a/asterixdb/src/main/appended-resources/supplemental-models.xml
+++ b/asterixdb/src/main/appended-resources/supplemental-models.xml
@@ -73,8 +73,20 @@
</organization>
<licenses>
<license>
- <name>The BSD License</name>
+ <name>a BSD 3-clause license</name>
<url>http://jline.sourceforge.net/license.html</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch</artifactId>
+ <licenses>
+ <license>
+ <name>a BSD 3-clause license</name>
+ <url>http://www.jcraft.com/jsch/LICENSE.txt</url>
</license>
</licenses>
</project>
@@ -100,6 +112,7 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<name>Java Servlet API</name>
+
<url>https://jcp.org/aboutJava/communityprocess/mrel/jsr154/index.html</url>
<organization>
<name>Oracle Corporation</name>
<url>http://www.oracle.com/</url>
@@ -114,6 +127,18 @@
</supplement>
<supplement>
<project>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <licenses>
+ <license>
+ <name>an ASL v1.1-style license</name>
+ <url>licenses/jdom.txt</url>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
+ <supplement>
+ <project>
<groupId>rome</groupId>
<artifactId>rome</artifactId>
<name>ROME</name>
diff --git
a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_codehaus_paranamer-git_master_LICENSE.txt
b/asterixdb/src/main/licenses/content/paranamer-2.3_LICENSE.txt
similarity index 100%
rename from
asterixdb/src/main/licenses/content/raw.githubusercontent.com_codehaus_paranamer-git_master_LICENSE.txt
rename to asterixdb/src/main/licenses/content/paranamer-2.3_LICENSE.txt
diff --git a/asterixdb/src/main/licenses/content/protobuf_2.5.0_LICENSE.txt
b/asterixdb/src/main/licenses/content/protobuf_2.5.0_LICENSE.txt
index 2dcab42..fb69007 100644
--- a/asterixdb/src/main/licenses/content/protobuf_2.5.0_LICENSE.txt
+++ b/asterixdb/src/main/licenses/content/protobuf_2.5.0_LICENSE.txt
@@ -1,4 +1,5 @@
-Copyright 2014, Google Inc. All rights reserved.
+Copyright 2008, Google Inc.
+All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
@@ -29,4 +30,4 @@
Code generated by the Protocol Buffer compiler is owned by the owner
of the input file used when generating it. This code is not
standalone and requires a support library to be linked with it. This
-support library is itself covered by the above license.
+support library is itself covered by the above license.
\ No newline at end of file
diff --git a/asterixdb/src/main/licenses/templates/asterix-license.ftl
b/asterixdb/src/main/licenses/templates/asterix-license.ftl
index 8b83c1f..9a8ca3f 100644
--- a/asterixdb/src/main/licenses/templates/asterix-license.ftl
+++ b/asterixdb/src/main/licenses/templates/asterix-license.ftl
@@ -47,7 +47,10 @@
</#if>
<#list projects as p>
* ${p.name} (${p.groupId}:${p.artifactId}:${p.version})
- <#list p.locations as loc>
+ <#if p.sourcePointer?has_content>
+ [sources: ${p.sourcePointer}]
+ </#if>
+ <#list p.locations as loc>
- ${loc}${p.artifactId}-${p.version}.jar
</#list>
</#list>
diff --git a/asterixdb/src/main/licenses/templates/source_licenses.ftl
b/asterixdb/src/main/licenses/templates/source_licenses.ftl
index 475c6ac..e04cf5e 100644
--- a/asterixdb/src/main/licenses/templates/source_licenses.ftl
+++ b/asterixdb/src/main/licenses/templates/source_licenses.ftl
@@ -87,7 +87,7 @@
Copyright 2012 Twitter, Inc.
http://www.apache.org/licenses/LICENSE-2.0.txt
</@license>
-<@license files=["webui/static/js/smoothie.js", "feed/smoothie.js"]>
+<@license files=["webui/static/js/smoothie.js", "feed/smoothie.js"]
licenseName="The MIT License">
Copyright (c) 2010-2013, Joe Walnes
Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/asterixdb/src/main/licenses/templates/source_only_licenses.ftl
b/asterixdb/src/main/licenses/templates/source_only_licenses.ftl
index 376b1bf..8bf0c56 100644
--- a/asterixdb/src/main/licenses/templates/source_only_licenses.ftl
+++ b/asterixdb/src/main/licenses/templates/source_only_licenses.ftl
@@ -40,7 +40,8 @@
</@indent>
---
</#macro>
-<@license files="asterix-examples/src/main/resources/admaql101-demo/bottle.py"
+<@license
files=["asterix-examples/src/main/resources/admaql101-demo/bottle.py",
+
"asterix-examples/src/main/resources/tweetbook-demo/bottle.py"]
component="AsterixDB API examples" licenseName="The MIT License">
Copyright (c) 2014, Marcel Hellkamp.
@@ -74,7 +75,71 @@
</@license>
<@license
files="asterix-examples/src/main/resources/tweetbook-demo/static/js/rainbowvis.js"
component="AsterixDB API examples" licenseName="The MIT License">
+RainbowVis-JS
+Released under MIT License
-See https://opensource.org/licenses/mit-license.php
+(text of The MIT License follows for convenience)
+Copyright <YEAR> <COPYRIGHT HOLDER>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+</@license>
+<@license
files="asterix-examples/src/main/resources/admaql101-demo/static/js/jquery.min.js"
+ component="AsterixDB API examples" licenseName="The MIT License">
+(https://github.com/jquery/jquery/blob/2.0.3/MIT-LICENSE.txt)
+Copyright 2013 jQuery Foundation and other contributors
+http://jquery.com/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+</@license>
+<@license
files="asterix-examples/src/main/resources/admaql101-demo/static/js/bootstrap.min.js"
+ component="AsterixDB API examples" licenseName="The Apache Software
License, Version 2.0">
+bootstrap.js v3.0.0 by @fat and @mdo
+
+Copyright 2013 Twitter Inc.
+
+http://www.apache.org/licenses/LICENSE-2.0
+</@license>
+<@license
files="asterix-examples/src/main/resources/admaql101-demo/static/css/bootstrap.min.css"
+ component="AsterixDB API examples" licenseName="The Apache Software
License, Version 2.0">
+Bootstrap v3.0.0
+
+Copyright 2013 Twitter, Inc
+
+Licensed under the Apache License v2.0
+http://www.apache.org/licenses/LICENSE-2.0
+
+Designed and built with all the love in the world by @mdo and @fat.
+
+also contains normalize.css v2.1.0, under the following license:
+(https://github.com/necolas/normalize.css/blob/v2.1.0/LICENSE.md)
+
+Copyright (c) Nicolas Gallagher and Jonathan Neal
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
</@license>
diff --git
a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/pom.xml
b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/pom.xml
index 5190bbb..bcd6cc0 100644
---
a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/pom.xml
+++
b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/pom.xml
@@ -85,6 +85,11 @@
<artifactId>maven-artifact</artifactId>
<version>3.0</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ <version>3.3.9</version>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git
a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java
b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java
index fa5429a..796f7aa 100644
---
a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java
+++
b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java
@@ -22,8 +22,11 @@
import java.io.FileWriter;
import java.io.IOException;
import java.io.StringWriter;
+import java.lang.Override;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
import java.util.Comparator;
import java.util.Enumeration;
import java.util.HashMap;
@@ -31,6 +34,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Random;
import java.util.Set;
import java.util.SortedMap;
import java.util.SortedSet;
@@ -49,17 +53,31 @@
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
import org.apache.hyracks.maven.license.freemarker.IndentDirective;
import org.apache.hyracks.maven.license.freemarker.LoadFileDirective;
import org.apache.hyracks.maven.license.project.LicensedProjects;
import org.apache.hyracks.maven.license.project.Project;
-import org.apache.commons.io.IOUtils;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.DefaultArtifact;
+import org.apache.maven.artifact.metadata.ArtifactMetadata;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
+import org.apache.maven.artifact.repository.Authentication;
+import org.apache.maven.artifact.repository.DefaultRepositoryRequest;
+import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
+import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
+import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
+import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
+import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingException;
+import org.apache.maven.repository.Proxy;
@Mojo(name = "generate",
requiresProject = true,
@@ -109,15 +127,64 @@
resolveNoticeFiles();
resolveLicenseFiles();
rebuildLicenseContentProjectMap();
- buildNoticeProjectMap();
- persistLicenseMap();
combineCommonGavs();
+ collectSourceAssemblies();
+ persistLicenseMap();
+ buildNoticeProjectMap();
generateFiles();
} catch (IOException | TemplateException | ProjectBuildingException e)
{
throw new MojoExecutionException("Unexpected exception: " + e, e);
}
}
+ private void collectSourceAssemblies() throws ProjectBuildingException,
IOException {
+ try (StubArtifactRepository stubRepo = new StubArtifactRepository()) {
+ DefaultRepositoryRequest rr = new DefaultRepositoryRequest();
+ rr.setLocalRepository(stubRepo);
+ ArtifactRepository central = getCentralRepository();
+ rr.setRemoteRepositories(Collections.singletonList(central));
+ ArtifactResolutionRequest request = new
ArtifactResolutionRequest(rr);
+ for (LicensedProjects lp : licenseMap.values()) {
+ if
(lp.getLicense().getDisplayName().toLowerCase().contains("cddl")) {
+ ensureSourcesPointer(lp.getProjects(), central, request);
+ }
+ }
+ }
+ }
+
+ private void ensureSourcesPointer(Collection<Project> projects,
ArtifactRepository central,
+ ArtifactResolutionRequest request)
throws ProjectBuildingException {
+ for (Project p : projects) {
+ if (p.getSourcePointer() != null) {
+ continue;
+ }
+ getLog().debug("finding sources for artifact: " + p);
+ Artifact sourcesArtifact = new DefaultArtifact(p.getGroupId(),
p.getArtifactId(),
+ p.getVersion(), Artifact.SCOPE_COMPILE, "jar", "sources",
null);
+ MavenProject mavenProject = resolveDependency(sourcesArtifact);
+
sourcesArtifact.setArtifactHandler(mavenProject.getArtifact().getArtifactHandler());
+
+ request.setArtifact(sourcesArtifact);
+ ArtifactResolutionResult result =
artifactResolver.resolve(request);
+ getLog().debug("result: " + result);
+ if (result.isSuccess()) {
+ p.setSourcePointer(central.getUrl() + "/" +
central.pathOf(sourcesArtifact));
+ } else {
+ getLog().warn("Unable to find sources in 'central' for " + p +
", falling back to project url: "
+ + p.getUrl());
+ p.setSourcePointer(p.getUrl() != null ? "see " + p.getUrl() :
"MISSING SOURCE POINTER");
+ }
+ }
+ }
+
+ private ArtifactRepository getCentralRepository() {
+ for (ArtifactRepository repo :
session.getRequest().getRemoteRepositories()) {
+ if ("central".equals(repo.getId())) {
+ return repo;
+ }
+ }
+ throw new IllegalStateException("Unable to find 'central' remote
repository!");
+ }
private void resolveLicenseContent() throws IOException {
Set<LicenseSpec> licenseSpecs = new HashSet<>();
@@ -359,5 +426,145 @@
}
return matches;
}
+
+ private static class StubArtifactRepository implements ArtifactRepository,
AutoCloseable {
+ private final File tempDir;
+ private final ArtifactRepositoryLayout layout;
+
+ public StubArtifactRepository() {
+ String tmpDir = System.getProperty("java.io.tmpdir", "/tmp");
+ this.tempDir = new File(tmpDir, "repo" + new Random().nextInt());
+ this.layout = new DefaultRepositoryLayout();
+ }
+
+ @Override
+ public ArtifactRepositoryLayout getLayout() {
+ return layout;
+ }
+
+ @Override
+ public String pathOf(Artifact artifact) {
+ return this.layout.pathOf(artifact);
+ }
+
+ @Override
+ public String getBasedir() {
+ return tempDir.toString();
+ }
+
+ @Override
+ public void close() throws IOException {
+ FileUtils.deleteDirectory(tempDir);
+
+ }
+
+ @Override
+ public String pathOfRemoteRepositoryMetadata(ArtifactMetadata
artifactMetadata) {
+ return null;
+ }
+
+ @Override
+ public String pathOfLocalRepositoryMetadata(ArtifactMetadata
artifactMetadata,
+ ArtifactRepository
artifactRepository) {
+ return null;
+ }
+
+ @Override
+ public String getUrl() {
+ return null;
+ }
+
+ @Override
+ public void setUrl(String s) {
+ }
+
+ @Override
+ public String getProtocol() {
+ return null;
+ }
+
+ @Override
+ public String getId() {
+ return null;
+ }
+
+ @Override
+ public void setId(String s) {
+ }
+
+ @Override
+ public ArtifactRepositoryPolicy getSnapshots() {
+ return null;
+ }
+
+ @Override
+ public void setSnapshotUpdatePolicy(ArtifactRepositoryPolicy
artifactRepositoryPolicy) {
+ }
+
+ @Override
+ public ArtifactRepositoryPolicy getReleases() {
+ return null;
+ }
+
+ @Override
+ public void setReleaseUpdatePolicy(ArtifactRepositoryPolicy
artifactRepositoryPolicy) {
+ }
+
+ @Override
+ public void setLayout(ArtifactRepositoryLayout
artifactRepositoryLayout) {
+ }
+
+ @Override
+ public String getKey() {
+ return null;
+ }
+
+ @Override
+ public boolean isUniqueVersion() {
+ return false;
+ }
+
+ @Override
+ public boolean isBlacklisted() {
+ return false;
+ }
+
+ @Override
+ public void setBlacklisted(boolean b) {
+ }
+
+ @Override
+ public Artifact find(Artifact artifact) {
+ return null;
+ }
+
+ @Override
+ public List<String> findVersions(Artifact artifact) {
+ return null;
+ }
+
+ @Override
+ public boolean isProjectAware() {
+ return false;
+ }
+
+ @Override
+ public void setAuthentication(Authentication authentication) {
+ }
+
+ @Override
+ public Authentication getAuthentication() {
+ return null;
+ }
+
+ @Override
+ public void setProxy(Proxy proxy) {
+ }
+
+ @Override
+ public Proxy getProxy() {
+ return null;
+ }
+ }
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseMojo.java
b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseMojo.java
index 4363170..929b7d7 100644
---
a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseMojo.java
+++
b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseMojo.java
@@ -40,6 +40,7 @@
import org.apache.hyracks.maven.license.project.Project;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.License;
import org.apache.maven.model.Model;
import org.apache.maven.plugin.AbstractMojo;
@@ -85,6 +86,12 @@
@Component
private ModelInheritanceAssembler assembler;
+
+ @Parameter( defaultValue = "${session}", required = true, readonly = true )
+ protected MavenSession session;
+
+ @Component
+ protected org.apache.maven.artifact.resolver.ArtifactResolver
artifactResolver;
@Parameter ( required = true )
private String location;
@@ -192,6 +199,9 @@
urlToLicenseMap.put(alias ,license);
}
}
+ } else if (license.getDisplayName() == null && spec.getDisplayName()
!= null) {
+ getLog().info("Propagating license name from " + project.gav() +
": " + spec.getDisplayName());
+ license.setDisplayName(spec.getDisplayName());
}
licenseUrl = license.getUrl();
LicensedProjects entry = licenseMap.get(licenseUrl);
diff --git
a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/project/Project.java
b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/project/Project.java
index e5e57ad..80d4548 100644
---
a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/project/Project.java
+++
b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/project/Project.java
@@ -19,7 +19,9 @@
package org.apache.hyracks.maven.license.project;
import java.io.File;
+import java.util.Arrays;
import java.util.Comparator;
+import java.util.List;
import org.apache.maven.project.MavenProject;
@@ -37,6 +39,7 @@
private String artifactPath;
private String noticeText;
private String licenseText;
+ private String sourcePointer;
@JsonIgnore
private MavenProject mavenProject;
@@ -105,8 +108,9 @@
}
@JsonIgnore
- public String [] getLocations() {
- return getLocation().split(",");
+ public List<String> getLocations() {
+ // TODO(mblow): store locations as an set instead of string
+ return Arrays.asList(getLocation().split(","));
}
public void setArtifactId(String artifactId) {
@@ -156,4 +160,17 @@
public void setLicenseText(String licenseText) {
this.licenseText = licenseText;
}
+
+ public String getSourcePointer() {
+ return sourcePointer;
+ }
+
+ public void setSourcePointer(String sourcePointer) {
+ this.sourcePointer = sourcePointer;
+ }
+
+ @Override
+ public String toString() {
+ return "Project [" + gav() + "]";
+ }
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/1463
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9fe9c18f63624896ccda420e1bf83ae0127021e
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <[email protected]>
