You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/04/21 22:50:31 UTC
[10/19] incubator-brooklyn git commit: LICENSE/NOTICE for binary
distribution
LICENSE/NOTICE for binary distribution
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f5bf31f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f5bf31f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f5bf31f5
Branch: refs/heads/master
Commit: f5bf31f58bd3f5f275802f3c60f493124cd7c2fc
Parents: e567366
Author: Richard Downer <ri...@apache.org>
Authored: Fri Apr 17 14:00:07 2015 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Fri Apr 17 14:10:23 2015 +0100
----------------------------------------------------------------------
.../main/config/build-distribution-archive.xml | 9 +-
.../src/main/config/build-distribution-dir.xml | 9 +-
usage/dist/src/main/license/LICENSE | 1691 ++++++++++++++++++
usage/dist/src/main/license/NOTICE | 5 +
4 files changed, 1710 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f5bf31f5/usage/dist/src/main/config/build-distribution-archive.xml
----------------------------------------------------------------------
diff --git a/usage/dist/src/main/config/build-distribution-archive.xml b/usage/dist/src/main/config/build-distribution-archive.xml
index 06c43f4..805d291 100644
--- a/usage/dist/src/main/config/build-distribution-archive.xml
+++ b/usage/dist/src/main/config/build-distribution-archive.xml
@@ -33,12 +33,16 @@
<directoryMode>0755</directoryMode>
<includes>
<include>README*</include>
- <include>LICENSE*</include>
- <include>NOTICE*</include>
<include>DISCLAIMER*</include>
</includes>
</fileSet>
<fileSet>
+ <directory>${project.basedir}/src/main/license</directory>
+ <outputDirectory>/</outputDirectory>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <fileSet>
<directory>${project.basedir}/src/main/dist/bin</directory>
<outputDirectory>/bin</outputDirectory>
<fileMode>0755</fileMode>
@@ -79,6 +83,7 @@
<outputDirectory>/lib/brooklyn</outputDirectory>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
+ <outputFileNameMapping>${artifact.groupId}-${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
</dependencySet>
</dependencySets>
</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f5bf31f5/usage/dist/src/main/config/build-distribution-dir.xml
----------------------------------------------------------------------
diff --git a/usage/dist/src/main/config/build-distribution-dir.xml b/usage/dist/src/main/config/build-distribution-dir.xml
index 72b4989..a7a8b56 100644
--- a/usage/dist/src/main/config/build-distribution-dir.xml
+++ b/usage/dist/src/main/config/build-distribution-dir.xml
@@ -33,12 +33,16 @@
<directoryMode>0755</directoryMode>
<includes>
<include>README*</include>
- <include>LICENSE*</include>
- <include>NOTICE*</include>
<include>DISCLAIMER*</include>
</includes>
</fileSet>
<fileSet>
+ <directory>${project.basedir}/src/main/license</directory>
+ <outputDirectory>/</outputDirectory>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <fileSet>
<directory>${project.basedir}/src/main/dist/bin</directory>
<outputDirectory>/bin</outputDirectory>
<fileMode>0755</fileMode>
@@ -79,6 +83,7 @@
<outputDirectory>/lib/brooklyn</outputDirectory>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
+ <outputFileNameMapping>${artifact.groupId}-${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
</dependencySet>
</dependencySets>
</assembly>