<groupId>eu.etaxonomy</groupId>
<artifactId>cdm-vaadin</artifactId>
<packaging>war</packaging>
- <version>4.12.0-SNAPSHOT</version>
+ <version>5.5.3-SNAPSHOT</version>
<name>Vaadin Web Application</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <vaadin.version>7.7.10</vaadin.version>
+ <vaadin.version>7.7.13</vaadin.version>
<vaadin-spring.version>1.2.0</vaadin-spring.version>
<vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
- <cdmlib.version>4.12.0-SNAPSHOT</cdmlib.version>
+ <vaadin-spring-addon-eventbus.version>2.0.0.RELEASE</vaadin-spring-addon-eventbus.version>
+ <cdmlib.version>5.5.2-SNAPSHOT</cdmlib.version>
<unitils.version>3.4.2</unitils.version>
<!--
lucene.version must match the version as defined in cdmlib
<distributionManagement>
<repository>
<uniqueVersion>false</uniqueVersion>
- <id>wp5.e-taxonomy.eu</id>
+ <id>cybertaxonomy.eu</id>
<name>Edit Maven Repository</name>
- <url>scpexe://wp5.e-taxonomy.eu/var/www/wp5.e-taxonomy.eu/mavenrepo/</url>
+ <url>scpexe://cybertaxonomy.eu/var/www/wp5.e-taxonomy.eu/mavenrepo/</url>
<layout>default</layout>
</repository>
</distributionManagement>
</profiles>
<build>
<resources>
+ <resource>
+ <!-- all main resources without filtering -->
+ <directory>src/main/resources</directory>
+ </resource>
<resource>
<!-- replace the place holders like ${...} in datasources.xml -->
<filtering>true</filtering>
<exclude>datasources.xml</exclude>
</excludes>
</resource>
- <resource>
- <!-- all main resources without filtering -->
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <!-- i10n resources -->
- <directory>src/main/java/eu/etaxonomy/cdm/i10n</directory>
- <targetPath>../classes/eu/etaxonomy/cdm/i10n</targetPath>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
</resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>3.0.1</version>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.0.1</version>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<artifactId>vaadin-spring</artifactId>
<version>${vaadin-spring.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.vaadin.spring.addons</groupId>
+ <artifactId>vaadin-spring-addon-eventbus</artifactId>
+ <version>${vaadin-spring-addon-eventbus.version}</version>
+ </dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-server</artifactId>
<version>1.0.3</version>
</dependency>
<dependency>
- <groupId>org.vaadin.addons.lazyquerycontainer</groupId>
- <artifactId>vaadin-lazyquerycontainer</artifactId>
- <version>7.6.1.3</version>
+ <groupId>org.vaadin.addons.lazyquerycontainer</groupId>
+ <artifactId>vaadin-lazyquerycontainer</artifactId>
+ <version>7.6.1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.flowingcode.vaadin.addons</groupId>
+ <artifactId>error-window-vaadin</artifactId>
+ <version>1.0.0</version>
</dependency>
<!--
<dependency>
<artifactId>cdmlib-remote</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>eu.etaxonomy</groupId>
+ <artifactId>cdmlib-cache</artifactId>
+ <version>${cdmlib.version}</version>
+ </dependency>
<dependency>
<groupId>eu.etaxonomy</groupId>
<artifactId>cdmlib-test</artifactId>