pom.xml | 171 ++++++++++++++++++++++++++++++++++------------------------------
1 file changed, 92 insertions(+), 79 deletions(-)
New commits:
commit a7b0138c6d5b254af77238bb6d7d29ddcab47b9e
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue Nov 30 16:55:17 2010 -0500
Putting build number generation plugins in profile to facilitate building in mead
We execute git during the build to generate some build properties, namely a
build number. The git executable however is not available in the mead build
environment. I have move the plugins involved with generating build properties
into a profile so that we can disable them during builds in mead.
Conflicts:
pom.xml
diff --git a/pom.xml b/pom.xml
index 2b8888b..7be1025 100644
--- a/pom.xml
+++ b/pom.xml
@@ -614,85 +614,6 @@
</executions>
</plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>write-build-time-properties-file</id>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>generate-sources</phase>
- <configuration>
- <tasks>
- <tstamp>
- <format property="buildTime" pattern="MM/dd/yy hh:mm
aa z" locale="en,US" timezone="GMT" />
- </tstamp>
- <mkdir dir="target" />
- <echo file="target/build-time.properties"
level="error">buildTime = ${buildTime}</echo>
- </tasks>
- </configuration>
- </execution>
-
- <execution>
- <id>echo-build-properties</id>
- <phase>compile</phase>
- <inherited>false</inherited>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <echo level="debug">buildTime =
${buildTime}</echo>
- <echo level="debug">buildNumber =
${buildNumber}</echo>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-build-number-properties</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>git</executable>
- <arguments>
- <argument>log</argument>
- <argument>--pretty=format:buildNumber =
%h</argument>
- <argument>-n1</argument>
- </arguments>
-
<outputFile>${project.build.directory}/build-number.properties</outputFile>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>properties-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>read-build-properties</id>
- <phase>process-sources</phase>
- <goals>
- <goal>read-project-properties</goal>
- </goals>
- <configuration>
- <files>
-
<file>${project.build.directory}/build-time.properties</file>
-
<file>${project.build.directory}/build-number.properties</file>
- </files>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
@@ -1091,6 +1012,98 @@
</build>
</profile>
+ <profile>
+ <id>build-properties</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>write-build-time-properties-file</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>generate-sources</phase>
+ <configuration>
+ <tasks>
+ <tstamp>
+ <format property="buildTime"
pattern="MM/dd/yy hh:mm aa z" locale="en,US"
+ timezone="GMT"/>
+ </tstamp>
+ <mkdir dir="target"/>
+ <echo file="target/build-time.properties"
level="error">buildTime = ${buildTime}
+ </echo>
+ </tasks>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>echo-build-properties</id>
+ <phase>compile</phase>
+ <inherited>false</inherited>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <echo level="debug">buildTime =
${buildTime}</echo>
+ <echo level="debug">buildNumber =
${buildNumber}</echo>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-build-number-properties</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>git</executable>
+ <arguments>
+ <argument>log</argument>
+ <argument>--pretty=format:buildNumber =
%h</argument>
+ <argument>-n1</argument>
+ </arguments>
+
<outputFile>${project.build.directory}/build-number.properties</outputFile>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>read-build-properties</id>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>read-project-properties</goal>
+ </goals>
+ <configuration>
+ <files>
+
<file>${project.build.directory}/build-time.properties</file>
+
<file>${project.build.directory}/build-number.properties</file>
+ </files>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
</profiles>
Show replies by date