You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2022/02/25 08:09:03 UTC
svn commit: r1898407 - in /manifoldcf/trunk: build.xml framework/build.xml framework/buildfiles/connector-build.xml
Author: kwright
Date: Fri Feb 25 08:09:02 2022
New Revision: 1898407
URL: http://svn.apache.org/viewvc?rev=1898407&view=rev
Log:
Get it to build again with jdk 11
Modified:
manifoldcf/trunk/build.xml
manifoldcf/trunk/framework/build.xml
manifoldcf/trunk/framework/buildfiles/connector-build.xml
Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1898407&r1=1898406&r2=1898407&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Fri Feb 25 08:09:02 2022
@@ -74,6 +74,7 @@
<property name="stax-ex.version" value="1.8.1"/>
<property name="fastinfoset.version" value="1.2.16"/>
<property name="jaxws.version" value="2.3.2"/>
+ <property name="jaxws-api.version" value="2.2.6"/>
<property name="jakarta.activation.version" value="1.2.2"/>
<property name="jakarta.activation-api.version" value="1.2.1"/>
<property name="jakarta.ws.rs-api.version" value="2.1.6"/>
@@ -92,7 +93,7 @@
<property name="selenium.version" value="3.13.0"/>
<property name="hamcrest.version" value="1.3"/>
<property name="log4j12.version" value="1.2.17"/>
- <property name="log4j.version" value="2.17.0"/>
+ <property name="log4j.version" value="2.15.0"/>
<property name="mail.version" value="1.6.2"/>
<property name="mimepull.version" value="1.9.11"/>
<property name="opensaml.version" value="1.1"/>
@@ -594,7 +595,7 @@
<target name="doc" depends="deliver-site-doc"/>
<target name="set-version">
- <property name="release-version" value="2.22-dev"/>
+ <property name="release-version" value="2.21-dev"/>
</target>
<target name="create-source-zip" depends="set-version">
@@ -1039,6 +1040,12 @@ Use Apache Forrest version forrest-0.9-d
<target name="download-jdk11-materials">
<mkdir dir="lib"/>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="javax/annotation"/>
+ <param name="artifact-name" value="javax.annotation-api"/>
+ <param name="artifact-version" value="1.3.2"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
<antcall target="download-via-maven">
<param name="project-path" value="javax/activation"/>
<param name="artifact-version" value="${javax-activation.version}"/>
@@ -1053,6 +1060,13 @@ Use Apache Forrest version forrest-0.9-d
<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">
@@ -1690,6 +1704,12 @@ Use Apache Forrest version forrest-0.9-d
<param name="artifact-name" value="jaxws-rt"/>
<param name="artifact-type" value="jar"/>
</antcall>
+ <antcall target="download-via-maven"><param name="target" value="lib"/>
+ <param name="project-path" value="javax/xml/ws"/>
+ <param name="artifact-version" value="${jaxws-api.version}"/>
+ <param name="artifact-name" value="jaxws-api"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
</target>
<target name="download-jakarta-runtimes">
Modified: manifoldcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1898407&r1=1898406&r2=1898407&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Fri Feb 25 08:09:02 2022
@@ -207,6 +207,9 @@
<include name="istack-commons*.jar"/>
<include name="FastInfoset*.jar"/>
<include name="velocity-engine-core*.jar"/>
+ <include name="jaxws-api*.jar"/>
+ <include name="javax.annotation-api*.jar"/>
+ <include name="javax.jws-api*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="castor*.jar"/>
@@ -1705,6 +1708,9 @@
<include name="istack-commons*.jar"/>
<include name="FastInfoset*.jar"/>
<include name="velocity-engine-core*.jar"/>
+ <include name="jaxws-api*.jar"/>
+ <include name="javax.annotation-api*.jar"/>
+ <include name="javax.jws-api*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="castor*.jar"/>
Modified: manifoldcf/trunk/framework/buildfiles/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/buildfiles/connector-build.xml?rev=1898407&r1=1898406&r2=1898407&view=diff
==============================================================================
--- manifoldcf/trunk/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/trunk/framework/buildfiles/connector-build.xml Fri Feb 25 08:09:02 2022
@@ -566,6 +566,9 @@
<include name="commons-discovery*.jar"/>
<include name="commons-logging*.jar"/>
</fileset>
+ <fileset dir="${mcf-dist}/lib">
+ <include name="javax.activation*.jar"/>
+ </fileset>
</classpath>
</javac>
</target>