[jboss-svn-commits] JBoss Common SVN: r4480 - in shrinkwrap/trunk: build and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: ALRubinger
Date: 2010-06-09 12:48:47 -0400 (Wed, 09 Jun 2010)
New Revision: 4480

Modified:
   shrinkwrap/trunk/api/pom.xml
   shrinkwrap/trunk/build/pom.xml
   shrinkwrap/trunk/impl-base/pom.xml
Log:
[SHRINKWRAP-189] Test API and impl-base in JRE5

Modified: shrinkwrap/trunk/api/pom.xml
===================================================================
--- shrinkwrap/trunk/api/pom.xml	2010-06-09 13:43:43 UTC (rev 4479)
+++ shrinkwrap/trunk/api/pom.xml	2010-06-09 16:48:47 UTC (rev 4480)
@@ -55,6 +55,15 @@
         </executions>
       </plugin>
       
+      <!-- Surefire -->
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <!-- Run in Java5; be build with a JDK6 compiler so ensure we don't use any JDK6 libs-->
+          <jvm>${env.JAVA5_HOME}/bin/java</jvm>
+        </configuration>
+      </plugin>
+      
     </plugins>
   </build>
   

Modified: shrinkwrap/trunk/build/pom.xml
===================================================================
--- shrinkwrap/trunk/build/pom.xml	2010-06-09 13:43:43 UTC (rev 4479)
+++ shrinkwrap/trunk/build/pom.xml	2010-06-09 16:48:47 UTC (rev 4480)
@@ -135,6 +135,10 @@
               <property>env.JAVA_HOME</property>
               <message>"JAVA_HOME needs to be set to compile"</message>
             </requireProperty>
+            <requireProperty>
+              <property>env.JAVA5_HOME</property>
+              <message>"JAVA5_HOME needs to be set to run some tests in the JRE5 runtime"</message>
+            </requireProperty>
           </rules>
         </configuration>
       </plugin>

Modified: shrinkwrap/trunk/impl-base/pom.xml
===================================================================
--- shrinkwrap/trunk/impl-base/pom.xml	2010-06-09 13:43:43 UTC (rev 4479)
+++ shrinkwrap/trunk/impl-base/pom.xml	2010-06-09 16:48:47 UTC (rev 4480)
@@ -90,6 +90,15 @@
           <includeEmptyDirs>true</includeEmptyDirs>
         </configuration>
       </plugin>
+      
+      <!-- Surefire -->
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <!-- Run in Java5; be build with a JDK6 compiler so ensure we don't use any JDK6 libs-->
+          <jvm>${env.JAVA5_HOME}/bin/java</jvm>
+        </configuration>
+      </plugin>
 
     </plugins>
   </build>
@@ -114,6 +123,7 @@
                   <goal>test</goal>
                 </goals>
                 <configuration>
+                  <jvm>${env.JAVA5_HOME}/bin/java</jvm>
                   <includes>
                     <include>**/*StressTest.java</include>
                   </includes>