manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shinich...@apache.org
Subject svn commit: r1703359 - in /manifoldcf/trunk: ./ connectors/activedirectory/ connectors/alfresco-webscript/ connectors/alfresco/ connectors/amazoncloudsearch/ connectors/amazons3/ connectors/cmis/ connectors/confluence/ connectors/documentfilter/ connec...
Date Wed, 16 Sep 2015 08:30:10 GMT
Author: shinichiro
Date: Wed Sep 16 08:30:09 2015
New Revision: 1703359

URL: http://svn.apache.org/r1703359
Log:
Merge CONNECTORS-1231 work into trunk (revision 1703150:1703180)

Modified:
    manifoldcf/trunk/   (props changed)
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/build.xml
    manifoldcf/trunk/connectors/activedirectory/pom.xml
    manifoldcf/trunk/connectors/alfresco-webscript/pom.xml
    manifoldcf/trunk/connectors/alfresco/pom.xml
    manifoldcf/trunk/connectors/amazoncloudsearch/pom.xml
    manifoldcf/trunk/connectors/amazons3/pom.xml
    manifoldcf/trunk/connectors/cmis/pom.xml
    manifoldcf/trunk/connectors/confluence/pom.xml
    manifoldcf/trunk/connectors/documentfilter/pom.xml
    manifoldcf/trunk/connectors/dropbox/pom.xml
    manifoldcf/trunk/connectors/elasticsearch/pom.xml
    manifoldcf/trunk/connectors/email/pom.xml
    manifoldcf/trunk/connectors/filesystem/pom.xml
    manifoldcf/trunk/connectors/forcedmetadata/pom.xml
    manifoldcf/trunk/connectors/generic/pom.xml
    manifoldcf/trunk/connectors/googledrive/pom.xml
    manifoldcf/trunk/connectors/gridfs/pom.xml
    manifoldcf/trunk/connectors/gts/pom.xml
    manifoldcf/trunk/connectors/hdfs/pom.xml
    manifoldcf/trunk/connectors/jcifs/pom.xml
    manifoldcf/trunk/connectors/jdbc/pom.xml
    manifoldcf/trunk/connectors/jira/pom.xml
    manifoldcf/trunk/connectors/ldap/pom.xml
    manifoldcf/trunk/connectors/nullauthority/pom.xml
    manifoldcf/trunk/connectors/nulloutput/pom.xml
    manifoldcf/trunk/connectors/nulltransformation/pom.xml
    manifoldcf/trunk/connectors/opensearchserver/pom.xml
    manifoldcf/trunk/connectors/regexpmapper/pom.xml
    manifoldcf/trunk/connectors/rss/   (props changed)
    manifoldcf/trunk/connectors/rss/pom.xml
    manifoldcf/trunk/connectors/searchblox/pom.xml
    manifoldcf/trunk/connectors/sharepoint/   (props changed)
    manifoldcf/trunk/connectors/sharepoint/pom.xml
    manifoldcf/trunk/connectors/solr/pom.xml
    manifoldcf/trunk/connectors/tika/pom.xml
    manifoldcf/trunk/connectors/webcrawler/pom.xml
    manifoldcf/trunk/connectors/wiki/   (props changed)
    manifoldcf/trunk/connectors/wiki/pom.xml
    manifoldcf/trunk/framework/agents/pom.xml
    manifoldcf/trunk/framework/build.xml
    manifoldcf/trunk/framework/buildfiles/connector-build.xml
    manifoldcf/trunk/framework/connector-common/pom.xml
    manifoldcf/trunk/framework/core/pom.xml
    manifoldcf/trunk/framework/pull-agent/pom.xml
    manifoldcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/InterruptionTester.java
    manifoldcf/trunk/pom.xml

Propchange: manifoldcf/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 16 08:30:09 2015
@@ -56,6 +56,7 @@
 /manifoldcf/branches/CONNECTORS-120:1406712-1407974,1407982-1411043,1411049-1416451
 /manifoldcf/branches/CONNECTORS-120-1:1416450-1417056
 /manifoldcf/branches/CONNECTORS-1204:1682204-1682409
+/manifoldcf/branches/CONNECTORS-1231:1703151-1703180
 /manifoldcf/branches/CONNECTORS-1233:1697988-1701871
 /manifoldcf/branches/CONNECTORS-1236:1702132-1702240
 /manifoldcf/branches/CONNECTORS-13:1525862-1527182,1539324-1541634

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Wed Sep 16 08:30:09 2015
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 2.3-dev =====================
 
