From 2ca2ae045a2eebebc9f26c4a80d0eb69f723d51c Mon Sep 17 00:00:00 2001
From: Donald Woods <dwoods@apache.org>
Date: Tue, 26 Jan 2010 03:06:15 +0000
Subject: [PATCH] fix openjpa-all, which had some jaxb code included by the
 shade plugin due to transitive depends

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.0-beta@903062 13f79535-47bb-0310-9956-ffa450edef68
---
 openjpa-all/pom.xml          | 34 ----------------------------------
 openjpa-project/assembly.xml |  3 ++-
 openjpa/pom.xml              |  2 +-
 3 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/openjpa-all/pom.xml b/openjpa-all/pom.xml
index bb388c6b9..4cbbb7e90 100644
--- a/openjpa-all/pom.xml
+++ b/openjpa-all/pom.xml
@@ -106,39 +106,5 @@
             <artifactId>openjpa</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        <!-- Need to manually add back optional openjpa-jdbc depends -->
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <scope>compile</scope>
-            <optional>true</optional>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jsr173_api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.activation</groupId>
-                    <artifactId>activation</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <scope>compile</scope>
-            <optional>true</optional>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.xml.bind</groupId>
-                    <artifactId>jsr173_api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.activation</groupId>
-                    <artifactId>activation</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- end optional openjpa-jdbc depends -->
     </dependencies>
 </project>
diff --git a/openjpa-project/assembly.xml b/openjpa-project/assembly.xml
index a3eee6d8e..15de18bea 100644
--- a/openjpa-project/assembly.xml
+++ b/openjpa-project/assembly.xml
@@ -97,7 +97,8 @@
 
                 <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
                 <include>org.apache.geronimo.specs:geronimo-jpa_2.0_spec</include>
-                <include>org.apache.geronimo.specs:geronimo-validation_1.0_spec</include>
+                <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
+                <!-- <include>org.apache.geronimo.specs:geronimo-validation_1.0_spec</include> -->
             </includes>
         </dependencySet>
     </dependencySets>
diff --git a/openjpa/pom.xml b/openjpa/pom.xml
index 92ed973bc..b9f8d2bc5 100644
--- a/openjpa/pom.xml
+++ b/openjpa/pom.xml
@@ -174,6 +174,7 @@ tion:=optional,*</Import-Package>
                      javax.xml.bind:jsr173_api:jar:1.0
                      javax.activation:activation:jar:1.1
                      com.sun.xml.bind:jaxb-impl:jar:2.0.5
+            -->
             <exclusions>
                 <exclusion>
                     <groupId>javax.xml.bind</groupId>
@@ -184,7 +185,6 @@ tion:=optional,*</Import-Package>
                     <artifactId>jaxb-impl</artifactId>
                 </exclusion>
             </exclusions>
-            -->
         </dependency>
         <!-- Need to manually add back optional openjpa-jdbc depends -->
         <dependency>