You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2017/12/19 20:05:38 UTC

svn commit: r1818714 - in /manifoldcf/branches/release-2.9-branch: ./ CHANGES.txt connectors/alfresco-webscript/build.xml connectors/cmis/build.xml

Author: kwright
Date: Tue Dec 19 20:05:37 2017
New Revision: 1818714

URL: http://svn.apache.org/viewvc?rev=1818714&view=rev
Log:
Pull up fix for CONNECTORS-1479 from trunk.

Modified:
    manifoldcf/branches/release-2.9-branch/   (props changed)
    manifoldcf/branches/release-2.9-branch/CHANGES.txt
    manifoldcf/branches/release-2.9-branch/connectors/alfresco-webscript/build.xml
    manifoldcf/branches/release-2.9-branch/connectors/cmis/build.xml

Propchange: manifoldcf/branches/release-2.9-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 19 20:05:37 2017
@@ -150,4 +150,4 @@
 /manifoldcf/branches/CONNECTORS-981:1605049-1605773
 /manifoldcf/branches/CONNECTORS-989:1611600-1612101
 /manifoldcf/branches/CONNECTORS-990:1610284-1610707
-/manifoldcf/trunk:1818149,1818225,1818435
+/manifoldcf/trunk:1818149,1818225,1818435,1818713

Modified: manifoldcf/branches/release-2.9-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.9-branch/CHANGES.txt?rev=1818714&r1=1818713&r2=1818714&view=diff
==============================================================================
--- manifoldcf/branches/release-2.9-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-2.9-branch/CHANGES.txt Tue Dec 19 20:05:37 2017
@@ -3,7 +3,11 @@ $Id$
 
 ======================= Release 2.9 =====================
 
-CONNECTORS-1474: Proprietary example missing CSS style files.
+CONNECTORS-1479: Correct classpath for running alfresco-webscript
+tests.
+(Shinichiro Abe, Karl Wright)
+
+CONNECTORS-1478: Proprietary example missing CSS style files.
 (Markus Schuch, Karl Wright)
 
 CONNECTORS-1473: Alfresco authority did not return user token, just

Modified: manifoldcf/branches/release-2.9-branch/connectors/alfresco-webscript/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.9-branch/connectors/alfresco-webscript/build.xml?rev=1818714&r1=1818713&r2=1818714&view=diff
==============================================================================
--- manifoldcf/branches/release-2.9-branch/connectors/alfresco-webscript/build.xml (original)
+++ manifoldcf/branches/release-2.9-branch/connectors/alfresco-webscript/build.xml Tue Dec 19 20:05:37 2017
@@ -47,11 +47,12 @@
             <include name="streambuffer*.jar"/>
             <include name="jaxb*.jar"/>
             <include name="jaxws*.jar"/>
-            <include name="wstx-asl*.jar"/>
+            <include name="woodstox-core-asl*.jar"/>
             <include name="mimepull*.jar"/>
             <include name="resolver*.jar"/>
             <include name="org.osgi.core*.jar"/>
-            <include name="commons-lang*.jar"/>
+            <!-- include name="commons-lang*.jar"/ -->
+            <include name="joda*.jar"/>
         </fileset>
     </path>
 

Modified: manifoldcf/branches/release-2.9-branch/connectors/cmis/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-2.9-branch/connectors/cmis/build.xml?rev=1818714&r1=1818713&r2=1818714&view=diff
==============================================================================
--- manifoldcf/branches/release-2.9-branch/connectors/cmis/build.xml (original)
+++ manifoldcf/branches/release-2.9-branch/connectors/cmis/build.xml Tue Dec 19 20:05:37 2017
@@ -30,7 +30,7 @@
 
     <import file="${mcf-dist}/connector-build.xml"/>
     
-    <property name="chemistry.version" value="0.13.0"/>
+    <property name="chemistry.version" value="1.1.0"/>
     
     <target name="download-dependencies">
         <property name="chemistry-package" value="org/apache/chemistry/opencmis"/>
@@ -66,7 +66,7 @@
             <include name="mimepull*.jar"/>
             <include name="resolver*.jar"/>
             <include name="org.osgi.core*.jar"/>
-            <include name="commons-lang*.jar"/>
+            <!-- include name="commons-lang*.jar"/ -->
         	  <include name="joda*.jar"/>
         </fileset>
     </path>
@@ -84,7 +84,7 @@
                 <include name="mimepull*.jar"/>
                 <include name="resolver*.jar"/>
                 <include name="org.osgi.core*.jar"/>
-            	  <include name="joda*.jar"/>
+                <include name="joda*.jar"/>
             </fileset>
         </copy>
     </target>