+CONNECTORS-1231: Upgrade to JUnit 4.12.
+(Shinichiro Abe)
+
 CONNECTORS-1239: Handle code 401 from Solr more appropriately.
 (Cathal McGuinness, Karl Wright)
 

Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Wed Sep 16 08:30:09 2015
@@ -68,7 +68,8 @@
     <property name="jaxws.version" value="2.2.6"/>
     <property name="chemistry.version" value="0.11.0"/>
     <property name="glassfish.version" value="2.1.v20091210"/>
-    <property name="junit.version" value="4.8.2"/>
+    <property name="junit.version" value="4.12"/>
+    <property name="hamcrest.version" value="1.3"/>
     <property name="log4j.version" value="1.2.16"/>
     <property name="mail.version" value="1.4.5"/>
     <property name="mimepull.version" value="1.3"/>
@@ -1467,6 +1468,12 @@ Use Apache Forrest version forrest-0.9-d
             <param name="artifact-name" value="junit"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
+        <antcall target="download-via-maven"><param name="target" value="lib"/>
+            <param name="project-path" value="org/hamcrest"/>
+            <param name="artifact-version" value="${hamcrest.version}"/>
+            <param name="artifact-name" value="hamcrest-core"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
     </target>
     
     <target name="download-mockito">

Modified: manifoldcf/trunk/connectors/activedirectory/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/activedirectory/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/activedirectory/pom.xml (original)
+++ manifoldcf/trunk/connectors/activedirectory/pom.xml Wed Sep 16 08:30:09 2015
@@ -133,7 +133,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
       </plugin>
@@ -141,7 +142,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.12.3</version>
+        <version>2.18.1</version>
         <configuration>
           <skipTests>${skipITs}</skipTests>
           <systemPropertyVariables>
@@ -153,7 +154,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
         <executions>
@@ -357,4 +359,4 @@
     </dependency>
 
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: manifoldcf/trunk/connectors/alfresco-webscript/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco-webscript/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco-webscript/pom.xml (original)
+++ manifoldcf/trunk/connectors/alfresco-webscript/pom.xml Wed Sep 16 08:30:09 2015
@@ -117,7 +117,8 @@
                         <exclude>**/*Postgresql*.java</exclude>
                         <exclude>**/*MySQL*.java</exclude>
                     </excludes>
-                    <forkMode>always</forkMode>
+                    <forkCount>1</forkCount>
+                    <reuseForks>false</reuseForks>
                     <workingDirectory>target/test-output</workingDirectory>
                 </configuration>
             </plugin>
@@ -174,7 +175,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.12.3</version>
+                <version>2.18.1</version>
                 <configuration>
                     <skipTests>${skipITs}</skipTests>
                     <systemPropertyVariables>
@@ -187,7 +188,8 @@
                         <exclude>**/*Postgresql*.java</exclude>
                         <exclude>**/*MySQL*.java</exclude>
                     </excludes>
-                    <forkMode>always</forkMode>
+                    <forkCount>1</forkCount>
+                    <reuseForks>false</reuseForks>
                     <workingDirectory>target/test-output</workingDirectory>
                     <argLine>-Xms512m -Xmx1024m -Xss1024k -XX:MaxPermSize=256m -XX:NewSize=256m</argLine>
                 </configuration>

Modified: manifoldcf/trunk/connectors/alfresco/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/alfresco/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/alfresco/pom.xml (original)
+++ manifoldcf/trunk/connectors/alfresco/pom.xml Wed Sep 16 08:30:09 2015
@@ -184,7 +184,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
       </plugin>
@@ -192,7 +193,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.12.3</version>
+        <version>2.18.1</version>
         <configuration>
           <skipTests>${skipITs}</skipTests>
           <systemPropertyVariables>
@@ -205,7 +206,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
           <argLine>-Xms512m -Xmx1024m -Xss1024k -XX:MaxPermSize=256m -XX:NewSize=256m</argLine>
         </configuration>

Modified: manifoldcf/trunk/connectors/amazoncloudsearch/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/amazoncloudsearch/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/amazoncloudsearch/pom.xml (original)
+++ manifoldcf/trunk/connectors/amazoncloudsearch/pom.xml Wed Sep 16 08:30:09 2015
@@ -140,7 +140,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
       </plugin>
