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 <[email protected]> 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 0000000..581561a --- /dev/null +++ b/boms/jaxb-runtime/pom.xml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<!-- $Rev$ $Date$ --> + +<project xmlns="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";> + + <parent> + <groupId>org.apache.tomee.bom</groupId> + <artifactId>boms</artifactId> + <version>7.1.2-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>jaxb-runtime</artifactId> + <packaging>pom</packaging> + <name>TomEE :: BOMs :: JAXB Runtime</name> + + <!-- For easy copy paste + <dependency> + <groupId>org.apache.tomee.bom</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>${project.version}</version> + </dependency> + --> + + <dependencies> + <dependency> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> + <version>2.3.2</version> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>2.3.2</version> + <exclusions> + <exclusion> <!-- Is already included in java-ee-api --> + <artifactId>jakarta.activation</artifactId> + <groupId>jakarta.activation-api</groupId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + +</project> + diff --git a/boms/pom.xml b/boms/pom.xml new file mode 100644 index 0000000..615dbdd --- /dev/null +++ b/boms/pom.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<!-- $Rev$ $Date$ --> + +<project xmlns="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";> + + <parent> + <artifactId>tomee-project</artifactId> + <groupId>org.apache.tomee</groupId> + <version>7.1.2-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.tomee.bom</groupId> + <artifactId>boms</artifactId> + <packaging>pom</packaging> + <name>TomEE :: BOMs</name> + + <modules> + <module>jaxb-runtime</module> + </modules> + +</project> + 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 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - <scope>provided</scope> + <groupId>org.apache.tomee.bom</groupId> + <artifactId>jaxb-runtime</artifactId> + <type>pom</type> </dependency> <dependency> <groupId>junit</groupId> 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 @@ <version>2.4.8</version> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jaxb_2.2_spec</artifactId> - <version>1.0.1</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>2.2.11</version> + <groupId>org.apache.tomee.bom</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>7.1.2-SNAPSHOT</version> + <type>pom</type> </dependency> <dependency> <groupId>junit</groupId> 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 @@ <version>2.4.8</version> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jaxb_2.2_spec</artifactId> - <version>1.0.1</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>2.1.13</version> + <groupId>org.apache.tomee.bom</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>7.1.2-SNAPSHOT</version> + <type>pom</type> </dependency> <dependency> <groupId>junit</groupId> 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 @@ <version>2.4.8</version> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jaxb_2.2_spec</artifactId> - <version>1.0.1</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>2.1.13</version> + <groupId>org.apache.tomee.bom</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>7.1.2-SNAPSHOT</version> + <type>pom</type> </dependency> <dependency> <groupId>junit</groupId> 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 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.apache.tomee.bom</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>7.1.2-SNAPSHOT</version> + <type>pom</type> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.12</version> diff --git a/pom.xml b/pom.xml index 0a70f8b..1e2cc42 100644 --- a/pom.xml +++ b/pom.xml @@ -523,6 +523,7 @@ <activeByDefault>true</activeByDefault> </activation> <modules> + <module>boms</module> <module>itests</module> <module>maven</module> <module>gradle</module> @@ -552,6 +553,7 @@ <profile> <id>quick</id> <modules> + <module>boms</module> <module>maven</module> <module>gradle</module> <module>container</module> @@ -1740,25 +1742,16 @@ <artifactId>eclipselink</artifactId> <version>${version.eclipselink}</version> </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jaxb_2.2_spec</artifactId> - <version>1.0.1</version> - </dependency> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>2.3.0</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>2.3.0</version> + <dependency> <!-- Added in for backwards compatibility with the move to Jakarta EE coordinates --> + <groupId>com.sun.activation</groupId> + <artifactId>jakarta.activation</artifactId> + <version>1.2.1</version> </dependency> <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - <version>2.3.0</version> + <groupId>org.apache.tomee.bom</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>${project.version}</version> + <type>pom</type> </dependency> <dependency> <!-- licence apache, only 110ko --> <groupId>org.fusesource.jansi</groupId> diff --git a/server/openejb-client/pom.xml b/server/openejb-client/pom.xml index 677f73c..ee55880 100644 --- a/server/openejb-client/pom.xml +++ b/server/openejb-client/pom.xml @@ -138,16 +138,9 @@ <optional>true</optional> </dependency> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> + <groupId>org.apache.tomee.bom</groupId> + <artifactId>jaxb-runtime</artifactId> + <type>pom</type> </dependency> <dependency> <groupId>commons-logging</groupId> diff --git a/server/openejb-cxf/pom.xml b/server/openejb-cxf/pom.xml index 83f6fa9..a73f601 100644 --- a/server/openejb-cxf/pom.xml +++ b/server/openejb-cxf/pom.xml @@ -122,12 +122,9 @@ <artifactId>slf4j-api</artifactId> </dependency> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.apache.tomee.bom</groupId> + <artifactId>jaxb-runtime</artifactId> + <type>pom</type> </dependency> <dependency> <groupId>com.sun.xml.bind</groupId> diff --git a/server/openejb-webservices/pom.xml b/server/openejb-webservices/pom.xml index 0d7653c..0aebf09 100644 --- a/server/openejb-webservices/pom.xml +++ b/server/openejb-webservices/pom.xml @@ -58,16 +58,9 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> + <groupId>org.apache.tomee.bom</groupId> + <artifactId>jaxb-runtime</artifactId> + <type>pom</type> </dependency> <dependency> diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml index 461f1e6..ec58c1c 100644 --- a/tomee/apache-tomee/pom.xml +++ b/tomee/apache-tomee/pom.xml @@ -276,14 +276,10 @@ <version>${version.javaee-api}</version> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jaxb_2.2_spec</artifactId> - <version>1.0.1</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>2.2.11</version> + <groupId>org.apache.tomee.bom</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>${project.version}</version> + <type>pom</type> </dependency> <dependency> <groupId>${project.groupId}</groupId> diff --git a/tomee/tomee-webaccess/pom.xml b/tomee/tomee-webaccess/pom.xml index 96d2fff..db16153 100644 --- a/tomee/tomee-webaccess/pom.xml +++ b/tomee/tomee-webaccess/pom.xml @@ -229,16 +229,9 @@ <scope>runtime</scope> </dependency> <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jaxb_2.2_spec</artifactId> - <version>1.0.1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>2.2.11</version> - <scope>provided</scope> + <groupId>org.apache.tomee.bom</groupId> + <artifactId>jaxb-runtime</artifactId> + <type>pom</type> </dependency> </dependencies> <build>
