ref #8132 proper transaction rollback in RegistrationWorkingsetPresenter

[cdm-vaadin.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 26f97aec9d2825dd4fb5a0d4ead717ba8d5cd045..de00bc5fa4285dbc22c899e94a2451199be2e269 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -4,15 +4,15 @@
   <groupId>eu.etaxonomy</groupId>
   <artifactId>cdm-vaadin</artifactId>
   <packaging>war</packaging>
-  <version>5.1.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>
     <vaadin-spring-addon-eventbus.version>2.0.0.RELEASE</vaadin-spring-addon-eventbus.version>
-    <cdmlib.version>5.2.0-SNAPSHOT</cdmlib.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
@@ -147,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>
@@ -164,10 +168,6 @@
           <exclude>datasources.xml</exclude>
         </excludes>
       </resource>
-      <resource>
-        <!-- all main resources without filtering -->
-        <directory>src/main/resources</directory>
-      </resource>
     </resources>
     <plugins>
       <plugin>