From 3379c1bb6c6b4fc85c53c0ad0407ffe56e32f88c Mon Sep 17 00:00:00 2001 From: stack Date: Thu, 8 Jan 2015 13:54:52 -0800 Subject: [PATCH] HTRACE-58 Address Billie Rinaldi feedback on RC4 --- DISCLAIMER.txt | 7 +++++++ LICENSE.txt | 21 +++++++++++++++++++++ NOTICE.txt | 18 ++++++------------ htrace-core/pom.xml | 2 +- htrace-flume/pom.xml | 2 +- htrace-hbase/pom.xml | 2 +- htrace-zipkin/pom.xml | 2 +- pom.xml | 2 +- src/main/assembly/src.xml | 2 ++ 9 files changed, 41 insertions(+), 17 deletions(-) create mode 100644 DISCLAIMER.txt diff --git a/DISCLAIMER.txt b/DISCLAIMER.txt new file mode 100644 index 0000000..d8c920d --- /dev/null +++ b/DISCLAIMER.txt @@ -0,0 +1,7 @@ +Apache HTrace is an effort undergoing incubation at The Apache Software Foundation (ASF), +sponsored by the Apache Incubator project. Incubation is required of all newly accepted +projects until a further review indicates that the infrastructure, communications, and +decision making process have stabilized in a manner consistent with other successful +ASF projects. While incubation status is not necessarily a reflection of the +completeness or stability of the code, it does indicate that the project has yet to be +fully endorsed by the ASF. diff --git a/LICENSE.txt b/LICENSE.txt index d645695..abd9f26 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,3 +1,5 @@ +Apache HTrace (incubating) is Apache 2.0 Licensed. See below for licensing +of dependencies that are NOT Apache Licensed. Apache License Version 2.0, January 2004 @@ -200,3 +202,22 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + +levigo, a go wrapper for leveldb, is Copyright (c) 2012 Jeffrey M Hodges +and MIT licensed: https://github.com/jmhodges/levigo/blob/master/LICENSE + +Kingpin, a go command line and flag parser is Copyright (c) 2014 Alec Thomas +and MIT licensed: https://github.com/alecthomas/kingpin/blob/master/COPYING + +D3, a javascript library for manipulating data, used by htrace-hbase +is Copyright 2010-2014, Michael Bostock and BSD licensed: +https://github.com/mbostock/d3/blob/master/LICENSE + +Bootstrap, an html, css, and javascript framework, is +Copyright (c) 2011-2015 Twitter, Inc and MIT licensed: +https://github.com/twbs/bootstrap/blob/master/LICENSE + + + + diff --git a/NOTICE.txt b/NOTICE.txt index 19f97eb..551cc43 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,18 +1,12 @@ This product includes software developed by The Apache Software Foundation (http://www.apache.org/). -In addition, this product includes software developed by: +In addition, this product includes software dependencies. See +the accompanying LICENSE.txt for a listing of dependencies +that are NOT Apache licensed (with pointers to their licensing) -JUnit (http://www.junit.org/) included under the Common Public License v1.0. See -the full text here: http://junit.sourceforge.net/cpl-v10.html +Apache HTrace includes an Apache Thrift connector to Zipkin. Zipkin +is a distributed tracing system that is Apache 2.0 Licensed. +Copyright 2012 Twitter, Inc. -levigo, a go wrapper for leveldb, is copyright Jeffrey M Hodges and -is MIT licensed: https://github.com/jmhodges/levigo/blob/master/LICENSE -Units, unit multipliers and functions for go, has license -(TBD https://github.com/alecthomas/units/issues/1). -It is by alecthomas: https://github.com/alecthomas/units - -Kingpin, a go command line and flag parser is licensed MIT -(https://github.com/alecthomas/kingpin/blob/master/COPYING) -by alecthomas diff --git a/htrace-core/pom.xml b/htrace-core/pom.xml index 91d906c..4271c34 100644 --- a/htrace-core/pom.xml +++ b/htrace-core/pom.xml @@ -18,7 +18,7 @@ language governing permissions and limitations under the License. --> htrace org.apache.htrace - 3.1.0 + 3.1.0-incubating .. diff --git a/htrace-flume/pom.xml b/htrace-flume/pom.xml index b9fe5a8..cb03419 100644 --- a/htrace-flume/pom.xml +++ b/htrace-flume/pom.xml @@ -18,7 +18,7 @@ language governing permissions and limitations under the License. --> htrace org.apache.htrace - 3.1.0 + 3.1.0-incubating .. diff --git a/htrace-hbase/pom.xml b/htrace-hbase/pom.xml index 80f9091..f068da7 100644 --- a/htrace-hbase/pom.xml +++ b/htrace-hbase/pom.xml @@ -18,7 +18,7 @@ language governing permissions and limitations under the License. --> htrace org.apache.htrace - 3.1.0 + 3.1.0-incubating .. diff --git a/htrace-zipkin/pom.xml b/htrace-zipkin/pom.xml index f641512..6462c3a 100644 --- a/htrace-zipkin/pom.xml +++ b/htrace-zipkin/pom.xml @@ -18,7 +18,7 @@ language governing permissions and limitations under the License. --> htrace org.apache.htrace - 3.1.0 + 3.1.0-incubating .. diff --git a/pom.xml b/pom.xml index 5977a9e..fa3dc52 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ language governing permissions and limitations under the License. --> org.apache.htrace htrace - 3.1.0 + 3.1.0-incubating pom Apache HTrace A tracing framework for use with distributed systems written in java diff --git a/src/main/assembly/src.xml b/src/main/assembly/src.xml index d70d87f..fecbf5d 100644 --- a/src/main/assembly/src.xml +++ b/src/main/assembly/src.xml @@ -42,6 +42,7 @@ .git .gitignore .settings/ + **/src/go/bin/** @@ -78,6 +79,7 @@ LICENSE.txt NOTICE.txt CHANGES.txt + DISCLAIMER.txt README.md 0644 -- 2.2.1