You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by io...@apache.org on 2016/05/10 15:36:05 UTC

svn commit: r1743216 - in /manifoldcf/integration/solr-6.x/branches/release-2.2-branch: ./ README.txt src/main/assembly/bin.xml src/main/assembly/src.xml

Author: iorixxx
Date: Tue May 10 15:36:05 2016
New Revision: 1743216

URL: http://svn.apache.org/viewvc?rev=1743216&view=rev
Log:
merge r1743214 from trunk

Modified:
    manifoldcf/integration/solr-6.x/branches/release-2.2-branch/   (props changed)
    manifoldcf/integration/solr-6.x/branches/release-2.2-branch/README.txt
    manifoldcf/integration/solr-6.x/branches/release-2.2-branch/src/main/assembly/bin.xml
    manifoldcf/integration/solr-6.x/branches/release-2.2-branch/src/main/assembly/src.xml

Propchange: manifoldcf/integration/solr-6.x/branches/release-2.2-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 10 15:36:05 2016
@@ -1 +1 @@
-/manifoldcf/integration/solr-6.x/trunk:1743203
+/manifoldcf/integration/solr-6.x/trunk:1743203,1743214

Modified: manifoldcf/integration/solr-6.x/branches/release-2.2-branch/README.txt
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-6.x/branches/release-2.2-branch/README.txt?rev=1743216&r1=1743215&r2=1743216&view=diff
==============================================================================
--- manifoldcf/integration/solr-6.x/branches/release-2.2-branch/README.txt (original)
+++ manifoldcf/integration/solr-6.x/branches/release-2.2-branch/README.txt Tue May 10 15:36:05 2016
@@ -38,7 +38,7 @@ Instructions for Building Apache Manifol
 
    Execute the following command in order to build the distribution assemblies
 
-   mvn package assembly:assembly
+   mvn clean package assembly:single
 
    The JAR package can be found in the target folder:
 
@@ -103,7 +103,7 @@ curl -X POST -H 'Content-type:applicatio
 
 Replace <collection_name> with your core or collection name respectively.
 
-The default value of "__nosecurity__" is manadatory because the queries will be
+The default value of "__nosecurity__" is mandatory because the queries will be
 rewritten to use all of these 6 fields. If a field is missing in the index then
 you will get no results for your search.
 

Modified: manifoldcf/integration/solr-6.x/branches/release-2.2-branch/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-6.x/branches/release-2.2-branch/src/main/assembly/bin.xml?rev=1743216&r1=1743215&r2=1743216&view=diff
==============================================================================
--- manifoldcf/integration/solr-6.x/branches/release-2.2-branch/src/main/assembly/bin.xml (original)
+++ manifoldcf/integration/solr-6.x/branches/release-2.2-branch/src/main/assembly/bin.xml Tue May 10 15:36:05 2016
@@ -40,7 +40,6 @@
             <fileMode>644</fileMode>
             <directoryMode>755</directoryMode>
             <includes>
-                <include>KEYS</include>
                 <include>README.txt</include>
                 <include>LICENSE.txt</include>
                 <include>NOTICE.txt</include>

Modified: manifoldcf/integration/solr-6.x/branches/release-2.2-branch/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-6.x/branches/release-2.2-branch/src/main/assembly/src.xml?rev=1743216&r1=1743215&r2=1743216&view=diff
==============================================================================
--- manifoldcf/integration/solr-6.x/branches/release-2.2-branch/src/main/assembly/src.xml (original)
+++ manifoldcf/integration/solr-6.x/branches/release-2.2-branch/src/main/assembly/src.xml Tue May 10 15:36:05 2016
@@ -29,6 +29,7 @@
             <fileMode>644</fileMode>
             <directoryMode>755</directoryMode>
             <excludes>
+                <exclude>KEYS</exclude>
                 <exclude>**/.*</exclude>
                 <exclude>**/.*/**</exclude>
                 <exclude>**/*.iml/**</exclude>