[jboss-cvs] JBossAS SVN: r94042 - in branches/Branch_5_x: testsuite and 1 other directory.

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

Author: smcgowan at redhat.com
Date: 2009-09-25 18:33:53 -0400 (Fri, 25 Sep 2009)
New Revision: 94042

Modified:
   branches/Branch_5_x/pom.xml
   branches/Branch_5_x/testsuite/build.xml
Log:
JBAS-7293 - enforce JDK 6

Modified: branches/Branch_5_x/pom.xml
===================================================================
--- branches/Branch_5_x/pom.xml	2009-09-25 22:24:04 UTC (rev 94041)
+++ branches/Branch_5_x/pom.xml	2009-09-25 22:33:53 UTC (rev 94042)
@@ -414,7 +414,7 @@
                       <version>2.0.9</version>
                     </requireMavenVersion>
                     <requireJavaVersion>
-                      <version>1.5</version>
+                      <version>1.6</version>
                     </requireJavaVersion>           
                   </rules>
                 </configuration>

Modified: branches/Branch_5_x/testsuite/build.xml
===================================================================
--- branches/Branch_5_x/testsuite/build.xml	2009-09-25 22:24:04 UTC (rev 94041)
+++ branches/Branch_5_x/testsuite/build.xml	2009-09-25 22:33:53 UTC (rev 94042)
@@ -381,6 +381,9 @@
    </propertyset>
 
    <target name="init">
+
+      <fail message="The testsuite build requires JDK1.6" unless="HAVE_JDK_1.6"/>
+
       <record name="${basedir}/build.log" append="yes" action="start" loglevel="error"/>
       <mkdir dir="${build.gen-src}/org/jboss/test/cts/ejb"/>
       <mkdir dir="${build.gen-src}/org/jboss/test/cts/interfaces"/>