Get trunk to build on jdk11 with cxf connector
git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/trunk@1884341 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index dbbe598..050e44f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,9 @@
======================= 2.18-dev =====================
+NOTICKET: Get the CXF wsdl-2-java utility working on JDK 11.
+(Karl Wright)
+
CONNECTORS-1660: Better handling of non-correctly-formatted HTML.
(Olivier Tavard)
diff --git a/build.xml b/build.xml
index 7ca3270..741b7bf 100644
--- a/build.xml
+++ b/build.xml
@@ -1038,6 +1038,13 @@
<param name="artifact-name" value="javax.activation"/>
<param name="artifact-type" value="jar"/>
</antcall>
+ <antcall target="download-via-maven">
+ <param name="project-path" value="javax/jws"/>
+ <param name="artifact-version" value="1.1"/>
+ <param name="target" value="lib"/>
+ <param name="artifact-name" value="javax.jws-api"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
</target>
<target name="download-hsqldb">
diff --git a/connectors/alfresco-webscript/build.xml b/connectors/alfresco-webscript/build.xml
index 8d25630..78c5cd5 100644
--- a/connectors/alfresco-webscript/build.xml
+++ b/connectors/alfresco-webscript/build.xml
@@ -45,7 +45,6 @@
<include name="chemistry*.jar"/>
<include name="stax*.jar"/>
<include name="streambuffer*.jar"/>
- <include name="jaxws-api*.jar"/>
<include name="cxf-rt-frontend-jaxws*.jar"/>
<include name="woodstox-core-asl*.jar"/>
<include name="mimepull*.jar"/>
diff --git a/connectors/cmis/build.xml b/connectors/cmis/build.xml
index e408490..8447b3d 100644
--- a/connectors/cmis/build.xml
+++ b/connectors/cmis/build.xml
@@ -60,12 +60,11 @@
<include name="chemistry*.jar"/>
<include name="stax*.jar"/>
<include name="streambuffer*.jar"/>
- <include name="jaxws-api*.jar"/>
<include name="woodstox-core-asl*.jar"/>
<include name="mimepull*.jar"/>
<include name="resolver*.jar"/>
<include name="org.osgi.core*.jar"/>
- <include name="joda*.jar"/>
+ <include name="joda*.jar"/>
</fileset>
</path>
@@ -76,7 +75,6 @@
<include name="chemistry*.jar"/>
<include name="stax*.jar"/>
<include name="streambuffer*.jar"/>
- <include name="jaxws-api*.jar"/>
<include name="woodstox-core-asl*.jar"/>
<include name="mimepull*.jar"/>
<include name="resolver*.jar"/>
diff --git a/framework/build.xml b/framework/build.xml
index b0983c9..616336b 100644
--- a/framework/build.xml
+++ b/framework/build.xml
@@ -1692,6 +1692,10 @@
<include name="opensaml*.jar"/>
<include name="activation*.jar"/>
</fileset>
+ <fileset dir="../lib">
+ <include name="jaxws-api*.jar"/>
+ <include name="javax.jws-api*.jar"/>
+ </fileset>
</copy>
</target>
diff --git a/framework/buildfiles/connector-build.xml b/framework/buildfiles/connector-build.xml
index 0252d27..ed3fa44 100644
--- a/framework/buildfiles/connector-build.xml
+++ b/framework/buildfiles/connector-build.xml
@@ -136,6 +136,7 @@
<include name="jasper*.jar"/>
<include name="jetty*.jar"/>
<include name="slf4j*.jar"/>
+ <include name="javax.activation*.jar"/>
<include name="jsp-2.1*.jar"/>
<include name="jsp-api*.jar"/>
<include name="junit*.jar"/>
@@ -222,6 +223,8 @@
<include name="xmlschema-core*.jar"/>
<include name="javax.annotation-api*.jar"/>
<include name="javax.ws.rs-api*.jar"/>
+ <include name="jaxws-api*.jar"/>
+ <include name="javax.jws-api*.jar"/>
</fileset>
<fileset dir="${mcf-dist}/connector-common-lib">
<include name="axis*.jar"/>
@@ -421,11 +424,15 @@
<include name="xmlschema*.jar"/>
<include name="neethi*.jar"/>
<include name="xml-resolver*.jar"/>
+ <include name="jaxws-api*.jar"/>
+ <include name="javax.annotation-api*.jar"/>
+ <include name="javax.jws-api*.jar"/>
</fileset>
<fileset dir="${mcf-dist}/lib">
<include name="velocity*.jar"/>
<include name="commons-collections*.jar"/>
<include name="commons-lang*.jar"/>
+ <include name="javax.activation*.jar"/>
</fileset>
</classpath>
<jvmarg value="-Dorg.apache.cxf.stax.allowInsecureParser=1"/>
