From 51566e71a202d303b7eacb1b642e8dafa242e8c9 Mon Sep 17 00:00:00 2001
From: KevinVdV <kevin@mire.be>
Date: Wed, 30 May 2012 09:33:24 +0200
Subject: [PATCH] [DS-1181] Upgrade to solr 3.5.0

---
 pom.xml        | 276 ++++++++++++++++++++++++-------------------------
 webapp/pom.xml | 220 +++++++++++++++++++--------------------
 2 files changed, 248 insertions(+), 248 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4791f15a88aa..5e5ee4aaf6ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,138 +1,138 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-   <!--
-      Licensed to the Apache Software Foundation (ASF) under one or more
-      contributor license agreements. See the NOTICE file distributed
-      with this work for additional information regarding copyright
-      ownership. The ASF licenses this file to you under the Apache
-      License, Version 2.0 (the "License"); you may not use this file
-      except in compliance with the License. You may obtain a copy of
-      the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
-      required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied. See the License for the specific language governing
-      permissions and limitations under the License.
-   -->
-
-   <modelVersion>4.0.0</modelVersion>
-
-   <parent>
-      <groupId>org.dspace</groupId>
-      <artifactId>dspace-pom</artifactId>
-      <version>10</version>
-   </parent>
-
-   <groupId>org.dspace</groupId>
-   <artifactId>dspace-solr-parent</artifactId>
-   <name>Apache Solr Parent POM</name>
-   <version>3.3.0.1-SNAPSHOT</version>
-   <description>Apache Solr Parent POM</description>
-   <url>http://lucene.apache.org/solr</url>
-   <packaging>pom</packaging>
-
-   <issueManagement>
-      <system>JIRA</system>
-      <url>http://issues.apache.org/jira/browse/SOLR</url>
-   </issueManagement>
-
-
-   <inceptionYear>2006</inceptionYear>
-
-   <licenses>
-      <license>
-         <name>Apache 2</name>
-         <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      </license>
-   </licenses>
-
-   <scm>
-      <connection>
-      scm:svn:https://scm.dspace.org/svn/repo/modules/dspace-solr/trunk
-      </connection>
-      <developerConnection>
-      scm:svn:https://scm.dspace.org/svn/repo/modules/dspace-solr/trunk
-      </developerConnection>
-      <url>http://svn.apache.org/viewvc/maven/pom/tags/dspace-solr-parent-3.3.0.0</url>
-  </scm>
-
-   <modules>
-      <module>webapp</module>
-   </modules>
-
-   <build>
-      <plugins>
-         <plugin>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <configuration>
-               <source>1.5</source>
-               <target>1.5</target>
-            </configuration>
-         </plugin>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <version>2.1.1</version>
-            <executions>
-               <execution>
-                  <id>attach-sources</id>
-                  <phase>package</phase>
-                  <goals>
-                     <goal>jar-no-fork</goal>
-                  </goals>
-               </execution>
-            </executions>
-         </plugin>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <executions>
-               <execution>
-                  <id>attach-javadocs</id>
-                  <phase>package</phase>
-                  <goals>
-                     <goal>jar</goal>
-                  </goals>
-               </execution>
-            </executions>
-         </plugin>
-
-         <plugin>
-                <groupId>com.google.code.maven-license-plugin</groupId>
-                <artifactId>maven-license-plugin</artifactId>
-                <version>1.4.0</version>
-                <configuration>
-                    <header>http://scm.dspace.org/svn/repo/licenses/LICENSE_HEADER</header>
-                    <excludes>
-                        <exclude>src/**</exclude>
-                    </excludes>
-                    <properties />
-                    <encoding>UTF-8</encoding>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-      </plugins>
-   </build>
-    
-   <dependencies>
-      <dependency>
-         <groupId>javax.servlet</groupId>
-         <artifactId>servlet-api</artifactId>
-         <version>2.5</version>
-         <scope>provided</scope>
-      </dependency>
-      <dependency>
-         <groupId>junit</groupId>
-         <artifactId>junit</artifactId>
-         <version>4.7</version>
-         <scope>test</scope>
-      </dependency>
-   </dependencies>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+   <!--
+      Licensed to the Apache Software Foundation (ASF) under one or more
+      contributor license agreements. See the NOTICE file distributed
+      with this work for additional information regarding copyright
+      ownership. The ASF licenses this file to you under the Apache
+      License, Version 2.0 (the "License"); you may not use this file
+      except in compliance with the License. You may obtain a copy of
+      the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
+      required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied. See the License for the specific language governing
+      permissions and limitations under the License.
+   -->
+
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <groupId>org.dspace</groupId>
+      <artifactId>dspace-pom</artifactId>
+      <version>10</version>
+   </parent>
+
+   <groupId>org.dspace</groupId>
+   <artifactId>dspace-solr-parent</artifactId>
+   <name>Apache Solr Parent POM</name>
+   <version>3.5.0.0</version>
+   <description>Apache Solr Parent POM</description>
+   <url>http://lucene.apache.org/solr</url>
+   <packaging>pom</packaging>
+
+   <issueManagement>
+      <system>JIRA</system>
+      <url>http://issues.apache.org/jira/browse/SOLR</url>
+   </issueManagement>
+
+
+   <inceptionYear>2006</inceptionYear>
+
+   <licenses>
+      <license>
+         <name>Apache 2</name>
+         <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      </license>
+   </licenses>
+
+   <scm>
+      <connection>
+      scm:svn:https://scm.dspace.org/svn/repo/modules/dspace-solr/trunk
+      </connection>
+      <developerConnection>
+      scm:svn:https://scm.dspace.org/svn/repo/modules/dspace-solr/trunk
+      </developerConnection>
+      <url>http://svn.apache.org/viewvc/maven/pom/tags/dspace-solr-parent-3.3.0.0</url>
+  </scm>
+
+   <modules>
+      <module>webapp</module>
+   </modules>
+
+   <build>
+      <plugins>
+         <plugin>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+               <source>1.5</source>
+               <target>1.5</target>
+            </configuration>
+         </plugin>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <version>2.1.1</version>
+            <executions>
+               <execution>
+                  <id>attach-sources</id>
+                  <phase>package</phase>
+                  <goals>
+                     <goal>jar-no-fork</goal>
+                  </goals>
+               </execution>
+            </executions>
+         </plugin>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>attach-javadocs</id>
+                  <phase>package</phase>
+                  <goals>
+                     <goal>jar</goal>
+                  </goals>
+               </execution>
+            </executions>
+         </plugin>
+
+         <plugin>
+                <groupId>com.google.code.maven-license-plugin</groupId>
+                <artifactId>maven-license-plugin</artifactId>
+                <version>1.4.0</version>
+                <configuration>
+                    <header>http://scm.dspace.org/svn/repo/licenses/LICENSE_HEADER</header>
+                    <excludes>
+                        <exclude>src/**</exclude>
+                    </excludes>
+                    <properties />
+                    <encoding>UTF-8</encoding>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+      </plugins>
+   </build>
+    
+   <dependencies>
+      <dependency>
+         <groupId>javax.servlet</groupId>
+         <artifactId>servlet-api</artifactId>
+         <version>2.5</version>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>junit</groupId>
+         <artifactId>junit</artifactId>
+         <version>4.7</version>
+         <scope>test</scope>
+      </dependency>
+   </dependencies>
+</project>
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 2d686719b842..e5f4c3f94f22 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -1,110 +1,110 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-   <!--
-      Licensed to the Apache Software Foundation (ASF) under one or more
-      contributor license agreements. See the NOTICE file distributed
-      with this work for additional information regarding copyright
-      ownership. The ASF licenses this file to you under the Apache
-      License, Version 2.0 (the "License"); you may not use this file
-      except in compliance with the License. You may obtain a copy of
-      the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
-      required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied. See the License for the specific language governing
-      permissions and limitations under the License.
-   -->
-
-   <modelVersion>4.0.0</modelVersion>
-
-   <parent>
-      <groupId>org.dspace</groupId>
-      <artifactId>dspace-solr-parent</artifactId>
-      <version>3.3.0.1-SNAPSHOT</version>
-   </parent>
-
-   <groupId>org.dspace</groupId>
-   <artifactId>dspace-solr</artifactId>
-   <name>Apache Solr Webapp</name>
-   <version>3.3.0.1-SNAPSHOT</version>
-   <description>Apache Solr Server</description>
-   <packaging>war</packaging>
-
-   <scm>
-     <connection>
-      scm:svn:https://scm.dspace.org/svn/repo/modules/dspace-solr/trunk/webapp
-     </connection>
-     <developerConnection>
-      scm:svn:https://scm.dspace.org/svn/repo/modules/dspace-solr/trunk/webapp
-     </developerConnection>
-     <url>https://scm.dspace.org/svn/repo/modules/dspace-solr/trunk/webapp</url>
-  </scm>
-
-   <build>
-      <plugins>
-         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-war-plugin</artifactId>
-            <version>2.1-alpha-2</version>
-            <configuration>
-              <!-- This 'dspace-solr' WAR overlays the Apache Solr Web Application 
-                   available in Maven Central -->
-              <overlays>
-                <overlay>
-                 <groupId>org.apache.solr</groupId>
-                 <artifactId>solr</artifactId>
-                </overlay>
-              </overlays>
-            </configuration>
-            <executions>
-               <execution>
-                  <!-- This execution creates a normal WAR (with all JARs, etc)-->
-                  <id>webapp</id>
-                  <configuration>
-                     <primaryArtifact>true</primaryArtifact>
-                     <archiveClasses>true</archiveClasses>
-                     <attachClasses>true</attachClasses>
-                     <classesClassifier>classes</classesClassifier>
-                     <warSourceExcludes>WEB-INF/classes/**</warSourceExcludes>
-                     <packagingExcludes>WEB-INF/classes/**</packagingExcludes>
-                  </configuration>
-                  <goals>
-                     <goal>war</goal>
-                  </goals>
-                  <phase>package</phase>
-               </execution>
-               <execution>
-                  <!-- This execution creates a "skinny" WAR (without any JARs included)-->
-                  <id>skinny</id>
-                  <configuration>
-                     <primaryArtifact>false</primaryArtifact>
-                     <classifier>skinny</classifier>
-                     <warSourceExcludes>WEB-INF/lib/**,WEB-INF/classes/**</warSourceExcludes>
-                     <packagingExcludes>WEB-INF/lib/**,WEB-INF/classes/**</packagingExcludes>
-                  </configuration>
-                  <goals>
-                     <goal>war</goal>
-                  </goals>
-                  <phase>package</phase>
-               </execution>
-            </executions>
-         </plugin>
-      </plugins>
-   </build>
-   <dependencies>
-      <!-- Depends on the Apache 'solr' web application (see Overlay settings above)-->
-      <dependency>
-         <groupId>org.apache.solr</groupId>
-         <artifactId>solr</artifactId>
-         <version>3.3.0</version>
-         <type>war</type>
-      </dependency>
-      <!-- Commons Logging is needed for the LocalHostRestrictionFilter-->
-      <dependency>
-         <groupId>commons-logging</groupId>
-         <artifactId>commons-logging</artifactId>
-         <version>1.0.4</version>
-      </dependency>
-   </dependencies>
-
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+   <!--
+      Licensed to the Apache Software Foundation (ASF) under one or more
+      contributor license agreements. See the NOTICE file distributed
+      with this work for additional information regarding copyright
+      ownership. The ASF licenses this file to you under the Apache
+      License, Version 2.0 (the "License"); you may not use this file
+      except in compliance with the License. You may obtain a copy of
+      the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
+      required by applicable law or agreed to in writing, software
+      distributed under the License is distributed on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied. See the License for the specific language governing
+      permissions and limitations under the License.
+   -->
+
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <groupId>org.dspace</groupId>
+      <artifactId>dspace-solr-parent</artifactId>
+      <version>3.5.0.0</version>
+   </parent>
+
+   <groupId>org.dspace</groupId>
+   <artifactId>dspace-solr</artifactId>
+   <name>Apache Solr Webapp</name>
+   <version>3.5.0.0</version>
+   <description>Apache Solr Server</description>
+   <packaging>war</packaging>
+
+   <scm>
+     <connection>
+      scm:svn:https://scm.dspace.org/svn/repo/modules/dspace-solr/trunk/webapp
+     </connection>
+     <developerConnection>
+      scm:svn:https://scm.dspace.org/svn/repo/modules/dspace-solr/trunk/webapp
+     </developerConnection>
+     <url>https://scm.dspace.org/svn/repo/modules/dspace-solr/trunk/webapp</url>
+  </scm>
+
+   <build>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-war-plugin</artifactId>
+            <version>2.1-alpha-2</version>
+            <configuration>
+              <!-- This 'dspace-solr' WAR overlays the Apache Solr Web Application 
+                   available in Maven Central -->
+              <overlays>
+                <overlay>
+                 <groupId>org.apache.solr</groupId>
+                 <artifactId>solr</artifactId>
+                </overlay>
+              </overlays>
+            </configuration>
+            <executions>
+               <execution>
+                  <!-- This execution creates a normal WAR (with all JARs, etc)-->
+                  <id>webapp</id>
+                  <configuration>
+                     <primaryArtifact>true</primaryArtifact>
+                     <archiveClasses>true</archiveClasses>
+                     <attachClasses>true</attachClasses>
+                     <classesClassifier>classes</classesClassifier>
+                     <warSourceExcludes>WEB-INF/classes/**</warSourceExcludes>
+                     <packagingExcludes>WEB-INF/classes/**</packagingExcludes>
+                  </configuration>
+                  <goals>
+                     <goal>war</goal>
+                  </goals>
+                  <phase>package</phase>
+               </execution>
+               <execution>
+                  <!-- This execution creates a "skinny" WAR (without any JARs included)-->
+                  <id>skinny</id>
+                  <configuration>
+                     <primaryArtifact>false</primaryArtifact>
+                     <classifier>skinny</classifier>
+                     <warSourceExcludes>WEB-INF/lib/**,WEB-INF/classes/**</warSourceExcludes>
+                     <packagingExcludes>WEB-INF/lib/**,WEB-INF/classes/**</packagingExcludes>
+                  </configuration>
+                  <goals>
+                     <goal>war</goal>
+                  </goals>
+                  <phase>package</phase>
+               </execution>
+            </executions>
+         </plugin>
+      </plugins>
+   </build>
+   <dependencies>
+      <!-- Depends on the Apache 'solr' web application (see Overlay settings above)-->
+      <dependency>
+         <groupId>org.apache.solr</groupId>
+         <artifactId>solr</artifactId>
+         <version>3.5.0</version>
+         <type>war</type>
+      </dependency>
+      <!-- Commons Logging is needed for the LocalHostRestrictionFilter-->
+      <dependency>
+         <groupId>commons-logging</groupId>
+         <artifactId>commons-logging</artifactId>
+         <version>1.0.4</version>
+      </dependency>
+   </dependencies>
+
+</project>