You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2019/01/10 04:09:33 UTC
[cxf] branch master updated: [CXF-7907]Change jaxb-api to
jakarta.xml.bind-api artifact dependency
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/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new ccf67e1 [CXF-7907]Change jaxb-api to jakarta.xml.bind-api artifact dependency
ccf67e1 is described below
commit ccf67e1d83e88ff11f96857055697bd194dbd7a1
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Thu Jan 10 12:08:47 2019 +0800
[CXF-7907]Change jaxb-api to jakarta.xml.bind-api artifact dependency
---
parent/pom.xml | 6 +++---
tools/javato/ws/pom.xml | 4 ++--
.../tools/java2js/processor/JavaToJSProcessorTest.java | 15 ++++++++-------
.../generator/wsdl11/FaultBeanGeneratorTest.java | 8 +++-----
.../generator/wsdl11/WrapperBeanGeneratorTest.java | 12 +++++-------
.../tools/java2wsdl/processor/JavaToProcessorTest.java | 13 +++++++------
6 files changed, 28 insertions(+), 30 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 27703ad..cea480e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2852,9 +2852,9 @@
</build>
<dependencies>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${cxf.jaxb.version}</version>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>2.3.2</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
diff --git a/tools/javato/ws/pom.xml b/tools/javato/ws/pom.xml
index 1658de3..9a1bf25 100644
--- a/tools/javato/ws/pom.xml
+++ b/tools/javato/ws/pom.xml
@@ -226,8 +226,8 @@
<outputDirectory>${project.basedir}/target/java9</outputDirectory>
</artifactItem>
<artifactItem>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.basedir}/target/java9</outputDirectory>
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessorTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessorTest.java
index 7479cb2..ced20aa 100755
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessorTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessorTest.java
@@ -74,12 +74,13 @@ public class JavaToJSProcessorTest extends ProcessorTestBase {
public void testDocLitUseClassPathFlag() throws Exception {
File classFile = new java.io.File(output.getCanonicalPath() + "/classes");
classFile.mkdir();
- String java9PlusFolder = output.getParent() + "/java9";
- System.setProperty("java.class.path", getClassPath() + classFile.getCanonicalPath()
- + File.separatorChar + ":" + java9PlusFolder + "/jaxb-api-2.3.0.jar"
- + ":" + java9PlusFolder + "/jaxws-api-2.3.0.jar"
- + ":" + java9PlusFolder + "/geronimo-ws-metadata_2.0_spec-1.1.3.jar");
-
+ if (JavaUtils.isJava9Compatible()) {
+ System.setProperty("org.apache.cxf.common.util.Compiler-fork", "true");
+ String java9PlusFolder = output.getParent() + java.io.File.separator + "java9";
+ System.setProperty("java.class.path", System.getProperty("java.class.path")
+ + java.io.File.pathSeparator + java9PlusFolder + java.io.File.separator + "*");
+ }
+
env.put(ToolConstants.CFG_COMPILE, ToolConstants.CFG_COMPILE);
env.put(ToolConstants.CFG_CLASSDIR, output.getCanonicalPath() + "/classes");
@@ -109,4 +110,4 @@ public class JavaToJSProcessorTest extends ProcessorTestBase {
assertTrue("Generate JS Fail", jsFile.exists());
}
-}
\ No newline at end of file
+}
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java
index 59c109d..90b814d 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/FaultBeanGeneratorTest.java
@@ -48,11 +48,9 @@ public class FaultBeanGeneratorTest extends ProcessorTestBase {
System.setProperty("java.class.path", getClassPath());
if (JavaUtils.isJava9Compatible()) {
System.setProperty("org.apache.cxf.common.util.Compiler-fork", "true");
- String java9PlusFolder = output.getParent() + "/java9";
+ String java9PlusFolder = output.getParent() + java.io.File.separator + "java9";
System.setProperty("java.class.path", System.getProperty("java.class.path")
- + ":" + java9PlusFolder + "/jaxb-api-2.3.0.jar"
- + ":" + java9PlusFolder + "/jaxws-api-2.3.0.jar"
- + ":" + java9PlusFolder + "/geronimo-ws-metadata_2.0_spec-1.1.3.jar");
+ + java.io.File.pathSeparator + java9PlusFolder + java.io.File.separator + "*");
}
processor.setEnvironment(env);
}
@@ -126,4 +124,4 @@ public class FaultBeanGeneratorTest extends ProcessorTestBase {
assertEquals("org.apache.cxf.tools.fortest.cxf523.DBServiceFault",
classes.iterator().next().getName());
}
-}
\ No newline at end of file
+}
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGeneratorTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGeneratorTest.java
index 5c8e03d..20c60a6 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGeneratorTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/generator/wsdl11/WrapperBeanGeneratorTest.java
@@ -140,13 +140,11 @@ public class WrapperBeanGeneratorTest extends ProcessorTestBase {
generator.setToolContext(env);
generator.setServiceModel(getServiceInfo());
if (JavaUtils.isJava9Compatible()) {
- String java9PlusFolder = output.getParent() + "/java9";
- System.setProperty("java.class.path", System.getProperty("java.class.path")
- + ":" + java9PlusFolder + "/jaxb-api-2.3.0.jar"
- + ":" + java9PlusFolder + "/jaxws-api-2.3.0.jar"
- + ":" + java9PlusFolder + "/geronimo-ws-metadata_2.0_spec-1.1.3.jar");
+ System.setProperty("org.apache.cxf.common.util.Compiler-fork", "true");
+ String java9PlusFolder = output.getParent() + java.io.File.separator + "java9";
+ System.setProperty("java.class.path", System.getProperty("java.class.path")
+ + java.io.File.pathSeparator + java9PlusFolder + java.io.File.separator + "*");
}
-
generator.generate(output);
Class<?> clz = classLoader.loadClass("org.apache.cxf.SayHi");
assertNotNull(clz);
@@ -177,4 +175,4 @@ public class WrapperBeanGeneratorTest extends ProcessorTestBase {
assertTrue(contents.indexOf("public java.util.List<java.lang.String> getReturn()") != -1);
}
-}
\ No newline at end of file
+}
diff --git a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
index 95e82c9..00ab62d 100644
--- a/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
+++ b/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
@@ -170,11 +170,12 @@ public class JavaToProcessorTest extends ProcessorTestBase {
File classFile = new java.io.File(output.getCanonicalPath() + "/classes");
classFile.mkdir();
- String java9PlusFolder = output.getParent() + "/java9";
- System.setProperty("java.class.path", getClassPath() + classFile.getCanonicalPath()
- + File.separatorChar + ":" + java9PlusFolder + "/jaxb-api-2.3.0.jar"
- + ":" + java9PlusFolder + "/jaxws-api-2.3.0.jar"
- + ":" + java9PlusFolder + "/geronimo-ws-metadata_2.0_spec-1.1.3.jar");
+ if (JavaUtils.isJava9Compatible()) {
+ System.setProperty("org.apache.cxf.common.util.Compiler-fork", "true");
+ String java9PlusFolder = output.getParent() + java.io.File.separator + "java9";
+ System.setProperty("java.class.path", System.getProperty("java.class.path")
+ + java.io.File.pathSeparator + java9PlusFolder + java.io.File.separator + "*");
+ }
env.put(ToolConstants.CFG_COMPILE, ToolConstants.CFG_COMPILE);
env.put(ToolConstants.CFG_CLASSDIR, output.getCanonicalPath() + "/classes");
@@ -1042,4 +1043,4 @@ public class JavaToProcessorTest extends ProcessorTestBase {
assertEquals(-1, sw.getBuffer().indexOf("Exception Message"));
}
-}
\ No newline at end of file
+}