Skip to content

Commit

Permalink
Merge pull request #4358 from caskdata/docs/3.2.1_license_update
Browse files Browse the repository at this point in the history 
Update license dependency files.
  • Loading branch information
John Jackson committed Oct 21, 2015
2 parents 27055e3 + b47de5e commit ceac6fe
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 21 deletions.
Binary file modified cdap-docs/reference-manual/licenses-pdf/cdap-enterprise-dependencies.pdf
View file
Binary file not shown.
Binary file modified cdap-docs/reference-manual/licenses-pdf/cdap-level-1-dependencies.pdf
View file
Binary file not shown.
Binary file modified cdap-docs/reference-manual/licenses-pdf/cdap-standalone-dependencies.pdf
View file
Binary file not shown.
Binary file modified cdap-docs/reference-manual/licenses-pdf/cdap-ui-dependencies.pdf
View file
Binary file not shown.
13 changes: 5 additions & 8 deletions cdap-docs/reference-manual/source/licenses/cdap-enterprise-dependencies.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,13 @@ commons-cli.commons-cli-1.2.jar
commons-codec.commons-codec-1.6.jar
commons-collections.commons-collections-3.2.1.jar
commons-configuration.commons-configuration-1.6.jar
commons-daemon.commons-daemon-1.0.13.jar
commons-dbcp.commons-dbcp-1.4.jar
commons-digester.commons-digester-1.8.jar
commons-el.commons-el-1.0.jar
commons-httpclient.commons-httpclient-3.1.jar
commons-io.commons-io-2.4.jar
commons-lang.commons-lang-2.5.jar
commons-lang.commons-lang-2.6.jar
commons-logging.commons-logging-1.1.1.jar
commons-net.commons-net-3.1.jar
commons-pool.commons-pool-1.5.4.jar
com.ning.async-http-client-1.7.18.jar
Expand All @@ -43,7 +41,6 @@ com.sun.jersey.jersey-server-1.9.jar
com.sun.xml.bind.jaxb-impl-2.2.3-1.jar
com.thoughtworks.paranamer.paranamer-2.3.jar
com.twitter.parquet-hadoop-bundle-1.6.0rc3.jar
com.yammer.metrics.metrics-annotation-2.2.0.jar
com.yammer.metrics.metrics-core-2.2.0.jar
eigenbase.eigenbase-properties-1.1.4.jar
io.dropwizard.metrics.metrics-core-3.1.0.jar
Expand All @@ -56,19 +53,19 @@ javax.inject.javax.inject-1.jar
javax.jdo.jdo-api-3.0.1.jar
javax.mail.mail-1.4.1.jar
javax.servlet.javax.servlet-api-3.0.1.jar
javax.servlet.jsp.jsp-api-2.1.jar
javax.transaction.jta-1.1.jar
javax.ws.rs.javax.ws.rs-api-2.0.jar
javax.xml.bind.jaxb-api-2.2.2.jar
javax.xml.stream.stax-api-1.0-2.jar
jline.jline-2.12.jar
joda-time.joda-time-2.1.jar
log4j.apache-log4j-extras-1.2.17.jar
log4j.log4j-1.2.15.jar
log4j.log4j-1.2.14.jar
log4j.log4j-1.2.16.jar
log4j.log4j-1.2.17.jar
net.java.dev.jets3t.jets3t-0.9.0.jar
net.jcip.jcip-annotations-1.0.jar
net.jpountz.lz4.lz4-1.2.0.jar
net.sf.jopt-simple.jopt-simple-3.2.jar
net.sf.jpam.jpam-1.1.jar
net.sf.opencsv.opencsv-2.3.jar
Expand Down Expand Up @@ -99,7 +96,8 @@ org.apache.geronimo.specs.geronimo-jaspic_1.0_spec-1.1.jar
org.apache.geronimo.specs.geronimo-jta_1.1_spec-1.1.1.jar
org.apache.httpcomponents.httpclient-4.2.5.jar
org.apache.httpcomponents.httpcore-4.2.5.jar
org.apache.kafka.kafka_2.10-0.8.0.jar
org.apache.kafka.kafka_2.10-0.8.2.2.jar
org.apache.kafka.kafka-clients-0.8.2.2.jar
org.apache.thrift.libfb303-0.9.2.jar
org.apache.thrift.libthrift-0.9.0.jar
org.apache.twill.twill-api-0.6.0-incubating.jar
Expand Down Expand Up @@ -150,12 +148,11 @@ org.ow2.asm.asm-all-5.0.3.jar
org.pentaho.pentaho-aggdesigner-algorithm-5.1.5-jhyde.jar
org.quartz-scheduler.quartz-2.2.0.jar
org.quartz-scheduler.quartz-jobs-2.2.0.jar
org.scala-lang.scala-library-2.10.1.jar
org.scala-lang.scala-library-2.10.4.jar
org.slf4j.jcl-over-slf4j-1.7.2.jar
org.slf4j.slf4j-api-1.7.5.jar
org.tukaani.xz-1.0.jar
org.xerial.snappy.snappy-java-1.1.1.7.jar
oro.oro-2.0.8.jar
stax.stax-api-1.0.1.jar
tomcat.jasper-runtime-5.5.23.jar
xmlenc.xmlenc-0.52.jar
12 changes: 6 additions & 6 deletions cdap-docs/reference-manual/source/licenses/cdap-enterprise-dependencies.rst
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.. meta::
:author: Cask Data, Inc.
:copyright: Copyright © 2015 Cask Data, Inc.
:version: 3.2.0
:version: 3.2.1

