You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2019/08/13 19:54:33 UTC
[tomee] branch tomee-7.0.x updated (b7078ad -> ef73978)
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a change to branch tomee-7.0.x
in repository https://gitbox.apache.org/repos/asf/tomee.git.
from b7078ad Update CXF and Tomcat to latest versions
new 57166e9 Backport JAXB bom and 2.3.2
new ef73978 Fix compile error
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../jaxb-runtime}/pom.xml | 51 +++++++++++-----------
{assembly => boms}/pom.xml | 18 +++++---
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 | 13 ++----
server/openejb-webservices/pom.xml | 13 ++----
tomee/apache-tomee/pom.xml | 12 ++---
tomee/tomee-webaccess/pom.xml | 13 ++----
13 files changed, 83 insertions(+), 135 deletions(-)
copy {itests/openejb-itests-web => boms/jaxb-runtime}/pom.xml (61%)
copy {assembly => boms}/pom.xml (82%)
[tomee] 02/02: Fix compile error
Posted by jg...@apache.org.
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 ef739785deb5de1279bc3a5905c4c6bed02f8de5
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Tue Aug 13 20:51:00 2019 +0100
Fix compile error
---
server/openejb-cxf/pom.xml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/server/openejb-cxf/pom.xml b/server/openejb-cxf/pom.xml
index 4f16881..17a3a78 100644
--- a/server/openejb-cxf/pom.xml
+++ b/server/openejb-cxf/pom.xml
@@ -127,10 +127,6 @@
<type>pom</type>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf.version}</version>
[tomee] 01/02: Backport JAXB bom and 2.3.2
Posted by jg...@apache.org.
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 <jo...@jrg.me.uk>
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 1c1b14c..fd3980f 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 62f2f51..29aada3 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 98a5b07..5c97790 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 38231ea..20c4e47 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 6e158cb..8e78241 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 9042eea..c3c7849 100644
--- a/pom.xml
+++ b/pom.xml
@@ -509,6 +509,7 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
+ <module>boms</module>
<module>itests</module>
<module>maven</module>
<module>gradle</module>
@@ -537,6 +538,7 @@
<profile>
<id>quick</id>
<modules>
+ <module>boms</module>
<module>maven</module>
<module>gradle</module>
<module>container</module>
@@ -1724,25 +1726,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 d68e6eb..9256fb4 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 e1faa08..4f16881 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 d5e5fbf..34653e5 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 2f80a32..89568ae 100644
--- a/tomee/apache-tomee/pom.xml
+++ b/tomee/apache-tomee/pom.xml
@@ -256,14 +256,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 d7cedbb..a34684d 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>