manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shinich...@apache.org
Subject svn commit: r1693657 - in /manifoldcf/branches/CONNECTORS-1219: ./ CHANGES.txt build.xml connectors/hdfs/build.xml connectors/hdfs/pom.xml pom.xml
Date Fri, 31 Jul 2015 21:50:50 GMT
Author: shinichiro
Date: Fri Jul 31 21:50:50 2015
New Revision: 1693657

URL: http://svn.apache.org/r1693657
Log:
merged r1693653 from trunk

Modified:
    manifoldcf/branches/CONNECTORS-1219/   (props changed)
    manifoldcf/branches/CONNECTORS-1219/CHANGES.txt
    manifoldcf/branches/CONNECTORS-1219/build.xml
    manifoldcf/branches/CONNECTORS-1219/connectors/hdfs/build.xml
    manifoldcf/branches/CONNECTORS-1219/connectors/hdfs/pom.xml
    manifoldcf/branches/CONNECTORS-1219/pom.xml

Propchange: manifoldcf/branches/CONNECTORS-1219/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 31 21:50:50 2015
@@ -126,3 +126,4 @@
 /manifoldcf/branches/CONNECTORS-981:1605049-1605773
 /manifoldcf/branches/CONNECTORS-989:1611600-1612101
 /manifoldcf/branches/CONNECTORS-990:1610284-1610707
+/manifoldcf/trunk:1693653

Modified: manifoldcf/branches/CONNECTORS-1219/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1219/CHANGES.txt?rev=1693657&r1=1693656&r2=1693657&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1219/CHANGES.txt (original)
+++ manifoldcf/branches/CONNECTORS-1219/CHANGES.txt Fri Jul 31 21:50:50 2015
@@ -3,6 +3,21 @@ $Id$
 
 ======================= 2.2-dev =====================
 
+CONNECTORS-1224: Upgrade to Hadoop 2.6.0.
+(Shinichiro Abe)
+
+CONNECTORS-1222: Handle unregistered connector class in getActivitiesList().
+(Thomas Daniel, Karl Wright)
+
+CONNECTORS-1221: Update documentation for properties.xml to
+include new ldap authentication properties.
+(Karl Wright)
+
+CONNECTORS-1131: Add infrastructure for controlling individual
+user access to parts of the UI and API, also allow this to be
+configured via LDAP.
+(Colin Joyce, Karl Wright)
+
 CONNECTORS-1220: User mapping prerequisite choices were broken,
 caused a hang when there were more than one.
 (Karl Wright)

Modified: manifoldcf/branches/CONNECTORS-1219/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1219/build.xml?rev=1693657&r1=1693656&r2=1693657&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1219/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1219/build.xml Fri Jul 31 21:50:50 2015
@@ -128,9 +128,9 @@
     <property name="jackson-annotations.version" value="2.1.2"/>
     <property name="resteasy.client.version" value="3.0.8.Final"/>
     <property name="jsoup.version" value="1.8.1"/>
+    <property name="hadoop.version" value="2.6.0"/>
     <property name="lucene.version" value="5.2.1"/>
 
-
     <target name="downloaded-condition">
         <!-- Spot check a few of the dependent jars; no point including ALL of them here...
-->
         <available file="lib/hsqldb-${hsqldb.version}.jar" property="hsqldb-found"/>
@@ -1619,32 +1619,43 @@ Use Apache Forrest version forrest-0.9-d
         <antcall target="download-via-maven">
             <param name="target" value="lib"/>
             <param name="project-path" value="org/apache/hadoop"/>
-            <param name="artifact-version" value="2.2.0"/>
+            <param name="artifact-version" value="${hadoop.version}"/>
             <param name="artifact-name" value="hadoop-common"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
         <antcall target="download-via-maven">
             <param name="target" value="lib"/>
             <param name="project-path" value="org/apache/hadoop"/>
-            <param name="artifact-version" value="2.2.0"/>
+            <param name="artifact-version" value="${hadoop.version}"/>
             <param name="artifact-name" value="hadoop-annotations"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
         <antcall target="download-via-maven">
             <param name="target" value="lib"/>
             <param name="project-path" value="org/apache/hadoop"/>
-            <param name="artifact-version" value="2.2.0"/>
+            <param name="artifact-version" value="${hadoop.version}"/>
             <param name="artifact-name" value="hadoop-auth"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
         <antcall target="download-via-maven">
             <param name="target" value="lib"/>
             <param name="project-path" value="org/apache/hadoop"/>