@@ -148,7 +149,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.12.3</version>
+        <version>2.18.1</version>
         <configuration>
           <skipTests>${skipITs}</skipTests>
           <systemPropertyVariables>
@@ -160,7 +161,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
         <executions>

Modified: manifoldcf/trunk/connectors/amazons3/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/amazons3/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/amazons3/pom.xml (original)
+++ manifoldcf/trunk/connectors/amazons3/pom.xml Wed Sep 16 08:30:09 2015
@@ -151,7 +151,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
       </plugin>
@@ -159,7 +160,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.12.3</version>
+        <version>2.18.1</version>
         <configuration>
           <skipTests>${skipITs}</skipTests>
           <systemPropertyVariables>
@@ -171,7 +172,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
         <executions>

Modified: manifoldcf/trunk/connectors/cmis/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/cmis/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/cmis/pom.xml (original)
+++ manifoldcf/trunk/connectors/cmis/pom.xml Wed Sep 16 08:30:09 2015
@@ -150,7 +150,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
       </plugin>
@@ -158,7 +159,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.12.3</version>
+        <version>2.18.1</version>
         <configuration>
           <skipTests>${skipITs}</skipTests>
           <systemPropertyVariables>
@@ -171,7 +172,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
         <executions>
@@ -395,4 +397,4 @@
     </dependency>
 
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: manifoldcf/trunk/connectors/confluence/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/confluence/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/confluence/pom.xml (original)
+++ manifoldcf/trunk/connectors/confluence/pom.xml Wed Sep 16 08:30:09 2015
@@ -145,7 +145,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
       </plugin>
@@ -153,7 +154,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.12.3</version>
+        <version>2.18.1</version>
         <configuration>
           <skipTests>${skipITs}</skipTests>
           <systemPropertyVariables>
@@ -165,7 +166,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
         <executions>

Modified: manifoldcf/trunk/connectors/documentfilter/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/documentfilter/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/documentfilter/pom.xml (original)
+++ manifoldcf/trunk/connectors/documentfilter/pom.xml Wed Sep 16 08:30:09 2015
@@ -133,7 +133,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
       </plugin>
@@ -141,7 +142,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.12.3</version>
+        <version>2.18.1</version>
         <configuration>
           <skipTests>${skipITs}</skipTests>
           <systemPropertyVariables>
@@ -153,7 +154,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
         <executions>

Modified: manifoldcf/trunk/connectors/dropbox/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/dropbox/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/dropbox/pom.xml (original)
+++ manifoldcf/trunk/connectors/dropbox/pom.xml Wed Sep 16 08:30:09 2015
@@ -146,7 +146,8 @@
                   <exclude>**/*Postgresql*.java</exclude>
                   <exclude>**/*MySQL*.java</exclude>
                 </excludes>
-                <forkMode>always</forkMode>
+                <forkCount>1</forkCount>
+                <reuseForks>false</reuseForks>
                 <workingDirectory>target/test-output</workingDirectory>
               </configuration>
             </plugin>
@@ -154,7 +155,7 @@
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-failsafe-plugin</artifactId>
-              <version>2.12.3</version>
+              <version>2.18.1</version>
               <configuration>
                 <skipTests>${skipITs}</skipTests>
                 <systemPropertyVariables>
@@ -166,7 +167,8 @@
                   <exclude>**/*Postgresql*.java</exclude>
                   <exclude>**/*MySQL*.java</exclude>
                 </excludes>
-                <forkMode>always</forkMode>
+                <forkCount>1</forkCount>
+                <reuseForks>false</reuseForks>
                 <workingDirectory>target/test-output</workingDirectory>
               </configuration>
               <executions>

Modified: manifoldcf/trunk/connectors/elasticsearch/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/elasticsearch/pom.xml (original)
+++ manifoldcf/trunk/connectors/elasticsearch/pom.xml Wed Sep 16 08:30:09 2015
@@ -155,7 +155,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
       </plugin>
@@ -163,7 +164,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.12.3</version>
+        <version>2.18.1</version>
         <configuration>
           <skipTests>${skipITs}</skipTests>
           <systemPropertyVariables>
@@ -175,7 +176,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
         <executions>

Modified: manifoldcf/trunk/connectors/email/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/email/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/email/pom.xml (original)
+++ manifoldcf/trunk/connectors/email/pom.xml Wed Sep 16 08:30:09 2015
@@ -133,7 +133,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
       </plugin>
