flume-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject git commit: FLUME-1736: JSR-305.jar is listed as ASL2 when it's actually BSD-3 clause
Date Wed, 21 Nov 2012 13:17:23 GMT
Updated Branches:
  refs/heads/flume-1.4 ae0fb181f -> 31043fb05


FLUME-1736: JSR-305.jar is listed as ASL2 when it's actually BSD-3 clause

(Brock Noland via Brock Noland)


Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/31043fb0
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/31043fb0
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/31043fb0

Branch: refs/heads/flume-1.4
Commit: 31043fb054d580978585777b8c12a3ae0a1d2cfe
Parents: ae0fb18
Author: Brock Noland <brock@apache.org>
Authored: Wed Nov 21 07:16:18 2012 -0600
Committer: Brock Noland <brock@apache.org>
Committed: Wed Nov 21 07:16:34 2012 -0600

----------------------------------------------------------------------
 LICENSE |   34 +++++++++++++++++++++++++++++++++-
 1 files changed, 33 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flume/blob/31043fb0/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 294d3ab..04c1baf 100644
--- a/LICENSE
+++ b/LICENSE
@@ -230,7 +230,6 @@ For
  jetty-<version>.jar:
  jetty-util-<version>.jar:
  joda-time-<version>.jar:
- jsr305-<version>.jar:
  libthrift-<version>.jar:
  log4j-<version>.jar:
  mina-core-<version>.jar:
@@ -302,6 +301,39 @@ For
   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
   POSSIBILITY OF SUCH DAMAGE.
 
+For
+ jsr305-<version>.jar:
+
+  BSD License
+
+  Copyright (c) 2007-2009, JSR305 expert group
+  All rights reserved.
+
+  http://www.opensource.org/licenses/bsd-license.php
+
+  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 JSR305 expert group 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.
 
 For 
  paranamer-<version>.jar:


Mime
View raw message