You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2017/01/16 18:07:48 UTC
[1/2] asterixdb git commit: Fix Issues With Binary Assembly Licenses,
Cleanup
Repository: asterixdb
Updated Branches:
refs/heads/master 66fbbd176 -> b29bd73dc
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/b29bd73d/hyracks-fullstack/src/main/appended-resources/supplemental-models.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/src/main/appended-resources/supplemental-models.xml b/hyracks-fullstack/src/main/appended-resources/supplemental-models.xml
deleted file mode 100644
index 0d69dc6..0000000
--- a/hyracks-fullstack/src/main/appended-resources/supplemental-models.xml
+++ /dev/null
@@ -1,742 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<supplementalDataModels>
- <supplement>
- <project>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <name>Sun JAXB Reference Implementation Runtime</name>
- <organization>
- <name>Sun Microsystems</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
- <url>http://www.sun.com/cddl/cddl.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
- <name>Sun JAXB Reference Implementation Tools</name>
- <organization>
- <name>Sun Microsystems</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
- <url>http://www.sun.com/cddl/cddl.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
- <name>Sun SAAJ Reference Implementation</name>
- <organization>
- <name>Sun Microsystems</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
- <url>http://www.sun.com/cddl/cddl.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
- <name>Sun SAAJ API</name>
- <organization>
- <name>Sun Microsystems</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
- <url>http://www.sun.com/cddl/cddl.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>org.apache.neethi</groupId>
- <artifactId>neethi</artifactId>
- <name>Neethi</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <name>Java API for XML-Based Web Services (JAX-WS API)</name>
- <organization>
- <name>Sun Microsystems</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
- <url>http://www.sun.com/cddl/cddl.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <name>Java Architecture for XML Binding (JAXB API)</name>
- <organization>
- <name>Sun Microsystems</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
- <url>http://www.sun.com/cddl/cddl.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>javax.xml</groupId>
- <artifactId>jaxb-api</artifactId>
- <name>Java Architecture for XML Binding (JAXB API)</name>
- <organization>
- <name>Sun Microsystems</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
- <url>http://www.sun.com/cddl/cddl.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <name>Apache Xalan-Java</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>net.java.dev.stax-utils</groupId>
- <artifactId>stax-utils</artifactId>
- <name>StAX Utilities</name>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>wss4j</groupId>
- <artifactId>wss4j</artifactId>
- <name>Apache WSS4J</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- <name>JDOM</name>
- <organization>
- <name>jdom.org</name>
- <url>http://www.jdom.org</url>
- </organization>
- <licenses>
- <license>
- <name>Modified Apache Software License</name>
- <url>licenses/jdom.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>xml-security</groupId>
- <artifactId>xmlsec</artifactId>
- <name>XML Security</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <name>XML APIs</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <name>Apache Ant</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <name>Apache Ant (nodeps)</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- <name>Jettison</name>
- <organization>
- <name>Envoi Solutions LLC</name>
- <url>http://www.envoisolutions.com</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://jettison.codehaus.org/License</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <name>Apache Commons Codec</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <name>Apache Commons Collections</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <name>Apache Commons BeanUtils</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>commons-jexl</groupId>
- <artifactId>commons-jexl</artifactId>
- <name>Apache Commons JEXL</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <name>Apache Commons Logging</name>
- <url>http://commons.apache.org/logging</url>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <name>Apache Commons Logging Api</name>
- <url>http://commons.apache.org/logging</url>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <name>Apache Commons Pool</name>
- <url>http://commons.apache.org/pool</url>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>commons-vfs</groupId>
- <artifactId>commons-vfs</artifactId>
- <name>Apache Commons VFS</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <name>Apache Commons Codec</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint</artifactId>
- <name>Apache Aries Blueprint</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <name>ActiveMQ :: Core</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <name>Camel :: Core</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-classloader</artifactId>
- <name>XBean :: Classloader</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <name>SLF4J API Module</name>
- <organization>
- <name>QOS.ch</name>
- <url>http://www.qos.ch</url>
- </organization>
- <licenses>
- <license>
- <name>MIT style</name>
- <url>http://www.slf4j.org/license.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <name>SLF4J JDK14 Binding</name>
- <organization>
- <name>QOS.ch</name>
- <url>http://www.qos.ch</url>
- </organization>
- <licenses>
- <license>
- <name>MIT style</name>
- <url>http://www.slf4j.org/license.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <name>Log4j</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-classworlds</artifactId>
- <name>Plexus Classworlds</name>
- <url>http://plexus.codehaus.org/plexus-classworlds/</url>
- <organization>
- <name>Codehaus</name>
- <url>http://www.codehaus.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- <name>JLine</name>
- <url>http://jline.sourceforge.net</url>
- <organization>
- <name>JLine</name>
- <url>http://jline.sourceforge.net</url>
- </organization>
- <licenses>
- <license>
- <name>The BSD License</name>
- <url>http://jline.sourceforge.net/license.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <name>Jetty Server</name>
- <url>http://jetty.mortbay.org/</url>
- <organization>
- <name>Mort Bay Consulting</name>
- <url>http://www.mortbay.com</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <name>Jetty Utilities</name>
- <url>http://jetty.mortbay.org/</url>
- <organization>
- <name>Mort Bay Consulting</name>
- <url>http://www.mortbay.com</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>aopalliance</groupId>
- <artifactId>aopalliance</artifactId>
- <name>XML Pull Parsing API</name>
- <organization>
- <name>AOP Alliance</name>
- <url>http://aopalliance.sourceforge.net/</url>
- </organization>
- <licenses>
- <license>
- <name>Public Domain</name>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <name>Java Servlet API</name>
- <organization>
- <name>Oracle Corporation</name>
- <url>http://www.oracle.com/</url>
- </organization>
- <licenses>
- <license>
- <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
- <url>http://www.sun.com/cddl/cddl.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <name>Java Servlet API</name>
- <organization>
- <name>Oracle Corporation</name>
- <url>http://www.oracle.com/</url>
- </organization>
- <licenses>
- <license>
- <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
- <url>http://www.sun.com/cddl/cddl.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <name>Java Transaction API</name>
- <organization>
- <name>Oracle Corporation</name>
- <url>http://www.oracle.com/</url>
- </organization>
- <licenses>
- <license>
- <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
- <url>http://www.sun.com/cddl/cddl.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>org.antlr</groupId>
- <artifactId>antlr-runtime</artifactId>
- <licenses>
- <license>
- <name>MIT style</name>
- <url>http://www.slf4j.org/license.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>rome</groupId>
- <artifactId>rome</artifactId>
- <name>ROME</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <name>Jakarta ORO</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
-</supplementalDataModels>
[2/2] asterixdb git commit: Fix Issues With Binary Assembly Licenses,
Cleanup
Posted by mb...@apache.org.
Fix Issues With Binary Assembly Licenses, Cleanup
- cleanup / fix supplemental model
- remove unused licenses
- add missing client helper jars, managix, yarn jars to LICENSE
- allow same dependency to be mappped into multiple license
dependencySets
- prune extraneous supplemental model files
Change-Id: I8b9d1f13960bd5cf8782f0cc785eed8f3414b123
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1442
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <ti...@apache.org>
BAD: Jenkins <je...@fulliautomatix.ics.uci.edu>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/b29bd73d
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/b29bd73d
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/b29bd73d
Branch: refs/heads/master
Commit: b29bd73dcbe66fb6d811221cb5542202e190ca44
Parents: 66fbbd1
Author: Michael Blow <mb...@apache.org>
Authored: Mon Jan 16 11:44:39 2017 -0500
Committer: Michael Blow <mb...@apache.org>
Committed: Mon Jan 16 10:07:12 2017 -0800
----------------------------------------------------------------------
asterixdb/LICENSE | 23 +
.../appended-resources/supplemental-models.xml | 1 -
asterixdb/asterix-client-helper/pom.xml | 47 ++
asterixdb/asterix-external-data/pom.xml | 4 +
.../appended-resources/supplemental-models.xml | 1 -
asterixdb/asterix-server/pom.xml | 28 +-
asterixdb/asterix-yarn/pom.xml | 6 -
.../appended-resources/supplemental-models.xml | 1 -
.../src/main/assembly/binary-assembly.xml | 1 +
asterixdb/pom.xml | 10 +
.../appended-resources/supplemental-models.xml | 675 +----------------
.../licenses/content/hamcrest_1.3_LICENSE.txt | 27 -
.../content/jdom--jdom--1.0_licenses_jdom.txt | 51 --
...eedc3f20ab5a998533711d042ba004a8_LICENSE.txt | 19 -
.../content/www.antlr.org_license.html.txt | 23 -
.../www.eclipse.org_legal_epl-v10.html.txt | 145 ----
.../content/www.json.org_license.html.txt | 16 -
.../hyracks-control/hyracks-control-cc/pom.xml | 6 +
.../hyracks/maven/license/GenerateFileMojo.java | 49 +-
.../hyracks/maven/license/LicenseMojo.java | 65 +-
.../appended-resources/supplemental-models.xml | 742 -------------------
21 files changed, 182 insertions(+), 1758 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/b29bd73d/asterixdb/LICENSE
----------------------------------------------------------------------
diff --git a/asterixdb/LICENSE b/asterixdb/LICENSE
index 62d1c3e..7896416 100644
--- a/asterixdb/LICENSE
+++ b/asterixdb/LICENSE
@@ -342,7 +342,30 @@
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.
+
+ queryui/css/bootstrap.min.css also contains normalize.css v3.0.3
+ (http://github.com/necolas/normalize.css), having the following copyright:
+
+ Copyright � 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.
---
+
Portions of the AsterixDB QueryUI
located at:
asterix-app/src/main/resources/queryui/js/angular.min.js
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/b29bd73d/asterixdb/asterix-app/src/main/appended-resources/supplemental-models.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/main/appended-resources/supplemental-models.xml b/asterixdb/asterix-app/src/main/appended-resources/supplemental-models.xml
deleted file mode 120000
index a3e53f9..0000000
--- a/asterixdb/asterix-app/src/main/appended-resources/supplemental-models.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../src/main/appended-resources/supplemental-models.xml
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/b29bd73d/asterixdb/asterix-client-helper/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-client-helper/pom.xml b/asterixdb/asterix-client-helper/pom.xml
index d3a6d4e..defb488 100644
--- a/asterixdb/asterix-client-helper/pom.xml
+++ b/asterixdb/asterix-client-helper/pom.xml
@@ -66,6 +66,53 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>license-automation-plugin</artifactId>
+ <version>${hyracks.version}</version>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <templateRootDir>${basedir}/../../</templateRootDir>
+ <generatedFiles>
+ <generatedFile>
+ <template>asterixdb/src/main/licenses/templates/asterix-license.ftl</template>
+ <outputFile>LICENSE</outputFile>
+ </generatedFile>
+ </generatedFiles>
+ <location>repo/</location>
+ <licenseMapOutputFile>${project.build.directory}/generated-resources/license_map.json</licenseMapOutputFile>
+ <excludes>
+ <exclude>org.apache.asterix:*</exclude>
+ <exclude>org.apache.algebricks:*</exclude>
+ <exclude>org.apache.hyracks:*</exclude>
+ </excludes>
+ <licenseDirectory>${basedir}/../src/main/licenses/content</licenseDirectory>
+ <models>
+ <model>${basedir}/../src/main/appended-resources/supplemental-models.xml</model>
+ </models>
+ <licenses>
+ <license>
+ <url>https://raw.githubusercontent.com/mojohaus/appassembler/master/LICENSE.txt</url>
+ <aliasUrls>http://svn.codehaus.org/mojo/trunk/mojo/appassembler/LICENSE.txt</aliasUrls>
+ </license>
+ <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>
+ <aliasUrls>
+ <aliasUrl>https://stax-utils.dev.java.net/source/browse/*checkout*/stax-utils/LICENSE</aliasUrl>
+ </aliasUrls>
+ </license>
+ </licenses>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.6</version>
<executions>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/b29bd73d/asterixdb/asterix-external-data/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-external-data/pom.xml b/asterixdb/asterix-external-data/pom.xml
index c603571..563799e 100644
--- a/asterixdb/asterix-external-data/pom.xml
+++ b/asterixdb/asterix-external-data/pom.xml
@@ -254,6 +254,10 @@
<artifactId>rome</artifactId>
<groupId>net.java.dev.rome</groupId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/b29bd73d/asterixdb/asterix-installer/src/main/appended-resources/supplemental-models.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-installer/src/main/appended-resources/supplemental-models.xml b/asterixdb/asterix-installer/src/main/appended-resources/supplemental-models.xml
deleted file mode 120000
index a3e53f9..0000000
--- a/asterixdb/asterix-installer/src/main/appended-resources/supplemental-models.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../src/main/appended-resources/supplemental-models.xml
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/b29bd73d/asterixdb/asterix-server/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml
index ad783a7..de2e5e4 100644
--- a/asterixdb/asterix-server/pom.xml
+++ b/asterixdb/asterix-server/pom.xml
@@ -81,24 +81,18 @@
<models>
<model>${basedir}/../src/main/appended-resources/supplemental-models.xml</model>
</models>
+ <extraLicenseMaps>
+ <extraLicenseMap>
+ <file>${basedir}/../asterix-client-helper/target/generated-resources/license_map.json</file>
+ <location>lib/</location>
+ </extraLicenseMap>
+ </extraLicenseMaps>
<overrides>
<override>
- <gav>org.tukaani:xz:1.0</gav>
- <url>PUBLIC_DOMAIN</url>
- </override>
- <override>
- <gav>aopalliance:aopalliance:1.0</gav>
- <url>PUBLIC_DOMAIN</url>
- </override>
- <override>
<gav>asm:asm:3.1</gav>
<url>http://asm.objectweb.org/license.html</url>
</override>
<override>
- <gav>commons-el:commons-el:1.0</gav>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </override>
- <override>
<gav>com.thoughtworks.paranamer:paranamer:2.3</gav>
<url>https://raw.githubusercontent.com/codehaus/paranamer-git/master/LICENSE.txt</url>
</override>
@@ -127,17 +121,9 @@
<url>https://raw.githubusercontent.com/google/protobuf/master/LICENSE</url>
</override>
<override>
- <gav>org.hamcrest:hamcrest-core:1.3</gav>
- <url>https://raw.githubusercontent.com/hamcrest/JavaHamcrest/1260407ae3d2786cb54b8be52ebe041e54ccd6ac/LICENSE.txt</url>
- </override>
- <override>
<gav>xmlenc:xmlenc:0.52</gav>
<url>xmlenc_0.52_LICENSE</url>
</override>
- <override>
- <gav>org.slf4j:slf4j-log4j12:1.7.5</gav>
- <url>http://www.slf4j.org/license.html</url>
- </override>
</overrides>
<licenses>
<license>
@@ -199,6 +185,7 @@
<aliasUrl>https://glassfish.java.net/public/CDDL+GPL.html</aliasUrl>
<aliasUrl>http://glassfish.dev.java.net/public/CDDL+GPL.html</aliasUrl>
<aliasUrl>https://glassfish.dev.java.net/public/CDDLv1.0.html</aliasUrl>
+ <aliasUrl>https://glassfish.java.net/public/CDDLv1.0.html</aliasUrl>
</aliasUrls>
</license>
<license>
@@ -216,6 +203,7 @@
<license>
<!-- this is special case- handled in ftl template -->
<url>PUBLIC_DOMAIN</url>
+ <aliasUrls>Public Domain</aliasUrls>
</license>
</licenses>
<templateProperties>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/b29bd73d/asterixdb/asterix-yarn/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-yarn/pom.xml b/asterixdb/asterix-yarn/pom.xml
index 03e62ea..32c33fb 100644
--- a/asterixdb/asterix-yarn/pom.xml
+++ b/asterixdb/asterix-yarn/pom.xml
@@ -171,10 +171,6 @@
<gav>com.google.protobuf:protobuf-java:2.5.0</gav>
<url>https://raw.githubusercontent.com/google/protobuf/master/LICENSE</url>
</override>
- <override>
- <gav>org.slf4j:slf4j-simple:1.6.1</gav>
- <url>http://www.slf4j.org/license.html</url>
- </override>
</overrides>
<licenses>
<license>
@@ -383,7 +379,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.6.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -419,7 +414,6 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/b29bd73d/asterixdb/asterix-yarn/src/main/appended-resources/supplemental-models.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-yarn/src/main/appended-resources/supplemental-models.xml b/asterixdb/asterix-yarn/src/main/appended-resources/supplemental-models.xml
deleted file mode 120000
index a3e53f9..0000000
--- a/asterixdb/asterix-yarn/src/main/appended-resources/supplemental-models.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../src/main/appended-resources/supplemental-models.xml
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/b29bd73d/asterixdb/asterix-yarn/src/main/assembly/binary-assembly.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-yarn/src/main/assembly/binary-assembly.xml b/asterixdb/asterix-yarn/src/main/assembly/binary-assembly.xml
index 6677c73..94ce7b0 100644
--- a/asterixdb/asterix-yarn/src/main/assembly/binary-assembly.xml
+++ b/asterixdb/asterix-yarn/src/main/assembly/binary-assembly.xml
@@ -76,6 +76,7 @@
<dependencySets>
<dependencySet>
<includes>
+ <!-- NOTE! Any changes here must be mirrored in src/main/assembly/binary-assembly.xml -->
<include>org.apache.asterix:asterix-yarn</include>
<include>org.apache.asterix:asterix-common</include>
<include>log4j:log4j</include>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/b29bd73d/asterixdb/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index af301b0..24571da 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -649,6 +649,11 @@
<version>${jetty.version}</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.7.5</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
@@ -739,6 +744,11 @@
<version>1.0.4</version>
</dependency>
<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.hive.shims</groupId>
<artifactId>hive-shims-common</artifactId>
<version>0.13.0</version>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/b29bd73d/asterixdb/src/main/appended-resources/supplemental-models.xml
----------------------------------------------------------------------
diff --git a/asterixdb/src/main/appended-resources/supplemental-models.xml b/asterixdb/src/main/appended-resources/supplemental-models.xml
index 93a0740..f87a1a7 100644
--- a/asterixdb/src/main/appended-resources/supplemental-models.xml
+++ b/asterixdb/src/main/appended-resources/supplemental-models.xml
@@ -2,531 +2,23 @@
<supplementalDataModels>
<supplement>
<project>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <name>Sun JAXB Reference Implementation Runtime</name>
- <organization>
- <name>Sun Microsystems</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
- <url>http://www.sun.com/cddl/cddl.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
- <name>Sun JAXB Reference Implementation Tools</name>
- <organization>
- <name>Sun Microsystems</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
- <url>http://www.sun.com/cddl/cddl.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
- <name>Sun SAAJ Reference Implementation</name>
- <organization>
- <name>Sun Microsystems</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
- <url>http://www.sun.com/cddl/cddl.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
- <name>Sun SAAJ API</name>
- <organization>
- <name>Sun Microsystems</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
- <url>http://www.sun.com/cddl/cddl.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>org.apache.neethi</groupId>
- <artifactId>neethi</artifactId>
- <name>Neethi</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <name>Java API for XML-Based Web Services (JAX-WS API)</name>
- <organization>
- <name>Sun Microsystems</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
- <url>http://www.sun.com/cddl/cddl.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <name>Java Architecture for XML Binding (JAXB API)</name>
- <organization>
- <name>Sun Microsystems</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
- <url>http://www.sun.com/cddl/cddl.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>javax.xml</groupId>
- <artifactId>jaxb-api</artifactId>
- <name>Java Architecture for XML Binding (JAXB API)</name>
- <organization>
- <name>Sun Microsystems</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
- <url>http://www.sun.com/cddl/cddl.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <name>Apache Xalan-Java</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>net.java.dev.stax-utils</groupId>
- <artifactId>stax-utils</artifactId>
- <name>StAX Utilities</name>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>stax</groupId>
- <artifactId>stax</artifactId>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- <properties>
- <verifiedVersions>1.1.1-dev,1.2.0</verifiedVersions>
- </properties>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>wss4j</groupId>
- <artifactId>wss4j</artifactId>
- <name>Apache WSS4J</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- <name>JDOM</name>
- <organization>
- <name>jdom.org</name>
- <url>http://www.jdom.org</url>
- </organization>
- <licenses>
- <license>
- <name>an Apache-style open source license</name>
- <url>licenses/jdom.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>xml-security</groupId>
- <artifactId>xmlsec</artifactId>
- <name>XML Security</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <name>XML APIs</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <name>Apache Ant</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <name>Apache Ant (nodeps)</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- <name>Jettison</name>
- <organization>
- <name>Envoi Solutions LLC</name>
- <url>http://www.envoisolutions.com</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://jettison.codehaus.org/License</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <name>Apache Commons Codec</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <name>Apache Commons Collections</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <name>Apache Commons BeanUtils</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>commons-jexl</groupId>
- <artifactId>commons-jexl</artifactId>
- <name>Apache Commons JEXL</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <name>Apache Commons Logging</name>
- <url>http://commons.apache.org/logging</url>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <name>Apache Commons Logging Api</name>
- <url>http://commons.apache.org/logging</url>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <name>Apache Commons Pool</name>
- <url>http://commons.apache.org/pool</url>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>commons-vfs</groupId>
- <artifactId>commons-vfs</artifactId>
- <name>Apache Commons VFS</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <name>Apache Commons Codec</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint</artifactId>
- <name>Apache Aries Blueprint</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <name>ActiveMQ :: Core</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <name>Camel :: Core</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-classloader</artifactId>
- <name>XBean :: Classloader</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
+ <groupId>stax</groupId>
+ <artifactId>stax</artifactId>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>
+ <properties>
+ <verifiedVersions>1.1.1-dev,1.2.0</verifiedVersions>
+ </properties>
</project>
</supplement>
<supplement>
<project>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <name>SLF4J API Module</name>
- <organization>
- <name>QOS.ch</name>
- <url>http://www.qos.ch</url>
- </organization>
+ <artifactId>slf4j-simple</artifactId>
<licenses>
<license>
<name>an MIT-style license</name>
@@ -538,8 +30,8 @@
<supplement>
<project>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <name>SLF4J JDK14 Binding</name>
+ <artifactId>slf4j-api</artifactId>
+ <name>SLF4J API Module</name>
<organization>
<name>QOS.ch</name>
<url>http://www.qos.ch</url>
@@ -571,41 +63,6 @@
</supplement>
<supplement>
<project>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <name>Log4j</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-classworlds</artifactId>
- <name>Plexus Classworlds</name>
- <url>http://plexus.codehaus.org/plexus-classworlds/</url>
- <organization>
- <name>Codehaus</name>
- <url>http://www.codehaus.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
<name>JLine</name>
@@ -624,42 +81,6 @@
</supplement>
<supplement>
<project>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <name>Jetty Server</name>
- <url>http://jetty.mortbay.org/</url>
- <organization>
- <name>Mort Bay Consulting</name>
- <url>http://www.mortbay.com</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <name>Jetty Utilities</name>
- <url>http://jetty.mortbay.org/</url>
- <organization>
- <name>Mort Bay Consulting</name>
- <url>http://www.mortbay.com</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
<name>XML Pull Parsing API</name>
@@ -693,52 +114,6 @@
</supplement>
<supplement>
<project>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <name>Java Servlet API</name>
- <organization>
- <name>Oracle Corporation</name>
- <url>http://www.oracle.com/</url>
- </organization>
- <licenses>
- <license>
- <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
- <url>http://www.sun.com/cddl/cddl.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <name>Java Transaction API</name>
- <organization>
- <name>Oracle Corporation</name>
- <url>http://www.oracle.com/</url>
- </organization>
- <licenses>
- <license>
- <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</name>
- <url>http://www.sun.com/cddl/cddl.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>org.antlr</groupId>
- <artifactId>antlr-runtime</artifactId>
- <licenses>
- <license>
- <name>an MIT-style license</name>
- <url>http://www.slf4j.org/license.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
<groupId>rome</groupId>
<artifactId>rome</artifactId>
<name>ROME</name>
@@ -754,38 +129,4 @@
</licenses>
</project>
</supplement>
- <supplement>
- <project>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <name>Jakarta ORO</name>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>args4j</groupId>
- <artifactId>args4j</artifactId>
- <licenses>
- <license>
- <name>an MIT-style license</name>
- <url>https://raw.githubusercontent.com/kohsuke/args4j/b72102efeedc3f20ab5a998533711d042ba004a8/LICENSE</url>
- </license>
- </licenses>
- <!-- not yet used
- <properties>
- <verifiedVersions>2.33</verifiedVersions>
- </properties>
- -->
- </project>
- </supplement>
</supplementalDataModels>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/b29bd73d/asterixdb/src/main/licenses/content/hamcrest_1.3_LICENSE.txt
----------------------------------------------------------------------
diff --git a/asterixdb/src/main/licenses/content/hamcrest_1.3_LICENSE.txt b/asterixdb/src/main/licenses/content/hamcrest_1.3_LICENSE.txt
deleted file mode 100644
index 1acfd03..0000000
--- a/asterixdb/src/main/licenses/content/hamcrest_1.3_LICENSE.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-(BSD Style License)
-
-Copyright (c) 2000-2006, HamCrest.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 HamCrest 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.
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/b29bd73d/asterixdb/src/main/licenses/content/jdom--jdom--1.0_licenses_jdom.txt
----------------------------------------------------------------------
diff --git a/asterixdb/src/main/licenses/content/jdom--jdom--1.0_licenses_jdom.txt b/asterixdb/src/main/licenses/content/jdom--jdom--1.0_licenses_jdom.txt
deleted file mode 100644
index ce84df5..0000000
--- a/asterixdb/src/main/licenses/content/jdom--jdom--1.0_licenses_jdom.txt
+++ /dev/null
@@ -1,51 +0,0 @@
- $Id: LICENSE.txt,v 1.11 2004/02/06 09:32:57 jhunter Exp $
-
- Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions, and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions, and the disclaimer that follows
- these conditions in the documentation and/or other materials
- provided with the distribution.
-
- 3. The name "JDOM" must not be used to endorse or promote products
- derived from this software without prior written permission. For
- written permission, please contact <request_AT_jdom_DOT_org>.
-
- 4. Products derived from this software may not be called "JDOM", nor
- may "JDOM" appear in their name, without prior written permission
- from the JDOM Project Management <request_AT_jdom_DOT_org>.
-
- In addition, we request (but do not require) that you include in the
- end-user documentation provided with the redistribution and/or in the
- software itself an acknowledgement equivalent to the following:
- "This product includes software developed by the
- JDOM Project (http://www.jdom.org/)."
- Alternatively, the acknowledgment may be graphical using the logos
- available at http://www.jdom.org/images/logos.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 JDOM AUTHORS OR THE PROJECT
- 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.
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the JDOM Project and was originally
- created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
- Brett McLaughlin <brett_AT_jdom_DOT_org>. For more information
- on the JDOM Project, please see <http://www.jdom.org/>.
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/b29bd73d/asterixdb/src/main/licenses/content/raw.githubusercontent.com_kohsuke_args4j_b72102efeedc3f20ab5a998533711d042ba004a8_LICENSE.txt
----------------------------------------------------------------------
diff --git a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_kohsuke_args4j_b72102efeedc3f20ab5a998533711d042ba004a8_LICENSE.txt b/asterixdb/src/main/licenses/content/raw.githubusercontent.com_kohsuke_args4j_b72102efeedc3f20ab5a998533711d042ba004a8_LICENSE.txt
deleted file mode 100644
index c49840b..0000000
--- a/asterixdb/src/main/licenses/content/raw.githubusercontent.com_kohsuke_args4j_b72102efeedc3f20ab5a998533711d042ba004a8_LICENSE.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2013 Kohsuke Kawaguchi and other contributors
-
-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.
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/b29bd73d/asterixdb/src/main/licenses/content/www.antlr.org_license.html.txt
----------------------------------------------------------------------
diff --git a/asterixdb/src/main/licenses/content/www.antlr.org_license.html.txt b/asterixdb/src/main/licenses/content/www.antlr.org_license.html.txt
deleted file mode 100644
index 475717f..0000000
--- a/asterixdb/src/main/licenses/content/www.antlr.org_license.html.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-ANTLR 4 License
-
-[The BSD License]
-Copyright (c) 2012 Terence Parr and Sam Harwell
-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 author 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.
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/b29bd73d/asterixdb/src/main/licenses/content/www.eclipse.org_legal_epl-v10.html.txt
----------------------------------------------------------------------
diff --git a/asterixdb/src/main/licenses/content/www.eclipse.org_legal_epl-v10.html.txt b/asterixdb/src/main/licenses/content/www.eclipse.org_legal_epl-v10.html.txt
deleted file mode 100644
index e1460e4..0000000
--- a/asterixdb/src/main/licenses/content/www.eclipse.org_legal_epl-v10.html.txt
+++ /dev/null
@@ -1,145 +0,0 @@
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-i) changes to the Program, and
-ii) additions to the Program;
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A
-Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting
-on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of
-software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative
-works of the Program.
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of
-its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform,
-distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and
-object code form.
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide,
-royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the
-Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the
-combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such
-addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall
-not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no
-assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other
-entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property
-rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the
-Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to
-grant the copyright license set forth in this Agreement.
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-b) its license agreement:
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including
-warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and
-fitness for a particular purpose;
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special,
-incidental and consequential damages, such as lost profits;
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any
-other party; and
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it
-in a reasonable manner on or through a medium customarily used for software exchange.
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-b) a copy of this Agreement must be included with each copy of the Program.
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who
-includes the Program in a commercial product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering,
-such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified
-Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or
-omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged
-intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the
-Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with
-the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may
-participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is
-then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties
-related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone.
-Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to
-those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result,
-the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED 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. Each Recipient is solely responsible for
-determining the appropriateness of using and distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption
-of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
-GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity
-or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto,
-such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such
-Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such
-litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such
-noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution
-of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any
-licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the
-Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to
-publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward
-has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation
-may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the
-Agreement will be given a distinguishing version number. The Program (including Contributions) may always be
-distributed subject to the version of the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new
-version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the
-intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or
-otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States
-of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the
-cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/b29bd73d/asterixdb/src/main/licenses/content/www.json.org_license.html.txt
----------------------------------------------------------------------
diff --git a/asterixdb/src/main/licenses/content/www.json.org_license.html.txt b/asterixdb/src/main/licenses/content/www.json.org_license.html.txt
deleted file mode 100644
index e5bfdb4..0000000
--- a/asterixdb/src/main/licenses/content/www.json.org_license.html.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Copyright (c) 2002 JSON.org
-
-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 shall be used for Good, not Evil.
-
-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.
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/b29bd73d/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml
----------------------------------------------------------------------
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml
index eafc8d2..9b326b8 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/pom.xml
@@ -47,6 +47,12 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
<version>1.5.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-io</groupId>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/b29bd73d/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java
----------------------------------------------------------------------
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 3dfbb1a..fa5429a 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
@@ -118,6 +118,7 @@ public class GenerateFileMojo extends LicenseMojo {
}
}
+
private void resolveLicenseContent() throws IOException {
Set<LicenseSpec> licenseSpecs = new HashSet<>();
for (LicensedProjects licensedProjects : licenseMap.values()) {
@@ -125,22 +126,30 @@ public class GenerateFileMojo extends LicenseMojo {
}
licenseSpecs.addAll(urlToLicenseMap.values());
for (LicenseSpec license : licenseSpecs) {
- if (license.getContent() == null) {
- getLog().debug("Resolving content for " + license.getUrl() + " (" + license.getContentFile() + ")");
- File cFile = new File(license.getContentFile());
- if (!cFile.isAbsolute()) {
- cFile = new File(licenseDirectory, license.getContentFile());
- }
- if (!cFile.exists()) {
+ resolveLicenseContent(license, true);
+ }
+ }
+
+ private String resolveLicenseContent(LicenseSpec license, boolean bestEffort) throws IOException {
+ if (license.getContent() == null) {
+ getLog().debug("Resolving content for " + license.getUrl() + " (" + license.getContentFile() + ")");
+ File cFile = new File(license.getContentFile());
+ if (!cFile.isAbsolute()) {
+ cFile = new File(licenseDirectory, license.getContentFile());
+ }
+ if (!cFile.exists()) {
+ if (!bestEffort) {
getLog().warn("MISSING: license content file (" + cFile + ") for url: " + license.getUrl());
license.setContent("MISSING: " + license.getContentFile() + " (" + license.getUrl() + ")");
- } else {
- StringWriter sw = new StringWriter();
- LicenseUtil.readAndTrim(sw, cFile);
- license.setContent(sw.toString());
}
+ } else {
+ getLog().info("Reading license content from file: " + cFile);
+ StringWriter sw = new StringWriter();
+ LicenseUtil.readAndTrim(sw, cFile);
+ license.setContent(sw.toString());
}
}
+ return license.getContent();
}
private void combineCommonGavs() {
@@ -231,7 +240,7 @@ public class GenerateFileMojo extends LicenseMojo {
}
}
- private void rebuildLicenseContentProjectMap() {
+ private void rebuildLicenseContentProjectMap() throws IOException {
int counter = 0;
Map<String, LicensedProjects> licenseMap2 = new TreeMap<>(WHITESPACE_NORMALIZED_COMPARATOR);
for (LicensedProjects lps : licenseMap.values()) {
@@ -239,17 +248,27 @@ public class GenerateFileMojo extends LicenseMojo {
String licenseText = project.getLicenseText();
if (licenseText == null) {
getLog().warn("Using license other than from within artifact: " + project.gav());
- licenseText = lps.getLicense().getContent();
+ licenseText = resolveLicenseContent(lps.getLicense(), false);
+ }
+ LicenseSpec spec = lps.getLicense();
+ if (spec.getDisplayName() == null) {
+ LicenseSpec canonicalLicense = urlToLicenseMap.get(spec.getUrl());
+ if (canonicalLicense != null) {
+ spec.setDisplayName(canonicalLicense.getDisplayName());
+ }
}
if (!licenseMap2.containsKey(licenseText)) {
- LicenseSpec spec = lps.getLicense();
if (!licenseText.equals(lps.getLicense().getContent())) {
spec = new LicenseSpec(new ArrayList<>(), licenseText, null, spec.getDisplayName(),
spec.getMetric(), spec.getUrl() + (counter++));
}
licenseMap2.put(licenseText, new LicensedProjects(spec));
}
- licenseMap2.get(licenseText).addProject(project);
+ final LicensedProjects lp2 = licenseMap2.get(licenseText);
+ if (lp2.getLicense().getDisplayName() == null) {
+ lp2.getLicense().setDisplayName(lps.getLicense().getDisplayName());
+ }
+ lp2.addProject(project);
}
}
licenseMap = licenseMap2;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/b29bd73d/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/LicenseMojo.java
----------------------------------------------------------------------
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 ea5c878..4363170 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
@@ -19,7 +19,6 @@
package org.apache.hyracks.maven.license;
import java.io.File;
-import java.lang.*;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
@@ -30,13 +29,15 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
+import java.util.TreeSet;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
-import org.apache.hyracks.maven.license.project.LicensedProjects;
-import org.apache.hyracks.maven.license.project.Project;
+import org.apache.commons.lang3.mutable.MutableBoolean;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
+import org.apache.hyracks.maven.license.project.LicensedProjects;
+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.model.License;
@@ -116,33 +117,49 @@ public abstract class LicenseMojo extends AbstractMojo {
Map<MavenProject, List<Pair<String, String>>> dependencyLicenseMap = gatherDependencies();
for (Map.Entry<MavenProject, List<Pair<String, String>>> dep : dependencyLicenseMap.entrySet()) {
final MavenProject depProject = dep.getKey();
- String depLocation = dependencySets.isEmpty() ? location : getIncludedLocation(depProject.getArtifact());
+ Set<String> locations = dependencySets.isEmpty() ? Collections.singleton(location)
+ : getIncludedLocation(depProject.getArtifact());
if (isExcluded(depProject.getArtifact())) {
getLog().debug("skipping " + depProject + " [excluded]");
- } else if (depLocation == null) {
+ } else if (locations.isEmpty()) {
getLog().debug("skipping " + depProject + " [not included in dependency sets]");
} else {
- addDependencyToLicenseMap(depProject, dep.getValue(), depLocation);
+ for (String depLocation : locations) {
+ addDependencyToLicenseMap(depProject, dep.getValue(), depLocation);
+ }
}
}
}
+ private int getLicenseMetric(String url) {
+ LicenseSpec licenseSpec = urlToLicenseMap.get(url);
+ return licenseSpec != null ? licenseSpec.getMetric() : LicenseSpec.UNDEFINED_LICENSE_METRIC;
+ }
+
private void addDependencyToLicenseMap(MavenProject depProject, List<Pair<String, String>> depLicenses,
String depLocation) {
final String depGav = toGav(depProject);
getLog().debug("adding " + depGav + ", location: " + depLocation);
+ final MutableBoolean usedMetric = new MutableBoolean(false);
if (depLicenses.size() > 1) {
Collections.sort(depLicenses, (o1, o2) -> {
- final LicenseSpec l1 = urlToLicenseMap.get(o1.getLeft());
- final LicenseSpec l2 = urlToLicenseMap.get(o2.getLeft());
- return Integer.compare(l1 != null ? l1.getMetric() : LicenseSpec.UNDEFINED_LICENSE_METRIC,
- l2 != null ? l2.getMetric() : LicenseSpec.UNDEFINED_LICENSE_METRIC);
+ final int metric1 = getLicenseMetric(o1.getLeft());
+ final int metric2 = getLicenseMetric(o2.getLeft());
+ usedMetric.setValue(usedMetric.booleanValue()
+ || metric1 != LicenseSpec.UNDEFINED_LICENSE_METRIC
+ || metric2 != LicenseSpec.UNDEFINED_LICENSE_METRIC);
+ return Integer.compare(metric1, metric2);
});
- getLog().warn("Multiple licenses for " + depGav + ": " + depLicenses
- + "; taking first or lowest metric.");
+ if (usedMetric.booleanValue()) {
+ getLog().info("Multiple licenses for " + depGav + ": " + depLicenses
+ + "; taking lowest metric: " + depLicenses.get(0));
+ } else {
+ getLog().warn("Multiple licenses for " + depGav + ": " + depLicenses
+ + "; taking first listed: " + depLicenses.get(0));
+ }
} else if (depLicenses.isEmpty()) {
- getLog().error("No license defined for " + depGav);
- depLicenses.add(new ImmutablePair<>("MISSING_LICENSE", "MISSING LICENSE"));
+ getLog().info("no license defined in model for " + depGav);
+ depLicenses.add(new ImmutablePair<>("MISSING_LICENSE", null));
}
Pair<String, String> key = depLicenses.get(0);
String licenseUrl = key.getLeft();
@@ -155,7 +172,7 @@ public abstract class LicenseMojo extends AbstractMojo {
} catch (MalformedURLException e) {
// we encounter this a lot. Log a warning, and use an annotated key
final String fakeLicenseUrl = depGav.replaceAll(":", "--") + "_" + licenseUrl;
- getLog().warn("- URL for " + depGav + " is malformed: " + licenseUrl + "; using: "
+ getLog().info("- URL for " + depGav + " is malformed: " + licenseUrl + "; using: "
+ fakeLicenseUrl);
licenseUrl = fakeLicenseUrl;
}
@@ -211,13 +228,12 @@ public abstract class LicenseMojo extends AbstractMojo {
if (dep == null) {
getLog().warn("Unused override dependency " + gav + "; ignoring...");
} else {
- final List<Pair<String, String>> newUrl = Collections.singletonList(
+ final List<Pair<String, String>> newLicense = Collections.singletonList(
new ImmutablePair<>(override.getUrl(), override.getName()));
- List<Pair<String, String>> prev = dependencyLicenseMap.put(dep, newUrl);
- if (!prev.isEmpty()) {
- getLog().warn("NOTICE: replacing license(s) " + prev + " for dependency " + gav + " with "
- + newUrl);
- }
+ List<Pair<String, String>> prevLicense = dependencyLicenseMap.put(dep, newLicense);
+ getLog().warn("license list for " + toGav(dep)
+ + " changed with <override>; was: " + prevLicense
+ + ", now: " + newLicense);
}
}
return dependencyLicenseMap;
@@ -308,15 +324,16 @@ public abstract class LicenseMojo extends AbstractMojo {
return false;
}
- protected String getIncludedLocation(Artifact artifact) {
+ protected Set<String> getIncludedLocation(Artifact artifact) {
+ Set<String> locations = new TreeSet<>();
for (DependencySet set : dependencySets) {
for (Pattern include : set.getPatterns()) {
if (include.matcher(artifact.getGroupId() + ":" + artifact.getArtifactId()).matches()) {
- return set.getLocation();
+ locations.add(set.getLocation());
}
}
}
- return null;
+ return locations;
}
}