<parent>
<artifactId>cdmlib-parent</artifactId>
<groupId>eu.etaxonomy</groupId>
- <version>3.4.0-SNAPSHOT</version>
+ <version>3.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>eu.etaxonomy</groupId>
- <artifactId>cdmlib-remote-webapp</artifactId>
+ <artifactId>cdmlib-remote-webapp</artifactId>
<name>CDM Remote Webapp</name>
<packaging>war</packaging>
</url>
</scm>
- <profiles>
+ <profiles>
<profile>
<id>local-repository</id>
<activation>
<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?
What does provided mean? -->
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <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>
<version>1.1.2</version>
<type>tld</type>
</dependency>
- <!-- Connection Pooling -->
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-c3p0</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.vaadin</groupId>
- <artifactId>vaadin-server</artifactId>
- </dependency>
- <dependency>
- <groupId>com.vaadin</groupId>
- <artifactId>vaadin-shared</artifactId>
- </dependency>
- <dependency>
- <groupId>com.vaadin</groupId>
- <artifactId>vaadin-client-compiled</artifactId>
- </dependency>
- <dependency>
- <groupId>com.vaadin</groupId>
- <artifactId>vaadin-client</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.vaadin</groupId>
- <artifactId>vaadin-themes</artifactId>
- </dependency>
+ <!-- swagger -->
<dependency>
- <groupId>com.vaadin</groupId>
- <artifactId>vaadin-client-compiler</artifactId>
+ <groupId>com.mangofactory</groupId>
+ <artifactId>swagger-springmvc</artifactId>
+ <version>0.8.5</version>
</dependency>
-
+ <!-- dependencies for swagger-springmvc, added explicitely -->
<dependency>
- <groupId>ru.xpoft.vaadin</groupId>
- <artifactId>spring-vaadin-integration</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
</dependency>
-
<dependency>
- <groupId>org.vaadin.addons</groupId>
- <artifactId>exporter</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
</dependency>
-
<dependency>
- <groupId>org.vaadin.addons</groupId>
- <artifactId>wizards-for-vaadin</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
</dependency>
-
- <dependency>
+ <!-- END of dependencies for swagger-springmvc, added explicitely -->
+ <!-- testing -->
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
<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>
- <resources>
+ <resources>
<!-- ${basedir}/src/test/resources -->
<resource>
- <!-- replace the place holders like ${basedir} in the resource files -->
+ <!-- replace the place holders like ${...} in datasources.xml -->
<targetPath>${project.build.directory}/test-classes</targetPath>
<filtering>true</filtering>
- <directory>${basedir}/src/test/resources</directory>
+ <directory>${basedir}src/test/resources</directory>
<includes>
- <include>datasources.xml</include>
+ <include>datasources.xml</include>
</includes>
</resource>
<resource>
- <!-- all other files without filtering -->
+ <!-- all other test resources without filtering -->
<targetPath>${project.build.directory}/test-classes</targetPath>
- <directory>${basedir}/src/test/resources</directory>
+ <directory>${basedir}src/test/resources</directory>
<excludes>
- <exclude>datasources.xml</exclude>
+ <exclude>datasources.xml</exclude>
</excludes>
</resource>
- </resources>
+ <resource>
+ <!-- all main resources without filtering -->
+ <targetPath>${project.build.directory}/classes</targetPath>
+ <directory>${basedir}src/main/resources</directory>
+ </resource>
+ </resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.3</version>
- </plugin>
- <plugin>
- <groupId>com.vaadin</groupId>
- <artifactId>vaadin-maven-plugin</artifactId>
- <version>7.1.11</version>
- <executions>
- <execution>
- <configuration>
- <!--
- if you don't specify any modules, the plugin will find them
- -->
- <modules>
- <module>${cdm-remote}.vaadin.redlist.widgetset</module>
- </modules>
- </configuration>
- <goals>
- <goal>update-widgetset</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <strict>true</strict>
- <force>true</force>
- <webappDirectory>src/main/webapp/VAADIN/widgetsets</webappDirectory>
- <module>eu.etaxonomy.cdm.remote.vaadin.redlist.wigetset.AppWidgetSet</module>
- </configuration>
- </plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.16</version>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.1.3.v20140225</version>
<configuration>
- <stopKey>stop</stopKey>
- <stopPort>9199</stopPort>
- <scanIntervalSeconds>10</scanIntervalSeconds>
- <jettyXml>${basedir}/src/test/resources/etc/jetty/jetty.xml,${basedir}/src/test/resources/etc/jetty/jetty-http.xml</jettyXml>
- <!--
- <jettyXml>./src/test/resources/etc/jetty/jetty.xml,./src/test/resources/etc/jetty/jetty-http.xml,./src/test/resources/etc/jetty/jetty-ssl.xml,./src/test/resources/etc/jetty/jetty-https.xml</jettyXml>
- -->
- <systemProperties>
- <systemProperty>
- <name>cdm.datasource</name>
- <value>h2_cdmTest</value>
- </systemProperty>
- <systemProperty>
- <!-- datasources.xml is prepared by <plugins><resources>..</resources> above -->
- <name>cdm.beanDefinitionFile</name>
- <value>${project.build.directory}/test-classes/datasources.xml</value>
- </systemProperty>
- </systemProperties>
+ <stopKey>stop</stopKey>
+ <stopPort>9199</stopPort>
+ <scanIntervalSeconds>10</scanIntervalSeconds>
+ <jettyXml>${basedir}/src/test/resources/etc/jetty/jetty.xml,${basedir}/src/test/resources/etc/jetty/jetty-http.xml</jettyXml>
+ <!-- <jettyXml>./src/test/resources/etc/jetty/jetty.xml,./src/test/resources/etc/jetty/jetty-http.xml,./src/test/resources/etc/jetty/jetty-ssl.xml,./src/test/resources/etc/jetty/jetty-https.xml</jettyXml> -->
+ <systemProperties>
+ <systemProperty>
+ <name>cdm.datasource</name>
+ <value>h2_cdmTest</value>
+ </systemProperty>
+ <systemProperty>
+ <!-- datasources.xml is prepared by <plugins><resources>..</resources>
+ above -->
+ <name>cdm.beanDefinitionFile</name>
+ <value>${project.build.directory}/test-classes/datasources.xml</value>
+ </systemProperty>
+ </systemProperties>
</configuration>
<executions>
<execution>