BGBM BDI Projects / cdmlib.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
merge trunk to 3.3
[cdmlib.git] / cdmlib-remote-webapp / pom.xml
diff --git a/cdmlib-remote-webapp/pom.xml b/cdmlib-remote-webapp/pom.xml
index d8a3015d02928a694dd7a5c635ec359883185416..734c11ff9f4c14b15aa2d09632ee091935b23592 100644 (file)
--- a/cdmlib-remote-webapp/pom.xml
+++ b/cdmlib-remote-webapp/pom.xml
@@ -4,92 +4,43 @@
   <parent>
     <artifactId>cdmlib-parent</artifactId>
     <groupId>eu.etaxonomy</groupId>
-    <version>3.0.13</version>
+    <version>3.2.2-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
   </parent>
-  
+
   <groupId>eu.etaxonomy</groupId>
   <artifactId>cdmlib-remote-webapp</artifactId>
   <name>CDM Remote Webapp</name>
   <packaging>war</packaging>
-  
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
   <scm>
     <connection>
-      scm:svn:http://dev.e-taxonomy.eu/svn/tags/cdmlib/cdmlib-parent-3.0.13/cdmlib-remote
+      scm:svn:http://dev.e-taxonomy.eu/svn/trunk/cdmlib/cdmlib-remote/
     </connection>
     <developerConnection>
-      scm:svn:http://dev.e-taxonomy.eu/svn/tags/cdmlib/cdmlib-parent-3.0.13/cdmlib-remote
+      scm:svn:https://dev.e-taxonomy.eu/svn/trunk/cdmlib/cdmlib-remote/
     </developerConnection>
     <url>
-      scm:svn:http://dev.e-taxonomy.eu/svn/tags/cdmlib/cdmlib-parent-3.0.13/cdmlib-remote
+      http://dev.e-taxonomy.eu/trac/browser/trunk/cdmlib/cdmlib-remote/
     </url>
   </scm>
-  
+
   <dependencies>
-      <dependency>
-        <groupId>eu.etaxonomy</groupId>
-        <artifactId>cdmlib-ext</artifactId>
-      </dependency>
-      <dependency>
-        <groupId>eu.etaxonomy</groupId>
-        <artifactId>cdmlib-persistence</artifactId>
-      </dependency>
-      <dependency>
-        <groupId>eu.etaxonomy</groupId>
-        <artifactId>cdmlib-model</artifactId>
-      </dependency>
-      <dependency>
-        <groupId>eu.etaxonomy</groupId>
-        <artifactId>cdmlib-services</artifactId>
-      </dependency>
-      <dependency>
-        <groupId>eu.etaxonomy</groupId>
-        <artifactId>cdmlib-io</artifactId>
-      </dependency>
     <dependency>
       <groupId>eu.etaxonomy</groupId>
       <artifactId>cdmlib-remote</artifactId>
     </dependency>
       <dependency>
+       <!-- TODO this is also offered by cdmlib-remote, can it be removed? What does provided mean? -->
         <groupId>javax.servlet</groupId>
         <artifactId>servlet-api</artifactId>
         <scope>provided</scope>
       </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>org.springframework.web</artifactId>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>org.springframework.context.support</artifactId>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>org.springframework.web.servlet</artifactId>
-      </dependency>
-      <dependency>
-        <groupId>org.springmodules</groupId>
-        <artifactId>spring-modules-cache</artifactId>
-        <version>0.7</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-mock</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>com.ibm.lsid</groupId>
-        <artifactId>lsid-server</artifactId>
-      </dependency>
-      <dependency>
-        <groupId>com.ibm.lsid</groupId>
-        <artifactId>lsid-client</artifactId>
-      </dependency>
+
       <dependency>
         <groupId>org.easymock</groupId>
         <artifactId>easymock</artifactId>
@@ -98,102 +49,31 @@
         <groupId>xmlunit</groupId>
         <artifactId>xmlunit</artifactId>
       </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>org.springframework.test</artifactId>
-      </dependency>
-      <dependency>
-        <groupId>net.sf.dozer</groupId>
-        <artifactId>dozer</artifactId>
-      </dependency>
-      <dependency>
-        <groupId>joda-time</groupId>
-        <artifactId>joda-time</artifactId>    
-      </dependency>
-      <dependency>
-        <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-cglib-repack</artifactId>
-      </dependency>
-      <dependency>
-        <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-core</artifactId>
-      </dependency>
-      <dependency>
-        <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-ehcache</artifactId>
-      </dependency>
+
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
       </dependency>
       <!-- JsonView -->
       <dependency>
+        <!--  TODO can this be removed, it already exists in cdmlib-remote -->
         <groupId>net.sf.json-lib</groupId>
         <artifactId>json-lib</artifactId>
-        <version>2.2.3</version>
-        <classifier>jdk15</classifier>   
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>org.springframework.oxm</artifactId>
-        <version>${spring.version}</version>
+        <classifier>jdk15</classifier>
       </dependency>
-      
-      <!-- XmlView -->
+
+      <!-- Profiling -->
       <dependency>
-        <groupId>com.thoughtworks.xstream</groupId>
-        <artifactId>xstream</artifactId>
-      </dependency>
-      <dependency>
-        <groupId>xpp3</groupId>
-        <artifactId>xpp3</artifactId>
-      </dependency>
-      <dependency>
-        <groupId>stax</groupId>
-        <artifactId>stax</artifactId>
-      </dependency>
-      
-      <!-- JSP TAG LIBS -->
-      <dependency>
-        <groupId>taglibs</groupId>
-        <artifactId>standard</artifactId>
-        <version>1.1.2</version>
-      </dependency>
-      <dependency>
-        <groupId>taglibs</groupId>
-        <artifactId>x</artifactId>
-        <version>1.1.2</version>
-        <type>tld</type>
-      </dependency>
-      <!--  Connection Pooling  -->
-      <dependency> 
-        <groupId>org.hibernate</groupId> 
-        <artifactId>hibernate-c3p0</artifactId>         
-      </dependency>
-      
-      <!--  SQL Profiling  -->
-      <dependency>
-        <groupId>p6spy</groupId>
-        <artifactId>p6spy</artifactId>
-        <version>1.3</version>
-      </dependency>
-    
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
+        <groupId>com.yourkit</groupId>
+        <artifactId>yjp-controller-api-redist</artifactId>
+        <scope>test</scope>
     </dependency>
-  
+
   </dependencies>
-  
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-    
+
     <build>
       <!-- Configure the webapp -->
-      <finalName>cdmserver</finalName> 
+      <finalName>cdmserver</finalName>
       <plugins>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>