-            <param name="artifact-version" value="2.2.0"/>
+            <param name="artifact-version" value="${hadoop.version}"/>
             <param name="artifact-name" value="hadoop-hdfs"/>
             <param name="artifact-type" value="jar"/>
         </antcall>
     </target>
+
+    <target name="download-htrace">
+        <mkdir dir="lib"/>
+        <antcall target="download-via-maven">
+            <param name="target" value="lib"/>
+            <param name="project-path" value="org/htrace"/>
+            <param name="artifact-version" value="3.0.4"/>
+            <param name="artifact-name" value="htrace-core"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+    </target>
     
     <target name="download-protobuf">
         <mkdir dir="lib"/>
@@ -1990,7 +2001,7 @@ Use Apache Forrest version forrest-0.9-d
         </antcall>
     </target>
 	
-    <target name="make-core-deps" depends="download-resteasy,download-jsoup,download-mockito,download-alfresco-webscript-plugin,download-alfresco-indexer-client,download-mongo-java-driver,download-jira-client,download-google-api-client,download-dropbox-client,download-solrj,download-zookeeper,download-httpcomponents,download-json,download-hsqldb,download-xerces,download-commons,download-elasticsearch-plugin,download-solr-plugins,download-sharepoint-plugins,download-jstl,download-xmlgraphics-commons,download-woodstox,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,downloa
 d-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj,download-hadoop,download-protobuf,download-tika,download-jackson,download-lucene">
+    <target name="make-core-deps" depends="download-resteasy,download-jsoup,download-mockito,download-alfresco-webscript-plugin,download-alfresco-indexer-client,download-mongo-java-driver,download-jira-client,download-google-api-client,download-dropbox-client,download-solrj,download-zookeeper,download-httpcomponents,download-json,download-hsqldb,download-xerces,download-commons,download-elasticsearch-plugin,download-solr-plugins,download-sharepoint-plugins,download-jstl,download-xmlgraphics-commons,download-woodstox,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-postgresql,download-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,downloa
 d-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj,download-hadoop,download-htrace,download-protobuf,download-tika,download-jackson,download-lucene">
         <copy todir="lib">
             <fileset dir="lib-license" includes="*.txt"/>
         </copy>

Modified: manifoldcf/branches/CONNECTORS-1219/connectors/hdfs/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1219/connectors/hdfs/build.xml?rev=1693657&r1=1693656&r2=1693657&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1219/connectors/hdfs/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1219/connectors/hdfs/build.xml Fri Jul 31 21:50:50 2015
@@ -40,6 +40,7 @@
             <include name="hadoop-auth*.jar"/>
             <include name="hadoop-hdfs*.jar"/>
             <include name="guava*.jar"/>
+            <include name="htrace-core*.jar"/>
             <include name="protobuf-java*.jar"/>
         </fileset>
     </path>
@@ -55,6 +56,7 @@
                 <include name="hadoop-auth*.jar"/>
                 <include name="hadoop-hdfs*.jar"/>
                 <include name="guava*.jar"/>
+                <include name="htrace-core*.jar"/>
                 <include name="protobuf-java*.jar"/>
             </fileset>
         </copy>

Modified: manifoldcf/branches/CONNECTORS-1219/connectors/hdfs/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1219/connectors/hdfs/pom.xml?rev=1693657&r1=1693656&r2=1693657&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1219/connectors/hdfs/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1219/connectors/hdfs/pom.xml Fri Jul 31 21:50:50 2015
@@ -358,7 +358,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-common</artifactId>
-      <version>2.2.0</version>
+      <version>${hadoop.version}</version>
     </dependency>
   </dependencies>
 </project>

Modified: manifoldcf/branches/CONNECTORS-1219/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1219/pom.xml?rev=1693657&r1=1693656&r2=1693657&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1219/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-1219/pom.xml Fri Jul 31 21:50:50 2015
@@ -87,6 +87,7 @@
     <tika.version>1.7</tika.version>
     <jhighlight.version>1.0.2</jhighlight.version>
     <boilerpipe.version>1.1.0</boilerpipe.version>
+    <hadoop.version>2.6.0</hadoop.version>
     <lucene.version>5.2.1</lucene.version>
   </properties>
 



Mime
View raw message