@@ -141,7 +142,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.12.3</version>
+        <version>2.18.1</version>
         <configuration>
           <skipTests>${skipITs}</skipTests>
           <systemPropertyVariables>
@@ -153,7 +154,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
         <executions>

Modified: manifoldcf/trunk/connectors/filesystem/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/filesystem/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/filesystem/pom.xml (original)
+++ manifoldcf/trunk/connectors/filesystem/pom.xml Wed Sep 16 08:30:09 2015
@@ -140,7 +140,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
       </plugin>
@@ -148,7 +149,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.12.3</version>
+        <version>2.18.1</version>
         <configuration>
           <skipTests>${skipITs}</skipTests>
           <systemPropertyVariables>
@@ -161,7 +162,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
         <executions>

Modified: manifoldcf/trunk/connectors/forcedmetadata/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/forcedmetadata/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/forcedmetadata/pom.xml (original)
+++ manifoldcf/trunk/connectors/forcedmetadata/pom.xml Wed Sep 16 08:30:09 2015
@@ -133,7 +133,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
       </plugin>
@@ -141,7 +142,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.12.3</version>
+        <version>2.18.1</version>
         <configuration>
           <skipTests>${skipITs}</skipTests>
           <systemPropertyVariables>
@@ -153,7 +154,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
         <executions>

Modified: manifoldcf/trunk/connectors/generic/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/generic/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/generic/pom.xml (original)
+++ manifoldcf/trunk/connectors/generic/pom.xml Wed Sep 16 08:30:09 2015
@@ -134,7 +134,8 @@
                   <exclude>**/*Postgresql*.java</exclude>
                   <exclude>**/*MySQL*.java</exclude>
                 </excludes>
-                <forkMode>always</forkMode>
+                <forkCount>1</forkCount>
+                <reuseForks>false</reuseForks>
                 <workingDirectory>target/test-output</workingDirectory>
               </configuration>
             </plugin>
@@ -142,7 +143,7 @@
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-failsafe-plugin</artifactId>
-              <version>2.12.3</version>
+              <version>2.18.1</version>
               <configuration>
                 <skipTests>${skipITs}</skipTests>
                 <systemPropertyVariables>
@@ -154,7 +155,8 @@
                   <exclude>**/*Postgresql*.java</exclude>
                   <exclude>**/*MySQL*.java</exclude>
                 </excludes>
-                <forkMode>always</forkMode>
+                <forkCount>1</forkCount>
+                <reuseForks>false</reuseForks>
                 <workingDirectory>target/test-output</workingDirectory>
               </configuration>
               <executions>

Modified: manifoldcf/trunk/connectors/googledrive/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/googledrive/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/googledrive/pom.xml (original)
+++ manifoldcf/trunk/connectors/googledrive/pom.xml Wed Sep 16 08:30:09 2015
@@ -148,7 +148,8 @@
                   <exclude>**/*Postgresql*.java</exclude>
                   <exclude>**/*MySQL*.java</exclude>
                 </excludes>
-                <forkMode>always</forkMode>
+                <forkCount>1</forkCount>
+                <reuseForks>false</reuseForks>
                 <workingDirectory>target/test-output</workingDirectory>
               </configuration>
             </plugin>
@@ -156,7 +157,7 @@
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-failsafe-plugin</artifactId>
-              <version>2.12.3</version>
+              <version>2.18.1</version>
               <configuration>
                 <skipTests>${skipITs}</skipTests>
                 <systemPropertyVariables>
@@ -168,7 +169,8 @@
                   <exclude>**/*Postgresql*.java</exclude>
                   <exclude>**/*MySQL*.java</exclude>
                 </excludes>
-                <forkMode>always</forkMode>
+                <forkCount>1</forkCount>
+                <reuseForks>false</reuseForks>
                 <workingDirectory>target/test-output</workingDirectory>
               </configuration>
               <executions>

Modified: manifoldcf/trunk/connectors/gridfs/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/gridfs/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/gridfs/pom.xml (original)
+++ manifoldcf/trunk/connectors/gridfs/pom.xml Wed Sep 16 08:30:09 2015
@@ -54,7 +54,8 @@
                         <exclude>**/*Postgresql*.java</exclude>
                         <exclude>**/*MySQL*.java</exclude>
                     </excludes>
-                    <forkMode>always</forkMode>
+                    <forkCount>1</forkCount>
+                    <reuseForks>false</reuseForks>
                     <workingDirectory>target/test-output</workingDirectory>
                 </configuration>
             </plugin>

