You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2018/09/29 06:47:46 UTC
[karaf] branch master updated: [KARAF-5933]use JAXB2.3 with JDK
9/10/11
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/master by this push:
new 02ef661 [KARAF-5933]use JAXB2.3 with JDK 9/10/11
02ef661 is described below
commit 02ef661331bdc29f51ffd21f9c9a470246c26c9a
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Sat Sep 29 14:47:16 2018 +0800
[KARAF-5933]use JAXB2.3 with JDK 9/10/11
---
assemblies/features/base/pom.xml | 6 +++---
.../src/main/filtered-resources/resources/etc/jre.properties | 12 ++++++------
features/core/pom.xml | 1 +
jaas/modules/pom.xml | 1 +
pom.xml | 2 +-
scheduler/pom.xml | 1 +
6 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/assemblies/features/base/pom.xml b/assemblies/features/base/pom.xml
index f16431a..45797dd 100644
--- a/assemblies/features/base/pom.xml
+++ b/assemblies/features/base/pom.xml
@@ -44,8 +44,8 @@
</dependency>
<dependency>
<groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1.1</version>
+ <artifactId>javax.activation-api</artifactId>
+ <version>1.2.0</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
@@ -209,7 +209,7 @@
</artifactItem>
<artifactItem>
<groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
+ <artifactId>javax.activation-api</artifactId>
<outputDirectory>target/classes/resources/lib/jdk9plus</outputDirectory>
</artifactItem>
<artifactItem>
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties b/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties
index a7ac0c5..494d263 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties
+++ b/assemblies/features/base/src/main/filtered-resources/resources/etc/jre.properties
@@ -617,12 +617,12 @@ jre-9= \
javax.tools, \
javax.transaction; javax.transaction.xa; partial=true; mandatory:=partial, \
javax.xml, \
- javax.xml.bind;version="2.2.1", \
- javax.xml.bind.annotation;version="2.2.1", \
- javax.xml.bind.annotation.adapters;version="2.2.1", \
- javax.xml.bind.attachment;version="2.2.1", \
- javax.xml.bind.helpers;version="2.2.1", \
- javax.xml.bind.util;version="2.2.1", \
+ javax.xml.bind;version="2.3.0", \
+ javax.xml.bind.annotation;version="2.3.0", \
+ javax.xml.bind.annotation.adapters;version="2.3.0", \
+ javax.xml.bind.attachment;version="2.3.0", \
+ javax.xml.bind.helpers;version="2.3.0", \
+ javax.xml.bind.util;version="2.3.0", \
javax.xml.crypto, \
javax.xml.crypto.dom, \
javax.xml.crypto.dsig, \
diff --git a/features/core/pom.xml b/features/core/pom.xml
index 99addf4..7f7d0f6 100644
--- a/features/core/pom.xml
+++ b/features/core/pom.xml
@@ -156,6 +156,7 @@
</Export-Package>
<Import-Package>
!org.eclipse.osgi.service.resolver,
+ javax.xml.bind*;version="[2.2,3)",
*
</Import-Package>
<Private-Package>
diff --git a/jaas/modules/pom.xml b/jaas/modules/pom.xml
index d9de3f6..1772036 100644
--- a/jaas/modules/pom.xml
+++ b/jaas/modules/pom.xml
@@ -161,6 +161,7 @@
!net.sf.ehcache*,
!net.spy.memcached*,
com.sun.security.auth.module;resolution:=optional,
+ javax.xml.bind*;version="[2.2,3)",
*
</Import-Package>
<Private-Package>
diff --git a/pom.xml b/pom.xml
index 1e165d7..4a9bf4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,7 +153,7 @@
<cglib2.version>2.2.0</cglib2.version>
<jna.version>4.5.1</jna.version>
- <jaxb.version>2.2.11</jaxb.version>
+ <jaxb.version>2.3.0</jaxb.version>
<commons-beanutils.version>1.9.2</commons-beanutils.version>
<commons-codec.version>1.10</commons-codec.version>
<commons-compress.version>1.17</commons-compress.version>
diff --git a/scheduler/pom.xml b/scheduler/pom.xml
index a8b00b2..266cbf8 100644
--- a/scheduler/pom.xml
+++ b/scheduler/pom.xml
@@ -71,6 +71,7 @@
!javax.transaction,
javax.servlet*;resolution:=optional,
org.jboss.*;resolution:=optional,
+ javax.xml.bind*;version="[2.2,3)",
*
</Import-Package>
<Private-Package>