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 @@ openjpa ${pom.version} - - - javax.xml.bind - jaxb-api - compile - true - - - javax.xml.bind - jsr173_api - - - javax.activation - activation - - - - - com.sun.xml.bind - jaxb-impl - compile - true - - - javax.xml.bind - jsr173_api - - - javax.activation - activation - - - - 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 @@ org.apache.geronimo.specs:geronimo-jta_1.1_spec org.apache.geronimo.specs:geronimo-jpa_2.0_spec - org.apache.geronimo.specs:geronimo-validation_1.0_spec + org.apache.geronimo.specs:geronimo-jms_1.1_spec + 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,* javax.xml.bind:jsr173_api:jar:1.0 javax.activation:activation:jar:1.1 com.sun.xml.bind:jaxb-impl:jar:2.0.5 + --> javax.xml.bind @@ -184,7 +185,6 @@ tion:=optional,* jaxb-impl - -->