Fix service handling and refresh problem for distribution table

[cdm-vaadin.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 6615eb0e63a227f5cdb409d2330c68864b3456b6..42e152ba496905b1211cb9e536a333f45dcdf6b2 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -4,20 +4,21 @@
   <groupId>eu.etaxonomy</groupId>
   <artifactId>cdm-vaadin</artifactId>
   <packaging>war</packaging>
-  <version>4.5.0-SNAPSHOT</version>
+  <version>4.8.0-SNAPSHOT</version>
   <name>Vaadin Web Application</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <vaadin.version>7.6.3</vaadin.version>
+    <vaadin.version>7.7.7</vaadin.version>
+    <vaadin-spring.version>1.2.0</vaadin-spring.version>
     <vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
-    <cdmlib.version>4.5.0-SNAPSHOT</cdmlib.version>
+    <cdmlib.version>4.8.0-SNAPSHOT</cdmlib.version>
     <unitils.version>3.4.2</unitils.version>
     <!-- 
         lucene.version must match the version as defined in cdmlib
     -->
     <lucene.version>5.4.1</lucene.version>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
   <prerequisites>
     <maven>3.0.5</maven>
@@ -26,7 +27,7 @@
     <!-- the cdm internal repository -->
     <repository>
       <id>EditRepository</id>
-      <url>http://wp5.e-taxonomy.eu/mavenrepo/</url>
+      <url>http://cybertaxonomy.eu/mavenrepo/</url>
     </repository>
     <!-- current spring source repositories -->
     <repository>
@@ -84,6 +85,12 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <!-- Try updating in cdmlib to 20090211 -->
+        <groupId>org.json</groupId>
+        <artifactId>json</artifactId>
+        <version>20151123</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <distributionManagement>
@@ -393,6 +400,11 @@
   </build>
   <dependencies>
     <!-- ============ Vaadin ============ -->
+    <dependency>
+      <groupId>com.vaadin</groupId>
+      <artifactId>vaadin-spring</artifactId>
+      <version>${vaadin-spring.version}</version>
+    </dependency>
     <dependency>
       <groupId>com.vaadin</groupId>
       <artifactId>vaadin-server</artifactId>
@@ -438,6 +450,12 @@
       <artifactId>contextmenu</artifactId>
       <version>4.5</version>
     </dependency>
+    <!--     <dependency>
+        only in the edit repo
+      <groupId>org.vaadin.addons</groupId>
+      <artifactId>lazyloadwrapper</artifactId>
+      <version>0.1-alpha</version>
+    </dependency> -->
     <!-- ============ cdmlib ============ -->
     <dependency>
       <groupId>eu.etaxonomy</groupId>
@@ -487,10 +505,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <!-- Try updating in cdmlib to 20090211 -->
       <groupId>org.json</groupId>
       <artifactId>json</artifactId>
-      <version>20151123</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>