modules/enterprise/server/plugins/alert-operations/pom.xml | 98 +++++++------
pom.xml | 33 ++--
2 files changed, 73 insertions(+), 58 deletions(-)
New commits:
commit e840b5ebe391a4e7dfdd75388319bef0cac29b7d
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Mar 3 11:12:42 2010 +0100
Mvn exec-plugin executions need unique ids across the project.
Enable automatic build of the tokens documentation
diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml
b/modules/enterprise/server/plugins/alert-operations/pom.xml
index 98f835e..6f99cce 100644
--- a/modules/enterprise/server/plugins/alert-operations/pom.xml
+++ b/modules/enterprise/server/plugins/alert-operations/pom.xml
@@ -52,6 +52,62 @@
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <!-- Generate tokens.xml file -->
+ <id>generate-tokens-xml</id>
+ <phase>install</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>java</executable>
+ <workingDirectory>target</workingDirectory>
+ <arguments>
+ <argument>-cp</argument>
+
<argument>${project.build.directory}/${project.build.finalName}.jar</argument>
+
<argument>org.rhq.enterprise.server.plugins.alertOperations.PrintTokens</argument>
+ <argument>tokens.xml</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xml-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- translate the tokens.xml file to confluence markup
-->
+ <phase>install</phase>
+ <goals>
+ <goal>transform</goal>
+ </goals>
+ <configuration>
+ <transformationSets>
+ <transformationSet>
+ <dir>target</dir>
+
<stylesheet>src/main/token2confluence.xsl</stylesheet>
+ <includes>
+ <include>
+ tokens.xml
+ </include></includes>
+ <fileMappers>
+ <fileMapper
implementation="org.codehaus.plexus.components.io.filemappers.FileExtensionMapper">
+
<targetExtension>.confluence</targetExtension>
+ </fileMapper>
+ </fileMappers>
+ </transformationSet>
+ </transformationSets>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -129,48 +185,6 @@
</executions>
</plugin>
-<!--
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.0</version>
- <executions>
- <execution>
- <id>copy-resteasy-jars</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
-
<groupId>org.jboss.resteasy</groupId>
-
<artifactId>resteasy-jaxrs</artifactId>
-
<version>${resteasy.version}</version>
- </artifactItem>
- <artifactItem>
-
<groupId>org.jboss.resteasy</groupId>
-
<artifactId>jaxrs-api</artifactId>
-
<version>${resteasy.version}</version>
- </artifactItem>
- <artifactItem>
- <groupId>org.slf4j</groupId>
-
<artifactId>slf4j-simple</artifactId>
- <version>1.5.6</version>
- </artifactItem>
- <artifactItem>
- <groupId>org.slf4j</groupId>
-
<artifactId>slf4j-api</artifactId>
- <version>1.5.6</version>
- </artifactItem>
-
- </artifactItems>
-
<outputDirectory>${project.build.outputDirectory}/lib</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
--->
-
</plugins>
</build>
</profile>
diff --git a/pom.xml b/pom.xml
index 191f86e..37afdcb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -554,10 +554,10 @@
<phase>generate-resources</phase>
<configuration>
<tasks>
- <tstamp>
+ <tstamp>
<format property="buildTime" pattern="MM/dd/yy hh:mm
aa z" locale="en,US" timezone="GMT"/>
</tstamp>
- <mkdir dir="target"/>
+ <mkdir dir="target"/>
<echo file="target/build-time.properties"
level="error">buildTime = ${buildTime}</echo>
</tasks>
</configuration>
@@ -569,7 +569,7 @@
<inherited>false</inherited>
<goals>
<goal>run</goal>
- </goals>
+ </goals>
<configuration>
<tasks>
<echo level="debug">buildTime =
${buildTime}</echo>
@@ -585,23 +585,24 @@
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
+ <id>generate-build-number-properties</id>
<phase>generate-resources</phase>
<goals>
<goal>exec</goal>
- </goals>
+ </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>
- <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>
</plugin>
-
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
@@ -620,7 +621,7 @@
</execution>
</executions>
</plugin>
-
+
<!-- Ensure all code compiles and runs on Java 5 or later. -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
@@ -852,7 +853,7 @@
<property>
<name>rhq.m2.repo.url.oracle</name>
</property>
- </activation>
+ </activation>
<dependencies>
<!-- Oracle JDBC driver - required only if you want to run the tests, or
dbsetup, against Oracle.
Show replies by date