From 5f24630d9bf5e9f57dcf7397f3057844f319959f Mon Sep 17 00:00:00 2001
From: Mark Diggory <mdiggory@atmire.com>
Date: Fri, 25 Mar 2011 00:16:24 +0000
Subject: [PATCH] Improvements to build and release for dspace-solr

---
 pom.xml        | 12 ++++++------
 webapp/pom.xml | 52 ++++++--------------------------------------------
 2 files changed, 12 insertions(+), 52 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5576304dad..0abfc35078 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,15 +18,15 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache</groupId>
-      <artifactId>apache</artifactId>
-      <version>4</version>
+      <groupId>org.dspace</groupId>
+      <artifactId>dspace-pom</artifactId>
+      <version>9</version>
    </parent>
 
    <groupId>org.dspace</groupId>
    <artifactId>dspace-solr-parent</artifactId>
    <name>Apache Solr Parent POM</name>
-   <version>1.4.1.0</version>
+   <version>1.4.1.1-SNAPSHOT</version>
    <description>Apache Solr Parent POM</description>
    <url>http://lucene.apache.org/solr</url>
    <packaging>pom</packaging>
@@ -48,10 +48,10 @@
 
    <scm>
       <connection>
-      scm:svn:https://scm.dspace.org/svn/repo/modules/dspace-solr/tags/dspace-solr-parent-1.4.1.0
+      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/tags/dspace-solr-parent-1.4.1.0
+      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-1.4.1.0</url>
   </scm>
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 9e0f3c4089..3ef9cedf1d 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -20,24 +20,24 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>dspace-solr-parent</artifactId>
-      <version>1.4.1.0</version>
+      <version>1.4.1.1-SNAPSHOT</version>
    </parent>
 
    <groupId>org.dspace</groupId>
    <artifactId>dspace-solr</artifactId>
    <name>Apache Solr Webapp</name>
-   <version>1.4.1.0</version>
+   <version>1.4.1.1-SNAPSHOT</version>
    <description>Apache Solr Server</description>
    <packaging>war</packaging>
 
    <scm>
       <connection>
-      scm:svn:https://scm.dspace.org/svn/repo/modules/dspace-solr/tags/dspace-solr-parent-1.4.1.0/webapp
+      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/tags/dspace-solr-parent-1.4.1.0/webapp
+      scm:svn:https://scm.dspace.org/svn/repo/modules/dspace-solr/trunk/webapp
     </developerConnection>
-     <url>http://svn.apache.org/viewvc/maven/pom/tags/dspace-solr-parent-1.4.1.0/dspace-solr-webapp</url>
+     <url>https://scm.dspace.org/svn/repo/modules/dspace-solr/trunk/webapp</url>
   </scm>
    
    <build>
@@ -77,46 +77,6 @@
                </execution>
             </executions>
          </plugin>
-
-
-
-         <plugin>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>maven-jetty-plugin</artifactId>
-            <configuration>
-
-               <scanIntervalSeconds>10</scanIntervalSeconds>
-
-               <webApp>${basedir}/target/dspace-solr-webapp-${version}.war</webApp>
-
-               <systemProperties>
-            <systemProperty>
-              <name>solr.solr.home</name>
-               <value>/Users/dryad/repo/solr</value>
-            </systemProperty>
-               </systemProperties>
-               <connectors>
-                  <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-                     <port>9090</port>
-                     <maxIdleTime>60000</maxIdleTime>
-                  </connector>
-               </connectors>
-               <requestLog implementation="org.mortbay.jetty.NCSARequestLog">
-                  <filename>target/yyyy_mm_dd.request.log</filename>
-                  <retainDays>90</retainDays>
-                  <append>true</append>
-                  <extended>false</extended>
-                  <logTimeZone>GMT</logTimeZone>
-               </requestLog>
-            </configuration>
-         </plugin>
-
-
-
-
-
-
-
       </plugins>
    </build>
    <dependencies>
@@ -164,4 +124,4 @@
       </dependency>
    </dependencies>
 
-</project>
\ No newline at end of file
+</project>