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 20:44:13 UTC
[tomee] branch tomee-7.0.x updated (2def9c4 -> 31a4704)
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 2def9c4 Correcting versions after backport
new cc1b5f4 Revert "Correcting versions after backport"
new 90dbea1 Revert "Fix compile error"
new 4ae4d7f Revert "Backport JAXB bom and 2.3.2"
new 0f4002a Update JAXB to 2.3.1
new 31a4704 Revert "Update JAXB to 2.3.1"
The 5 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] 05/05: Revert "Update JAXB to 2.3.1"
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 31a4704929c63ded7fc4e1c0f20c5064a0c5fa62
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Tue Aug 13 21:43:51 2019 +0100
Revert "Update JAXB to 2.3.1"
This reverts commit 0f4002a6849b4a4f9712a2ebf07bef70bb8cf719.
---
examples/groovy-cdi/pom.xml | 2 +-
examples/groovy-jpa/pom.xml | 2 +-
examples/groovy-spock/pom.xml | 2 +-
pom.xml | 6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/examples/groovy-cdi/pom.xml b/examples/groovy-cdi/pom.xml
index 9840e4c..62f2f51 100644
--- a/examples/groovy-cdi/pom.xml
+++ b/examples/groovy-cdi/pom.xml
@@ -87,7 +87,7 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.3.1</version>
+ <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 c96eddc..98a5b07 100644
--- a/examples/groovy-jpa/pom.xml
+++ b/examples/groovy-jpa/pom.xml
@@ -88,7 +88,7 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.3.1</version>
+ <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 3106207..38231ea 100644
--- a/examples/groovy-spock/pom.xml
+++ b/examples/groovy-spock/pom.xml
@@ -97,7 +97,7 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.3.1</version>
+ <version>2.1.13</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/pom.xml b/pom.xml
index c7e723e..9042eea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1732,17 +1732,17 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.3.1</version>
+ <version>2.3.0</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.3.1</version>
+ <version>2.3.0</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
- <version>2.3.1</version>
+ <version>2.3.0</version>
</dependency>
<dependency> <!-- licence apache, only 110ko -->
<groupId>org.fusesource.jansi</groupId>
[tomee] 04/05: Update JAXB to 2.3.1
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 0f4002a6849b4a4f9712a2ebf07bef70bb8cf719
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Tue Aug 13 21:33:39 2019 +0100
Update JAXB to 2.3.1
---
examples/groovy-cdi/pom.xml | 2 +-
examples/groovy-jpa/pom.xml | 2 +-
examples/groovy-spock/pom.xml | 2 +-
pom.xml | 6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/examples/groovy-cdi/pom.xml b/examples/groovy-cdi/pom.xml
index 62f2f51..9840e4c 100644
--- a/examples/groovy-cdi/pom.xml
+++ b/examples/groovy-cdi/pom.xml
@@ -87,7 +87,7 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.2.11</version>
+ <version>2.3.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/examples/groovy-jpa/pom.xml b/examples/groovy-jpa/pom.xml
index 98a5b07..c96eddc 100644
--- a/examples/groovy-jpa/pom.xml
+++ b/examples/groovy-jpa/pom.xml
@@ -88,7 +88,7 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.1.13</version>
+ <version>2.3.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/examples/groovy-spock/pom.xml b/examples/groovy-spock/pom.xml
index 38231ea..3106207 100644
--- a/examples/groovy-spock/pom.xml
+++ b/examples/groovy-spock/pom.xml
@@ -97,7 +97,7 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.1.13</version>
+ <version>2.3.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/pom.xml b/pom.xml
index 9042eea..c7e723e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1732,17 +1732,17 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.3.0</version>
+ <version>2.3.1</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.3.0</version>
+ <version>2.3.1</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
- <version>2.3.0</version>
+ <version>2.3.1</version>
</dependency>
<dependency> <!-- licence apache, only 110ko -->
<groupId>org.fusesource.jansi</groupId>
[tomee] 03/05: 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.0.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 4ae4d7f19fb6830c89b370be38d50f88dc590911
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Tue Aug 13 21:31:11 2019 +0100
Revert "Backport JAXB bom and 2.3.2"
This reverts commit 57166e9c0c561d650819ddff2f1c8e9d81e6cf11.
---
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 fd3980f..1c1b14c 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 29aada3..62f2f51 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 5c97790..98a5b07 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 20c4e47..38231ea 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 8e78241..6e158cb 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 c3c7849..9042eea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -509,7 +509,6 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
- <module>boms</module>
<module>itests</module>
<module>maven</module>
<module>gradle</module>
@@ -538,7 +537,6 @@
<profile>
<id>quick</id>
<modules>
- <module>boms</module>
<module>maven</module>
<module>gradle</module>
<module>container</module>
@@ -1726,16 +1724,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 9256fb4..d68e6eb 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 4f16881..e1faa08 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 34653e5..d5e5fbf 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 89568ae..2f80a32 100644
--- a/tomee/apache-tomee/pom.xml
+++ b/tomee/apache-tomee/pom.xml
@@ -256,10 +256,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 a34684d..d7cedbb 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>
[tomee] 01/05: Revert "Correcting versions after backport"
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 cc1b5f434681dbae93dd2cc526ac91878dbc1e13
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Tue Aug 13 21:30:48 2019 +0100
Revert "Correcting versions after backport"
This reverts commit 2def9c43dcda3efcecf961e6a2454b6605e5d546.
---
boms/jaxb-runtime/pom.xml | 2 +-
boms/pom.xml | 2 +-
examples/groovy-cdi/pom.xml | 2 +-
examples/groovy-jpa/pom.xml | 2 +-
examples/groovy-spock/pom.xml | 2 +-
examples/simple-stateful-callbacks/pom.xml | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/boms/jaxb-runtime/pom.xml b/boms/jaxb-runtime/pom.xml
index d50a6dc..581561a 100644
--- a/boms/jaxb-runtime/pom.xml
+++ b/boms/jaxb-runtime/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tomee.bom</groupId>
<artifactId>boms</artifactId>
- <version>7.0.7-SNAPSHOT</version>
+ <version>7.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/boms/pom.xml b/boms/pom.xml
index dbb1376..615dbdd 100644
--- a/boms/pom.xml
+++ b/boms/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>tomee-project</artifactId>
<groupId>org.apache.tomee</groupId>
- <version>7.0.7-SNAPSHOT</version>
+ <version>7.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/examples/groovy-cdi/pom.xml b/examples/groovy-cdi/pom.xml
index f63867a..29aada3 100644
--- a/examples/groovy-cdi/pom.xml
+++ b/examples/groovy-cdi/pom.xml
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.tomee.bom</groupId>
<artifactId>jaxb-runtime</artifactId>
- <version>7.0.7-SNAPSHOT</version>
+ <version>7.1.2-SNAPSHOT</version>
<type>pom</type>
</dependency>
<dependency>
diff --git a/examples/groovy-jpa/pom.xml b/examples/groovy-jpa/pom.xml
index 471b002..5c97790 100644
--- a/examples/groovy-jpa/pom.xml
+++ b/examples/groovy-jpa/pom.xml
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.apache.tomee.bom</groupId>
<artifactId>jaxb-runtime</artifactId>
- <version>7.0.7-SNAPSHOT</version>
+ <version>7.1.2-SNAPSHOT</version>
<type>pom</type>
</dependency>
<dependency>
diff --git a/examples/groovy-spock/pom.xml b/examples/groovy-spock/pom.xml
index bf25032..20c4e47 100644
--- a/examples/groovy-spock/pom.xml
+++ b/examples/groovy-spock/pom.xml
@@ -92,7 +92,7 @@
<dependency>
<groupId>org.apache.tomee.bom</groupId>
<artifactId>jaxb-runtime</artifactId>
- <version>7.0.7-SNAPSHOT</version>
+ <version>7.1.2-SNAPSHOT</version>
<type>pom</type>
</dependency>
<dependency>
diff --git a/examples/simple-stateful-callbacks/pom.xml b/examples/simple-stateful-callbacks/pom.xml
index d98e633..8e78241 100644
--- a/examples/simple-stateful-callbacks/pom.xml
+++ b/examples/simple-stateful-callbacks/pom.xml
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.tomee.bom</groupId>
<artifactId>jaxb-runtime</artifactId>
- <version>7.0.7-SNAPSHOT</version>
+ <version>7.1.2-SNAPSHOT</version>
<type>pom</type>
</dependency>
<dependency>
[tomee] 02/05: 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.0.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 90dbea19d77ee80af6b740eafaf901e7d984e8eb
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Tue Aug 13 21:31:01 2019 +0100
Revert "Fix compile error"
This reverts commit ef739785deb5de1279bc3a5905c4c6bed02f8de5.
---
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 17a3a78..4f16881 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>