ref #8132 proper transaction rollback in RegistrationWorkingsetPresenter

[cdm-vaadin.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index ab7907ab9579a22d26ccac0764be979524529315..de00bc5fa4285dbc22c899e94a2451199be2e269 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -4,14 +4,15 @@
   <groupId>eu.etaxonomy</groupId>
   <artifactId>cdm-vaadin</artifactId>
   <packaging>war</packaging>
-  <version>4.13.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.13.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
@@ -96,9 +97,9 @@
   <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>
@@ -146,6 +147,10 @@
   </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>
@@ -163,18 +168,6 @@
           <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>
@@ -418,6 +411,11 @@
       <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>
@@ -489,6 +487,11 @@
       <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>
         <groupId>org.vaadin.spring.extensions</groupId>
@@ -509,6 +512,11 @@
       <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>