[tomee] 01/02: Backport JAXB bom and 2.3.2
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch tomee-7.0.x in repository https://gitbox.apache.org/repos/asf/tomee.git commit 57166e9c0c561d650819ddff2f1c8e9d81e6cf11 Author: Jonathan Gallimore AuthorDate: Tue Aug 13 20:20:50 2019 +0100 Backport JAXB bom and 2.3.2 --- boms/jaxb-runtime/pom.xml | 63 ++ boms/pom.xml | 41 +++ container/openejb-jee/pom.xml | 16 ++-- examples/groovy-cdi/pom.xml| 12 ++ examples/groovy-jpa/pom.xml| 12 ++ examples/groovy-spock/pom.xml | 12 ++ examples/simple-stateful-callbacks/pom.xml | 6 +++ pom.xml| 27 + server/openejb-client/pom.xml | 13 ++ server/openejb-cxf/pom.xml | 9 ++--- server/openejb-webservices/pom.xml | 13 ++ tomee/apache-tomee/pom.xml | 12 ++ tomee/tomee-webaccess/pom.xml | 13 ++ 13 files changed, 151 insertions(+), 98 deletions(-) diff --git a/boms/jaxb-runtime/pom.xml b/boms/jaxb-runtime/pom.xml new file mode 100644 index 000..581561a --- /dev/null +++ b/boms/jaxb-runtime/pom.xml @@ -0,0 +1,63 @@ + + + + + +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + + +org.apache.tomee.bom +boms +7.1.2-SNAPSHOT + + + 4.0.0 + jaxb-runtime + pom + TomEE :: BOMs :: JAXB Runtime + + + + + + jakarta.xml.bind + jakarta.xml.bind-api + 2.3.2 + + + org.glassfish.jaxb + jaxb-runtime + 2.3.2 + + + jakarta.activation + jakarta.activation-api + + + + + + + diff --git a/boms/pom.xml b/boms/pom.xml new file mode 100644 index 000..615dbdd --- /dev/null +++ b/boms/pom.xml @@ -0,0 +1,41 @@ + + + + + +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + + +tomee-project +org.apache.tomee +7.1.2-SNAPSHOT + + + 4.0.0 + org.apache.tomee.bom + boms + pom + TomEE :: BOMs + + +jaxb-runtime + + + + diff --git a/container/openejb-jee/pom.xml b/container/openejb-jee/pom.xml index 1c1b14c..fd3980f 100644 --- a/container/openejb-jee/pom.xml +++ b/container/openejb-jee/pom.xml @@ -59,19 +59,9 @@ provided - javax.xml.bind - jaxb-api - provided - - - com.sun.xml.bind - jaxb-impl - provided - - - com.sun.xml.bind - jaxb-core - provided + org.apache.tomee.bom + jaxb-runtime + pom junit diff --git a/examples/groovy-cdi/pom.xml b/examples/groovy-cdi/pom.xml index 62f2f51..29aada3 100644 --- a/examples/groovy-cdi/pom.xml +++ b/examples/groovy-cdi/pom.xml @@ -80,14 +80,10 @@ 2.4.8 - org.apache.geronimo.specs - geronimo-jaxb_2.2_spec - 1.0.1 - - - com.sun.xml.bind - jaxb-impl - 2.2.11 + org.apache.tomee.bom + jaxb-runtime + 7.1.2-SNAPSHOT + pom junit diff --git a/examples/groovy-jpa/pom.xml b/examples/groovy-jpa/pom.xml index 98a5b07..5c97790 100644 --- a/examples/groovy-jpa/pom.xml +++ b/examples/groovy-jpa/pom.xml @@ -81,14 +81,10 @@ 2.4.8 - org.apache.geronimo.specs - geronimo-jaxb_2.2_spec - 1.0.1 - - - com.sun.xml.bind - jaxb-impl - 2.1.13 + org.apache.tomee.bom + jaxb-runtime + 7.1.2-SNAPSHOT + pom junit diff --git a/examples/groovy-spock/pom.xml b/examples/groovy-spock/pom.xml index 38231ea..20c4e47 100644 --- a/examples/groovy-spock/pom.xml +++ b/examples/groovy-spock/pom.xml @@ -90,14 +90,10 @@ 2.4.8 - org.apache.geronimo.specs - geronimo-jaxb_2.2_spec - 1.0.1 - - - com.sun.xml.bind - jaxb-impl - 2.1.13 + org.apache.tomee.bom + jaxb-runtime + 7.1.2-SNAPSHOT + pom junit diff --git a/examples/simple-stateful-callbacks/pom.xml b/examples/simple-stateful-callbacks/pom.xml index 6e158cb..8e78241 100644 --- a/examples/simple-stateful-callbacks/pom.xml +++ b/examples/simple-stateful-callbacks/pom.xml @@ -58,6 +58,12 @@ provided + org.apache.tomee.bom + jaxb-runtime + 7.1.2-SNAPSHOT + pom + + junit junit 4.12 diff --git a/pom.xml b/pom.xml index 9042eea..c3c7849 100644 --- a/pom.xml +++ b/pom.xml @@ -509,6 +509,7 @@ true +boms itests maven gradle @@ -537,6 +538,7 @@ quick +
[tomee] 01/02: Backport JAXB bom and 2.3.2
This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch tomee-7.1.x in repository https://gitbox.apache.org/repos/asf/tomee.git commit 73ef5a7d3ecca2fdd89ccfc0c96bf36bd3cf174b Author: Jonathan Gallimore AuthorDate: Tue Aug 13 20:20:50 2019 +0100 Backport JAXB bom and 2.3.2 --- boms/jaxb-runtime/pom.xml | 63 ++ boms/pom.xml | 41 +++ container/openejb-jee/pom.xml | 16 ++-- examples/groovy-cdi/pom.xml| 12 ++ examples/groovy-jpa/pom.xml| 12 ++ examples/groovy-spock/pom.xml | 12 ++ examples/simple-stateful-callbacks/pom.xml | 6 +++ pom.xml| 27 + server/openejb-client/pom.xml | 13 ++ server/openejb-cxf/pom.xml | 9 ++--- server/openejb-webservices/pom.xml | 13 ++ tomee/apache-tomee/pom.xml | 12 ++ tomee/tomee-webaccess/pom.xml | 13 ++ 13 files changed, 151 insertions(+), 98 deletions(-) diff --git a/boms/jaxb-runtime/pom.xml b/boms/jaxb-runtime/pom.xml new file mode 100644 index 000..581561a --- /dev/null +++ b/boms/jaxb-runtime/pom.xml @@ -0,0 +1,63 @@ + + + + + +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + + +org.apache.tomee.bom +boms +7.1.2-SNAPSHOT + + + 4.0.0 + jaxb-runtime + pom + TomEE :: BOMs :: JAXB Runtime + + + + + + jakarta.xml.bind + jakarta.xml.bind-api + 2.3.2 + + + org.glassfish.jaxb + jaxb-runtime + 2.3.2 + + + jakarta.activation + jakarta.activation-api + + + + + + + diff --git a/boms/pom.xml b/boms/pom.xml new file mode 100644 index 000..615dbdd --- /dev/null +++ b/boms/pom.xml @@ -0,0 +1,41 @@ + + + + + +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;> + + +tomee-project +org.apache.tomee +7.1.2-SNAPSHOT + + + 4.0.0 + org.apache.tomee.bom + boms + pom + TomEE :: BOMs + + +jaxb-runtime + + + + diff --git a/container/openejb-jee/pom.xml b/container/openejb-jee/pom.xml index 3e29c1e..1c6c9e1 100644 --- a/container/openejb-jee/pom.xml +++ b/container/openejb-jee/pom.xml @@ -59,19 +59,9 @@ provided - javax.xml.bind - jaxb-api - provided - - - com.sun.xml.bind - jaxb-impl - provided - - - com.sun.xml.bind - jaxb-core - provided + org.apache.tomee.bom + jaxb-runtime + pom junit diff --git a/examples/groovy-cdi/pom.xml b/examples/groovy-cdi/pom.xml index 07cf891..a87f8bd 100644 --- a/examples/groovy-cdi/pom.xml +++ b/examples/groovy-cdi/pom.xml @@ -80,14 +80,10 @@ 2.4.8 - org.apache.geronimo.specs - geronimo-jaxb_2.2_spec - 1.0.1 - - - com.sun.xml.bind - jaxb-impl - 2.2.11 + org.apache.tomee.bom + jaxb-runtime + 7.1.2-SNAPSHOT + pom junit diff --git a/examples/groovy-jpa/pom.xml b/examples/groovy-jpa/pom.xml index 4f819f7..f51655b 100644 --- a/examples/groovy-jpa/pom.xml +++ b/examples/groovy-jpa/pom.xml @@ -81,14 +81,10 @@ 2.4.8 - org.apache.geronimo.specs - geronimo-jaxb_2.2_spec - 1.0.1 - - - com.sun.xml.bind - jaxb-impl - 2.1.13 + org.apache.tomee.bom + jaxb-runtime + 7.1.2-SNAPSHOT + pom junit diff --git a/examples/groovy-spock/pom.xml b/examples/groovy-spock/pom.xml index 5ea8ba1..578449e 100644 --- a/examples/groovy-spock/pom.xml +++ b/examples/groovy-spock/pom.xml @@ -90,14 +90,10 @@ 2.4.8 - org.apache.geronimo.specs - geronimo-jaxb_2.2_spec - 1.0.1 - - - com.sun.xml.bind - jaxb-impl - 2.1.13 + org.apache.tomee.bom + jaxb-runtime + 7.1.2-SNAPSHOT + pom junit diff --git a/examples/simple-stateful-callbacks/pom.xml b/examples/simple-stateful-callbacks/pom.xml index 8e02250..93b5695 100644 --- a/examples/simple-stateful-callbacks/pom.xml +++ b/examples/simple-stateful-callbacks/pom.xml @@ -58,6 +58,12 @@ provided + org.apache.tomee.bom + jaxb-runtime + 7.1.2-SNAPSHOT + pom + + junit junit 4.12 diff --git a/pom.xml b/pom.xml index 0a70f8b..1e2cc42 100644 --- a/pom.xml +++ b/pom.xml @@ -523,6 +523,7 @@ true +boms itests maven gradle @@ -552,6 +553,7 @@ quick +