Modified: manifoldcf/trunk/connectors/gts/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/gts/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/gts/pom.xml (original)
+++ manifoldcf/trunk/connectors/gts/pom.xml Wed Sep 16 08:30:09 2015
@@ -133,7 +133,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
       </plugin>
@@ -141,7 +142,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.12.3</version>
+        <version>2.18.1</version>
         <configuration>
           <skipTests>${skipITs}</skipTests>
           <systemPropertyVariables>
@@ -153,7 +154,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
         <executions>

Modified: manifoldcf/trunk/connectors/hdfs/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/hdfs/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/hdfs/pom.xml (original)
+++ manifoldcf/trunk/connectors/hdfs/pom.xml Wed Sep 16 08:30:09 2015
@@ -133,7 +133,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
       </plugin>
@@ -141,7 +142,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.12.3</version>
+        <version>2.18.1</version>
         <configuration>
           <skipTests>${skipITs}</skipTests>
           <systemPropertyVariables>
@@ -153,7 +154,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
         <executions>

Modified: manifoldcf/trunk/connectors/jcifs/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jcifs/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/jcifs/pom.xml (original)
+++ manifoldcf/trunk/connectors/jcifs/pom.xml Wed Sep 16 08:30:09 2015
@@ -133,7 +133,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
       </plugin>
@@ -141,7 +142,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.12.3</version>
+        <version>2.18.1</version>
         <configuration>
           <skipTests>${skipITs}</skipTests>
           <systemPropertyVariables>
@@ -153,7 +154,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
         <executions>

Modified: manifoldcf/trunk/connectors/jdbc/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jdbc/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/jdbc/pom.xml (original)
+++ manifoldcf/trunk/connectors/jdbc/pom.xml Wed Sep 16 08:30:09 2015
@@ -133,7 +133,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
       </plugin>
@@ -141,7 +142,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.12.3</version>
+        <version>2.18.1</version>
         <configuration>
           <skipTests>${skipITs}</skipTests>
           <systemPropertyVariables>
@@ -153,7 +154,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
         <executions>

Modified: manifoldcf/trunk/connectors/jira/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jira/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/jira/pom.xml (original)
+++ manifoldcf/trunk/connectors/jira/pom.xml Wed Sep 16 08:30:09 2015
@@ -148,7 +148,8 @@
                   <exclude>**/*Postgresql*.java</exclude>
                   <exclude>**/*MySQL*.java</exclude>
                 </excludes>
-                <forkMode>always</forkMode>
+                <forkCount>1</forkCount>
+                <reuseForks>false</reuseForks>
                 <workingDirectory>target/test-output</workingDirectory>
               </configuration>
             </plugin>
@@ -156,7 +157,7 @@
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-failsafe-plugin</artifactId>
-              <version>2.12.3</version>
+              <version>2.18.1</version>
               <configuration>
                 <skipTests>${skipITs}</skipTests>
                 <systemPropertyVariables>
@@ -168,7 +169,8 @@
                   <exclude>**/*Postgresql*.java</exclude>
                   <exclude>**/*MySQL*.java</exclude>
                 </excludes>
-                <forkMode>always</forkMode>
+                <forkCount>1</forkCount>
+                <reuseForks>false</reuseForks>
                 <workingDirectory>target/test-output</workingDirectory>
               </configuration>
               <executions>

Modified: manifoldcf/trunk/connectors/ldap/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/ldap/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/ldap/pom.xml (original)
+++ manifoldcf/trunk/connectors/ldap/pom.xml Wed Sep 16 08:30:09 2015
@@ -133,7 +133,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
       </plugin>
@@ -141,7 +142,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.12.3</version>
+        <version>2.18.1</version>
         <configuration>
           <skipTests>${skipITs}</skipTests>
           <systemPropertyVariables>
@@ -153,7 +154,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
         <executions>
@@ -354,4 +356,4 @@
     </dependency>
 
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: manifoldcf/trunk/connectors/nullauthority/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/nullauthority/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/nullauthority/pom.xml (original)
+++ manifoldcf/trunk/connectors/nullauthority/pom.xml Wed Sep 16 08:30:09 2015
@@ -133,7 +133,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
       </plugin>
@@ -141,7 +142,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.12.3</version>
+        <version>2.18.1</version>
         <configuration>
           <skipTests>${skipITs}</skipTests>
           <systemPropertyVariables>
