Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/cdmlib into remoting-4.0

[cdmlib.git] / cdmlib-remote-webapp / pom.xml

diff --git a/cdmlib-remote-webapp/pom.xml b/cdmlib-remote-webapp/pom.xml
index 97b9ebef301e3deae0ce68533243a948dff3c071..983fad99f98eabafedccff61f1d0808876a217f6 100644 (file)
--- a/cdmlib-remote-webapp/pom.xml
+++ b/cdmlib-remote-webapp/pom.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>cdmlib-parent</artifactId>
     <groupId>eu.etaxonomy</groupId>
-    <version>3.4.1-SNAPSHOT</version>
+    <version>3.6.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -16,7 +15,6 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jackson.version>2.2.3</jackson.version>
   </properties>
 
   <scm>
@@ -60,19 +58,43 @@
     <dependency>
       <groupId>eu.etaxonomy</groupId>
       <artifactId>cdmlib-remote</artifactId>
+      <exclusions>
+        <!-- 
+            exclude all jdbc drivers from the war. 
+            Jdbc drivers must only be added to {APPLICATION_CONTAINER}/lib
+            see http://dev.e-taxonomy.eu/trac/ticket/4955 
+            and http://stackoverflow.com/questions/6981564/why-must-the-jdbc-driver-be-put-in-tomcat-home-lib-folder
+         -->
+        <exclusion>
+          <artifactId>postgresql</artifactId>
+          <groupId>postgresql</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>mysql-connector-java</artifactId>
+          <groupId>mysql</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>c3p0</artifactId>
+          <groupId>com.mchange</groupId>
+        </exclusion>
+        <exclusion>
+            <groupId>oracle</groupId>
+            <artifactId>ojdbc14</artifactId>
+        </exclusion>
+        <exclusion>
+            <groupId>net.sourceforge.jtds</groupId>
+            <artifactId>jtds</artifactId>         
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
-      <!-- TODO this is also offered by cdmlib-remote, can it be removed? 
+      <!-- TODO this is also offered by cdmlib-remote, can it be removed?
         What does provided mean? -->
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-    </dependency>
     <dependency>
       <groupId>xmlunit</groupId>
       <artifactId>xmlunit</artifactId>
@@ -123,11 +145,6 @@
       <version>1.1.2</version>
       <type>tld</type>
     </dependency>
-    <!-- Connection Pooling -->
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-c3p0</artifactId>
-    </dependency>
     <!-- swagger -->
     <dependency>
       <groupId>com.mangofactory</groupId>
@@ -138,20 +155,18 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>${jackson.version}</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>${jackson.version}</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>${jackson.version}</version>
     </dependency>
+    <!-- END of dependencies for swagger-springmvc, added explicitely -->
     <!-- testing -->
-       <dependency>
+  <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
@@ -161,6 +176,16 @@
       <artifactId>yjp-controller-api-redist</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Connection Pooling and jdbc -->
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-c3p0</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+        <artifactId>c3p0</artifactId>
+        <groupId>com.mchange</groupId>
+    </dependency>
   </dependencies>
 
   <build>
@@ -190,19 +215,6 @@
       </resource>
     </resources>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-        <version>2.3</version>
-        <configuration>
-          <webResources>
-            <resource>
-              <!-- this is relative to the pom.xml directory -->
-              <directory>${project.build.directory}/cdm-vaadin</directory>
-            </resource>
-          </webResources>
-        </configuration>
-      </plugin>
       <plugin>
         <artifactId>maven-failsafe-plugin</artifactId>
         <version>2.16</version>
@@ -235,7 +247,7 @@
               <value>h2_cdmTest</value>
             </systemProperty>
             <systemProperty>
-              <!-- datasources.xml is prepared by <plugins><resources>..</resources> 
+              <!-- datasources.xml is prepared by <plugins><resources>..</resources>
                 above -->
               <name>cdm.beanDefinitionFile</name>
               <value>${project.build.directory}/test-classes/datasources.xml</value>
@@ -263,40 +275,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.9</version>
-        <executions>
-          <execution>
-            <id>unpack</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>eu.etaxonomy</groupId>
-                  <artifactId>cdm-vaadin</artifactId>
-                  <version> ${project.version}</version>
-                  <type>war</type>
-                  <overWrite>true</overWrite>
-                  <outputDirectory>${project.build.directory}/cdm-vaadin</outputDirectory>
-                  <!-- <destFileName>optional-new-name.jar</destFileName> -->
-                  <!-- <includes>**/*.class,**/*.xml</includes> -->
-                  <excludes>META-INF/**</excludes>
-                </artifactItem>
-              </artifactItems>
-              <!-- <includes>**/*.java</includes> -->
-              <!-- <excludes>**/*.properties</excludes> -->
-              <!-- <outputDirectory>${project.build.directory}/wars</outputDirectory> -->
-              <overWriteReleases>false</overWriteReleases>
-              <overWriteSnapshots>true</overWriteSnapshots>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>