Author: kwright
Date: Tue Mar 10 00:11:12 2020
New Revision: 1875022
URL: http://svn.apache.org/viewvc?rev=1875022&view=rev
Log:
Merge CONNECTORS-1637 branch to trunk. Thanks to Julien Massiera for the
contribution!
Added:
manifoldcf/trunk/connectors/confluence-v6/
- copied from r1875021,
manifoldcf/branches/CONNECTORS-1637/connectors/confluence-v6/
Modified:
manifoldcf/trunk/ (props changed)
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/connectors/pom.xml
Propchange: manifoldcf/trunk/
------------------------------------------------------------------------------
Merged /manifoldcf/branches/CONNECTORS-1637:r1874888-1875021
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1875022&r1=1875021&r2=1875022&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Tue Mar 10 00:11:12 2020
@@ -3,6 +3,10 @@ $Id$
======================= 2.16-dev =====================
+CONNECTORS-1637: Add Confluence V6+ connector. Thanks to Julien Massiera
+for the contribution!
+(Julien Massiera)
+
CONNECTORS-1629: Add support for global Kerberos setup.
(Jörn Franke, Karl Wright)
Modified: manifoldcf/trunk/connectors/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/pom.xml?rev=1875022&r1=1875021&r2=1875022&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/pom.xml (original)
+++ manifoldcf/trunk/connectors/pom.xml Tue Mar 10 00:11:12 2020
@@ -67,6 +67,7 @@
<module>documentfilter</module>
<module>searchblox</module>
<module>confluence</module>
+ <module>confluence-v6</module>
<module>amazons3</module>
<module>kafka</module>
<module>opennlp</module>
