[jboss-cvs] JBossAS SVN: r90732 - projects/embedded/trunk/testsuite-full-dep.

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

Author: ALRubinger
Date: 2009-07-01 02:08:53 -0400 (Wed, 01 Jul 2009)
New Revision: 90732

Modified:
   projects/embedded/trunk/testsuite-full-dep/pom.xml
Log:
[EMB-26] Enforce JDK6.  Add explicit dependencies and excludes to handle JACC properly.  Clean AS boot in "default" config.

Modified: projects/embedded/trunk/testsuite-full-dep/pom.xml
===================================================================
--- projects/embedded/trunk/testsuite-full-dep/pom.xml	2009-07-01 03:24:29 UTC (rev 90731)
+++ projects/embedded/trunk/testsuite-full-dep/pom.xml	2009-07-01 06:08:53 UTC (rev 90732)
@@ -22,6 +22,7 @@
   <build>
 
     <plugins>
+    
       <!-- Surefire -->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -29,7 +30,7 @@
           <systemProperties>
             <!--
               This doesn't seem to help for JDK5, and is not needed in
-              JDK6. Aims to address "feature not implemented" error onn
+              JDK6. Aims to address "feature not implemented" error on
               boot
             -->
             <property>
@@ -39,6 +40,31 @@
           </systemProperties>
         </configuration>
       </plugin>
+      
+      <!-- Enforce Maven Environment -->
+      <plugin>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>enforce-maven-environment</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <rules>
+            <requireMavenVersion>
+              <version>[2.0.9,2.1)</version> <!-- Must be Maven 2.0.9 >= x > 2.1  -->
+            </requireMavenVersion>
+            <requireJavaVersion>
+              <version>1.6.0</version> <!-- Must be JDK6 -->
+            </requireJavaVersion>
+          </rules>
+        </configuration>
+      </plugin>
+      
+      
     </plugins>
   </build>
 
@@ -46,6 +72,7 @@
   <properties>
     <version.org.jboss.jbossas>5.2.0-SNAPSHOT</version.org.jboss.jbossas>
     <version.jboss.web>2.1.3.GA</version.jboss.web>
+    <version.org.jboss.javaee_jboss.javaee>5.0.1.GA</version.org.jboss.javaee_jboss.javaee>
 
   </properties>
 
@@ -64,10 +91,19 @@
       <artifactId>jboss-as-build</artifactId>
       <version>${version.org.jboss.jbossas}</version>
       <type>pom</type>
+      <exclusions>
+         <!-- TODO: Should this be necessary? -->
+         <exclusion>
+          <groupId>javax.security</groupId>
+          <artifactId>jacc</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <!--
-      Deps in the runtime of AS but *not* part of the AS dep tree
+      Deps in the runtime of AS but *not* part of the AS dependency tree
+      
+      TODO: Get these represented by the AS build dependency chain
     -->
 
     <dependency>
@@ -86,6 +122,11 @@
       <artifactId>el-api</artifactId>
       <version>${version.jboss.web}</version>
     </dependency>
+    <dependency>
+      <groupId>org.jboss.javaee</groupId>
+      <artifactId>jboss-javaee</artifactId>
+      <version>${version.org.jboss.javaee_jboss.javaee}</version>
+    </dependency>
 
   </dependencies>