Author: [email protected]
Date: Wed Sep 14 17:52:54 2011
New Revision: 1365
Log:
AMDATU-413 change release profile to be active by default
Modified:
trunk/amdatu-release-ams/pom.xml
trunk/amdatu-release/pom.xml
Modified: trunk/amdatu-release-ams/pom.xml
==============================================================================
--- trunk/amdatu-release-ams/pom.xml (original)
+++ trunk/amdatu-release-ams/pom.xml Wed Sep 14 17:52:54 2011
@@ -21,12 +21,12 @@
<properties>
<org.amdatu.release.version>0.2.0-SNAPSHOT</org.amdatu.release.version>
<org.apache.ace.version>0.8.1-incubator-SNAPSHOT</org.apache.ace.version>
-
+
<amdatu.http.hostname>localhost</amdatu.http.hostname>
<amdatu.http.port>8080</amdatu.http.port>
<amdatu.https.port>8045</amdatu.https.port>
<amdatu.log.level>INFO</amdatu.log.level>
-
+
</properties>
<repositories>
@@ -246,11 +246,11 @@
</dependency>
<dependency>
- <groupId>org.apache.ace</groupId>
- <artifactId>org.apache.ace.client.rest</artifactId>
- <version>${org.apache.ace.version}</version>
- <type>bundle</type>
- <scope>compile</scope>
+ <groupId>org.apache.ace</groupId>
+ <artifactId>org.apache.ace.client.rest</artifactId>
+ <version>${org.apache.ace.version}</version>
+ <type>bundle</type>
+ <scope>compile</scope>
</dependency>
</dependencies>
@@ -300,8 +300,13 @@
</plugins>
</build>
<profiles>
+ <!--
+ This profile is active by default and only assembles
+ the dev server. However it will be overruled by the
+ release profile below unless that one is deactivated.
+ -->
<profile>
- <id>build-release</id>
+ <id>development</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
@@ -320,7 +325,7 @@
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
- <descriptor>src/main/assembly/bin-release.xml</descriptor>
+ <descriptor>src/main/assembly/dev-server.xml</descriptor>
</descriptors>
</configuration>
</execution>
@@ -330,9 +335,13 @@
</build>
</profile>
<profile>
- <id>build-dev</id>
+ <!--
+ The release profile by default generates all binary, source,
+ javadoc and assemblies
+ -->
+ <id>release</id>
<activation>
- <activeByDefault>false</activeByDefault>
+ <activeByDefault>true</activeByDefault>
</activation>
<build>
<plugins>
@@ -347,8 +356,10 @@
<goal>single</goal>
</goals>
<configuration>
+ <appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/main/assembly/dev-server.xml</descriptor>
+ <descriptor>src/main/assembly/bin-release.xml</descriptor>
</descriptors>
</configuration>
</execution>
Modified: trunk/amdatu-release/pom.xml
==============================================================================
--- trunk/amdatu-release/pom.xml (original)
+++ trunk/amdatu-release/pom.xml Wed Sep 14 17:52:54 2011
@@ -367,9 +367,14 @@
</build>
<profiles>
<profile>
- <id>build-dev</id>
+ <!--
+ The dev profile is active by default and only assembles
+ the dev server. However it will be overruled by the
+ release profile below unless that one is deactivated.
+ -->
+ <id>development</id>
<activation>
- <activeByDefault>false</activeByDefault>
+ <activeByDefault>true</activeByDefault>
</activation>
<build>
<plugins>
@@ -384,6 +389,7 @@
<goal>single</goal>
</goals>
<configuration>
+ <appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/main/assembly/dev-server.xml</descriptor>
</descriptors>
@@ -395,37 +401,13 @@
</build>
</profile>
<profile>
- <id>build-war</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>create-release</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/war-release.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>build-release</id>
+ <!--
+ The release profile by default generates all binary, source,
+ javadoc and assemblies
+ -->
+ <id>release</id>
<activation>
- <activeByDefault>false</activeByDefault>
+ <activeByDefault>true</activeByDefault>
</activation>
<build>
<plugins>
@@ -442,6 +424,7 @@
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
+ <descriptor>src/main/assembly/dev-server.xml</descriptor>
<descriptor>src/main/assembly/bin-release.xml</descriptor>
<descriptor>src/main/assembly/war-release.xml</descriptor>
</descriptors>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
