From 96892cf8f9edb439bc4800b8b9066b57de8b55ef Mon Sep 17 00:00:00 2001 From: jomu Date: Mon, 17 Jun 2019 14:21:11 +0200 Subject: [PATCH] started to fix sharepoint API under JDK11 --- pom.xml | 7 +++-- sharepoint/api/pom.xml | 70 +++++++++++++++++++++++++++++++++++++---- sharepoint/mock/pom.xml | 2 +- sharepoint/pom.xml | 1 + 4 files changed, 70 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 4f1d477..500a627 100644 --- a/pom.xml +++ b/pom.xml @@ -269,9 +269,10 @@ 3.0.1 - org.codehaus.mojo - jaxws-maven-plugin - 2.5 + + com.helger.maven + jaxws-maven-plugin + 2.6.1 maven-release-plugin diff --git a/sharepoint/api/pom.xml b/sharepoint/api/pom.xml index e70979b..8f7bbd9 100644 --- a/sharepoint/api/pom.xml +++ b/sharepoint/api/pom.xml @@ -19,7 +19,7 @@ - org.codehaus.mojo + com.helger.maven jaxws-maven-plugin ${project.build.directory}/generated-sources/jaxws-wsimport @@ -160,15 +160,37 @@ - - + + + javax.annotation + javax.annotation-api + 1.3.2 + + + javax.xml.bind + jaxb-api + 2.3.1 + + + javax.xml.ws + jaxws-api + 2.3.1 + + + javax.jws + javax.jws-api + 1.1 + + + + org.codehaus.mojo jaxb2-maven-plugin false - false + true false @@ -186,7 +208,8 @@ ${project.build.directory}/generated-sources/jaxb/ true - ${basedir}/src/main/resources/xsd/batch.xsd + src/main/resources/xsd/dummy.xsd + src/main/resources/xsd/batch.xsd @@ -230,6 +253,18 @@ + + + org.glassfish.jaxb + jaxb-xjc + 2.3.2 + + + com.sun.activation + jakarta.activation + 1.2.1 + + @@ -255,6 +290,29 @@ org.slf4j slf4j-log4j12 test - + + + + + javax.xml.bind + jaxb-api + 2.3.1 + + + com.sun.xml.bind + jaxb-core + 2.3.0 + + + com.sun.xml.bind + jaxb-impl + 2.3.2 + + + com.sun.activation + jakarta.activation + 1.2.1 + + \ No newline at end of file diff --git a/sharepoint/mock/pom.xml b/sharepoint/mock/pom.xml index c956dbe..85b41c9 100644 --- a/sharepoint/mock/pom.xml +++ b/sharepoint/mock/pom.xml @@ -4,7 +4,7 @@ de.muehlencord.shared shared-sharepoint - 1.0-SNAPSHOT + 1.2-SNAPSHOT de.muehlencord.shared.sharepoint sharepoint-mock diff --git a/sharepoint/pom.xml b/sharepoint/pom.xml index 70a0bef..f60f8ba 100644 --- a/sharepoint/pom.xml +++ b/sharepoint/pom.xml @@ -4,6 +4,7 @@ de.muehlencord shared + 1.2-SNAPSHOT de.muehlencord.shared shared-sharepoint