@@ -153,7 +154,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
         <executions>

Modified: manifoldcf/trunk/connectors/nulloutput/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/nulloutput/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/nulloutput/pom.xml (original)
+++ manifoldcf/trunk/connectors/nulloutput/pom.xml Wed Sep 16 08:30:09 2015
@@ -133,7 +133,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
       </plugin>
@@ -141,7 +142,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.12.3</version>
+        <version>2.18.1</version>
         <configuration>
           <skipTests>${skipITs}</skipTests>
           <systemPropertyVariables>
@@ -153,7 +154,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
         <executions>

Modified: manifoldcf/trunk/connectors/nulltransformation/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/nulltransformation/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/nulltransformation/pom.xml (original)
+++ manifoldcf/trunk/connectors/nulltransformation/pom.xml Wed Sep 16 08:30:09 2015
@@ -133,7 +133,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
       </plugin>
@@ -141,7 +142,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.12.3</version>
+        <version>2.18.1</version>
         <configuration>
           <skipTests>${skipITs}</skipTests>
           <systemPropertyVariables>
@@ -153,7 +154,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
         <executions>

Modified: manifoldcf/trunk/connectors/opensearchserver/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/opensearchserver/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/opensearchserver/pom.xml (original)
+++ manifoldcf/trunk/connectors/opensearchserver/pom.xml Wed Sep 16 08:30:09 2015
@@ -142,7 +142,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
       </plugin>
@@ -150,7 +151,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.12.3</version>
+        <version>2.18.1</version>
         <configuration>
           <skipTests>${skipITs}</skipTests>
           <systemPropertyVariables>
@@ -162,7 +163,9 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
+
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
         <executions>
@@ -379,4 +382,4 @@
     </dependency>
 
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: manifoldcf/trunk/connectors/regexpmapper/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/regexpmapper/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/regexpmapper/pom.xml (original)
+++ manifoldcf/trunk/connectors/regexpmapper/pom.xml Wed Sep 16 08:30:09 2015
@@ -133,7 +133,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
       </plugin>
@@ -141,7 +142,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.12.3</version>
+        <version>2.18.1</version>
         <configuration>
           <skipTests>${skipITs}</skipTests>
           <systemPropertyVariables>
@@ -153,7 +154,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
         <executions>
@@ -356,4 +358,4 @@
     </dependency>
 
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Propchange: manifoldcf/trunk/connectors/rss/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 16 08:30:09 2015
@@ -35,6 +35,7 @@
 /manifoldcf/branches/CONNECTORS-1050/connectors/rss:1628142-1628796
 /manifoldcf/branches/CONNECTORS-1085/connectors/rss:1634276-1634533
 /manifoldcf/branches/CONNECTORS-120/connectors/rss:1406712-1407974,1407982-1411043,1411049-1411943,1411969,1412019
+/manifoldcf/branches/CONNECTORS-1231/connectors/rss:1703151-1703180
 /manifoldcf/branches/CONNECTORS-470/connectors/rss:1349741-1360750,1360808
 /manifoldcf/branches/CONNECTORS-474/connectors/rss:1349741-1353803
 /manifoldcf/branches/CONNECTORS-488/connectors/rss:1363249-1364203

Modified: manifoldcf/trunk/connectors/rss/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/rss/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/rss/pom.xml (original)
+++ manifoldcf/trunk/connectors/rss/pom.xml Wed Sep 16 08:30:09 2015
@@ -140,7 +140,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
       </plugin>
@@ -148,7 +149,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.12.3</version>
+        <version>2.18.1</version>
         <configuration>
           <skipTests>${skipITs}</skipTests>
           <systemPropertyVariables>
@@ -161,7 +162,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
         <executions>

Modified: manifoldcf/trunk/connectors/searchblox/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/searchblox/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/searchblox/pom.xml (original)
+++ manifoldcf/trunk/connectors/searchblox/pom.xml Wed Sep 16 08:30:09 2015
@@ -118,7 +118,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
       </plugin>
@@ -126,7 +127,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.12.3</version>
+        <version>2.18.1</version>
         <configuration>
           <skipTests>${skipITs}</skipTests>
           <systemPropertyVariables>
@@ -138,7 +139,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
         <executions>

