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/06/24 10:05:14 UTC
[03/22] incubator-brooklyn git commit: fix warnings in dist build
fix warnings in dist build
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/7b9d0e05
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/7b9d0e05
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/7b9d0e05
Branch: refs/heads/master
Commit: 7b9d0e05aa7387954c0bd63cc7dad6aad36e5886
Parents: b12ebb4
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Jun 15 11:54:27 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Jun 24 00:40:32 2015 -0700
----------------------------------------------------------------------
usage/dist/pom.xml | 2 ++
usage/dist/src/main/config/build-distribution.xml | 14 +++++++-------
2 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7b9d0e05/usage/dist/pom.xml
----------------------------------------------------------------------
diff --git a/usage/dist/pom.xml b/usage/dist/pom.xml
index 173dda4..401433d 100644
--- a/usage/dist/pom.xml
+++ b/usage/dist/pom.xml
@@ -91,6 +91,7 @@
<formats>
<format>dir</format>
</formats>
+ <attach>false</attach>
</configuration>
</execution>
<execution>
@@ -109,6 +110,7 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
+ <attach>false</attach>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7b9d0e05/usage/dist/src/main/config/build-distribution.xml
----------------------------------------------------------------------
diff --git a/usage/dist/src/main/config/build-distribution.xml b/usage/dist/src/main/config/build-distribution.xml
index 9398150..d3792bc 100644
--- a/usage/dist/src/main/config/build-distribution.xml
+++ b/usage/dist/src/main/config/build-distribution.xml
@@ -25,7 +25,7 @@
<fileSets>
<fileSet>
<directory>${project.basedir}/../..</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
<includes>
@@ -35,20 +35,20 @@
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/license</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/dist/bin</directory>
- <outputDirectory>/bin</outputDirectory>
+ <outputDirectory>bin</outputDirectory>
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
</fileSet>
<fileSet>
<!-- Add an empty dropins folder (so need to reference an existing dir, and exclude everything) -->
<directory>${project.basedir}/src/main/dist</directory>
- <outputDirectory>/lib/dropins</outputDirectory>
+ <outputDirectory>lib/dropins</outputDirectory>
<directoryMode>0755</directoryMode>
<excludes>
<exclude>**/*</exclude>
@@ -57,7 +57,7 @@
<fileSet>
<!-- Add an empty patch folder (so need to reference an existing dir, and exclude everything) -->
<directory>${project.basedir}/src/main/dist</directory>
- <outputDirectory>/lib/patch</outputDirectory>
+ <outputDirectory>lib/patch</outputDirectory>
<directoryMode>0755</directoryMode>
<excludes>
<exclude>**/*</exclude>
@@ -65,7 +65,7 @@
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/dist</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory></outputDirectory>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
<excludes>
@@ -78,7 +78,7 @@
<dependencySets>
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
- <outputDirectory>/lib/brooklyn</outputDirectory>
+ <outputDirectory>lib/brooklyn</outputDirectory>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
<outputFileNameMapping>${artifact.groupId}-${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>