Fix for CONNECTORS-1646.
git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/trunk@1879219 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index f392e60..2a42c26 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,9 @@
======================= 2.17-dev =====================
+CONNECTORS-1646: Include javax.activation jars in root classpath.
+(Uwe Wolfinger, Karl Wright)
+
CONNECTORS-1645: Web connector collision of page descriptions in login sequence.
(Julien Massiera, Karl Wright)
diff --git a/build.xml b/build.xml
index 1af1512..d03a864 100644
--- a/build.xml
+++ b/build.xml
@@ -28,7 +28,8 @@
<defaultexcludes add="**/*.patch"/>
<defaultexcludes add="**/*.iml"/>
<defaultexcludes add="**/.idea/**"/>
-
+
+ <property name="javax-activation.version" value="1.2.0"/>
<property name="hsqldb.version" value="2.3.2"/>
<property name="jetty.version" value="9.2.3.v20140905"/>
<property name="httpclient.version" value="4.5.8"/>
@@ -1021,6 +1022,24 @@
</antcall>
</target>
+ <target name="download-jdk11-materials">
+ <mkdir dir="lib"/>
+ <antcall target="download-via-maven">
+ <param name="project-path" value="javax/activation"/>
+ <param name="artifact-version" value="${javax-activation.version}"/>
+ <param name="target" value="lib"/>
+ <param name="artifact-name" value="javax.activation-api"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ <antcall target="download-via-maven">
+ <param name="project-path" value="com/sun/activation"/>
+ <param name="artifact-version" value="${javax-activation.version}"/>
+ <param name="target" value="lib"/>
+ <param name="artifact-name" value="javax.activation"/>
+ <param name="artifact-type" value="jar"/>
+ </antcall>
+ </target>
+
<target name="download-hsqldb">
<mkdir dir="lib"/>
<antcall target="download-via-maven">
@@ -3032,7 +3051,7 @@
</antcall>
</target>
- <target name="make-core-deps" depends="download-less-compiler,download-forbidden-checks,download-nuxeo-client,download-json-simple,download-selenium,download-kafka-client,download-joda-time,download-aws-sdk,download-resteasy,download-jsoup,download-mockito,download-alfresco-webscript-plugin,download-alfresco-indexer-client,download-mongo-java-driver,download-jira-client,download-google-api-client,download-dropbox-client,download-solrj,download-zookeeper,download-httpcomponents,download-hsqldb,download-xerces,download-commons,download-elasticsearch-plugin,download-solr-plugins,download-sharepoint-plugins,download-jstl,download-xmlgraphics-commons,download-woodstox,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj,download-hadoop,download-htrace,download-protobuf,download-tika,download-jackson">
+ <target name="make-core-deps" depends="download-less-compiler,download-forbidden-checks,download-nuxeo-client,download-json-simple,download-selenium,download-kafka-client,download-joda-time,download-aws-sdk,download-resteasy,download-jsoup,download-mockito,download-alfresco-webscript-plugin,download-alfresco-indexer-client,download-mongo-java-driver,download-jira-client,download-google-api-client,download-dropbox-client,download-solrj,download-zookeeper,download-httpcomponents,download-jdk11-materials,download-hsqldb,download-xerces,download-commons,download-elasticsearch-plugin,download-solr-plugins,download-sharepoint-plugins,download-jstl,download-xmlgraphics-commons,download-woodstox,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj,download-hadoop,download-htrace,download-protobuf,download-tika,download-jackson">
<copy todir="lib">
<fileset dir="lib-license" includes="*.txt"/>
</copy>
diff --git a/dist-license/LICENSE.txt b/dist-license/LICENSE.txt
index 4f0d8f5..a31bdf5 100644
--- a/dist-license/LICENSE.txt
+++ b/dist-license/LICENSE.txt
@@ -203,6 +203,10 @@
This product includes a number of slf4j jars.
License: MIT/X11 license
+This product includes a javax.activation-api.jar and a javax.activation.jar.
+License: DUAL Common Development and Distribution License (CDDL) v1.0 (https://glassfish.dev.java.net/public/CDDLv1.0.html), GPL 2.0.
+Distributed under terms of CDDL 1.0.
+
This product includes a postgresql.jar: http://jdbc.postgresql.org
License: BSD License (http://jdbc.postgresql.org/license.html)
diff --git a/dist-license/NOTICE.txt b/dist-license/NOTICE.txt
index 81c1f71..c76deef 100644
--- a/dist-license/NOTICE.txt
+++ b/dist-license/NOTICE.txt
@@ -1,5 +1,5 @@
Apache ManifoldCF
-Copyright 2010-2019 The Apache Software Foundation
+Copyright 2010-2020 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
diff --git a/framework/build.xml b/framework/build.xml
index ce94478..b0983c9 100644
--- a/framework/build.xml
+++ b/framework/build.xml
@@ -77,6 +77,9 @@
<include name="jna*.jar"/>
</fileset>
<fileset dir="../lib">
+ <include name="javax.activation*.jar"/>
+ </fileset>
+ <fileset dir="../lib">
<include name="postgresql*.jar"/>
<include name="hsqldb*.jar"/>
</fileset>
@@ -527,6 +530,9 @@
<include name="jna*.jar"/>
</fileset>
<fileset dir="../lib">
+ <include name="javax.activation*.jar"/>
+ </fileset>
+ <fileset dir="../lib">
<include name="postgresql*.jar"/>
<include name="hsqldb*.jar"/>
</fileset>
@@ -573,6 +579,9 @@
<include name="jna*.jar"/>
</fileset>
<fileset dir="../lib">
+ <include name="javax.activation*.jar"/>
+ </fileset>
+ <fileset dir="../lib">
<include name="postgresql*.jar"/>
<include name="hsqldb*.jar"/>
</fileset>
@@ -625,6 +634,9 @@
<include name="jna*.jar"/>
</fileset>
<fileset dir="../lib">
+ <include name="javax.activation*.jar"/>
+ </fileset>
+ <fileset dir="../lib">
<include name="postgresql*.jar"/>
<include name="hsqldb*.jar"/>
</fileset>
@@ -672,6 +684,9 @@
<include name="jna*.jar"/>
</fileset>
<fileset dir="../lib">
+ <include name="javax.activation*.jar"/>
+ </fileset>
+ <fileset dir="../lib">
<include name="postgresql*.jar"/>
<include name="hsqldb*.jar"/>
</fileset>
@@ -727,6 +742,9 @@
<include name="jna*.jar"/>
</fileset>
<fileset dir="../lib">
+ <include name="javax.activation*.jar"/>
+ </fileset>
+ <fileset dir="../lib">
<include name="postgresql*.jar"/>
<include name="hsqldb*.jar"/>
</fileset>
@@ -786,6 +804,9 @@
<include name="jna*.jar"/>
</fileset>
<fileset dir="../lib">
+ <include name="javax.activation*.jar"/>
+ </fileset>
+ <fileset dir="../lib">
<include name="postgresql*.jar"/>
<include name="hsqldb*.jar"/>
</fileset>
@@ -853,6 +874,9 @@
<include name="jna*.jar"/>
</fileset>
<fileset dir="../lib">
+ <include name="javax.activation*.jar"/>
+ </fileset>
+ <fileset dir="../lib">
<include name="postgresql*.jar"/>
<include name="hsqldb*.jar"/>
</fileset>
@@ -914,6 +938,9 @@
<include name="jna*.jar"/>
</fileset>
<fileset dir="../lib">
+ <include name="javax.activation*.jar"/>
+ </fileset>
+ <fileset dir="../lib">
<include name="postgresql*.jar"/>
<include name="hsqldb*.jar"/>
</fileset>
@@ -1054,6 +1081,9 @@
<include name="jsp-api*.jar"/>
</fileset>
<fileset dir="../lib">
+ <include name="javax.activation*.jar"/>
+ </fileset>
+ <fileset dir="../lib">
<include name="postgresql*.jar"/>
<include name="hsqldb*.jar"/>
</fileset>
@@ -1304,6 +1334,9 @@
<include name="jna*.jar"/>
<include name="zookeeper*.jar"/>
</fileset>
+ <fileset dir="../lib">
+ <include name="javax.activation*.jar"/>
+ </fileset>
</path>
<path id="process-lib-proprietary">
diff --git a/lib-license/LICENSE.txt b/lib-license/LICENSE.txt
index e9318c6..48341e6 100644
--- a/lib-license/LICENSE.txt
+++ b/lib-license/LICENSE.txt
@@ -203,6 +203,10 @@
This product includes a number of slf4j jars.
License: MIT/X11 license
+This product includes a javax.activation-api.jar and a javax.activation.jar.
+License: DUAL Common Development and Distribution License (CDDL) v1.0 (https://glassfish.dev.java.net/public/CDDLv1.0.html), GPL 2.0.
+Distributed under terms of CDDL 1.0.
+
This product includes a postgresql.jar: http://jdbc.postgresql.org
License: BSD License (http://jdbc.postgresql.org/license.html)
diff --git a/lib-license/NOTICE.txt b/lib-license/NOTICE.txt
index 7c1c78c..dfd5fda 100644
--- a/lib-license/NOTICE.txt
+++ b/lib-license/NOTICE.txt
@@ -1,5 +1,5 @@
Apache ManifoldCF
-Copyright 2010-2019 The Apache Software Foundation
+Copyright 2010-2020 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
