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/14 14:28:36 UTC
[tomee] branch tomee-7.1.x updated (608eed2 -> 9b4ae38)
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a change to branch tomee-7.1.x
in repository https://gitbox.apache.org/repos/asf/tomee.git.
from 608eed2 Fix compile error
new 0108bba Revert "Fix compile error"
new 9b4ae38 Revert "Backport JAXB bom and 2.3.2"
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:
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 | 13 ++++--
server/openejb-webservices/pom.xml | 13 ++++--
tomee/apache-tomee/pom.xml | 12 ++++--
tomee/tomee-webaccess/pom.xml | 13 ++++--
13 files changed, 102 insertions(+), 151 deletions(-)
delete mode 100644 boms/jaxb-runtime/pom.xml
delete mode 100644 boms/pom.xml
[tomee] 01/02: Revert "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.1.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 0108bbaf7217e06acb4ab16f10cd281a88f540a5
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Wed Aug 14 15:28:01 2019 +0100
Revert "Fix compile error"
This reverts commit 608eed2e8edc7c2b6b54666dcb83d9f9df762ac7.
---
server/openejb-cxf/pom.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/server/openejb-cxf/pom.xml b/server/openejb-cxf/pom.xml
index b266650..a73f601 100644
--- a/server/openejb-cxf/pom.xml
+++ b/server/openejb-cxf/pom.xml
@@ -127,6 +127,10 @@
<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] 02/02: Revert "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.1.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 9b4ae38302d31ea8515ac0528508659a1e3b2979
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Wed Aug 14 15:28:09 2019 +0100
Revert "Backport JAXB bom and 2.3.2"
This reverts commit 73ef5a7d3ecca2fdd89ccfc0c96bf36bd3cf174b.
---
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, 98 insertions(+), 151 deletions(-)
diff --git a/boms/jaxb-runtime/pom.xml b/boms/jaxb-runtime/pom.xml
deleted file mode 100644
index 581561a..0000000
--- a/boms/jaxb-runtime/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?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
deleted file mode 100644
index 615dbdd..0000000
--- a/boms/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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 1c6c9e1..3e29c1e 100644
--- a/container/openejb-jee/pom.xml
+++ b/container/openejb-jee/pom.xml
@@ -59,9 +59,19 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomee.bom</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <type>pom</type>
+ <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>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/examples/groovy-cdi/pom.xml b/examples/groovy-cdi/pom.xml
index a87f8bd..07cf891 100644
--- a/examples/groovy-cdi/pom.xml
+++ b/examples/groovy-cdi/pom.xml
@@ -80,10 +80,14 @@
<version>2.4.8</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee.bom</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>7.1.2-SNAPSHOT</version>
- <type>pom</type>
+ <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>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/examples/groovy-jpa/pom.xml b/examples/groovy-jpa/pom.xml
index f51655b..4f819f7 100644
--- a/examples/groovy-jpa/pom.xml
+++ b/examples/groovy-jpa/pom.xml
@@ -81,10 +81,14 @@
<version>2.4.8</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee.bom</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>7.1.2-SNAPSHOT</version>
- <type>pom</type>
+ <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>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/examples/groovy-spock/pom.xml b/examples/groovy-spock/pom.xml
index 578449e..5ea8ba1 100644
--- a/examples/groovy-spock/pom.xml
+++ b/examples/groovy-spock/pom.xml
@@ -90,10 +90,14 @@
<version>2.4.8</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee.bom</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>7.1.2-SNAPSHOT</version>
- <type>pom</type>
+ <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>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/examples/simple-stateful-callbacks/pom.xml b/examples/simple-stateful-callbacks/pom.xml
index 93b5695..8e02250 100644
--- a/examples/simple-stateful-callbacks/pom.xml
+++ b/examples/simple-stateful-callbacks/pom.xml
@@ -58,12 +58,6 @@
<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 1e2cc42..0a70f8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -523,7 +523,6 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
- <module>boms</module>
<module>itests</module>
<module>maven</module>
<module>gradle</module>
@@ -553,7 +552,6 @@
<profile>
<id>quick</id>
<modules>
- <module>boms</module>
<module>maven</module>
<module>gradle</module>
<module>container</module>
@@ -1742,16 +1740,25 @@
<artifactId>eclipselink</artifactId>
<version>${version.eclipselink}</version>
</dependency>
- <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>
+ <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>
<dependency>
- <groupId>org.apache.tomee.bom</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>2.3.0</version>
</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 ee55880..677f73c 100644
--- a/server/openejb-client/pom.xml
+++ b/server/openejb-client/pom.xml
@@ -138,9 +138,16 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.apache.tomee.bom</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <type>pom</type>
+ <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>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
diff --git a/server/openejb-cxf/pom.xml b/server/openejb-cxf/pom.xml
index a73f601..83f6fa9 100644
--- a/server/openejb-cxf/pom.xml
+++ b/server/openejb-cxf/pom.xml
@@ -122,9 +122,12 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.tomee.bom</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <type>pom</type>
+ <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>
diff --git a/server/openejb-webservices/pom.xml b/server/openejb-webservices/pom.xml
index 0aebf09..0d7653c 100644
--- a/server/openejb-webservices/pom.xml
+++ b/server/openejb-webservices/pom.xml
@@ -58,9 +58,16 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee.bom</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <type>pom</type>
+ <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>
</dependency>
<dependency>
diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml
index ec58c1c..461f1e6 100644
--- a/tomee/apache-tomee/pom.xml
+++ b/tomee/apache-tomee/pom.xml
@@ -276,10 +276,14 @@
<version>${version.javaee-api}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee.bom</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
+ <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>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/tomee/tomee-webaccess/pom.xml b/tomee/tomee-webaccess/pom.xml
index db16153..96d2fff 100644
--- a/tomee/tomee-webaccess/pom.xml
+++ b/tomee/tomee-webaccess/pom.xml
@@ -229,9 +229,16 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomee.bom</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <type>pom</type>
+ <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>
</dependency>
</dependencies>
<build>