Author: dwoods
Date: Tue Jan 26 03:12:12 2010
New Revision: 903064
URL: http://svn.apache.org/viewvc?rev=903064&view=rev
Log:
merged in r903062 from beta branch - fix openjpa-all, which had some jaxb code
included by the shade plugin due to transitive depends
Modified:
openjpa/trunk/openjpa-all/pom.xml
openjpa/trunk/openjpa-project/assembly.xml
openjpa/trunk/openjpa/pom.xml
Modified: openjpa/trunk/openjpa-all/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-all/pom.xml?rev=903064&r1=903063&r2=903064&view=diff
==============================================================================
--- openjpa/trunk/openjpa-all/pom.xml (original)
+++ openjpa/trunk/openjpa-all/pom.xml Tue Jan 26 03:12:12 2010
@@ -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>
Modified: openjpa/trunk/openjpa-project/assembly.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/assembly.xml?rev=903064&r1=903063&r2=903064&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/assembly.xml (original)
+++ openjpa/trunk/openjpa-project/assembly.xml Tue Jan 26 03:12:12 2010
@@ -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>
Modified: openjpa/trunk/openjpa/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa/pom.xml?rev=903064&r1=903063&r2=903064&view=diff
==============================================================================
--- openjpa/trunk/openjpa/pom.xml (original)
+++ openjpa/trunk/openjpa/pom.xml Tue Jan 26 03:12:12 2010
@@ -174,6 +174,7 @@
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 @@
<artifactId>jaxb-impl</artifactId>
</exclusion>
</exclusions>
- -->
</dependency>
<!-- Need to manually add back optional openjpa-jdbc depends -->
<dependency>
