3:46 p.m.
Author: pete.muir(a)jboss.org
Date: 2009-11-08 16:46:25 -0500 (Sun, 08 Nov 2009)
New Revision: 4792
Modified:
build/trunk/parent/pom.xml
Log:
variety of improvements
Modified: build/trunk/parent/pom.xml
===================================================================
--- build/trunk/parent/pom.xml 2009-11-08 21:29:21 UTC (rev 4791)
+++ build/trunk/parent/pom.xml 2009-11-08 21:46:25 UTC (rev 4792)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
@@ -27,12 +28,6 @@
<name>Weld committers</name>
</developer>
</developers>
-
- <properties>
- <weld.docbook.version>1.1.1-Beta3</weld.docbook.version>
- <seam.docbook.version>1.1.0.GA</seam.docbook.version>
- <jbossorg.docbook.version>1.1.0</jbossorg.docbook.version>
- </properties>
<organization>
<name>Seam Framework</name>
@@ -81,6 +76,9 @@
<!-- Force encoding to UTF-8 (bug on OS X) -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <weld.docbook.version>1.1.1-Beta3</weld.docbook.version>
+ <seam.docbook.version>1.1.0.GA</seam.docbook.version>
+ <jbossorg.docbook.version>1.1.0</jbossorg.docbook.version>
</properties>
<!-- Configure the build -->
@@ -102,6 +100,14 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ </plugin>
</plugins>
<defaultGoal>package</defaultGoal>
@@ -156,7 +162,7 @@
<format>
<formatName>pdf</formatName>
<stylesheetResource>classpath:/xslt/org/jboss/weld/pdf.xsl</stylesheetResource>
- <finalName>jsr299-tck-reference.pdf</finalName>
+ <finalName>${pdf.name}</finalName>
</format>
<format>
<formatName>html</formatName>
@@ -309,16 +315,14 @@
<version>2.2</version>
<configuration>
<archive>
- <manifest>
- <addDefaultImplementationEntries>
- true
- </addDefaultImplementationEntries>
- <addDefaultSpecificationEntries>
- true
- </addDefaultSpecificationEntries>
- </manifest>
<manifestEntries>
<Implementation-URL>${pom.url}</Implementation-URL>
+
<Implementation-Title>${pom.name}</Implementation-Title>
+
<Implementation-Version>${parsedVersion.osgiVersion}</Implementation-Version>
+
<Implementation-Vendor>${pom.organization.name}</Implementation-Vendor>
+
<Specification-Title>${pom.name}</Specification-Title>
+
<Specification-Version>${parsedVersion.osgiVersion}</Specification-Version>
+
<Specification-Vendor>${pom.organization.name}</Specification-Vendor>
</manifestEntries>
<manifestSections>
<manifestSection>
@@ -330,7 +334,7 @@
<Os-Name>${os.name}</Os-Name>
<Os-Arch>${os.arch}</Os-Arch>
<Os-Version>${os.version}</Os-Version>
- <Scm-Revision>${buildNumber}</Scm-Revision>
+ <SCM>r${buildNumber}</SCM>
<Build-Time>${timestamp}</Build-Time>
</manifestEntries>
</manifestSection>
@@ -347,6 +351,7 @@
<phase>validate</phase>
<goals>
<goal>maven-version</goal>
+ <goal>parse-version</goal>
</goals>
</execution>
</executions>
@@ -371,18 +376,14 @@
<goal>create</goal>
</goals>
<phase>validate</phase>
+ <configuration>
+ <getRevisionOnlyOnce>true</getRevisionOnlyOnce>
+
<revisionOnScmFailure>unavailable</revisionOnScmFailure>
+ <timestampFormat>{0, date, long} {0, time,
long}</timestampFormat>
+ </configuration>
</execution>
</executions>
<inherited>true</inherited>
- <configuration>
- <!--
- If the plugin fails to get the scm revision, set it
- to "unavailable"
- -->
- <getRevisionOnlyOnce>true</getRevisionOnlyOnce>
- <revisionOnScmFailure>unavailable</revisionOnScmFailure>
- <timestampFormat>{0, date, long} {0, time,
long}</timestampFormat>
- </configuration>
</plugin>
<plugin>
<groupId>org.twdata.maven</groupId>
@@ -468,6 +469,24 @@
<description>[nexus-maven-plugin] closing repository after
release:perform</description>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>validate-scm</id>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ <phase>validate</phase>
+ <configuration>
+ <doUpdate>true</doUpdate>
+ <doCheck>true</doCheck>
+ </configuration>
+ </execution>
+ </executions>
+ <inherited>true</inherited>
+ </plugin>
</plugins>
</build>
</profile>