Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [2127] RHQ-1173 Allow -DbuildNumber on the command line to override the buildnumber plugin, removing the requirement for SVN
|
From: <jsh...@rh...> - 2008-11-26 20:47:11
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } --></style> <title>[rhq-project.org rhq] [2127] RHQ-1173 Allow -DbuildNumber on the command line to override the buildnumber plugin, removing the requirement for SVN</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>2127</dd> <dt>Author</dt> <dd>jshaughn</dd> <dt>Date</dt> <dd>2008-11-26 14:47:07 -0600 (Wed, 26 Nov 2008)</dd> </dl> <h3>Log Message</h3> <pre>RHQ-1173 Allow -DbuildNumber on the command line to override the buildnumber plugin, removing the requirement for SVN</pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkpomxml">rhq/trunk/pom.xml</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkpomxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/pom.xml (2126 => 2127)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/pom.xml 2008-11-26 16:56:33 UTC (rev 2126) +++ rhq/trunk/pom.xml 2008-11-26 20:47:07 UTC (rev 2127) </span><span class="lines">@@ -410,25 +410,8 @@ </span><span class="cx"> <trimStackTrace>false</trimStackTrace> </configuration> </plugin> </span><span class="rem">- </span><span class="add">+ </span><span class="cx"> <plugin> </span><span class="rem">- <groupId>org.codehaus.mojo</groupId> - <artifactId>buildnumber-maven-plugin</artifactId> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>create</goal> - </goals> - </execution> - </executions> - <configuration> - <doCheck>false</doCheck> - <doUpdate>false</doUpdate> - </configuration> - </plugin> - - <plugin> </span><span class="cx"> <artifactId>maven-idea-plugin</artifactId> <version>2.1</version> <configuration> </span><span class="lines">@@ -591,6 +574,44 @@ </span><span class="cx"> </plugins> </build> </profile> </span><span class="add">+ + <!-- Unless -DbuildNumber is supplied on the command line, generate the buildNumber as the SVN rev --> + <profile> + <id>build-number-generation</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>buildnumber-maven-plugin</artifactId> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>create</goal> + </goals> + </execution> + </executions> + <configuration> + <doCheck>false</doCheck> + <doUpdate>false</doUpdate> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <!-- If SVN is not configured, supply -DbuildNumber manually. It should be an integer >= 0 --> + <profile> + <id>build-number-provided</id> + <activation> + <property> + <name>buildNumber</name> + </property> + </activation> + </profile> </span><span class="cx"> </profiles> </span> </pre> </div> </div> </body> </html> |