incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [1/5] Adding hadoop version specific assemblies with distinct LICENSE and NOTICE files.
Date Mon, 05 May 2014 18:39:29 GMT
Repository: incubator-blur
Updated Branches:
  refs/heads/apache-blur-0.2 6101aacdc -> 8d1434ee3


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/42a7a5d4/distribution/src/main/resources/notices/guava-14.0.jar.NOTICE
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/notices/guava-14.0.jar.NOTICE b/distribution/src/main/resources/notices/guava-14.0.jar.NOTICE
deleted file mode 100644
index e69de29..0000000

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/42a7a5d4/distribution/src/main/resources/notices/jackson-annotations-2.1.1.jar.NOTICE
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/notices/jackson-annotations-2.1.1.jar.NOTICE
b/distribution/src/main/resources/notices/jackson-annotations-2.1.1.jar.NOTICE
deleted file mode 100644
index e69de29..0000000

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/42a7a5d4/distribution/src/main/resources/notices/jackson-core-2.1.1.jar.NOTICE
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/notices/jackson-core-2.1.1.jar.NOTICE b/distribution/src/main/resources/notices/jackson-core-2.1.1.jar.NOTICE
deleted file mode 100644
index e69de29..0000000

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/42a7a5d4/distribution/src/main/resources/notices/jackson-databind-2.1.1.jar.NOTICE
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/notices/jackson-databind-2.1.1.jar.NOTICE b/distribution/src/main/resources/notices/jackson-databind-2.1.1.jar.NOTICE
deleted file mode 100644
index e69de29..0000000

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/42a7a5d4/distribution/src/main/resources/notices/jakarta-regexp-1.4.jar.NOTICE
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/notices/jakarta-regexp-1.4.jar.NOTICE b/distribution/src/main/resources/notices/jakarta-regexp-1.4.jar.NOTICE
deleted file mode 100644
index e69de29..0000000

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/42a7a5d4/distribution/src/main/resources/notices/jasper-compiler-5.5.12.jar.NOTICE
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/notices/jasper-compiler-5.5.12.jar.NOTICE b/distribution/src/main/resources/notices/jasper-compiler-5.5.12.jar.NOTICE
deleted file mode 100644
index 4275fb8..0000000
--- a/distribution/src/main/resources/notices/jasper-compiler-5.5.12.jar.NOTICE
+++ /dev/null
@@ -1,18 +0,0 @@
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-Java Management Extensions (JMX) support is provided by
-the MX4J package, which is open source software.  The
-original software and related information is available
-at http://mx4j.sourceforge.net.
-
-The Windows Installer is built with the Nullsoft
-Scriptable Install Sysem (NSIS), which is
-open source software.  The original software and
-related information is available at
-http://nsis.sourceforge.net.
-
-Java compilation software for JSP pages is provided by Eclipse, 
-which is open source software.  The orginal software and 
-related infomation is available at
-http://www.eclipse.org.

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/42a7a5d4/distribution/src/main/resources/notices/jasper-runtime-5.5.12.jar.NOTICE
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/notices/jasper-runtime-5.5.12.jar.NOTICE b/distribution/src/main/resources/notices/jasper-runtime-5.5.12.jar.NOTICE
deleted file mode 100644
index 4275fb8..0000000
--- a/distribution/src/main/resources/notices/jasper-runtime-5.5.12.jar.NOTICE
+++ /dev/null
@@ -1,18 +0,0 @@
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-Java Management Extensions (JMX) support is provided by
-the MX4J package, which is open source software.  The
-original software and related information is available
-at http://mx4j.sourceforge.net.
-
-The Windows Installer is built with the Nullsoft
-Scriptable Install Sysem (NSIS), which is
-open source software.  The original software and
-related information is available at
-http://nsis.sourceforge.net.
-
-Java compilation software for JSP pages is provided by Eclipse, 
-which is open source software.  The orginal software and 
-related infomation is available at
-http://www.eclipse.org.

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/42a7a5d4/distribution/src/main/resources/notices/jets3t-0.6.1.jar.NOTICE
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/notices/jets3t-0.6.1.jar.NOTICE b/distribution/src/main/resources/notices/jets3t-0.6.1.jar.NOTICE
deleted file mode 100644
index 18b21b4..0000000
--- a/distribution/src/main/resources/notices/jets3t-0.6.1.jar.NOTICE
+++ /dev/null
@@ -1,18 +0,0 @@
-=========================================================================
-==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
-==  Version 2.0, in this case for the distribution of jets3t.          ==
-=========================================================================
-
-This product includes software developed by:
-
-The Apache Software Foundation (http://www.apache.org/).
-
-The ExoLab Project (http://www.exolab.org/)
-
-Sun Microsystems (http://www.sun.com/)
-
-Codehaus (http://castor.codehaus.org)
-
-Safehaus (http://jug.safehaus.org/Home)
-
-Tatu Saloranta (http://wiki.fasterxml.com/TatuSaloranta)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/42a7a5d4/distribution/src/main/resources/notices/jetty-6.1.26.jar.NOTICE
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/notices/jetty-6.1.26.jar.NOTICE b/distribution/src/main/resources/notices/jetty-6.1.26.jar.NOTICE
deleted file mode 100644
index 21d4ed3..0000000
--- a/distribution/src/main/resources/notices/jetty-6.1.26.jar.NOTICE
+++ /dev/null
@@ -1,36 +0,0 @@
-==============================================================
- Jetty Web Container 
- Copyright 1995-2009 Mort Bay Consulting Pty Ltd
-==============================================================
-
-The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd
-unless otherwise noted. It is licensed under the apache 2.0
-license.
-
-The javax.servlet package used by Jetty is copyright 
-Sun Microsystems, Inc and Apache Software Foundation. It is 
-distributed under the Common Development and Distribution License.
-You can obtain a copy of the license at 
-https://glassfish.dev.java.net/public/CDDLv1.0.html.
-
-The UnixCrypt.java code ~Implements the one way cryptography used by
-Unix systems for simple password protection.  Copyright 1996 Aki Yoshida,
-modified April 2001  by Iris Van den Broeke, Daniel Deville.
-Permission to use, copy, modify and distribute UnixCrypt 
-for non-commercial or commercial purposes and without fee is
-granted provided that the copyright notice appears in all copies.
-
-The default JSP implementation is provided by the Glassfish JSP engine
-from project Glassfish http://glassfish.dev.java.net.  Copyright 2005
-Sun Microsystems, Inc. and portions Copyright Apache Software Foundation.
-
-Some portions of the code are Copyright:
-  2006 Tim Vernum 
-  1999 Jason Gilbert.
-
-The jboss integration module contains some LGPL code.
-
-The win32 Java Service Wrapper (v3.2.3) is Copyright (c) 1999, 2006 
-Tanuki Software, Inc.  and 2001 Silver Egg Technology.  It is 
-covered by an open license which is viewable at
-http://svn.codehaus.org/jetty/jetty/branches/jetty-6.1/extras/win32service/LICENSE.txt

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/42a7a5d4/distribution/src/main/resources/notices/jetty-util-6.1.26.jar.NOTICE
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/notices/jetty-util-6.1.26.jar.NOTICE b/distribution/src/main/resources/notices/jetty-util-6.1.26.jar.NOTICE
deleted file mode 100644
index 21d4ed3..0000000
--- a/distribution/src/main/resources/notices/jetty-util-6.1.26.jar.NOTICE
+++ /dev/null
@@ -1,36 +0,0 @@
-==============================================================
- Jetty Web Container 
- Copyright 1995-2009 Mort Bay Consulting Pty Ltd
-==============================================================
-
-The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd
-unless otherwise noted. It is licensed under the apache 2.0
-license.
-
-The javax.servlet package used by Jetty is copyright 
-Sun Microsystems, Inc and Apache Software Foundation. It is 
-distributed under the Common Development and Distribution License.
-You can obtain a copy of the license at 
-https://glassfish.dev.java.net/public/CDDLv1.0.html.
-
-The UnixCrypt.java code ~Implements the one way cryptography used by
-Unix systems for simple password protection.  Copyright 1996 Aki Yoshida,
-modified April 2001  by Iris Van den Broeke, Daniel Deville.
-Permission to use, copy, modify and distribute UnixCrypt 
-for non-commercial or commercial purposes and without fee is
-granted provided that the copyright notice appears in all copies.
-
-The default JSP implementation is provided by the Glassfish JSP engine
-from project Glassfish http://glassfish.dev.java.net.  Copyright 2005
-Sun Microsystems, Inc. and portions Copyright Apache Software Foundation.
-
-Some portions of the code are Copyright:
-  2006 Tim Vernum 
-  1999 Jason Gilbert.
-
-The jboss integration module contains some LGPL code.
-
-The win32 Java Service Wrapper (v3.2.3) is Copyright (c) 1999, 2006 
-Tanuki Software, Inc.  and 2001 Silver Egg Technology.  It is 
-covered by an open license which is viewable at
-http://svn.codehaus.org/jetty/jetty/branches/jetty-6.1/extras/win32service/LICENSE.txt

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/42a7a5d4/distribution/src/main/resources/notices/metrics-core-2.2.0.jar.NOTICE
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/notices/metrics-core-2.2.0.jar.NOTICE b/distribution/src/main/resources/notices/metrics-core-2.2.0.jar.NOTICE
deleted file mode 100644
index cc8767c..0000000
--- a/distribution/src/main/resources/notices/metrics-core-2.2.0.jar.NOTICE
+++ /dev/null
@@ -1,11 +0,0 @@
-Metrics
-Copyright 2010-2013 Coda Hale and Yammer, Inc.
-
-This product includes software developed by Coda Hale and Yammer, Inc.
-
-This product includes code derived from the JSR-166 project (ThreadLocalRandom, Striped64,
-LongAdder), which was released with the following comments:
-
-    Written by Doug Lea with assistance from members of JCP JSR-166
-    Expert Group and released to the public domain, as explained at
-    http://creativecommons.org/publicdomain/zero/1.0/
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/42a7a5d4/distribution/src/main/resources/notices/metrics-ganglia-2.2.0.jar.NOTICE
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/notices/metrics-ganglia-2.2.0.jar.NOTICE b/distribution/src/main/resources/notices/metrics-ganglia-2.2.0.jar.NOTICE
deleted file mode 100644
index cc8767c..0000000
--- a/distribution/src/main/resources/notices/metrics-ganglia-2.2.0.jar.NOTICE
+++ /dev/null
@@ -1,11 +0,0 @@
-Metrics
-Copyright 2010-2013 Coda Hale and Yammer, Inc.
-
-This product includes software developed by Coda Hale and Yammer, Inc.
-
-This product includes code derived from the JSR-166 project (ThreadLocalRandom, Striped64,
-LongAdder), which was released with the following comments:
-
-    Written by Doug Lea with assistance from members of JCP JSR-166
-    Expert Group and released to the public domain, as explained at
-    http://creativecommons.org/publicdomain/zero/1.0/
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/42a7a5d4/distribution/src/main/resources/notices/metrics-graphite-2.2.0.jar.NOTICE
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/notices/metrics-graphite-2.2.0.jar.NOTICE b/distribution/src/main/resources/notices/metrics-graphite-2.2.0.jar.NOTICE
deleted file mode 100644
index cc8767c..0000000
--- a/distribution/src/main/resources/notices/metrics-graphite-2.2.0.jar.NOTICE
+++ /dev/null
@@ -1,11 +0,0 @@
-Metrics
-Copyright 2010-2013 Coda Hale and Yammer, Inc.
-
-This product includes software developed by Coda Hale and Yammer, Inc.
-
-This product includes code derived from the JSR-166 project (ThreadLocalRandom, Striped64,
-LongAdder), which was released with the following comments:
-
-    Written by Doug Lea with assistance from members of JCP JSR-166
-    Expert Group and released to the public domain, as explained at
-    http://creativecommons.org/publicdomain/zero/1.0/
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/42a7a5d4/distribution/src/main/resources/notices/metrics-servlet-2.2.0.jar.NOTICE
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/notices/metrics-servlet-2.2.0.jar.NOTICE b/distribution/src/main/resources/notices/metrics-servlet-2.2.0.jar.NOTICE
deleted file mode 100644
index cc8767c..0000000
--- a/distribution/src/main/resources/notices/metrics-servlet-2.2.0.jar.NOTICE
+++ /dev/null
@@ -1,11 +0,0 @@
-Metrics
-Copyright 2010-2013 Coda Hale and Yammer, Inc.
-
-This product includes software developed by Coda Hale and Yammer, Inc.
-
-This product includes code derived from the JSR-166 project (ThreadLocalRandom, Striped64,
-LongAdder), which was released with the following comments:
-
-    Written by Doug Lea with assistance from members of JCP JSR-166
-    Expert Group and released to the public domain, as explained at
-    http://creativecommons.org/publicdomain/zero/1.0/
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/42a7a5d4/distribution/src/main/resources/notices/oro-2.0.8.jar.NOTICE
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/notices/oro-2.0.8.jar.NOTICE b/distribution/src/main/resources/notices/oro-2.0.8.jar.NOTICE
deleted file mode 100644
index e69de29..0000000

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/42a7a5d4/distribution/src/main/resources/notices/spatial4j-0.3.jar.NOTICE
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/notices/spatial4j-0.3.jar.NOTICE b/distribution/src/main/resources/notices/spatial4j-0.3.jar.NOTICE
deleted file mode 100644
index e69de29..0000000

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/42a7a5d4/distribution/src/main/resources/notices/zookeeper-3.4.5.jar.NOTICE
----------------------------------------------------------------------
diff --git a/distribution/src/main/resources/notices/zookeeper-3.4.5.jar.NOTICE b/distribution/src/main/resources/notices/zookeeper-3.4.5.jar.NOTICE
deleted file mode 100644
index d9e0a49..0000000
--- a/distribution/src/main/resources/notices/zookeeper-3.4.5.jar.NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache ZooKeeper
-Copyright 2009 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/42a7a5d4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d5c8881..1b07ce7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -232,6 +232,7 @@ under the License.
 						<exclude>**/.project</exclude>
 						<exclude>**/.settings/**</exclude>
 						<exclude>**/target/**</exclude>
+                                                <exclude>**/build/**</exclude>
 						
 						<!-- These javascript libs are accounted for in the 
 						LICENSE-src file in distribution/src/main/resources -->
@@ -264,9 +265,9 @@ under the License.
 						<exclude>**/src/main/webapp/js/d3.v2.min.js</exclude>
 						
 						<!-- License and Notice files for Blur -->
-						<exclude>**/src/main/resources/license-notes.txt</exclude>
-						<exclude>**/src/main/resources/NOTICE-bin.base.txt</exclude>
-						<exclude>**/src/main/resources/NOTICE-bin.txt</exclude>
+						<exclude>**/src/main/resources*/license-notes.txt</exclude>
+						<exclude>**/src/main/resources*/NOTICE-bin.base.txt</exclude>
+						<exclude>**/src/main/resources*/NOTICE-bin.txt</exclude>
 						
 						<!-- Default configuration files used by Blur -->
 						<exclude>**/src/main/scripts/conf/controllers</exclude>


Mime
View raw message