minor

[cdmlib.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index a3ff175b4d9f7bc33f39fa00842af77bd87127b4..373502347c9fb05f22763eae66f74253ea04d337 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.3.3</version>
+       <version>3.4.0-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://cybertaxonomy.eu/cdmlib/</url>
@@ -21,7 +21,7 @@
         <module>cdmlib-remote-webapp</module>
     </modules>
     <properties>
-       <vaadin.version>7.0.7</vaadin.version>
+       <vaadin.version>7.1.3</vaadin.version>
        <!-- <vaadin.version>7.1.3</vaadin.version> -->
        <java.codelevel>1.6</java.codelevel>
         <spring.version>3.2.2.RELEASE</spring.version>
@@ -35,9 +35,9 @@
                <doxia.version>1.3</doxia.version>
     </properties>
     <scm>
-        <connection>scm:svn:http://dev.e-taxonomy.eu/svn/tags/cdmlib/cdmlib-parent-3.3.3</connection>
-        <developerConnection>scm:svn:http://dev.e-taxonomy.eu/svn/tags/cdmlib/cdmlib-parent-3.3.3</developerConnection>
-        <url>http://dev.e-taxonomy.eu/trac/browser/tags/cdmlib/cdmlib-parent-3.3.3</url>
+        <connection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/cdmlib/</connection>
+        <developerConnection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/cdmlib/</developerConnection>
+        <url>http://dev.e-taxonomy.eu/trac/browser/trunk/cdmlib</url>
     </scm>
     <mailingLists>
         <mailingList>
@@ -105,6 +105,25 @@
             </organization>
             <organizationUrl>http://www.bgbm.org/BioDivInf/</organizationUrl>
             <timezone>+1</timezone>
+            <roles>
+                <role>Architect</role>
+                <role>Java Developer</role>
+                <role>Release Manager</role>
+            </roles>
+            <url />
+        </developer>
+         <developer>
+            <!-- your SVN account id please! -->
+            <id>c.mathew</id>
+            <name>
+                Cherian Mathew 
+            </name>
+            <email>c.mathew [at] bgbm.org</email>
+            <organization>
+                Botanical Garden Botanical Museum Berlin
+            </organization>
+            <organizationUrl>http://www.bgbm.org/BioDivInf/</organizationUrl>
+            <timezone>+1</timezone>
             <roles>
                 <role>Java Developer</role>
             </roles>
@@ -241,6 +260,13 @@
             <name>Maven Repository for iText</name>
             <url>http://maven.itextpdf.com/</url>
         </repository>
+               <!-- for jena snapshot -->
+               <repository>
+               <id>apache</id>
+            <name>Apache Repository for Snapshots</name>
+            <url>https://repository.apache.org/content/repositories/snapshots/</url>
+        </repository>
+               
        <!-- Vaadin -->
        <repository>
          <id>vaadin-addons</id>
@@ -255,7 +281,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.3.2</version>
                 <configuration>
-                    <source>${java.codelevel}</source>
+                                       <source>${java.codelevel}</source>
                     <target>${java.codelevel}</target>
                     <encoding>UTF-8</encoding>
                 </configuration>
@@ -894,12 +920,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>
@@ -926,7 +952,11 @@
                        <!-- TODO com.springsource.org.aopalliance  and com.springsource.org.apache.commons.logging seem to be duplicates of e.g. apache commons-logging. Needs to be further checked.   
                        -->
                        <!-- TODO xerces xmlParserAPIs duplicates many classes from jre and xml-apis. It is a dependency that comes with xom:xom  -->
-                       
+                       <dependency>
+                               <groupId>org.apache.jena</groupId>
+                               <artifactId>jena-tdb</artifactId>
+                               <version>1.0.2</version>
+                       </dependency>
                        
                        <dependency>
                 <groupId>net.sf.ezmorph</groupId>
@@ -1017,7 +1047,11 @@
                 <artifactId>dozer</artifactId>
                 <version>5.3.0</version>
             </dependency>
-
+            <dependency>
+                <groupId>net.sf.ehcache</groupId>
+                <artifactId>ehcache-core</artifactId>
+                <version>2.4.3</version>
+            </dependency>
             <!-- ******* XML ******* -->
             <dependency>
                 <groupId>xml-apis</groupId>
@@ -1507,15 +1541,10 @@
                        <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>
+               <version>3.1</version>
           </dependency>
               <!-- AptView -->
                    <dependency>