add NO_REAK_SPACE to UTF-8

[cdmlib.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 361ae4e03df9b1e0f9f13db090d913b7d55f5715..309d35463a899ed216a554bca2daed80216bcac8 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-       <version>3.2.4-SNAPSHOT</version>
+       <version>3.3.1-SNAPSHOT</version>
     <name>CDM Library</name>
     <description>The Java implementation of the Common Data Model (CDM), the data model for EDIT's internet platform for cybertaxonomy.</description>
     <url>http://wp5.e-taxonomy.eu/cdmlib/</url>
@@ -21,10 +21,12 @@
         <module>cdmlib-remote-webapp</module>
     </modules>
     <properties>
-               <java.codelevel>1.6</java.codelevel>
+       <vaadin.version>7.0.7</vaadin.version>
+       <!-- <vaadin.version>7.1.3</vaadin.version> -->
+       <java.codelevel>1.6</java.codelevel>
         <spring.version>3.2.2.RELEASE</spring.version>
         <spring-security.version>3.1.3.RELEASE</spring-security.version>
-               <hibernate.version>4.1.10.Final</hibernate.version>
+       <hibernate.version>4.1.10.Final</hibernate.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <unitils.version>3.3</unitils.version>
         <lucene.version>3.6.2</lucene.version>
@@ -215,6 +217,11 @@
             <name>Maven Repository for iText</name>
             <url>http://maven.itextpdf.com/</url>
         </repository>
+       <!-- Vaadin -->
+       <repository>
+         <id>vaadin-addons</id>
+         <url>http://maven.vaadin.com/vaadin-addons</url>
+       </repository>
     </repositories>
     <!-- **** PLUGINS **** -->
     <build>
@@ -863,12 +870,12 @@
                 <artifactId>httpclient</artifactId>
                 <version>${httpcomponents.version}</version>
             </dependency>
-                       <dependency>
-                               <groupId>org.apache.httpcomponents</groupId>
-                               <artifactId>httpcore</artifactId>
-                       <!--    <version>${httpcomponents.version}</version> -->
-                               <version>4.2.4</version>
-                       </dependency>
+       <dependency>
+               <groupId>org.apache.httpcomponents</groupId>
+               <artifactId>httpcore</artifactId>
+       <!--    <version>${httpcomponents.version}</version> -->
+               <version>4.2.4</version>
+               </dependency>
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
@@ -1066,8 +1073,26 @@
                 <artifactId>xom</artifactId>
                 <version>1.0</version>
             </dependency>
+                       <!-- ******* SAXON (ViBRANT)******* -->
+                       <dependency>
+                               <groupId>net.sf.saxon</groupId>
+                               <artifactId>Saxon-HE</artifactId>
+                               <version>9.5.1-2</version>
+                       </dependency>
+                       <!-- ******* http components (ViBRANT)******* -->
+                       <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpmime</artifactId>
+                <version>${httpcomponents.version}</version>
+                       </dependency>
+                       <!-- ***** json ********************-->
+                       <dependency>
+                               <groupId>org.json</groupId>
+                               <artifactId>json</artifactId>
+                               <version>20090211</version>
+                       </dependency>
             <!-- ******* HIBERNATE / EJB3 ******* -->
-       <dependency>
+                       <dependency>
                 <groupId>org.hibernate.javax.persistence</groupId>
                 <artifactId>hibernate-jpa-2.0-api</artifactId>
                 <version>1.0.1.Final</version>
@@ -1289,7 +1314,8 @@
                     <artifactId>spring-web</artifactId>
                   </exclusion>
                 </exclusions>
-            </dependency>            
+            </dependency>    
+                    
             
             <!-- ******* SERVLET/JSP/JSF ******* -->
             <dependency>
@@ -1373,6 +1399,58 @@
             <artifactId>itextpdf</artifactId>
             <version>5.4.0</version>
             <scope>compile</scope>
+          </dependency>
+       <!-- Vaadin -->
+          <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-server</artifactId>
+            <version>${vaadin.version}</version>
+          </dependency>
+         <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-shared</artifactId>
+            <version>${vaadin.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-client-compiled</artifactId>
+            <version>${vaadin.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-client</artifactId>
+            <scope>provided</scope>
+            <version>${vaadin.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-themes</artifactId>
+            <version>${vaadin.version}</version>
+          </dependency>
+          <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-client-compiler</artifactId>
+                   <version>${vaadin.version}</version>
+          </dependency>
+                 <dependency>
+                       <groupId>org.vaadin.addons</groupId>
+                       <artifactId>exporter</artifactId>
+                       <version>0.0.5.4</version>
+                 </dependency>
+                <dependency>
+                       <groupId>org.vaadin.addons</groupId>
+                       <artifactId>wizards-for-vaadin</artifactId>
+                       <version>1.0.0-beta1</version>
+                 </dependency>
+                 <dependency>
+                       <groupId>com.vaadin.addon</groupId>
+                       <artifactId>jpacontainer</artifactId>
+                       <version>3.1.1</version>
+                 </dependency>
+          <dependency>
+            <groupId>ru.xpoft.vaadin</groupId>
+            <artifactId>spring-vaadin-integration</artifactId>
+               <version>2.0.2</version>
           </dependency>
               <!-- AptView -->
                    <dependency>