Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B3878200C67 for ; Mon, 17 Apr 2017 08:19:30 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B20F7160B9D; Mon, 17 Apr 2017 06:19:30 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 0EF21160B9A for ; Mon, 17 Apr 2017 08:19:28 +0200 (CEST) Received: (qmail 47316 invoked by uid 500); 17 Apr 2017 06:19:28 -0000 Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@manifoldcf.apache.org Delivered-To: mailing list commits@manifoldcf.apache.org Received: (qmail 47307 invoked by uid 99); 17 Apr 2017 06:19:28 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Apr 2017 06:19:28 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 438083A197A for ; Mon, 17 Apr 2017 06:19:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1791663 - in /manifoldcf/trunk: ./ connectors/ connectors/alfresco-webscript/ connectors/amazons3/ connectors/confluence/ connectors/dropbox/ connectors/elasticsearch/ connectors/googledrive/ connectors/hdfs/ connectors/jira/ connectors/ka... Date: Mon, 17 Apr 2017 06:19:26 -0000 To: commits@manifoldcf.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170417061927.438083A197A@svn01-us-west.apache.org> archived-at: Mon, 17 Apr 2017 06:19:30 -0000 Author: kwright Date: Mon Apr 17 06:19:26 2017 New Revision: 1791663 URL: http://svn.apache.org/viewvc?rev=1791663&view=rev Log: Commit Nuxeo connector and authority (CONNECTORS-1290) Added: manifoldcf/trunk/connectors/nuxeo/ - copied from r1791662, manifoldcf/branches/CONNECTORS-1290-3/connectors/nuxeo/ manifoldcf/trunk/framework/example-multiprocess-common/logging.xml - copied unchanged from r1791662, manifoldcf/branches/CONNECTORS-1290-3/framework/example-multiprocess-common/logging.xml manifoldcf/trunk/framework/example-singleprocess-common/logging.xml - copied unchanged from r1791662, manifoldcf/branches/CONNECTORS-1290-3/framework/example-singleprocess-common/logging.xml manifoldcf/trunk/framework/jetty-runner/src/main/resources/logging.xml - copied unchanged from r1791662, manifoldcf/branches/CONNECTORS-1290-3/framework/jetty-runner/src/main/resources/logging.xml Removed: manifoldcf/trunk/framework/example-multiprocess-common/logging.ini manifoldcf/trunk/framework/example-singleprocess-common/logging.ini manifoldcf/trunk/framework/jetty-runner/src/main/resources/logging.ini Modified: manifoldcf/trunk/ (props changed) manifoldcf/trunk/CHANGES.txt manifoldcf/trunk/build.xml manifoldcf/trunk/connectors/alfresco-webscript/pom.xml manifoldcf/trunk/connectors/amazons3/pom.xml manifoldcf/trunk/connectors/confluence/pom.xml manifoldcf/trunk/connectors/dropbox/pom.xml manifoldcf/trunk/connectors/elasticsearch/pom.xml manifoldcf/trunk/connectors/googledrive/pom.xml manifoldcf/trunk/connectors/hdfs/pom.xml manifoldcf/trunk/connectors/jira/pom.xml manifoldcf/trunk/connectors/kafka/pom.xml manifoldcf/trunk/connectors/pom.xml manifoldcf/trunk/connectors/solr/pom.xml manifoldcf/trunk/dist-license/LICENSE.txt manifoldcf/trunk/framework/build.xml manifoldcf/trunk/framework/connector-common/pom.xml manifoldcf/trunk/framework/core/pom.xml manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/Logging.java manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/Base.java manifoldcf/trunk/framework/example-multiprocess-file-proprietary/properties.xml manifoldcf/trunk/framework/example-multiprocess-file/properties.xml manifoldcf/trunk/framework/example-multiprocess-zk-proprietary/properties.xml manifoldcf/trunk/framework/example-multiprocess-zk/properties.xml manifoldcf/trunk/framework/example-singleprocess-proprietary/properties.xml manifoldcf/trunk/framework/example-singleprocess/properties.xml manifoldcf/trunk/framework/jetty-runner/src/main/resources/properties.xml manifoldcf/trunk/lib-license/LICENSE.txt manifoldcf/trunk/pom.xml Propchange: manifoldcf/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Apr 17 06:19:26 2017 @@ -66,6 +66,9 @@ /manifoldcf/branches/CONNECTORS-1244:1705272-1705655 /manifoldcf/branches/CONNECTORS-1263:1718116-1719239,1719355 /manifoldcf/branches/CONNECTORS-1270:1726811-1727380 +/manifoldcf/branches/CONNECTORS-1290:1770892-1790234 +/manifoldcf/branches/CONNECTORS-1290-2:1790233-1791483 +/manifoldcf/branches/CONNECTORS-1290-3:1791483-1791662 /manifoldcf/branches/CONNECTORS-13:1525862-1527182,1539324-1541634 /manifoldcf/branches/CONNECTORS-1308:1741766-1741789 /manifoldcf/branches/CONNECTORS-1313:1742768-1743158 Modified: manifoldcf/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1791663&r1=1791662&r2=1791663&view=diff ============================================================================== --- manifoldcf/trunk/CHANGES.txt (original) +++ manifoldcf/trunk/CHANGES.txt Mon Apr 17 06:19:26 2017 @@ -3,6 +3,11 @@ $Id$ ======================= 2.8-dev ===================== +CONNECTORS-1290: Merge Nuxeo Connector. This also required going +to log4j 2.x. This connector is a work in progress but since a great deal +of work has been done and the connector is nearly done, it's time to +commit to trunk. +(David Arroyo Escobar, Rafa Haro, Karl Wright) ======================= Release 2.7 ===================== Modified: manifoldcf/trunk/build.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1791663&r1=1791662&r2=1791663&view=diff ============================================================================== --- manifoldcf/trunk/build.xml (original) +++ manifoldcf/trunk/build.xml Mon Apr 17 06:19:26 2017 @@ -71,7 +71,7 @@ - + @@ -839,6 +839,46 @@ Use Apache Forrest version forrest-0.9-d + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1633,9 +1673,21 @@ Use Apache Forrest version forrest-0.9-d - + + + + + + + + + + + + + - + @@ -2615,7 +2667,7 @@ Use Apache Forrest version forrest-0.9-d - + Modified: manifoldcf/trunk/connectors/alfresco-webscript/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/pom.xml?rev=1791663&r1=1791662&r2=1791663&view=diff ============================================================================== --- manifoldcf/trunk/connectors/alfresco-webscript/pom.xml (original) +++ manifoldcf/trunk/connectors/alfresco-webscript/pom.xml Mon Apr 17 06:19:26 2017 @@ -216,6 +216,12 @@ com.github.maoo.indexer alfresco-indexer-client ${alfresco.indexer.version} + + + log4j + log4j + + Modified: manifoldcf/trunk/connectors/amazons3/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/amazons3/pom.xml?rev=1791663&r1=1791662&r2=1791663&view=diff ============================================================================== --- manifoldcf/trunk/connectors/amazons3/pom.xml (original) +++ manifoldcf/trunk/connectors/amazons3/pom.xml Mon Apr 17 06:19:26 2017 @@ -381,22 +381,6 @@ - commons-logging - commons-logging - ${commons-logging.version} - - - - log4j - log4j - ${log4j.version} - - - commons-codec - commons-codec - ${commons-codec.version} - - com.amazonaws aws-java-sdk-s3 ${aws-java-sdk.version} Modified: manifoldcf/trunk/connectors/confluence/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/confluence/pom.xml?rev=1791663&r1=1791662&r2=1791663&view=diff ============================================================================== --- manifoldcf/trunk/connectors/confluence/pom.xml (original) +++ manifoldcf/trunk/connectors/confluence/pom.xml Mon Apr 17 06:19:26 2017 @@ -343,25 +343,6 @@ ${slf4j.version} - - commons-logging - commons-logging - 1.1.1 - test - - - - log4j - log4j - 1.2.16 - provided - jar - - - commons-codec - commons-codec - 1.8 - Modified: manifoldcf/trunk/connectors/dropbox/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/dropbox/pom.xml?rev=1791663&r1=1791662&r2=1791663&view=diff ============================================================================== --- manifoldcf/trunk/connectors/dropbox/pom.xml (original) +++ manifoldcf/trunk/connectors/dropbox/pom.xml Mon Apr 17 06:19:26 2017 @@ -230,18 +230,6 @@ 1.5.3 jar - - commons-logging - commons-logging - ${commons-logging.version} - test - - - log4j - log4j - ${log4j.version} - jar - Modified: manifoldcf/trunk/connectors/elasticsearch/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/pom.xml?rev=1791663&r1=1791662&r2=1791663&view=diff ============================================================================== --- manifoldcf/trunk/connectors/elasticsearch/pom.xml (original) +++ manifoldcf/trunk/connectors/elasticsearch/pom.xml Mon Apr 17 06:19:26 2017 @@ -466,6 +466,12 @@ elasticsearch-mapper-attachments 2.0.0.RC1 test + + + log4j + log4j + + Modified: manifoldcf/trunk/connectors/googledrive/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/googledrive/pom.xml?rev=1791663&r1=1791662&r2=1791663&view=diff ============================================================================== --- manifoldcf/trunk/connectors/googledrive/pom.xml (original) +++ manifoldcf/trunk/connectors/googledrive/pom.xml Mon Apr 17 06:19:26 2017 @@ -376,20 +376,7 @@ ${slf4j.version} test - - commons-logging - commons-logging - 1.1.1 - test - - - log4j - log4j - 1.2.16 - provided - jar - com.google.apis google-api-services-drive Modified: manifoldcf/trunk/connectors/hdfs/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/hdfs/pom.xml?rev=1791663&r1=1791662&r2=1791663&view=diff ============================================================================== --- manifoldcf/trunk/connectors/hdfs/pom.xml (original) +++ manifoldcf/trunk/connectors/hdfs/pom.xml Mon Apr 17 06:19:26 2017 @@ -361,6 +361,12 @@ org.apache.hadoop hadoop-common ${hadoop.version} + + + log4j + log4j + + Modified: manifoldcf/trunk/connectors/jira/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jira/pom.xml?rev=1791663&r1=1791662&r2=1791663&view=diff ============================================================================== --- manifoldcf/trunk/connectors/jira/pom.xml (original) +++ manifoldcf/trunk/connectors/jira/pom.xml Mon Apr 17 06:19:26 2017 @@ -376,25 +376,5 @@ ${slf4j.version} test - - - commons-logging - commons-logging - 1.1.1 - test - - - - log4j - log4j - 1.2.16 - provided - jar - - - commons-codec - commons-codec - 1.8 - Modified: manifoldcf/trunk/connectors/kafka/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/kafka/pom.xml?rev=1791663&r1=1791662&r2=1791663&view=diff ============================================================================== --- manifoldcf/trunk/connectors/kafka/pom.xml (original) +++ manifoldcf/trunk/connectors/kafka/pom.xml Mon Apr 17 06:19:26 2017 @@ -231,6 +231,12 @@ kafka_2.11 0.8.2.1 test + + + log4j + log4j + + org.scala-lang @@ -449,6 +455,12 @@ zookeeper ${zookeeper.version} test + + + log4j + log4j + + Modified: manifoldcf/trunk/connectors/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/pom.xml?rev=1791663&r1=1791662&r2=1791663&view=diff ============================================================================== --- manifoldcf/trunk/connectors/pom.xml (original) +++ manifoldcf/trunk/connectors/pom.xml Mon Apr 17 06:19:26 2017 @@ -69,6 +69,7 @@ amazons3 kafka opennlp + nuxeo Modified: manifoldcf/trunk/connectors/solr/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/pom.xml?rev=1791663&r1=1791662&r2=1791663&view=diff ============================================================================== --- manifoldcf/trunk/connectors/solr/pom.xml (original) +++ manifoldcf/trunk/connectors/solr/pom.xml Mon Apr 17 06:19:26 2017 @@ -232,6 +232,12 @@ org.apache.zookeeper zookeeper ${zookeeper.version} + + + log4j + log4j + + org.apache.httpcomponents Modified: manifoldcf/trunk/dist-license/LICENSE.txt URL: http://svn.apache.org/viewvc/manifoldcf/trunk/dist-license/LICENSE.txt?rev=1791663&r1=1791662&r2=1791663&view=diff ============================================================================== --- manifoldcf/trunk/dist-license/LICENSE.txt (original) +++ manifoldcf/trunk/dist-license/LICENSE.txt Mon Apr 17 06:19:26 2017 @@ -493,6 +493,18 @@ selenium-api.jar, selenium-chrome-driver selenium-java.jar, selenium-opera-driver.jar, selenium-remote-driver.jar, selenium-safari-driver.jar, selenium-support.jar License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +This product includes a nuxeo-java-client.jar: https://doc.nuxeo.com/nxdoc/licenses/ +License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes a retrofit.jar. +License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes a okhttp.jar. +License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes a okio.jar. +License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + ========================================================================== The following license applies to postgresql.jar, which is available from http://jdbc.postgresql.org Modified: manifoldcf/trunk/framework/build.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1791663&r1=1791662&r2=1791663&view=diff ============================================================================== --- manifoldcf/trunk/framework/build.xml (original) +++ manifoldcf/trunk/framework/build.xml Mon Apr 17 06:19:26 2017 @@ -1577,7 +1577,6 @@ - @@ -1606,7 +1605,6 @@ - @@ -1637,7 +1635,6 @@ - @@ -1670,7 +1667,6 @@ - @@ -1726,7 +1722,6 @@ - @@ -1760,7 +1755,6 @@ - Modified: manifoldcf/trunk/framework/connector-common/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/connector-common/pom.xml?rev=1791663&r1=1791662&r2=1791663&view=diff ============================================================================== --- manifoldcf/trunk/framework/connector-common/pom.xml (original) +++ manifoldcf/trunk/framework/connector-common/pom.xml Mon Apr 17 06:19:26 2017 @@ -69,11 +69,6 @@ ${httpcomponent.httpclient.version} - log4j - log4j - ${log4j.version} - - org.apache.tika tika-core ${tika.version} @@ -104,6 +99,10 @@ ${castor.version} + log4j + log4j + + adaptx adaptx Modified: manifoldcf/trunk/framework/core/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/pom.xml?rev=1791663&r1=1791662&r2=1791663&view=diff ============================================================================== --- manifoldcf/trunk/framework/core/pom.xml (original) +++ manifoldcf/trunk/framework/core/pom.xml Mon Apr 17 06:19:26 2017 @@ -67,8 +67,18 @@ ${httpcomponent.httpclient.version} - log4j - log4j + org.apache.logging.log4j + log4j-core + ${log4j.version} + + + org.apache.logging.log4j + log4j-api + ${log4j.version} + + + org.apache.logging.log4j + log4j-1.2-api ${log4j.version} @@ -88,6 +98,10 @@ ${zookeeper.version} + log4j + log4j + + junit junit Modified: manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/Logging.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/Logging.java?rev=1791663&r1=1791662&r2=1791663&view=diff ============================================================================== --- manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/Logging.java (original) +++ manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/Logging.java Mon Apr 17 06:19:26 2017 @@ -23,15 +23,11 @@ import java.util.*; import java.io.*; import org.apache.log4j.*; -import org.apache.log4j.Logger; -import org.apache.log4j.Level; -import org.apache.log4j.Layout.*; -import org.apache.log4j.helpers.DateLayout; -import org.apache.log4j.helpers.DateTimeDateFormat; -import org.apache.log4j.DailyRollingFileAppender; -import org.apache.log4j.PropertyConfigurator; +import org.apache.logging.log4j.core.config.ConfigurationSource; +import org.apache.logging.log4j.core.config.ConfigurationFactory; +import org.apache.logging.log4j.core.config.properties.PropertiesConfigurationFactory; -/** This class furnishes the logging environment for the JSKW application. +/** This class furnishes the logging environment for ManifoldCF. */ public class Logging { @@ -52,7 +48,7 @@ public class Logging /** Initialize logger setup. */ - public static synchronized void initializeLoggingSystem(File logConfigFile) + public static synchronized void initializeLoggingSystem(final File logConfigFile) { if (logLevelMap != null) return; @@ -70,9 +66,7 @@ public class Logging loggerTable = new HashMap(); - // Initialize the logger - PropertyConfigurator.configure(logConfigFile.toString()); - + System.setProperty("log4j.configurationFile", logConfigFile.toString()); //System.err.println("ManifoldCF logger setup complete"); } Modified: manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java?rev=1791663&r1=1791662&r2=1791663&view=diff ============================================================================== --- manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java (original) +++ manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java Mon Apr 17 06:19:26 2017 @@ -265,7 +265,7 @@ public class ManifoldCF System.err.println("Couldn't find "+logConfigFileProperty+" property; using default"); String configPath = (String)props.get("user.home") + "/"+applicationName; configPath = configPath.replace('\\', '/'); - logConfigFile = new File(configPath,"logging.ini"); + logConfigFile = new File(configPath,"logging.xml"); } // Make sure that the registered entry points for polling and cleanup are cleared, just in case. Modified: manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/Base.java URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/Base.java?rev=1791663&r1=1791662&r2=1791663&view=diff ============================================================================== --- manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/Base.java (original) +++ manifoldcf/trunk/framework/core/src/test/java/org/apache/manifoldcf/core/tests/Base.java Mon Apr 17 06:19:26 2017 @@ -45,7 +45,7 @@ public class Base // First, write a properties file and a logging file, in the current directory. configFile = new File("properties.xml").getCanonicalFile(); - loggingFile = new File("logging.ini").getCanonicalFile(); + loggingFile = new File("logging.xml").getCanonicalFile(); logOutputFile = new File("manifoldcf.log").getCanonicalFile(); connectorFile = new File("connectors.xml").getCanonicalFile(); @@ -90,11 +90,20 @@ public class Base throws Exception { output.append( - "log4j.appender.MAIN.File="+logOutputFile.getAbsolutePath().replaceAll("\\\\","/")+"\n" + - "log4j.rootLogger=WARN, MAIN\n" + - "log4j.appender.MAIN=org.apache.log4j.RollingFileAppender\n" + - "log4j.appender.MAIN.layout=org.apache.log4j.PatternLayout\n" + - "log4j.appender.MAIN.layout.ConversionPattern=%5p %d{ISO8601} (%t) - %m%n\n" +"\n"+ +" \n"+ +" \n"+ +" \n"+ +" %5p %d{ISO8601} (%t) - %m%n\n"+ +" \n"+ +" \n"+ +" \n"+ +" \n"+ +" \n"+ +" \n"+ +" \n"+ +" \n"+ +"\n" ); } Modified: manifoldcf/trunk/framework/example-multiprocess-file-proprietary/properties.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-file-proprietary/properties.xml?rev=1791663&r1=1791662&r2=1791663&view=diff ============================================================================== --- manifoldcf/trunk/framework/example-multiprocess-file-proprietary/properties.xml (original) +++ manifoldcf/trunk/framework/example-multiprocess-file-proprietary/properties.xml Mon Apr 17 06:19:26 2017 @@ -37,7 +37,7 @@ - + Modified: manifoldcf/trunk/framework/example-multiprocess-file/properties.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-file/properties.xml?rev=1791663&r1=1791662&r2=1791663&view=diff ============================================================================== --- manifoldcf/trunk/framework/example-multiprocess-file/properties.xml (original) +++ manifoldcf/trunk/framework/example-multiprocess-file/properties.xml Mon Apr 17 06:19:26 2017 @@ -37,7 +37,7 @@ - + Modified: manifoldcf/trunk/framework/example-multiprocess-zk-proprietary/properties.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-zk-proprietary/properties.xml?rev=1791663&r1=1791662&r2=1791663&view=diff ============================================================================== --- manifoldcf/trunk/framework/example-multiprocess-zk-proprietary/properties.xml (original) +++ manifoldcf/trunk/framework/example-multiprocess-zk-proprietary/properties.xml Mon Apr 17 06:19:26 2017 @@ -32,7 +32,7 @@ - + Modified: manifoldcf/trunk/framework/example-multiprocess-zk/properties.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-zk/properties.xml?rev=1791663&r1=1791662&r2=1791663&view=diff ============================================================================== --- manifoldcf/trunk/framework/example-multiprocess-zk/properties.xml (original) +++ manifoldcf/trunk/framework/example-multiprocess-zk/properties.xml Mon Apr 17 06:19:26 2017 @@ -32,7 +32,7 @@ - + Modified: manifoldcf/trunk/framework/example-singleprocess-proprietary/properties.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-singleprocess-proprietary/properties.xml?rev=1791663&r1=1791662&r2=1791663&view=diff ============================================================================== --- manifoldcf/trunk/framework/example-singleprocess-proprietary/properties.xml (original) +++ manifoldcf/trunk/framework/example-singleprocess-proprietary/properties.xml Mon Apr 17 06:19:26 2017 @@ -34,7 +34,7 @@ - + Modified: manifoldcf/trunk/framework/example-singleprocess/properties.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-singleprocess/properties.xml?rev=1791663&r1=1791662&r2=1791663&view=diff ============================================================================== --- manifoldcf/trunk/framework/example-singleprocess/properties.xml (original) +++ manifoldcf/trunk/framework/example-singleprocess/properties.xml Mon Apr 17 06:19:26 2017 @@ -34,7 +34,7 @@ - + Modified: manifoldcf/trunk/framework/jetty-runner/src/main/resources/properties.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/jetty-runner/src/main/resources/properties.xml?rev=1791663&r1=1791662&r2=1791663&view=diff ============================================================================== --- manifoldcf/trunk/framework/jetty-runner/src/main/resources/properties.xml (original) +++ manifoldcf/trunk/framework/jetty-runner/src/main/resources/properties.xml Mon Apr 17 06:19:26 2017 @@ -24,7 +24,7 @@ - + Modified: manifoldcf/trunk/lib-license/LICENSE.txt URL: http://svn.apache.org/viewvc/manifoldcf/trunk/lib-license/LICENSE.txt?rev=1791663&r1=1791662&r2=1791663&view=diff ============================================================================== --- manifoldcf/trunk/lib-license/LICENSE.txt (original) +++ manifoldcf/trunk/lib-license/LICENSE.txt Mon Apr 17 06:19:26 2017 @@ -502,6 +502,18 @@ selenium-api.jar, selenium-chrome-driver selenium-java.jar, selenium-opera-driver.jar, selenium-remote-driver.jar, selenium-safari-driver.jar, selenium-support.jar License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) +This product includes a nuxeo-java-client.jar: https://doc.nuxeo.com/nxdoc/licenses/ +License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes a retrofit.jar. +License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes a okhttp.jar. +License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + +This product includes a okio.jar. +License: Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt) + ========================================================================== The following license applies to postgresql.jar, which is available from http://jdbc.postgresql.org Modified: manifoldcf/trunk/pom.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/pom.xml?rev=1791663&r1=1791662&r2=1791663&view=diff ============================================================================== --- manifoldcf/trunk/pom.xml (original) +++ manifoldcf/trunk/pom.xml Mon Apr 17 06:19:26 2017 @@ -77,7 +77,7 @@ 3.1.0 1.2 2.1.v20091210 - 1.2.16 + 2.4.1 1.7 1.7.7 2.2.6