You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2015/09/13 00:47:09 UTC
[2/6] accumulo git commit: ACCUMULO-3990 Update location of appended
NOTICE and LICENSE files.
ACCUMULO-3990 Update location of appended NOTICE and LICENSE files.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6c4df76c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6c4df76c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6c4df76c
Branch: refs/heads/1.7
Commit: 6c4df76ccc095c3ebd18becbdf43a4e6a3fc0e7d
Parents: e9177fc
Author: Josh Elser <el...@apache.org>
Authored: Sat Sep 12 18:47:28 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sat Sep 12 18:47:28 2015 -0400
----------------------------------------------------------------------
assemble/pom.xml | 14 ++++
.../src/main/appended-resources/META-INF/NOTICE | 9 +++
.../main/appended-resources/META-INF/LICENSE | 74 ++++++++++++++++++++
.../main/appended-resources/META-INF/LICENSE | 74 --------------------
.../src/main/appended-resources/META-INF/NOTICE | 9 ---
5 files changed, 97 insertions(+), 83 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6c4df76c/assemble/pom.xml
----------------------------------------------------------------------
diff --git a/assemble/pom.xml b/assemble/pom.xml
index 4c23616..35d974a 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -162,6 +162,20 @@
</dependency>
</dependencies>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>bin-LICENSE</exclude>
+ <exclude>bin-NOTICE</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6c4df76c/server/base/src/main/appended-resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/server/base/src/main/appended-resources/META-INF/NOTICE b/server/base/src/main/appended-resources/META-INF/NOTICE
new file mode 100644
index 0000000..a4f1f1a
--- /dev/null
+++ b/server/base/src/main/appended-resources/META-INF/NOTICE
@@ -0,0 +1,9 @@
+----
+
+This product includes the following work from the Apache Thrift project:
+
+TNonblockingServerSocket.java
+
+Apache Thrift
+Copyright 2006-2010 The Apache Software Foundation.
+
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6c4df76c/server/monitor/src/main/appended-resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/appended-resources/META-INF/LICENSE b/server/monitor/src/main/appended-resources/META-INF/LICENSE
new file mode 100644
index 0000000..974cb4b
--- /dev/null
+++ b/server/monitor/src/main/appended-resources/META-INF/LICENSE
@@ -0,0 +1,74 @@
+----
+
+APACHE ACCUMULO SUBCOMPONENTS:
+
+The Apache Accumulo project contains subcomponents with separate copyright
+notices and license terms. Your use of the source code for the these
+subcomponents is subject to the terms and conditions of the following
+licenses.
+
+----
+
+This product bundles JQuery
+
+ * Copyright 2011, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2011, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+
+Distributed under the MIT License:
+
+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.
+
+
+----
+This product bundles Flot,
+
+Copyright (c) 2007-2009 IOLA and Ole Laursen
+
+Available under the MIT License (see above)
+
+Flot bundles additional works:
+
+jquery.pie.js
+* Created by Brian Medendorp, June 2009
+* Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
+
+jquery.flot.resize.js
+* Inline dependency:
+ * jQuery resize event - v1.1 - 3/14/2010
+ * http://benalman.com/projects/jquery-resize-plugin/
+ *
+ * Copyright (c) 2010 "Cowboy" Ben Alman
+ * Dual licensed under the MIT and GPL licenses.
+ * http://benalman.com/about/license/
+
+distributed under the MIT license (see above)
+
+For details, see
+ server/src/main/resources/web/flot/
+
+----
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6c4df76c/server/src/main/appended-resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/server/src/main/appended-resources/META-INF/LICENSE b/server/src/main/appended-resources/META-INF/LICENSE
deleted file mode 100644
index 974cb4b..0000000
--- a/server/src/main/appended-resources/META-INF/LICENSE
+++ /dev/null
@@ -1,74 +0,0 @@
-----
-
-APACHE ACCUMULO SUBCOMPONENTS:
-
-The Apache Accumulo project contains subcomponents with separate copyright
-notices and license terms. Your use of the source code for the these
-subcomponents is subject to the terms and conditions of the following
-licenses.
-
-----
-
-This product bundles JQuery
-
- * Copyright 2011, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
-
-Distributed under the MIT License:
-
-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.
-
-
-----
-This product bundles Flot,
-
-Copyright (c) 2007-2009 IOLA and Ole Laursen
-
-Available under the MIT License (see above)
-
-Flot bundles additional works:
-
-jquery.pie.js
-* Created by Brian Medendorp, June 2009
-* Updated November 2009 with contributions from: btburnett3, Anthony Aragues and Xavi Ivars
-
-jquery.flot.resize.js
-* Inline dependency:
- * jQuery resize event - v1.1 - 3/14/2010
- * http://benalman.com/projects/jquery-resize-plugin/
- *
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
-
-distributed under the MIT license (see above)
-
-For details, see
- server/src/main/resources/web/flot/
-
-----
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6c4df76c/server/src/main/appended-resources/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/server/src/main/appended-resources/META-INF/NOTICE b/server/src/main/appended-resources/META-INF/NOTICE
deleted file mode 100644
index a4f1f1a..0000000
--- a/server/src/main/appended-resources/META-INF/NOTICE
+++ /dev/null
@@ -1,9 +0,0 @@
-----
-
-This product includes the following work from the Apache Thrift project:
-
-TNonblockingServerSocket.java
-
-Apache Thrift
-Copyright 2006-2010 The Apache Software Foundation.
-