[seam-commits] Seam SVN: r9460 - in tags/JBoss_Seam_2_1_0_SP1: seam-gen and 1 other directory.

[seam-commits at lists.jboss.org]

Author: norman.richards at jboss.com
Date: 2008-10-28 21:46:15 -0400 (Tue, 28 Oct 2008)
New Revision: 9460

Modified:
   tags/JBoss_Seam_2_1_0_SP1/build/gen.pom.xml
   tags/JBoss_Seam_2_1_0_SP1/build/root.pom.xml
   tags/JBoss_Seam_2_1_0_SP1/seam-gen/build.xml
Log:
second try to merge 9448:9449 from trunk

Modified: tags/JBoss_Seam_2_1_0_SP1/build/gen.pom.xml
===================================================================
--- tags/JBoss_Seam_2_1_0_SP1/build/gen.pom.xml	2008-10-28 22:01:50 UTC (rev 9459)
+++ tags/JBoss_Seam_2_1_0_SP1/build/gen.pom.xml	2008-10-29 01:46:15 UTC (rev 9460)
@@ -70,6 +70,12 @@
          <scope>runtime</scope>
       </dependency>
 
+      <dependency>
+         <groupId>javax.xml.bind</groupId>
+         <artifactId>jaxb-api</artifactId>
+         <scope>runtime</scope>
+      </dependency>
+
    </dependencies>
 
 

Modified: tags/JBoss_Seam_2_1_0_SP1/build/root.pom.xml
===================================================================
--- tags/JBoss_Seam_2_1_0_SP1/build/root.pom.xml	2008-10-28 22:01:50 UTC (rev 9459)
+++ tags/JBoss_Seam_2_1_0_SP1/build/root.pom.xml	2008-10-29 01:46:15 UTC (rev 9460)
@@ -640,6 +640,22 @@
       </dependency>
 
       <dependency>
+        <groupId>javax.xml.bind</groupId>
+        <artifactId>jaxb-api</artifactId>
+        <version>2.1</version>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.xml.stream</groupId>
+            <artifactId>stax-api</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+
+      <dependency>
         <groupId>org.codehaus.groovy</groupId>
         <artifactId>groovy-all</artifactId>
         <version>1.5.4</version>

Modified: tags/JBoss_Seam_2_1_0_SP1/seam-gen/build.xml
===================================================================
--- tags/JBoss_Seam_2_1_0_SP1/seam-gen/build.xml	2008-10-28 22:01:50 UTC (rev 9459)
+++ tags/JBoss_Seam_2_1_0_SP1/seam-gen/build.xml	2008-10-29 01:46:15 UTC (rev 9460)
@@ -606,18 +606,8 @@
             <fileset file="${driver.jar}"/>
         </copy>
 
-        <!-- we must use an endorsed jars directory for running SeamTest under Java 6 -->
-        <artifact:dependencies filesetId="endorsed.fileset" versionsId="endorsed.versions">
-            <dependency groupId="javax.xml.bind" artifactId="jaxb-api" version="2.1">
-                <exclusion groupId="javax.xml.stream" artifactId="stax-api"/>
-                <exclusion groupId="javax.activation" artifactId="activation"/>
-            </dependency>
-            <remoteRepository refId="repository.jboss.org"/>
-        </artifact:dependencies>
-        <copy todir="${project.home}/lib/endorsed" overwrite="true">
-            <fileset refid="endorsed.fileset"/>
-            <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${endorsed.versions}" to="flatten"/>
-        </copy>
+        <!-- we must use an endorsed jars directory containing JAXB 2.1 for running SeamTest under Java 6 -->
+        <copy todir="${project.home}/lib/endorsed" file="${seam.dir}/lib/gen/jaxb-api.jar" overwrite="true"/>
 
         <echo message="Copying JBoss Embedded configuration to the ${project.home}/bootstrap directory..."/>
         <copy todir="${project.home}/bootstrap" overwrite="true">