X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/551bf0bcc8e4a6caed4e3f6ab9521ad357eb25da..7b0b0ba0048a6dc8163a4c29ba9ae410d359a96a:/pom.xml

diff --git a/pom.xml b/pom.xml
index 1907b8e786..59af3fe6de 100755
--- a/pom.xml
+++ b/pom.xml
@@ -3,10 +3,10 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-	<version>3.3.1-SNAPSHOT</version>
+	<version>3.3.8-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>
+    <url>http://cybertaxonomy.eu/cdmlib/</url>
     <inceptionYear>2007</inceptionYear>
     <packaging>pom</packaging>
     <modules>
@@ -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>
@@ -103,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>
@@ -155,10 +176,34 @@
         <url>http://dev.e-taxonomy.eu/trac/</url>
     </issueManagement>
     <ciManagement>
-        <system>Hudson</system>
-        <url>http://160.45.63.201/hudson</url>
+        <system>Jenkins</system>
+        <url>http://int.e-taxonomy.eu/jenkins</url>
     </ciManagement>
     <!-- **** REPOSITORIES **** -->
+    <profiles>
+        <profile>
+          <id>local-repository</id>
+          <activation>
+            <property>
+              <name>localrepo</name>
+            </property>
+          </activation>
+          <repositories>
+            <repository>
+              <id>EditLocalRepository</id>
+              <url>file://${localrepo}/eu/etaxonomy/</url>
+              <releases>
+                <enabled>false</enabled>
+                <updatePolicy>always</updatePolicy>
+              </releases>
+              <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+              </snapshots>
+            </repository>
+          </repositories>
+        </profile>
+      </profiles>
     <repositories>
         <!-- sun repository -->
         <repository>
@@ -215,6 +260,18 @@
             <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>
+    	  <url>http://maven.vaadin.com/vaadin-addons</url>
+	</repository>
     </repositories>
     <!-- **** PLUGINS **** -->
     <build>
@@ -222,16 +279,17 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <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>
-                <version>2.3.2</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.12</version>
                 <configuration>
                     <argLine>-Xmx512M -XX:MaxPermSize=128M</argLine>
                     <runOrder>alphabetical</runOrder>
@@ -239,7 +297,6 @@
                         <include>**/*Test.java</include>
                     </includes>
                 </configuration>
-                <version>2.12</version>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -863,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>
@@ -895,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>apache-jena-libs</artifactId>
+				<version>2.11.2</version>
+			</dependency>
 			
 			<dependency>
                 <groupId>net.sf.ezmorph</groupId>
@@ -986,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>
@@ -1065,6 +1130,17 @@
                 <groupId>xom</groupId>
                 <artifactId>xom</artifactId>
                 <version>1.0</version>
+                <exclusions>
+                    <!-- 
+                        need to exclude com.ibm.icu:icu4j since it contains an invalid file 
+                        which causes the jetty-maven-plugin to fail
+                        see http://stackoverflow.com/questions/3026956/javassist-failure-in-hibernate-invalid-constant-type-60
+                    -->
+                    <exclusion>
+                        <groupId>com.ibm.icu</groupId>
+                        <artifactId>icu4j</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 			<!-- ******* SAXON (ViBRANT)******* -->
 			<dependency>
@@ -1307,7 +1383,38 @@
                     <artifactId>spring-web</artifactId>
                   </exclusion>
                 </exclusions>
-            </dependency>            
+            </dependency>    
+            <dependency>
+                <groupId>org.springframework.security</groupId>
+                <artifactId>spring-security-web</artifactId>
+                <version>${spring-security.version}</version>
+                 <exclusions>
+                  <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-aop</artifactId>
+                  </exclusion>
+                  <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-beans</artifactId>
+                  </exclusion>
+                  <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-context</artifactId>
+                  </exclusion>
+                  <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
+                  </exclusion>
+                  <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-web</artifactId>
+                  </exclusion>
+                  <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-expression</artifactId>
+                  </exclusion>
+                </exclusions>
+            </dependency>    
             
             <!-- ******* SERVLET/JSP/JSF ******* -->
             <dependency>
@@ -1391,6 +1498,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>