You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by m4...@apache.org on 2017/09/29 10:38:08 UTC
[2/4] brooklyn-dist git commit: Update RPM and DEB packages to match
new catalog.bom files structure
Update RPM and DEB packages to match new catalog.bom files structure
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/4f4037ec
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/4f4037ec
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/4f4037ec
Branch: refs/heads/master
Commit: 4f4037ec3911ce86d711951434d7aac2411ac503
Parents: 3779d9c
Author: Thomas Bouron <th...@cloudsoftcorp.com>
Authored: Wed Sep 20 11:55:19 2017 +0100
Committer: Thomas Bouron <th...@cloudsoftcorp.com>
Committed: Wed Sep 20 11:58:20 2017 +0100
----------------------------------------------------------------------
deb-packaging/pom.xml | 7 ++++---
rpm-packaging/pom.xml | 5 -----
2 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/4f4037ec/deb-packaging/pom.xml
----------------------------------------------------------------------
diff --git a/deb-packaging/pom.xml b/deb-packaging/pom.xml
index 32bddb7..cb67027 100644
--- a/deb-packaging/pom.xml
+++ b/deb-packaging/pom.xml
@@ -117,11 +117,12 @@
</mapper>
</data>
<data>
- <src>${project.build.directory}/deps/apache-brooklyn-${project.version}/catalog</src>
- <type>directory</type>
+ <type>template</type>
+ <paths>
+ <path>/opt/brooklyn-${project.version}/catalog</path>
+ </paths>
<mapper>
<type>perm</type>
- <prefix>/opt/brooklyn-${project.version}/catalog</prefix>
<user>brooklyn</user>
<group>brooklyn</group>
<filemode>${brooklyn.file.permission.default}</filemode>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/4f4037ec/rpm-packaging/pom.xml
----------------------------------------------------------------------
diff --git a/rpm-packaging/pom.xml b/rpm-packaging/pom.xml
index 27f4770..3396516 100644
--- a/rpm-packaging/pom.xml
+++ b/rpm-packaging/pom.xml
@@ -132,11 +132,6 @@
</mapping>
<mapping>
<directory>/opt/brooklyn-${project.version}/catalog</directory>
- <sources>
- <source>
- <location>${project.build.directory}/deps/apache-brooklyn-${project.version}/catalog</location>
- </source>
- </sources>
</mapping>
<mapping>
<directory>/opt/brooklyn-${project.version}/data</directory>