You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by dr...@apache.org on 2017/09/21 12:39:58 UTC

[1/2] brooklyn-dist git commit: Add LICENSE and NOTICE file back to the RPM and DEB packages

Repository: brooklyn-dist
Updated Branches:
  refs/heads/master 4b555fcbc -> 34bb943bb


Add LICENSE and NOTICE file back to the RPM and DEB packages


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/22bd5f5b
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/22bd5f5b
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/22bd5f5b

Branch: refs/heads/master
Commit: 22bd5f5bd8b7146ff8609e7ef379400e4e99b725
Parents: 4b555fc
Author: Thomas Bouron <th...@cloudsoftcorp.com>
Authored: Thu Sep 21 11:17:07 2017 +0100
Committer: Thomas Bouron <th...@cloudsoftcorp.com>
Committed: Thu Sep 21 11:17:07 2017 +0100

----------------------------------------------------------------------
 deb-packaging/pom.xml | 22 ++++++++++++++++++++++
 rpm-packaging/pom.xml | 16 ++++++++++++++++
 2 files changed, 38 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/22bd5f5b/deb-packaging/pom.xml
----------------------------------------------------------------------
diff --git a/deb-packaging/pom.xml b/deb-packaging/pom.xml
index 32bddb7..1091170 100644
--- a/deb-packaging/pom.xml
+++ b/deb-packaging/pom.xml
@@ -184,6 +184,28 @@
                                     </mapper>
                                 </data>
                                 <data>
+                                    <src>${project.build.directory}/deps/apache-brooklyn-${project.version}/LICENSE</src>
+                                    <type>file</type>
+                                    <mapper>
+                                        <type>perm</type>
+                                        <prefix>/opt/brooklyn-${project.version}</prefix>
+                                        <user>brooklyn</user>
+                                        <group>brooklyn</group>
+                                        <filemode>${brooklyn.file.permission.global}</filemode>
+                                    </mapper>
+                                </data>
+                                <data>
+                                    <src>${project.build.directory}/deps/apache-brooklyn-${project.version}/NOTICE</src>
+                                    <type>file</type>
+                                    <mapper>
+                                        <type>perm</type>
+                                        <prefix>/opt/brooklyn-${project.version}</prefix>
+                                        <user>brooklyn</user>
+                                        <group>brooklyn</group>
+                                        <filemode>${brooklyn.file.permission.global}</filemode>
+                                    </mapper>
+                                </data>
+                                <data>
                                     <type>template</type>
                                     <paths>
                                         <path>/opt/brooklyn-${project.version}/data/log</path>

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/22bd5f5b/rpm-packaging/pom.xml
----------------------------------------------------------------------
diff --git a/rpm-packaging/pom.xml b/rpm-packaging/pom.xml
index 27f4770..26325d1 100644
--- a/rpm-packaging/pom.xml
+++ b/rpm-packaging/pom.xml
@@ -186,6 +186,22 @@
                             </sources>
                         </mapping>
                         <mapping>
+                            <directory>/opt/brooklyn-${project.version}</directory>
+                            <sources>
+                                <source>
+                                    <location>${project.build.directory}/deps/apache-brooklyn-${project.version}/LICENSE</location>
+                                </source>
+                            </sources>
+                        </mapping>
+                        <mapping>
+                            <directory>/opt/brooklyn-${project.version}</directory>
+                            <sources>
+                                <source>
+                                    <location>${project.build.directory}/deps/apache-brooklyn-${project.version}/NOTICE</location>
+                                </source>
+                            </sources>
+                        </mapping>
+                        <mapping>
                             <directory>/lib/systemd/system</directory>
                             <directoryIncluded>false</directoryIncluded>
                             <filemode>${brooklyn.file.permission.global}</filemode>


[2/2] brooklyn-dist git commit: This closes #109

Posted by dr...@apache.org.
This closes #109


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/34bb943b
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/34bb943b
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/34bb943b

Branch: refs/heads/master
Commit: 34bb943bba0c42cd0ca7bab3d55cfc6c61cd5823
Parents: 4b555fc 22bd5f5
Author: Duncan Godwin <dr...@googlemail.com>
Authored: Thu Sep 21 13:39:49 2017 +0100
Committer: Duncan Godwin <dr...@googlemail.com>
Committed: Thu Sep 21 13:39:49 2017 +0100

----------------------------------------------------------------------
 deb-packaging/pom.xml | 22 ++++++++++++++++++++++
 rpm-packaging/pom.xml | 16 ++++++++++++++++
 2 files changed, 38 insertions(+)
----------------------------------------------------------------------