Author: ivol
Date: Tue Oct 12 16:47:31 2010
New Revision: 161
Log:
AMDATU-34 Added build-release profile with Ant task
Modified:
trunk/amdatu-release/pom.xml
trunk/maven-settings-bamboo.xml
trunk/pom.xml
Modified: trunk/amdatu-release/pom.xml
==============================================================================
--- trunk/amdatu-release/pom.xml (original)
+++ trunk/amdatu-release/pom.xml Tue Oct 12 16:47:31 2010
@@ -271,6 +271,7 @@
<profiles>
<profile>
+ <!-- Profile active only for release builds -->
<id>build-release</id>
<activation>
<activeByDefault>false</activeByDefault>
@@ -279,6 +280,25 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <delete dir="${snapshot.repository.directory}"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-5</version>
<executions>
Modified: trunk/maven-settings-bamboo.xml
==============================================================================
--- trunk/maven-settings-bamboo.xml (original)
+++ trunk/maven-settings-bamboo.xml Tue Oct 12 16:47:31 2010
@@ -61,16 +61,46 @@
<id>build-amdatu</id>
<properties>
<server.hostname>localhost</server.hostname>
- <server.port>3737</server.port>
+ <server.port>8080</server.port>
<server.port.secure>9090</server.port.secure>
<root.directory>.</root.directory>
- <conf.directory>${root.directory}/conf</conf.directory>
- <work.directory.name>work</work.directory.name>
-
<work.directory>${root.directory}/${work.directory.name}</work.directory>
- <deploy.directory.name>deploy</deploy.directory.name>
-
<deploy.directory>${root.directory}/${deploy.directory.name}</deploy.directory>
<repository.url>dav:http://repository.amdatu.org</repository.url>
</properties>
- </profile>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <debug>false</debug>
+ <optimize>true</optimize>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>build-release</id>
+ <properties>
+ <server.hostname>localhost</server.hostname>
+ <server.port>80</server.port>
+ <server.port.secure>9090</server.port.secure>
+ <root.directory>.</root.directory>
+ <repository.url>dav:http://repository.amdatu.org</repository.url>
+
<snapshot.repository.directory>vol/www/repository/amdatu/nightly/org</snapshot.repository.directory>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <debug>false</debug>
+ <optimize>true</optimize>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</settings>
Modified: trunk/pom.xml
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Tue Oct 12 16:47:31 2010
@@ -842,8 +842,8 @@
<profiles>
<profile>
- <!-- Profile for developers -->
- <id>development</id>
+ <!-- Profile active in all modes, overrule properties in own
settings.xml if needed -->
+ <id>default</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
@@ -870,34 +870,6 @@
</plugin>
</plugins>
</build>
- </profile>
-
- <!-- Profile for release builds -->
- <profile>
- <id>release</id>
- <properties>
- <server.hostname>localhost</server.hostname>
- <server.port>80</server.port>
- <server.port.secure>443</server.port.secure>
- <root.directory>./target</root.directory>
- <conf.directory>${root.directory}/conf</conf.directory>
- <work.directory.name>work</work.directory.name>
-
<work.directory>${root.directory}/${work.directory.name}</work.directory>
- <deploy.directory.name>deploy</deploy.directory.name>
-
<deploy.directory>${root.directory}/${deploy.directory.name}</deploy.directory>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <debug>false</debug>
- <optimize>true</optimize>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
+ </profile>
</profiles>
</project>