=================================================
Cask Data Application Platform |version|
Expand Down Expand Up @@ -79,19 +79,19 @@ Cask Data Application Platform Distributed Dependencies
"javax.jdo.jdo-api-3.0.1.jar","3.0.1","\-","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
"javax.mail.mail-1.4.1.jar","1.4.1","\-","CDDL 1.0","https://glassfish.java.net/public/CDDLv1.0.html"
"javax.servlet.javax.servlet-api-3.0.1.jar","3.0.1","\-","CDDL 1.0","https://glassfish.dev.java.net/public/CDDL+GPL.html"
"javax.servlet.jsp.jsp-api-2.1.jar","2.1","\-","CDDL 1.0","https://glassfish.java.net/public/CDDLv1.0.html"
"javax.transaction.jta-1.1.jar","1.1","\-","CDDL 1.0","http://opensource.org/licenses/cddl1.php"
"javax.ws.rs.javax.ws.rs-api-2.0.jar","2.0","\-","Best of CDDL and GPL 2.0","http://glassfish.java.net/public/CDDL+GPL_1_1.html"
"javax.xml.bind.jaxb-api-2.2.2.jar","2.2.2","\-","Best of CDDL 1.1 and GPL 2.0","https://glassfish.java.net/nonav/public/CDDL+GPL.html"
"javax.xml.stream.stax-api-1.0-2.jar","1.0","2","Best of CDDL 1.0 and GPL 2.0","https://glassfish.java.net/nonav/public/CDDL+GPL.html"
"jline.jline-2.12.jar","2.12","\-","The BSD License","http://www.opensource.org/licenses/bsd-license.php"
"joda-time.joda-time-2.1.jar","2.1","\-","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
"log4j.apache-log4j-extras-1.2.17.jar","1.2.17","\-","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
"log4j.log4j-1.2.15.jar","1.2.15","\-","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
"log4j.log4j-1.2.14.jar","1.2.15","\-","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
"log4j.log4j-1.2.16.jar","1.2.16","\-","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
"log4j.log4j-1.2.17.jar","1.2.17","\-","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
"net.java.dev.jets3t.jets3t-0.9.0.jar","0.9.0","\-","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
"net.jcip.jcip-annotations-1.0.jar","1.0","\-","Creative Commons Attribution License","http://creativecommons.org/licenses/by/2.5"
"net.jpountz.lz4.lz4-1.2.0.jar","1.2.0","\-","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
"net.sf.jopt-simple.jopt-simple-3.2.jar","3.2","\-","The MIT License","http://www.opensource.org/licenses/mit-license.php"
"net.sf.jpam.jpam-1.1.jar","1.1","\-","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
"net.sf.opencsv.opencsv-2.3.jar","2.3","\-","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
Expand Down Expand Up @@ -122,7 +122,8 @@ Cask Data Application Platform Distributed Dependencies
"org.apache.geronimo.specs.geronimo-jta_1.1_spec-1.1.1.jar","1.1.1","\-","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
"org.apache.httpcomponents.httpclient-4.2.5.jar","4.2.5","\-","The Apache Software License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.txt"
"org.apache.httpcomponents.httpcore-4.2.5.jar","4.2.5","\-","The Apache Software License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.txt"
"org.apache.kafka.kafka_2.10-0.8.0.jar","0.8.0","\-","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
"org.apache.kafka.kafka_2.10-0.8.2.2.jar","0.8.2.2","\-","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
"org.apache.kafka.kafka-clients-0.8.2.2.jar","0.8.2.2","\-","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
"org.apache.thrift.libfb303-0.9.2.jar","0.9.2","\-","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
"org.apache.thrift.libthrift-0.9.0.jar","0.9.0","\-","The Apache Software License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.txt"
"org.apache.twill.twill-api-0.6.0-incubating.jar","0.6.0","incubating","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
Expand Down Expand Up @@ -173,12 +174,11 @@ Cask Data Application Platform Distributed Dependencies
"org.pentaho.pentaho-aggdesigner-algorithm-5.1.5-jhyde.jar","5.1.5","jhyde","The Apache Software License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.txt"
"org.quartz-scheduler.quartz-2.2.0.jar","2.2.0","\-","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
"org.quartz-scheduler.quartz-jobs-2.2.0.jar","2.2.0","\-","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
"org.scala-lang.scala-library-2.10.1.jar","2.10.1","\-","BSD-like","http://www.scala-lang.org/license.html"
"org.scala-lang.scala-library-2.10.4.jar","2.10.4","\-","BSD-like","http://www.scala-lang.org/license.html"
"org.slf4j.jcl-over-slf4j-1.7.2.jar","1.7.2","\-","MIT License","http://www.opensource.org/licenses/mit-license.php"
"org.slf4j.slf4j-api-1.7.5.jar","1.7.5","\-","MIT license","http://www.slf4j.org/license.html"
"org.tukaani.xz-1.0.jar","1.0","\-","Public Domain",""
"org.xerial.snappy.snappy-java-1.1.1.7.jar","1.1.1.7","\-","The Apache Software License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.txt"
"oro.oro-2.0.8.jar","2.0.8","\-","Apache License, Version 1.1","http://www.apache.org/licenses/LICENSE-1.1"
"stax.stax-api-1.0.1.jar","1.0.1","\-","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
"tomcat.jasper-runtime-5.5.23.jar","5.5.23","\-","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
"xmlenc.xmlenc-0.52.jar","0.52","\-","BSD 2","http://opensource.org/licenses/bsd-license.php"
2 changes: 1 addition & 1 deletion cdap-docs/reference-manual/source/licenses/cdap-level-1-dependencies.rst
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.. meta::
:author: Cask Data, Inc.
:copyright: Copyright © 2015 Cask Data, Inc.
:version: 3.2.0
:version: 3.2.1

