NOJIRA removed unused dependencies and war build.

review: aron

_M   id
M    id/service/pom.xml
M    id/pom.xml

diff --git a/services/id/pom.xml b/services/id/pom.xml
index bd293cfd41cfe333b93742fd8edfe8f9a9b932ce..997f5e9c33d8c4ab890546761a4355fe1098a829 100644 (file)
--- a/services/id/pom.xml
+++ b/services/id/pom.xml
@@ -37,57 +37,15 @@
 
   
   <modules>
-    <module>jaxb</module>
+    <!--module>jaxb</module-->
     <module>service</module>
-    <module>3rdparty</module>
+    <!--module>3rdparty</module-->
     <!-- Uncomment the following when/if we'll be creating a client library for this service. -->
     <!-- <module>client</module> -->
   </modules>
 
   <build>
-    <pluginManagement>
-      <plugins>
-      
-        <!-- Compiles Java sources, including test sources. -->
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <configuration>
-            <source>1.5</source>
-            <target>1.5</target>
-          </configuration>
-        </plugin>
-        
-        <!-- Generates a site for the project, typically a website with project documentation. -->
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-site-plugin</artifactId>
-          <configuration>
-            <unzipCommand>/usr/bin/unzip -o &gt; err.txt</unzipCommand>
-          </configuration>
-        </plugin>
-        
-        <plugin>
-        
-          <!--
-            Collects "all artifact dependencies, classes and resources of the web
-            application," packaging them into a web application archive (WAR file).
-          -->
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-war-plugin</artifactId>
-          <version>2.0.1</version>
-          <configuration>
-            <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
-            <archive>
-              <manifest>
-                <addClasspath>true</addClasspath>
-              </manifest>
-            </archive>
-          </configuration>
-        </plugin>
-        
-      </plugins>
-    </pluginManagement>
+
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

diff --git a/services/id/service/pom.xml b/services/id/service/pom.xml
index 7b518531b74ffe5ff0bf503dcdefd6087b768204..8efbe4eb02c28d42fe859e05db80b7fabc4ce3fc 100644 (file)
--- a/services/id/service/pom.xml
+++ b/services/id/service/pom.xml
@@ -43,13 +43,6 @@
       <version>1.0</version>
     </dependency>
     
-    <!-- JAXB-generated code, in the jaxb module of this project. -->
-    <dependency>
-      <groupId>org.collectionspace.services</groupId>
-      <artifactId>org.collectionspace.services.id.jaxb</artifactId>
-      <version>1.0</version>
-    </dependency>
-
     <!-- JUnit, a testing framework. -->
     <!-- NOTE: Versions later than 4.1 - such as 4.5 - are available. -->
     <dependency>
@@ -111,36 +104,6 @@
       <version>1.0.2.GA</version>
     </dependency>
     
-    <!-- Nuxeo, a platform offering many enterprise content management (ECM) services. -->
-    <dependency>
-      <groupId>org.nuxeo.ecm.core</groupId>
-      <artifactId>nuxeo-core-api</artifactId>
-      <version>${nuxeo.version.1.5}</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>jboss-remoting</artifactId>
-          <groupId>jboss</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <!-- Restlet, a framework for providing and consuming RESTful services. -->
-    <dependency>
-      <groupId>org.restlet</groupId>
-      <artifactId>org.restlet</artifactId>
-      <version>1.1.5</version>
-    </dependency>
-    <dependency>
-      <groupId>com.noelios.restlet</groupId>
-      <artifactId>com.noelios.restlet.ext.httpclient</artifactId>
-      <version>1.1.5</version>
-    </dependency>
-    <dependency>
-      <groupId>com.noelios.restlet</groupId>
-      <artifactId>com.noelios.restlet</artifactId>
-      <version>1.1.5</version>
-    </dependency>
-
     <!-- Cobertura, a tool for identifying the extent of code coverage in test classes -->
     <dependency>
       <groupId>org.codehaus.mojo</groupId>
@@ -152,7 +115,8 @@
     <dependency>
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
-      <version>5.1.6</version>
+      <!--version>5.1.6</version-->
+      <scope>test</scope>
     </dependency>
     
     <!-- XStream, an XML serializer -->
@@ -168,16 +132,6 @@
   <build>
     <finalName>collectionspace-services-id</finalName>
     <plugins>
-      <plugin>
-        <!-- The Mojo project manages a collection of plugins for Maven 2. -->
-        <groupId>org.codehaus.mojo</groupId>
-        <!-- Manages the ability to start/stop JBoss and deploy/undeploy applications via JMX. -->
-        <artifactId>jboss-maven-plugin</artifactId>
-        <!-- The jboss.dir property comes from the accompanying build.properties file. -->
-        <configuration>
-          <jbossHome>${jboss.dir}</jbossHome>
-        </configuration>
-      </plugin>
       <!-- Compiles Java sources, including test sources. -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>