Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [4382] for smooth building experience on jdk5, only include the client module in the reactor if "-Dclient" is passed on the command line;
<!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] [4382] for smooth building experience on jdk5, only include the client module in the reactor if "-Dclient" is passed on the command line; </title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>4382</dd> <dt>Author</dt> <dd>jmarques</dd> <dt>Date</dt> <dd>2009-07-13 14:28:40 -0500 (Mon, 13 Jul 2009)</dd> </dl> <h3>Log Message</h3> <pre>for smooth building experience on jdk5, only include the client module in the reactor if "-Dclient" is passed on the command line; furthermore, if a user tries to build the client module directly, they will get an error if they are not using jdk6 or later; </pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulesenterpriseclientpomxml">rhq/trunk/modules/enterprise/client/pom.xml</a></li> <li><a href="#rhqtrunkmodulesenterprisepomxml">rhq/trunk/modules/enterprise/pom.xml</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulesenterpriseclientpomxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/client/pom.xml (4381 => 4382)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/client/pom.xml 2009-07-13 19:24:48 UTC (rev 4381) +++ rhq/trunk/modules/enterprise/client/pom.xml 2009-07-13 19:28:40 UTC (rev 4382) </span><span class="lines">@@ -147,6 +147,27 @@ </span><span class="cx"> <outputDirectory>target/${project.build.finalName}</outputDirectory> <plugins> </span><span class="add">+ + <plugin> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <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> + </goals> + <configuration> + <rules> + <requireJavaVersion> + <version>[1.6,1.8)</version> <!-- 1.6.x, 1.7.x --> + </requireJavaVersion> + </rules> + </configuration> + </execution> + </executions> + </plugin> </span><span class="cx"> <plugin> <artifactId>maven-antrun-plugin</artifactId> </span></pre></div> <a id="rhqtrunkmodulesenterprisepomxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/pom.xml (4381 => 4382)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/pom.xml 2009-07-13 19:24:48 UTC (rev 4381) +++ rhq/trunk/modules/enterprise/pom.xml 2009-07-13 19:28:40 UTC (rev 4382) </span><span class="lines">@@ -60,13 +60,24 @@ </span><span class="cx"> <module>server/safe-invoker</module> <module>server/sars</module> <module>gui</module> </span><span class="rem">- <module>client</module> </span><span class="cx"> <module>server/plugins</module> </span><span class="rem">- <module>server/ear</module> </span><span class="add">+ <module>server/ear</module> </span><span class="cx"> <module>server/container-lib</module> <module>server/container</module> </modules> </profile> </span><span class="add">+ + <profile> + <id>client</id> + <activation> + <property> + <name>client</name> + </property> + </activation> + <modules> + <module>client</module> + </modules> + </profile> </span><span class="cx"> </profiles> </span> </pre> </div> </div> </body> </html> |