=================================================
Cask Data Application Platform |version|
Expand Down
2 changes: 0 additions & 2 deletions cdap-docs/reference-manual/source/licenses/cdap-standalone-dependencies.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ com.twitter.parquet-hadoop-1.6.0rc3.jar
com.twitter.parquet-hadoop-bundle-1.6.0rc3.jar
com.twitter.parquet-jackson-1.6.0rc3.jar
com.typesafe.config-1.2.1.jar
com.yammer.metrics.metrics-annotation-2.2.0.jar
com.yammer.metrics.metrics-core-2.2.0.jar
commons-beanutils.commons-beanutils-1.7.0.jar
commons-beanutils.commons-beanutils-core-1.8.3.jar
Expand All @@ -60,7 +59,6 @@ commons-el.commons-el-1.0.jar
commons-httpclient.commons-httpclient-3.1.jar
commons-io.commons-io-2.4.jar
commons-lang.commons-lang-2.5.jar
commons-logging.commons-logging-1.1.1.jar
commons-net.commons-net-2.2.jar
commons-pool.commons-pool-1.5.4.jar
eigenbase.eigenbase-properties-1.1.4.jar
Expand Down
4 changes: 1 addition & 3 deletions cdap-docs/reference-manual/source/licenses/cdap-standalone-dependencies.rst
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.. meta::
:author: Cask Data, Inc.
:copyright: Copyright © 2015 Cask Data, Inc.
:version: 3.2.0
:version: 3.2.1

=================================================
Cask Data Application Platform |version|
Expand Down Expand Up @@ -69,7 +69,6 @@ Cask Data Application Platform Standalone Dependencies
"com.twitter.parquet-hadoop-bundle-1.6.0rc3.jar","1.6.0","rc3","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
"com.twitter.parquet-jackson-1.6.0rc3.jar","1.6.0","rc3","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
"com.typesafe.config-1.2.1.jar","1.2.1","\-","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
"com.yammer.metrics.metrics-annotation-2.2.0.jar","2.2.0","\-","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
"com.yammer.metrics.metrics-core-2.2.0.jar","2.2.0","\-","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
"commons-beanutils.commons-beanutils-1.7.0.jar","1.7.0","\-","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
"commons-beanutils.commons-beanutils-core-1.8.3.jar","1.8.3","\-","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
Expand All @@ -83,7 +82,6 @@ Cask Data Application Platform Standalone Dependencies
"commons-httpclient.commons-httpclient-3.1.jar","3.1","\-","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
"commons-io.commons-io-2.4.jar","2.4","\-","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
"commons-lang.commons-lang-2.5.jar","2.5","\-","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
"commons-logging.commons-logging-1.1.1.jar","1.1.1","\-","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
"commons-net.commons-net-2.2.jar","2.2","\-","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
"commons-pool.commons-pool-1.5.4.jar","1.5.4","\-","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
"eigenbase.eigenbase-properties-1.1.4.jar","1.1.4","\-","Apache License, Version 2.0","http://www.apache.org/licenses/LICENSE-2.0.html"
Expand Down
2 changes: 1 addition & 1 deletion cdap-docs/reference-manual/source/licenses/cdap-ui-dependencies.rst
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.. meta::
:author: Cask Data, Inc.
:copyright: Copyright © 2015 Cask Data, Inc.
:version: 3.2.0
:version: 3.2.1

=================================================
Cask Data Application Platform |version|
Expand Down

0 comments on commit ceac6fe

Please sign in to comment.