modules/core/domain/pom.xml | 19 -- modules/enterprise/gui/installer-war/pom.xml | 11 - modules/enterprise/gui/portal-war/pom.xml | 11 - modules/enterprise/server/ear/pom.xml | 15 -- modules/enterprise/server/jar/pom.xml | 19 -- pom.xml | 187 +++++++++++++++++++++++---- 6 files changed, 162 insertions(+), 100 deletions(-)
New commits: commit 8982bb66f438f435b06e5fc7e65ad1061ef3ea14 Author: Ian P. Springer ips@jetengine.springer.net Date: Mon Feb 1 17:48:53 2010 -0500
include current time (as Built-Time attribute) and Git revision (as Build-Number attribute) in all JAR, WAR, and EAR Manifests
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 53d16e5..121b1e0 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -237,25 +237,6 @@ </configuration> </plugin>
- <plugin> - <artifactId>maven-ejb-plugin</artifactId> - <version>2.1</version> - <configuration> - <ejbVersion>3.0</ejbVersion> - <archive> - <manifest> - <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - <addClasspath>true</addClasspath> - <classpathPrefix>lib/</classpathPrefix> - </manifest> - <manifestEntries> - <Build-Number>${buildNumber}</Build-Number> - </manifestEntries> - </archive> - </configuration> - </plugin> - </plugins> </build>
diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index 111a873..ac3f224 100644 --- a/modules/enterprise/gui/installer-war/pom.xml +++ b/modules/enterprise/gui/installer-war/pom.xml @@ -114,15 +114,6 @@ <plugin> <artifactId>maven-war-plugin</artifactId> <configuration> - <archive> - <manifest> - <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - <manifestEntries> - <Build-Number>${buildNumber}</Build-Number> - </manifestEntries> - </archive> <webResources> <resource> <filtering>true</filtering> @@ -291,4 +282,4 @@ </repository> </repositories>
-</project> \ No newline at end of file +</project> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index 912b70a..e6e062e 100644 --- a/modules/enterprise/gui/portal-war/pom.xml +++ b/modules/enterprise/gui/portal-war/pom.xml @@ -383,17 +383,7 @@
<plugin> <artifactId>maven-war-plugin</artifactId> - <version>2.1-alpha-1</version> <configuration> - <archive> - <manifest> - <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - <manifestEntries> - <Build-Number>${buildNumber}</Build-Number> - </manifestEntries> - </archive> <webResources> <resource> <filtering>false</filtering> @@ -409,7 +399,6 @@
<plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions> <execution> <id>Generate I18N Resource Bundles</id> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 3faa62b..bc7898d 100644 --- a/modules/enterprise/server/ear/pom.xml +++ b/modules/enterprise/server/ear/pom.xml @@ -146,19 +146,8 @@
<plugin> <artifactId>maven-ear-plugin</artifactId> - <version>2.3.1</version> <configuration> - <archive> - <manifest> - <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - <manifestEntries> - <Build-Number>${buildNumber}</Build-Number> - </manifestEntries> - </archive> - <displayName>RHQ</displayName> - <version>1.4</version> <!-- J2EE version --> + <displayName>RHQ</displayName> <workDirectory>${earDirectory}</workDirectory> <resourcesDir>${basedir}/target/classes</resourcesDir> <defaultJavaBundleDir>lib</defaultJavaBundleDir> @@ -233,7 +222,6 @@
<plugin> <artifactId>maven-dependency-plugin</artifactId> - <version>2.0</version> <executions>
<execution> @@ -465,7 +453,6 @@
<plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> <executions>
<execution> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 310da9f..327238f 100644 --- a/modules/enterprise/server/jar/pom.xml +++ b/modules/enterprise/server/jar/pom.xml @@ -426,25 +426,6 @@ </plugin>
<plugin> - <artifactId>maven-ejb-plugin</artifactId> - <version>2.1</version> - <configuration> - <ejbVersion>3.0</ejbVersion> - <archive> - <manifest> - <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - <addClasspath>true</addClasspath> - <classpathPrefix>lib/</classpathPrefix> - </manifest> - <manifestEntries> - <Build-Number>${buildNumber}</Build-Number> - </manifestEntries> - </archive> - </configuration> - </plugin> - - <plugin> <artifactId>maven-surefire-plugin</artifactId> <!-- Everything but the web service tests, this is the standard test execution --> <configuration> diff --git a/pom.xml b/pom.xml index bcf59d2..c6410a9 100644 --- a/pom.xml +++ b/pom.xml @@ -505,12 +505,22 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>1.3</version> + <version>1.4</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>buildnumber-maven-plugin</artifactId> - <version>1.0-beta-3</version> + <version>1.0-beta-4</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.1</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>properties-maven-plugin</artifactId> + <version>1.0-alpha-2</version> </plugin> </plugins> </pluginManagement> @@ -525,7 +535,7 @@ <artifactId>build-helper-maven-plugin</artifactId> <executions> <execution> - <phase>validate</phase> + <phase>initialize</phase> <goals> <goal>maven-version</goal> </goals> @@ -533,29 +543,84 @@ </executions> </plugin>
- <!-- Set the 'buildNumber' property to the current SVN revision, or to '0' - if an SVN revision cannot be determined, so we can include the SVN - revision in the MANIFEST.MF files of all build artifacts. --> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>buildnumber-maven-plugin</artifactId> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>create</goal> - </goals> - </execution> - </executions> - <configuration> - <getRevisionOnlyOnce>true</getRevisionOnlyOnce> - <revisionOnScmFailure>0</revisionOnScmFailure> - <doCheck>false</doCheck> - <doUpdate>false</doUpdate> - <timestampFormat>{0, date, long} {0, time, long}</timestampFormat> - </configuration> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>write-build-time-properties-file</id> + <goals> + <goal>run</goal> + </goals> + <phase>generate-resources</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> + <phase>generate-resources</phase> + <goals> + <goal>exec</goal> + </goals> + </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> + <executions> + <execution> + <phase>process-resources</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> + <!-- Ensure all code compiles and runs on Java 5 or later. --> <plugin> <artifactId>maven-compiler-plugin</artifactId> @@ -588,7 +653,77 @@ <Os-Arch>${os.arch}</Os-Arch> <Os-Version>${os.version}</Os-Version> <Build-Number>${buildNumber}</Build-Number> - <Build-Time>${timestamp}</Build-Time> + <Build-Time>${buildTime}</Build-Time> + </manifestEntries> + </archive> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-ejb-plugin</artifactId> + <configuration> + <ejbVersion>3.0</ejbVersion> + <archive> + <manifest> + <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + <addClasspath>true</addClasspath> + <classpathPrefix>lib/</classpathPrefix> + </manifest> + <manifestEntries> + <Maven-Version>${maven.version}</Maven-Version> + <Java-Version>${java.version}</Java-Version> + <Java-Vendor>${java.vendor}</Java-Vendor> + <Os-Name>${os.name}</Os-Name> + <Os-Arch>${os.arch}</Os-Arch> + <Os-Version>${os.version}</Os-Version> + <Build-Number>${buildNumber}</Build-Number> + <Build-Time>${buildTime}</Build-Time> + </manifestEntries> + </archive> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + <manifestEntries> + <Maven-Version>${maven.version}</Maven-Version> + <Java-Version>${java.version}</Java-Version> + <Java-Vendor>${java.vendor}</Java-Vendor> + <Os-Name>${os.name}</Os-Name> + <Os-Arch>${os.arch}</Os-Arch> + <Os-Version>${os.version}</Os-Version> + <Build-Number>${buildNumber}</Build-Number> + <Build-Time>${buildTime}</Build-Time> + </manifestEntries> + </archive> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-ear-plugin</artifactId> + <configuration> + <version>1.4</version> <!-- JEE version --> + <archive> + <manifest> + <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + <manifestEntries> + <Maven-Version>${maven.version}</Maven-Version> + <Java-Version>${java.version}</Java-Version> + <Java-Vendor>${java.vendor}</Java-Vendor> + <Os-Name>${os.name}</Os-Name> + <Os-Arch>${os.arch}</Os-Arch> + <Os-Version>${os.version}</Os-Version> + <Build-Number>${buildNumber}</Build-Number> + <Build-Time>${buildTime}</Build-Time> </manifestEntries> </archive> </configuration> @@ -600,9 +735,7 @@ <execution> <id>enforce-versions</id> <goals> - <!-- IMPORTANT: Use enforce goal, rather than enforce-once goal, otherwise reactor - builds will fail due to http://jira.codehaus.org/browse/MENFORCER-11 --> - <goal>enforce</goal> + <goal>enforce-once</goal> </goals> <configuration> <rules>
rhq-commits@lists.fedorahosted.org