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 2015/03/09 01:26:45 UTC

svn commit: r1665102 - in /manifoldcf/integration/solr-5.x/branches/release-2.0-branch: ./ src/main/assembly/bin.xml src/main/assembly/src.xml

Author: kwright
Date: Mon Mar  9 00:26:44 2015
New Revision: 1665102

URL: http://svn.apache.org/r1665102
Log:
Pull up Ahmet's change

Modified:
    manifoldcf/integration/solr-5.x/branches/release-2.0-branch/   (props changed)
    manifoldcf/integration/solr-5.x/branches/release-2.0-branch/src/main/assembly/bin.xml
    manifoldcf/integration/solr-5.x/branches/release-2.0-branch/src/main/assembly/src.xml

Propchange: manifoldcf/integration/solr-5.x/branches/release-2.0-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar  9 00:26:44 2015
@@ -9,4 +9,4 @@
 /lucene/dev/branches/realtime_search:953476-1097796
 /lucene/dev/branches/solr2452:1087601-1144716
 /manifoldcf/integration/solr-4.x/branches/CONNECTORS-914:1583544-1583849
-/manifoldcf/integration/solr-5.x/trunk:1665052
+/manifoldcf/integration/solr-5.x/trunk:1665052,1665095

Modified: manifoldcf/integration/solr-5.x/branches/release-2.0-branch/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-5.x/branches/release-2.0-branch/src/main/assembly/bin.xml?rev=1665102&r1=1665101&r2=1665102&view=diff
==============================================================================
--- manifoldcf/integration/solr-5.x/branches/release-2.0-branch/src/main/assembly/bin.xml (original)
+++ manifoldcf/integration/solr-5.x/branches/release-2.0-branch/src/main/assembly/bin.xml Mon Mar  9 00:26:44 2015
@@ -30,7 +30,7 @@
             <fileMode>644</fileMode>
             <directoryMode>755</directoryMode>
             <includes>
-                <include>apache-manifoldcf-solr5x-plugin-${project.version}.jar</include>
+                <include>${project.artifactId}-${project.version}.jar</include>
             </includes>
         </fileSet>
         

Modified: manifoldcf/integration/solr-5.x/branches/release-2.0-branch/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-5.x/branches/release-2.0-branch/src/main/assembly/src.xml?rev=1665102&r1=1665101&r2=1665102&view=diff
==============================================================================
--- manifoldcf/integration/solr-5.x/branches/release-2.0-branch/src/main/assembly/src.xml (original)
+++ manifoldcf/integration/solr-5.x/branches/release-2.0-branch/src/main/assembly/src.xml Mon Mar  9 00:26:44 2015
@@ -33,6 +33,8 @@
                 <exclude>**/.*/**</exclude>
                 <exclude>**/*.iml/**</exclude>
                 <exclude>**/*.patch/**</exclude>
+                <exclude>**/*.sh/**</exclude>
+                <exclude>**/*.bat/**</exclude>
                 <exclude>**/target/**</exclude>
                 <exclude>**/lib/**</exclude>
                 <exclude>**/data/**</exclude>