Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merged in r903062 from beta branch - 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/trunk@903064 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Donald Woods 2010-01-26 03:12:12 +00:00
parent 9c90ca5506
commit 83897b4d28
3 changed files with 3 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
openjpa-all/pom.xml
View File

@ -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>

3
openjpa-project/assembly.xml
View File

@ -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>

2
openjpa/pom.xml
View File

@ -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>