Merge pull request #2 from atmire/dspace-solr-parent-3.5.0.1

[DS-1181] Upgrade to solr 3.5.0 (Fixing SOLR-1709)
DSpace · Jul 7, 2012 · 94a3d01 · 94a3d01
2 parents e708c6f + 1b3d476
commit 94a3d01
Show file tree

Hide file tree

Showing 3 changed files with 855 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -26,7 +26,7 @@
    <groupId>org.dspace</groupId>
    <artifactId>dspace-solr-parent</artifactId>
    <name>Apache Solr Parent POM</name>
-   <version>3.5.0.1-SNAPSHOT</version>
+   <version>3.5.0.1</version>
    <description>Apache Solr Parent POM</description>
    <url>http://lucene.apache.org/solr</url>
    <packaging>pom</packaging>

diff --git a/webapp/pom.xml b/webapp/pom.xml
@@ -20,13 +20,13 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-solr-parent</artifactId>
-      <version>3.5.0.1-SNAPSHOT</version>
+      <version>3.5.0.1</version>
    </parent>
 
    <groupId>org.dspace</groupId>
    <artifactId>dspace-solr</artifactId>
    <name>Apache Solr Webapp</name>
-   <version>3.5.0.1-SNAPSHOT</version>
+   <version>3.5.0.1</version>
    <description>Apache Solr Server</description>
    <packaging>war</packaging>
 
@@ -43,6 +43,13 @@
                 <overlay>
                  <groupId>org.apache.solr</groupId>
                  <artifactId>solr</artifactId>
+                    <!--
+                    Exclude the solr core named apache-solr-core, this is needed because the dspace-solr changes
+                    need to take precendence over the solr-core, the solr-core will still be loaded in the solr-core.jar
+                    -->
+                    <excludes>
+                        <exclude>WEB-INF/lib/apache-solr-core-3.5.0.jar</exclude>
+                    </excludes>
                 </overlay>
               </overlays>
             </configuration>
@@ -89,6 +96,12 @@
          <version>3.5.0</version>
          <type>war</type>
       </dependency>
+      <dependency>
+         <groupId>org.apache.solr</groupId>
+         <artifactId>solr-core</artifactId>
+         <version>3.5.0</version>
+         <type>jar</type>
+      </dependency>
       <!-- Commons Logging is needed for the LocalHostRestrictionFilter-->
       <dependency>
          <groupId>commons-logging</groupId>