asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ima...@apache.org
Subject [19/36] incubator-asterixdb git commit: Change LICENSE creation mode for binary assemblies
Date Fri, 18 Mar 2016 06:37:52 GMT
Change LICENSE creation mode for binary assemblies

Change-Id: I402cef4206fa0610eaff899cf005875323fb18d6
Reviewed-on: https://asterix-gerrit.ics.uci.edu/571
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Chris Hillery <ceej@lambda.nu>


Project: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/commit/622c25e0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/tree/622c25e0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/diff/622c25e0

Branch: refs/heads/master
Commit: 622c25e0f9ebcc62f90cae22a9898d3242d651d6
Parents: dc829c7
Author: Ian Maxon <imaxon@apache.org>
Authored: Tue Jan 5 07:00:04 2016 -0800
Committer: Ian Maxon <imaxon@apache.org>
Committed: Fri Jan 22 09:22:18 2016 -0800

----------------------------------------------------------------------
 .../main/appended-resources/META-INF/LICENSE    |   10 +-
 .../main/appended-resources/META-INF/LICENSE    |   10 +-
 .../main/appended-resources/META-INF/LICENSE    |   20 +-
 .../src/main/assembly/binary-assembly.xml       |    9 +-
 asterix-installer/src/main/licenses/LICENSE     | 1761 +++++++++++++++++
 asterix-installer/src/main/licenses/NOTICE      |  403 ++++
 .../src/main/assembly/binary-assembly.xml       |   17 +-
 asterix-server/src/main/licenses/LICENSE        | 1739 +++++++++++++++++
 asterix-server/src/main/licenses/NOTICE         |  403 ++++
 .../src/main/assembly/binary-assembly.xml       |    9 +-
 asterix-yarn/src/main/licenses/LICENSE          | 1785 ++++++++++++++++++
 asterix-yarn/src/main/licenses/NOTICE           |  403 ++++
 asterix-yarn/src/main/resources/LICENSE         |  815 ++++++++
 13 files changed, 7350 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/622c25e0/asterix-app/src/main/appended-resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/asterix-app/src/main/appended-resources/META-INF/LICENSE b/asterix-app/src/main/appended-resources/META-INF/LICENSE
index 420a1a3..2749d04 100644
--- a/asterix-app/src/main/appended-resources/META-INF/LICENSE
+++ b/asterix-app/src/main/appended-resources/META-INF/LICENSE
@@ -12,11 +12,11 @@ licenses.
  The MIT License
 -----------------------------------------------------------------------
 
- - jQuery
- - Bootstrap
- - Smoothie Charts
- - Bottle
- - geostats
+ - jQuery (src/main/resources/webui/static/js/jquery.min.js)
+ - Bootstrap (src/main/resources/webui/static/js/bootstrap.min.js),
+   (src/main/resources/webui/static/js/bootstrap.min.css),
+   (src/main/resources/webui/static/js/bootstrap-responsive.min.css)
+ - Smoothie Charts (src/main/resources/webui/static/js/smoothie.js)
 
 The text of The MIT License is below for convenience. Refer to the website of each project
for exact details.
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/622c25e0/asterix-examples/src/main/appended-resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/asterix-examples/src/main/appended-resources/META-INF/LICENSE b/asterix-examples/src/main/appended-resources/META-INF/LICENSE
index 420a1a3..811623a 100644
--- a/asterix-examples/src/main/appended-resources/META-INF/LICENSE
+++ b/asterix-examples/src/main/appended-resources/META-INF/LICENSE
@@ -12,11 +12,11 @@ licenses.
  The MIT License
 -----------------------------------------------------------------------
 
- - jQuery
- - Bootstrap
- - Smoothie Charts
- - Bottle
- - geostats
+ - jQuery (src/main/resources/admaql101-demo/static/js)
+ - Bootstrap (src/main/resources/admaql101-demo/static/js/bootstrap.min.js),
+             (src/main/resources/tweetbook-demo/static/js/bootstrap.min.js)
+ - Bottle (src/main/resources/tweetbook-demo/bottle.py, src/main/resources/admaql101-demo/bottle.py)
+ - geostats (src/main/resources/tweetbook-demo/static/js/geostats.js)
 
 The text of The MIT License is below for convenience. Refer to the website of each project
for exact details.
 

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/622c25e0/asterix-installer/src/main/appended-resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/asterix-installer/src/main/appended-resources/META-INF/LICENSE b/asterix-installer/src/main/appended-resources/META-INF/LICENSE
index 420a1a3..9c25c1c 100644
--- a/asterix-installer/src/main/appended-resources/META-INF/LICENSE
+++ b/asterix-installer/src/main/appended-resources/META-INF/LICENSE
@@ -9,23 +9,9 @@ licenses.
 
 
 -----------------------------------------------------------------------
- The MIT License
+ Apache Software License 2.0
 -----------------------------------------------------------------------
 
- - jQuery
- - Bootstrap
- - Smoothie Charts
- - Bottle
- - geostats
+ - Apache Hadoop (hadoop-0.20.2/bin/hadoop, hadoop-0.20.2/bin/hadoop-config.sh,
+                  hadoop-0.20.2/bin/hadoop-config.she, hadoop-0.20.2/conf/hadoop-env.sh)
 
-The text of The MIT License is below for convenience. Refer to the website of each project
for exact details.
-
-The MIT License (MIT)
-
-Copyright (c) <year> <copyright holders>
-
-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.

http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/622c25e0/asterix-installer/src/main/assembly/binary-assembly.xml
----------------------------------------------------------------------
diff --git a/asterix-installer/src/main/assembly/binary-assembly.xml b/asterix-installer/src/main/assembly/binary-assembly.xml
index 564a85e..da042b9 100644
--- a/asterix-installer/src/main/assembly/binary-assembly.xml
+++ b/asterix-installer/src/main/assembly/binary-assembly.xml
@@ -73,10 +73,15 @@
 			<directory>target/classes/META-INF</directory>
 			<outputDirectory>.</outputDirectory>
 			<includes>
+				<include>DISCLAIMER*</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>src/main/licenses/</directory>
+			<outputDirectory>.</outputDirectory>
+			<includes>
 				<include>LICENSE*</include>
 				<include>NOTICE*</include>
-				<include>DISCLAIMER*</include>
-				<include>DEPENDENCIES*</include>
 			</includes>
 		</fileSet>
 		<fileSet>


Mime
View raw message