minor
[cdmlib.git] / pom.xml
diff --git a/pom.xml b/pom.xml
index 654f06f8a7c74edb9bf7f69efd2c004022f36cac..7d4050c314ea0fe03b60707fea9bef2c05389110 100755 (executable)
--- 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.1.4-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>
         <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>
         <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>
             <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>
             <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>
                         <include>**/*Test.java</include>
                     </includes>
                 </configuration>
-                <version>2.12</version>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <exclusion>
                     <groupId>org.springframework</groupId>
                     <artifactId>spring-orm</artifactId>
+                </exclusion>
+                               <exclusion>
+                    <groupId>javax.persistence</groupId>
+                    <artifactId>persistence-api</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
                    <version>1.7.1</version>
                </dependency>
       <!-- ******* VARIOUS ******* -->
-      <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <version>1.2.17</version>
-      </dependency>
+                 <dependency>
+                       <groupId>log4j</groupId>
+                       <artifactId>log4j</artifactId>
+                       <version>1.2.17</version>
+                 </dependency>
             <dependency>
                 <groupId>javax.annotation</groupId>
                 <artifactId>jsr250-api</artifactId>
                 <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>
                 <version>2.4</version>
             </dependency>
-            <dependency>
+                       <!-- only for version management, poi currently requires 1.6, commons-logging 1.1.1 requires 1.6, so we update here to the latest version -->
+                       <dependency>
+                           <groupId>commons-codec</groupId>
+                               <artifactId>commons-codec</artifactId>
+                               <version>20041127.091804</version>  <!-- probably same as commons-codec version 1.8 --> 
+                       </dependency>
+                       <!-- only for version management, httpcore:4.2.4, commons-beanutils:1.8.3, commons-collections:3.2.1 currently require 1.1.1 , httpclient:4.2.3, spring-modules-cache require 1.1 and batik-ext requires 1.0.4, so we update here to the latest version 1.1.2 -->
+                       <dependency>
+                               <groupId>commons-logging</groupId>
+                               <artifactId>commons-logging</artifactId>
+                               <version>1.1.2</version>
+                       </dependency>
+            <!-- only for version management, hibernate-commons-annotations:4.0.1.Final requires 3.1.0.CR2 , hibernate-ehcache:4.1.10  requires 3.1.0.GA , so we update here to the latest version 3.1.3.GA -->
+                       <dependency>
+                               <groupId>org.jboss.logging</groupId>
+                               <artifactId>jboss-logging</artifactId>
+                               <version>3.1.3.GA</version>
+                       </dependency>
+                       <!-- 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>net.sf.ezmorph</groupId>
                 <artifactId>ezmorph</artifactId>
                 <version>1.0.6</version>
                       <artifactId>lucene-grouping</artifactId>
                       <version>${lucene.version}</version>
                    </dependency>
+            <dependency>
+               <groupId>org.apache.lucene</groupId>
+               <artifactId>lucene-join</artifactId>
+               <version>${lucene.version}</version>
+            </dependency>
 
             <dependency>
                 <groupId>com.ibm.lsid</groupId>
                 <artifactId>dozer</artifactId>
                 <version>5.3.0</version>
             </dependency>
+
             <!-- ******* XML ******* -->
             <dependency>
                 <groupId>xml-apis</groupId>
                 <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>
                     <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>
                 <groupId>com.yourkit</groupId>
                 <artifactId>yjp-controller-api-redist</artifactId>
                 <version>9.0.8</version>
+                               <!-- <version>10.0.6</version> TODO find repo or put into our own -->
+                               <scope>test</scope>
             </dependency>
             <!-- For Validation -->
             <dependency>
             <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>