Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [5224] fix so build of enterprise/remoting/pom.xml will run successfully with either JDK5 or JDK6
|
From: <isp...@rh...> - 2009-09-29 19:27:21
|
<!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] [5224] fix so build of enterprise/remoting/pom.xml will run successfully with either JDK5 or JDK6</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>5224</dd> <dt>Author</dt> <dd>ispringer</dd> <dt>Date</dt> <dd>2009-09-29 14:27:08 -0500 (Tue, 29 Sep 2009)</dd> </dl> <h3>Log Message</h3> <pre>fix so build of enterprise/remoting/pom.xml will run successfully with either JDK5 or JDK6</pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulesenterpriseremotingclipomxml">rhq/trunk/modules/enterprise/remoting/cli/pom.xml</a></li> <li><a href="#rhqtrunkmodulesenterpriseremotingpomxml">rhq/trunk/modules/enterprise/remoting/pom.xml</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulesenterpriseremotingclipomxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/remoting/cli/pom.xml (5223 => 5224)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/remoting/cli/pom.xml 2009-09-29 19:25:38 UTC (rev 5223) +++ rhq/trunk/modules/enterprise/remoting/cli/pom.xml 2009-09-29 19:27:08 UTC (rev 5224) </span><span class="lines">@@ -160,7 +160,7 @@ </span><span class="cx"> </execution> </executions> </plugin> </span><span class="rem">- </span><span class="add">+ </span><span class="cx"> <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> </span><span class="lines">@@ -229,8 +229,7 @@ </span><span class="cx"> </executions> </plugin> </span><span class="rem">- <plugin> - <groupId>org.apache.maven.plugins</groupId> </span><span class="add">+ <plugin> </span><span class="cx"> <artifactId>maven-jar-plugin</artifactId> <configuration> <includes> </span><span class="lines">@@ -309,7 +308,31 @@ </span><span class="cx"> <profiles> </span><span class="add">+ <!-- Unlike most of RHQ, this module requires JDK6, so replace the Java 5 bootclasspath that was added to the compiler args by the root POM with a bootclasspath based on the java.home sysprop (which should be Java 6 or later if the enforcer plugin did its job). --> </span><span class="cx"> <profile> </span><span class="add">+ <id>check-java-api</id> + + <activation> + <property> + <name>java5.home</name> + </property> + </activation> + + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <compilerArguments> + <bootclasspath>${java.home}/lib/rt.jar${path.separator}${java.home}/lib/jsse.jar${path.separator}${java.home}/lib/jce.jar</bootclasspath> + </compilerArguments> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <profile> </span><span class="cx"> <id>dev</id> <properties> <rhq.client.build.include.client.jar>true</rhq.client.build.include.client.jar> </span></pre></div> <a id="rhqtrunkmodulesenterpriseremotingpomxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/remoting/pom.xml (5223 => 5224)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/remoting/pom.xml 2009-09-29 19:25:38 UTC (rev 5223) +++ rhq/trunk/modules/enterprise/remoting/pom.xml 2009-09-29 19:27:08 UTC (rev 5224) </span><span class="lines">@@ -23,14 +23,7 @@ </span><span class="cx"> <id>cli</id> <activation> </span><span class="rem">- <!-- - Maven currently applies OR logic to activation conditions. Until AND syntax is provided we'll have to - omit the 1.6 requirement and go with java5.home being unset. - --> - <!-- <jdk>1.6</jdk> --> - <property> - <name>!java5.home</name> - </property> </span><span class="add">+ <jdk>1.6</jdk> </span><span class="cx"> </activation> <modules> </span> </pre> </div> </div> </body> </html> |