X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/448acdfa3fa5110c52d0923109250031b732303c..1686096f285715d546920797b81baad9981e57a0:/pom.xml

diff --git a/pom.xml b/pom.xml
index 4fdac26108..a6159abbd3 100755
--- a/pom.xml
+++ b/pom.xml
@@ -21,18 +21,17 @@
         <module>cdmlib-remote-webapp</module>
     </modules>
     <properties>
-	<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>
+      <vaadin.version>7.1.3</vaadin.version>
+      <java.codelevel>1.7</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>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <unitils.version>3.3</unitils.version>
-        <lucene.version>3.6.2</lucene.version>
-        <hsqldb.version>1.8.0.10</hsqldb.version><!-- 1.8.0.10, 1.9.0-rc6 (manualy build only for debugging) -->
-		<httpcomponents.version>4.2.3</httpcomponents.version>
-		<doxia.version>1.3</doxia.version>
+      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+      <unitils.version>3.3</unitils.version>
+      <lucene.version>3.6.2</lucene.version>
+      <hsqldb.version>1.8.0.10</hsqldb.version><!-- 1.8.0.10, 1.9.0-rc6 (manualy build only for debugging) -->
+      <httpcomponents.version>4.2.3</httpcomponents.version>
+      <doxia.version>1.3</doxia.version>
     </properties>
     <scm>
         <connection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/cdmlib/</connection>
@@ -105,6 +104,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 +259,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 +280,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 +919,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 +951,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 +1046,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 +1540,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>