Propchange: manifoldcf/trunk/connectors/sharepoint/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 16 08:30:09 2015
@@ -37,6 +37,7 @@
 /manifoldcf/branches/CONNECTORS-1104/connectors/sharepoint:1640149-1640198
 /manifoldcf/branches/CONNECTORS-120/connectors/sharepoint:1406712-1407974,1411049-1416451
 /manifoldcf/branches/CONNECTORS-120-1/connectors/sharepoint:1416450-1417056
+/manifoldcf/branches/CONNECTORS-1231/connectors/sharepoint:1703151-1703180
 /manifoldcf/branches/CONNECTORS-470/connectors/sharepoint:1349741-1360750,1360808
 /manifoldcf/branches/CONNECTORS-474/connectors/sharepoint:1349741-1353803
 /manifoldcf/branches/CONNECTORS-488/connectors/sharepoint:1363249-1364203

Modified: manifoldcf/trunk/connectors/sharepoint/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/sharepoint/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/sharepoint/pom.xml (original)
+++ manifoldcf/trunk/connectors/sharepoint/pom.xml Wed Sep 16 08:30:09 2015
@@ -133,7 +133,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
       </plugin>
@@ -141,7 +142,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.12.3</version>
+        <version>2.18.1</version>
         <configuration>
           <skipTests>${skipITs}</skipTests>
           <systemPropertyVariables>
@@ -153,7 +154,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
         <executions>

Modified: manifoldcf/trunk/connectors/solr/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/solr/pom.xml (original)
+++ manifoldcf/trunk/connectors/solr/pom.xml Wed Sep 16 08:30:09 2015
@@ -133,7 +133,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
       </plugin>
@@ -141,7 +142,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.12.3</version>
+        <version>2.18.1</version>
         <configuration>
           <skipTests>${skipITs}</skipTests>
           <systemPropertyVariables>
@@ -153,7 +154,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
         <executions>

Modified: manifoldcf/trunk/connectors/tika/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/tika/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/tika/pom.xml (original)
+++ manifoldcf/trunk/connectors/tika/pom.xml Wed Sep 16 08:30:09 2015
@@ -133,7 +133,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
       </plugin>
@@ -141,7 +142,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.12.3</version>
+        <version>2.18.1</version>
         <configuration>
           <skipTests>${skipITs}</skipTests>
           <systemPropertyVariables>
@@ -153,7 +154,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
         <executions>

Modified: manifoldcf/trunk/connectors/webcrawler/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/webcrawler/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/webcrawler/pom.xml (original)
+++ manifoldcf/trunk/connectors/webcrawler/pom.xml Wed Sep 16 08:30:09 2015
@@ -133,7 +133,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
       </plugin>
@@ -141,7 +142,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.12.3</version>
+        <version>2.18.1</version>
         <configuration>
           <skipTests>${skipITs}</skipTests>
           <systemPropertyVariables>
@@ -153,7 +154,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
         <executions>

Propchange: manifoldcf/trunk/connectors/wiki/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 16 08:30:09 2015
@@ -36,6 +36,7 @@
 /manifoldcf/branches/CONNECTORS-1067/connectors/wiki:1630049-1630186
 /manifoldcf/branches/CONNECTORS-1085/connectors/wiki:1634276-1634533
 /manifoldcf/branches/CONNECTORS-120/connectors/wiki:1406712-1407974,1407982-1411043,1411049-1411943
+/manifoldcf/branches/CONNECTORS-1231/connectors/wiki:1703151-1703180
 /manifoldcf/branches/CONNECTORS-470/connectors/wiki:1349741-1360750,1360808
 /manifoldcf/branches/CONNECTORS-474/connectors/wiki:1349741-1353803
 /manifoldcf/branches/CONNECTORS-488/connectors/wiki:1363249-1364203

Modified: manifoldcf/trunk/connectors/wiki/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/wiki/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/wiki/pom.xml (original)
+++ manifoldcf/trunk/connectors/wiki/pom.xml Wed Sep 16 08:30:09 2015
@@ -133,7 +133,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
       </plugin>
@@ -141,7 +142,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>2.12.3</version>
+        <version>2.18.1</version>
         <configuration>
           <skipTests>${skipITs}</skipTests>
           <systemPropertyVariables>
@@ -153,7 +154,8 @@
             <exclude>**/*Postgresql*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
         <executions>

Modified: manifoldcf/trunk/framework/agents/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/agents/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/framework/agents/pom.xml (original)
+++ manifoldcf/trunk/framework/agents/pom.xml Wed Sep 16 08:30:09 2015
@@ -50,7 +50,8 @@
             <exclude>**/*HSQLDBext*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
       </plugin>
