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 2015/03/09 16:44:54 UTC

svn commit: r1665263 - in /manifoldcf/integration/solr-4.x/trunk: README.txt src/main/assembly/bin.xml src/main/assembly/src.xml

Author: iorixxx
Date: Mon Mar  9 15:44:54 2015
New Revision: 1665263

URL: http://svn.apache.org/r1665263
Log:
make solr-4.x plugin release material fully compatible with solr-5.x

Modified:
    manifoldcf/integration/solr-4.x/trunk/README.txt
    manifoldcf/integration/solr-4.x/trunk/src/main/assembly/bin.xml
    manifoldcf/integration/solr-4.x/trunk/src/main/assembly/src.xml

Modified: manifoldcf/integration/solr-4.x/trunk/README.txt
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-4.x/trunk/README.txt?rev=1665263&r1=1665262&r2=1665263&view=diff
==============================================================================
--- manifoldcf/integration/solr-4.x/trunk/README.txt (original)
+++ manifoldcf/integration/solr-4.x/trunk/README.txt Mon Mar  9 15:44:54 2015
@@ -49,7 +49,7 @@ Instructions for Building Apache Manifol
 
    The JAR packages can be found in the target folder:
 
-   target/solr4x-plugin-mcf-<VERSION>.jar where <VERSION> is the release version
+   target/apache-manifoldcf-solr-4.x-plugin-<VERSION>.jar where <VERSION> is the release version
 
 
 Getting Started

Modified: manifoldcf/integration/solr-4.x/trunk/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-4.x/trunk/src/main/assembly/bin.xml?rev=1665263&r1=1665262&r2=1665263&view=diff
==============================================================================
--- manifoldcf/integration/solr-4.x/trunk/src/main/assembly/bin.xml (original)
+++ manifoldcf/integration/solr-4.x/trunk/src/main/assembly/bin.xml Mon Mar  9 15:44:54 2015
@@ -21,24 +21,9 @@
         <format>tar.gz</format>
         <format>zip</format>
     </formats>
-    <moduleSets>
-        <moduleSet>
-            <excludes>
-            </excludes>
-            <binaries>
-                <outputDirectory>lib</outputDirectory>
-                <unpack>false</unpack>
-                <dependencySets>
-                    <dependencySet>
-                        <excludes>
-                            <exclude>org.slf4j:*</exclude>
-                        </excludes>
-                    </dependencySet>
-                </dependencySets>
-            </binaries>
-        </moduleSet>
-    </moduleSets>
+    
     <fileSets>
+        
         <fileSet>
             <directory>target</directory>
             <outputDirectory/>
@@ -48,10 +33,13 @@
                 <include>${project.artifactId}-${project.version}.jar</include>
             </includes>
         </fileSet>
+        
         <fileSet>
+            <directory>.</directory>
+            <outputDirectory/>
+            <fileMode>644</fileMode>
+            <directoryMode>755</directoryMode>
             <includes>
-	    <include>${project.artifactId}-${project.version}.jar</include>
-                <include>**/target/*.jar</include>
                 <include>README.txt</include>
                 <include>LICENSE.txt</include>
                 <include>NOTICE.txt</include>

Modified: manifoldcf/integration/solr-4.x/trunk/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-4.x/trunk/src/main/assembly/src.xml?rev=1665263&r1=1665262&r2=1665263&view=diff
==============================================================================
--- manifoldcf/integration/solr-4.x/trunk/src/main/assembly/src.xml (original)
+++ manifoldcf/integration/solr-4.x/trunk/src/main/assembly/src.xml Mon Mar  9 15:44:54 2015
@@ -24,10 +24,17 @@
     <fileSets>
         <!-- Release materials -->
         <fileSet>
+            <directory>.</directory>
+            <outputDirectory/>
+            <fileMode>644</fileMode>
+            <directoryMode>755</directoryMode>
             <excludes>
                 <exclude>**/.*</exclude>
                 <exclude>**/.*/**</exclude>
                 <exclude>**/*.iml/**</exclude>
+                <exclude>**/*.patch/**</exclude>
+                <exclude>**/*.sh/**</exclude>
+                <exclude>**/*.bat/**</exclude>
                 <exclude>**/target/**</exclude>
                 <exclude>**/lib/**</exclude>
                 <exclude>**/data/**</exclude>