HTRACE-58 Address Billie Rinaldi feedback on RC4 of 3.1.0
diff --git a/LICENSE.txt b/LICENSE.txt
index d645695..9667e15 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,23 @@
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
+
+Units, a string formatting go library, is Copyright (c) 2014 Alec Thomas
+and MIT licensed: https://github.com/alecthomas/units/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
+
+Gorilla mux gorilla/mux implements a request router and dispatcher is BSD licensed
+( https://github.com/gorilla/mux/blob/master/LICENSE
diff --git a/NOTICE.txt b/NOTICE.txt
index c377812..a91e22d 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,21 +1,10 @@
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
-
-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
-
-Gorilla mux gorilla/mux implements a request router and dispatcher is BSD licensed
-( https://github.com/gorilla/mux/blob/master/LICENSE
+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.
diff --git a/htrace-core/pom.xml b/htrace-core/pom.xml
index 72884de..2c2b85e 100644
--- a/htrace-core/pom.xml
+++ b/htrace-core/pom.xml
@@ -18,7 +18,7 @@
<parent>
<artifactId>htrace</artifactId>
<groupId>org.apache.htrace</groupId>
- <version>3.1.0</version>
+ <version>3.1.0-incubating</version>
<relativePath>..</relativePath>
</parent>
diff --git a/htrace-flume/pom.xml b/htrace-flume/pom.xml
index 5c938c1..9e7358b 100644
--- a/htrace-flume/pom.xml
+++ b/htrace-flume/pom.xml
@@ -18,7 +18,7 @@
<parent>
<artifactId>htrace</artifactId>
<groupId>org.apache.htrace</groupId>
- <version>3.1.0</version>
+ <version>3.1.0-incubating</version>
<relativePath>..</relativePath>
</parent>
diff --git a/htrace-hbase/pom.xml b/htrace-hbase/pom.xml
index 71fd589..c2407fe 100644
--- a/htrace-hbase/pom.xml
+++ b/htrace-hbase/pom.xml
@@ -18,7 +18,7 @@
<parent>
<artifactId>htrace</artifactId>
<groupId>org.apache.htrace</groupId>
- <version>3.1.0</version>
+ <version>3.1.0-incubating</version>
<relativePath>..</relativePath>
</parent>
diff --git a/htrace-zipkin/pom.xml b/htrace-zipkin/pom.xml
index fb64539..db58a10 100644
--- a/htrace-zipkin/pom.xml
+++ b/htrace-zipkin/pom.xml
@@ -18,7 +18,7 @@
<parent>
<artifactId>htrace</artifactId>
<groupId>org.apache.htrace</groupId>
- <version>3.1.0</version>
+ <version>3.1.0-incubating</version>
<relativePath>..</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index 807b567..e5ae99d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.apache.htrace</groupId>
<artifactId>htrace</artifactId>
- <version>3.1.0</version>
+ <version>3.1.0-incubating</version>
<packaging>pom</packaging>
<name>Apache HTrace</name>
<description>A tracing framework for use with distributed systems written in java</description>
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 @@
<exclude>.git</exclude>
<exclude>.gitignore</exclude>
<exclude>.settings/</exclude>
+ <exclude>**/src/go/bin/**</exclude>
</excludes>
</fileSet>
</fileSets>
@@ -78,6 +79,7 @@
<include>LICENSE.txt</include>
<include>NOTICE.txt</include>
<include>CHANGES.txt</include>
+ <include>DISCLAIMER.txt</include>
<include>README.md</include>
</includes>
<fileMode>0644</fileMode>