@@ -92,4 +93,4 @@
     </dependency>
 
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: manifoldcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Wed Sep 16 08:30:09 2015
@@ -64,6 +64,7 @@
         </fileset>
         <fileset dir="../lib">
             <include name="junit*.jar"/>
+            <include name="hamcrest-core*.jar"/>
             <include name="mockito-core*.jar"/>
             <include name="wiremock*.jar"/>
             <include name="objenesis*.jar"/>
@@ -1778,6 +1779,7 @@
         <copy todir="dist/test-lib">
             <fileset dir="../lib">
                 <include name="junit*.jar"/>
+                <include name="hamcrest-core*.jar"/>
                 <include name="mockito-core*.jar"/>
                 <include name="wiremock*.jar"/>
                 <include name="objenesis*.jar"/>

Modified: manifoldcf/trunk/framework/buildfiles/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/buildfiles/connector-build.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/trunk/framework/buildfiles/connector-build.xml Wed Sep 16 08:30:09 2015
@@ -133,6 +133,7 @@
             <include name="jsp-2.1*.jar"/>
             <include name="jsp-api*.jar"/>
             <include name="junit*.jar"/>
+            <include name="hamcrest-core*.jar"/>
             <include name="log4j*.jar"/>
             <include name="serializer*.jar"/>
             <include name="javax.servlet-api*.jar"/>

Modified: manifoldcf/trunk/framework/connector-common/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/connector-common/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/framework/connector-common/pom.xml (original)
+++ manifoldcf/trunk/framework/connector-common/pom.xml Wed Sep 16 08:30:09 2015
@@ -47,7 +47,8 @@
           <excludes>
             <exclude>**/*Postgresql*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
       </plugin>

Modified: manifoldcf/trunk/framework/core/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/framework/core/pom.xml (original)
+++ manifoldcf/trunk/framework/core/pom.xml Wed Sep 16 08:30:09 2015
@@ -47,7 +47,8 @@
           <excludes>
             <exclude>**/*Postgresql*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
       </plugin>

Modified: manifoldcf/trunk/framework/pull-agent/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/pom.xml (original)
+++ manifoldcf/trunk/framework/pull-agent/pom.xml Wed Sep 16 08:30:09 2015
@@ -49,7 +49,8 @@
             <exclude>**/*HSQLDBext*.java</exclude>
             <exclude>**/*MySQL*.java</exclude>
           </excludes>
-          <forkMode>always</forkMode>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
           <workingDirectory>target/test-output</workingDirectory>
         </configuration>
       </plugin>
@@ -190,4 +191,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: manifoldcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/InterruptionTester.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/InterruptionTester.java?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/InterruptionTester.java (original)
+++ manifoldcf/trunk/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/InterruptionTester.java Wed Sep 16 08:30:09 2015
@@ -84,14 +84,14 @@ public class InterruptionTester
     instance.waitJobRunningNative(jobManager,job.getID(),30000L);
     
     // Wait for the job to become inactive.  The time should not exceed 10 seconds for the actual crawl.
-    instance.waitJobInactiveNative(jobManager,job.getID(),30000L);
+    instance.waitJobInactiveNative(jobManager,job.getID(),60000L);
     // The document will be skipped in the end.
     if (jobManager.getStatus(job.getID()).getDocumentsProcessed() != 9)
       throw new Exception("Expected 9 documents, saw "+jobManager.getStatus(job.getID()).getDocumentsProcessed());
     
     // Now, delete the job.
     jobManager.deleteJob(job.getID());
-    instance.waitJobDeletedNative(jobManager,job.getID(),30000L);
+    instance.waitJobDeletedNative(jobManager,job.getID(),60000L);
 
     // Shut down instance2
     instance.stop();

Modified: manifoldcf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/pom.xml?rev=1703359&r1=1703358&r2=1703359&view=diff
==============================================================================
--- manifoldcf/trunk/pom.xml (original)
+++ manifoldcf/trunk/pom.xml Wed Sep 16 08:30:09 2015
@@ -41,7 +41,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <!-- dependency versions -->
-    <junit.version>4.8.2</junit.version>
+    <junit.version>4.12</junit.version>
     <mockito.version>1.9.5</mockito.version>
     <wiremock.version>1.34</wiremock.version>
     <postgresql.version>9.1-901.jdbc4</postgresql.version>



Mime
View raw message