Author: [email protected]
Date: Wed Sep 14 17:55:41 2011
New Revision: 1367

Log:
AMDATU-413 Changed release and itest profiles to be on by default

Modified:
   trunk/amdatu-opensocial/pom.xml
   trunk/amdatu-opensocial/release/pom.xml
   trunk/amdatu-opensocial/test-integration/tests/pom.xml

Modified: trunk/amdatu-opensocial/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/pom.xml     (original)
+++ trunk/amdatu-opensocial/pom.xml     Wed Sep 14 17:55:41 2011
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.amdatu</groupId>
     <artifactId>amdatu</artifactId>
-    <version>3-SNAPSHOT</version>
+    <version>4-SNAPSHOT</version>
     <relativePath>../amdatu-parent/pom.xml</relativePath>
   </parent>
   <groupId>org.amdatu.opensocial</groupId>

Modified: trunk/amdatu-opensocial/release/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/release/pom.xml     (original)
+++ trunk/amdatu-opensocial/release/pom.xml     Wed Sep 14 17:55:41 2011
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-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/maven-v4_0_0.xsd";>
+<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/maven-v4_0_0.xsd";>
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.amdatu.opensocial</groupId>
@@ -43,20 +44,17 @@
       <type>bundle</type>
     </dependency>
   </dependencies>
-
   <profiles>
-    <profile>
-      <!-- Profile active only for release builds -->
-      <id>build-release</id>
+    <profile>
+      <id>release</id>
       <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
       <build>
         <plugins>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-assembly-plugin</artifactId>
-            <version>2.2.1</version>
             <executions>
               <execution>
                 <id>create-release</id>

Modified: trunk/amdatu-opensocial/test-integration/tests/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/test-integration/tests/pom.xml      (original)
+++ trunk/amdatu-opensocial/test-integration/tests/pom.xml      Wed Sep 14 
17:55:41 2011
@@ -210,50 +210,12 @@
     </plugins>
   </build>
   <profiles>
-    <!--
-      Outside the itest profile show some help.
-    -->
     <profile>
+      <id>itest</id>
       <activation>
         <activeByDefault>true</activeByDefault>
       </activation>
       <build>
-        <defaultGoal>initialize</defaultGoal>
-        <plugins>
-          <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>show-help</id>
-                <phase>initialize</phase>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-                <configuration>
-                  <tasks>
-                    <echo>
-                <![CDATA[
-================================================
-Please activate the "itest" profile if you whish
-to run the Amdatu Auth integration tests
-================================================
-                  ]]>
-                    </echo>
-                  </tasks>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <!--
-      In the itest profile launch surefire in the
-      integration-test phase.
-    -->
-    <profile>
-      <id>itest</id>
-      <build>
         <plugins>
           <plugin>
             <groupId>org.ops4j.pax.exam</groupId>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits

Reply via email to