You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by ol...@apache.org on 2012/12/14 22:49:17 UTC
[2/3] git commit: fix NOTICE file for core module
fix NOTICE file for core module
Project: http://git-wip-us.apache.org/repos/asf/incubator-helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-helix/commit/e2ab124b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/e2ab124b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/e2ab124b
Branch: refs/heads/master
Commit: e2ab124b9252d548f2d8627365de9da02d6256f0
Parents: f288896
Author: olivier lamy <ol...@apache.org>
Authored: Fri Dec 14 22:42:38 2012 +0100
Committer: olivier lamy <ol...@apache.org>
Committed: Fri Dec 14 22:42:38 2012 +0100
----------------------------------------------------------------------
helix-core/NOTICE | 30 +++++++++++++++++++++++++++++
helix-core/src/assemble/assembly.xml | 4 +-
2 files changed, 32 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/e2ab124b/helix-core/NOTICE
----------------------------------------------------------------------
diff --git a/helix-core/NOTICE b/helix-core/NOTICE
new file mode 100644
index 0000000..b18da5f
--- /dev/null
+++ b/helix-core/NOTICE
@@ -0,0 +1,30 @@
+Apache Kalumet
+Copyright 2012 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+Codehaus (http://www.codehaus.org/)
+Licensed under the BSD License.
+
+This product includes software developed at
+jline (http://jline.sourceforge.net/ )
+Licensed under the BSD License.
+
+This product includes software developed at
+josql (http://sourceforge.net/projects/josql/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+restlet (http://www.restlet.org/about/legal).
+Licensed under the Apache License 2.0.
+
+
+II. License Summary
+- Apache License 2.0
+- BSD License
http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/e2ab124b/helix-core/src/assemble/assembly.xml
----------------------------------------------------------------------
diff --git a/helix-core/src/assemble/assembly.xml b/helix-core/src/assemble/assembly.xml
index 871b87a..e52997e 100644
--- a/helix-core/src/assemble/assembly.xml
+++ b/helix-core/src/assemble/assembly.xml
@@ -39,11 +39,11 @@ under the License.
<!-- <fileSet> <directory>src/main/conf</directory> <includes> <include>app-env.bat</include>
</includes> <outputDirectory>/booter-windows/bin</outputDirectory> </fileSet> -->
<fileSet>
- <directory>target/maven-shared-archive-resources/META-INF/</directory>
+ <directory>${project.basedir}</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>NOTICE</include>
<include>LICENSE</include>
+ <include>NOTICE</include>
</includes>
<fileMode>0755</fileMode>
</fileSet>