perfsonar development work

Author: nordunet.behrmann
Date: 2012-12-14 11:52:13 +0000 (Fri, 14 Dec 2012)
New Revision: 6069

Modified:
   trunk/parent/pom.xml
   trunk/perfsonar-java-sql-ma/pom.xml
Log:
perfsonar-java-sql-ma: Fix activation of deb profile and attach RPM

The Maven RPM <activeByDefault> tag gets disabled as soon as another
profile is activated. Thus whenever an RPM got build, the DEB did
not get build. This patch fixes that problem.

The patch also changes the goal of the RPM plugin to attached-rpm.
This ensures that the RPM is attached as a secondary artifact and
thus gets exposed by Jenkins and Artifactory.

Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml        2012-12-14 10:47:58 UTC (rev 6068)
+++ trunk/parent/pom.xml        2012-12-14 11:52:13 UTC (rev 6069)
@@ -195,7 +195,7 @@
                         <execution>
                             <phase>package</phase>
                             <goals>
-                                <goal>rpm</goal>
+                                <goal>attached-rpm</goal>
                             </goals>
                         </execution>
                     </executions>

Modified: trunk/perfsonar-java-sql-ma/pom.xml
===================================================================
--- trunk/perfsonar-java-sql-ma/pom.xml 2012-12-14 10:47:58 UTC (rev 6068)
+++ trunk/perfsonar-java-sql-ma/pom.xml 2012-12-14 11:52:13 UTC (rev 6069)
@@ -169,7 +169,12 @@
         <profile>
             <id>deb</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <!-- Activate this profile by default unless explicitly 
disabled. See
+                     
http://stackoverflow.com/questions/5309379/how-to-keep-maven-profiles-which-are-activebydefault-active-even-if-another-prof
+                     for details on why activeByDefault cannot be used here. 
-->
+                <property>
+                    <name>!skipDebProfile</name>
+                </property>
             </activation>
             <build>
                 <plugins>