X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/8578ec141a0c4fc7336231d1d5f83432681f715a..b592195537cc6954aa3601219a97157634204da3:/pom.xml

diff --git a/pom.xml b/pom.xml
index 7454ebce0b..7d4050c314 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.0-SNAPSHOT</version>
+	<version>3.3.6-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>
@@ -26,7 +26,7 @@
 	<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>
@@ -157,10 +157,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>
@@ -229,16 +253,17 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.3.2</version>
                 <configuration>
                     <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>
@@ -246,7 +271,6 @@
                         <include>**/*Test.java</include>
                     </includes>
                 </configuration>
-                <version>2.12</version>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -410,16 +434,6 @@
           <tagBase>http://dev.e-taxonomy.eu/svn/tags/cdmlib</tagBase>
         </configuration>
       </plugin>
-	  <plugin>
-            <groupId>com.vaadin</groupId>
-            <artifactId>vaadin-maven-plugin</artifactId>
-	    <version>${vaadin.version}</version>
-        <configuration>
-        <strict>true</strict>
-        <force>true</force>
-	     <webappDirectory>src/main/webapp/VAADIN/widgetsets</webappDirectory>
-        </configuration>
-	  </plugin>
         </plugins>
         <!--  -->
         <extensions>
@@ -880,12 +894,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>
@@ -1082,9 +1096,38 @@
                 <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>
+				<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>
@@ -1306,7 +1349,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>
@@ -1421,22 +1495,27 @@
           <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>
+		    <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.1</version>
+	        <version>2.0.2</version>
           </dependency>
               <!-- AptView -->
 		    <dependency>