brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aleds...@apache.org
Subject [1/2] brooklyn-dist git commit: Add packaging to pom modules, fix version
Date Fri, 11 Mar 2016 17:28:59 GMT
Repository: brooklyn-dist
Updated Branches:
  refs/heads/master 7177e2070 -> dadbc93ac


Add packaging to pom modules, fix version


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

Branch: refs/heads/master
Commit: 87818e5d3fd168582cc10f65fb3eb106ab712ae2
Parents: b38cdc7
Author: alrick87 <sotasil2003@gmail.com>
Authored: Wed Mar 9 08:52:23 2016 -0800
Committer: alrick87 <sotasil2003@gmail.com>
Committed: Fri Mar 11 09:15:29 2016 -0800

----------------------------------------------------------------------
 packaging/pom.xml | 26 ++++++++------------------
 pom.xml           |  1 +
 2 files changed, 9 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/87818e5d/packaging/pom.xml
----------------------------------------------------------------------
diff --git a/packaging/pom.xml b/packaging/pom.xml
index c4c0a99..ece4b01 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -19,8 +19,8 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <packaging>jar</packaging>
-    <artifactId>brooklyn-dist</artifactId>
+    <packaging>pom</packaging>
+    <artifactId>brooklyn-packaging</artifactId>
     <name>Brooklyn RPM Package</name>
     <description>
         Brooklyn RPM Package for Centos 7 and RHEL 7 operating systems
@@ -36,22 +36,9 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.brooklyn</groupId>
-            <artifactId>brooklyn-all</artifactId>
+            <artifactId>brooklyn-dist</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- TODO include examples -->
-        <!-- TODO include documentation -->
-        <dependency>
-            <groupId>org.apache.brooklyn</groupId>
-            <artifactId>brooklyn-test-support</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -63,7 +50,7 @@
                     <execution>
                         <id>generate-rpm</id>
                         <goals>
-                            <goal>rpm</goal>
+                            <goal>attached-rpm</goal>
                         </goals>
                     </execution>
                 </executions>
@@ -72,8 +59,11 @@
                     <license>ASL 2.0</license>
                     <group>Applications/Internet</group>
                     <changelogFile><!--TODO--></changelogFile>
-                    <needarch>true</needarch>
+                    <needarch>noarch</needarch>
                     <targetOS>Linux</targetOS>
+                    <requires>
+                        <require>java</require>
+                    </requires>
                     <mappings>
                         <mapping>
                             <directory>/etc/brooklyn</directory>

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/87818e5d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 976e575..fd4b767 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,6 +74,7 @@
         <module>downstream-parent</module>
         <module>all</module>
         <module>dist</module>
+        <module>packaging</module>
         <module>vagrant</module>
         <module>archetypes/quickstart</module>
     </modules>


Mime
View raw message