<groupId>eu.etaxonomy</groupId>
<artifactId>cdm-vaadin</artifactId>
<packaging>war</packaging>
- <version>0.9</version>
+ <version>3.4.0-SNAPSHOT</version>
<name>Vaadin Web Application</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<vaadin.version>7.3.5</vaadin.version>
<vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
- <cdmlib.version>3.4.0-SNAPSHOT</cdmlib.version>
+ <cdmlib.version>${version}</cdmlib.version>
<unitils.version>3.3</unitils.version>
</properties>
<repositories>
- <!-- the cdm internal repository -->
- <repository>
- <id>EditRepository</id>
- <url>http://wp5.e-taxonomy.eu/mavenrepo/</url>
- </repository>
- <!-- current spring source repositories -->
- <repository>
- <id>SpringSource Enterprise Bundle Repository - External Bundle Milestones</id>
- <url>http://repository.springsource.com/maven/bundles/milestone</url>
- </repository>
- <repository>
- <id>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</id>
- <url>http://repository.springsource.com/maven/bundles/release</url>
- </repository>
- <repository>
- <id>SpringSource Enterprise Bundle Repository - External Bundle Releases</id>
- <url>http://repository.springsource.com/maven/bundles/external</url>
- </repository>
+ <!-- the cdm internal repository -->
+ <repository>
+ <id>EditRepository</id>
+ <url>http://wp5.e-taxonomy.eu/mavenrepo/</url>
+ </repository>
+ <!-- current spring source repositories -->
+ <repository>
+ <id>SpringSource Enterprise Bundle Repository - External Bundle Milestones</id>
+ <url>http://repository.springsource.com/maven/bundles/milestone</url>
+ </repository>
+ <repository>
+ <id>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</id>
+ <url>http://repository.springsource.com/maven/bundles/release</url>
+ </repository>
+ <repository>
+ <id>SpringSource Enterprise Bundle Repository - External Bundle Releases</id>
+ <url>http://repository.springsource.com/maven/bundles/external</url>
+ </repository>
<repository>
<id>vaadin-addons</id>
<url>http://maven.vaadin.com/vaadin-addons</url>
</repository>
-
+
<repository>
<id>vaadin-snapshots</id>
<url>http://oss.sonatype.org/content/repositories/vaadin-snapshots/</url>
</snapshots>
</pluginRepository>
</pluginRepositories>
+ <distributionManagement>
+ <repository>
+ <uniqueVersion>false</uniqueVersion>
+ <id>wp5.e-taxonomy.eu</id>
+ <name>Edit Maven Repository</name>
+ <url>scpexe://wp5.e-taxonomy.eu/var/www/wp5.e-taxonomy.eu/mavenrepo/</url>
+ <layout>default</layout>
+ </repository>
+ </distributionManagement>
<dependencies>
<dependency>
<groupId>com.vaadin</groupId>
<groupId>eu.etaxonomy</groupId>
<artifactId>cdmlib-services</artifactId>
<version>${cdmlib.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>eu.etaxonomy</groupId>
<artifactId>cdmlib-model</artifactId>
<version>${cdmlib.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>eu.etaxonomy</groupId>
<artifactId>spring-mock</artifactId>
</exclusion>
</exclusions>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.4</version>
+ <scope>provided</scope>
</dependency>
-
- <!-- <dependency> -->
- <!-- <groupId>org.eclipse.jetty.websocket</groupId> -->
- <!-- <artifactId>websocket-server</artifactId> -->
- <!-- <version>9.2.5.v20141112</version> -->
- <!-- </dependency> -->
-
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
<version>2.0.8</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>3.2.2.RELEASE</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.web</artifactId>
<version>3.2.2.RELEASE</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.web.servlet</artifactId>
<version>3.2.2.RELEASE</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.2</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.2</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
</execution>
</executions>
</plugin>
+
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>9.2.3.v20140905</version>
- </plugin>
-
-
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
<stopPort>8005</stopPort>
<stopKey>STOP</stopKey>
+ <useProvidedScope>true</useProvidedScope>
+ <webApp>
+ <descriptor>${project.basedir}/src/main/webapp/WEB-INF/web.xml</descriptor>
+ </webApp>
</configuration>
<executions>
<execution>
<version>2.17</version>
<configuration>
<!-- Remove the skipTests line below to run TestBench tests -->
-<!-- <skipTests>true</skipTests> -->
+ <!-- <skipTests>true</skipTests> -->
</configuration>
<executions>
<execution>