<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>
</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.0.4.RELEASE</spring.version>
- <hibernate.version>3.4.0-SNAPSHOT</hibernate.version>
+ <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>2.9.4</lucene.version><!-- lucene.version in hibernate-search 3.4.0-SNAPSHOT is 2.4.0-->
+ <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>
<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>
<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</argLine>
+ <argLine>-Xmx512M -XX:MaxPermSize=128M</argLine>
<runOrder>alphabetical</runOrder>
<includes>
<include>**/*Test.java</include>
</includes>
</configuration>
- <version>2.12</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<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>
- </plugin>
</plugins>
<!-- -->
<extensions>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.1.6</version>
+ <version>2.2.7</version>
</dependency>
<dependency>
<groupId>xml-resolver</groupId>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
- <version>1.1</version>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.1.6</version>
+ <version>2.2-EA</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb1-impl</artifactId>
- <version>2.1.6</version>
+ <version>2.2-EA</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
- <version>2.1.6</version>
+ <version>2.2-EA</version>
</dependency>
- <!-- ******* hibernate 3.4 uses slf4j ******* -->
+ <!-- ******* hibernate uses slf4j ******* -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.6</version>
+ <version>1.7.2</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.6</version>
+ <version>1.7.2</version>
</dependency>
<!-- ******* testing ******* -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.carrotsearch</groupId>
- <artifactId>junit-benchmarks</artifactId>
- <version>0.3.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.unitils</groupId>
- <artifactId>unitils-core</artifactId>
- <version>${unitils.version}</version>
- <!-- <scope>test</scope> unscoped since we need this dependency at compile time in persistence for H2DbSupport.java -->
- </dependency>
- <dependency>
- <groupId>org.unitils</groupId>
- <artifactId>unitils-database</artifactId>
- <version>${unitils.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.unitils</groupId>
- <artifactId>unitils-dbmaintainer</artifactId>
- <version>${unitils.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.unitils</groupId>
- <artifactId>unitils-dbunit</artifactId>
- <version>${unitils.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.unitils</groupId>
- <artifactId>unitils-easymock</artifactId>
- <version>${unitils.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.unitils</groupId>
- <artifactId>unitils-mock</artifactId>
- <version>${unitils.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.unitils</groupId>
- <artifactId>unitils-inject</artifactId>
- <version>${unitils.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.unitils</groupId>
- <artifactId>unitils-orm</artifactId>
- <version>${unitils.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-orm</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <dependency>
+ <groupId>com.carrotsearch</groupId>
+ <artifactId>junit-benchmarks</artifactId>
+ <version>0.5.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.unitils</groupId>
+ <artifactId>unitils-core</artifactId>
+ <version>${unitils.version}</version>
+ <!-- <scope>test</scope> unscoped since we need this dependency at compile time in persistence for H2DbSupport.java -->
+ </dependency>
+ <dependency>
+ <groupId>org.unitils</groupId>
+ <artifactId>unitils-database</artifactId>
+ <version>${unitils.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.unitils</groupId>
+ <artifactId>unitils-dbmaintainer</artifactId>
+ <version>${unitils.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.unitils</groupId>
+ <artifactId>unitils-dbunit</artifactId>
+ <version>${unitils.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.unitils</groupId>
+ <artifactId>unitils-easymock</artifactId>
+ <version>${unitils.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.unitils</groupId>
+ <artifactId>unitils-mock</artifactId>
+ <version>${unitils.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.unitils</groupId>
+ <artifactId>unitils-inject</artifactId>
+ <version>${unitils.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.unitils</groupId>
+ <artifactId>unitils-orm</artifactId>
+ <version>${unitils.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-orm</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.unitils</groupId>
<artifactId>unitils-spring</artifactId>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
</exclusion>
</exclusions>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>3.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.dbunit</groupId>
- <artifactId>dbunit</artifactId>
- <version>2.4.8</version>
- <scope>test</scope>
- </dependency>
- <!-- ******* aspect ******* -->
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- <version>1.6.3</version>
- </dependency>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjweaver</artifactId>
- <version>1.6.3</version>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>3.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <version>1.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.dbunit</groupId>
+ <artifactId>dbunit</artifactId>
+ <version>2.4.9</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- dependency of unitils database, but with lower number there
+ , higher number needed for compatibility with current hibernate and Java 1.6 PreparedStatement -->
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.4</version>
+<!-- <scope>test</scope> -->
+ </dependency>
+
+ <!-- ******* aspect ******* -->
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <version>1.7.1</version>
+ </dependency>
<!-- ******* VARIOUS ******* -->
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.15</version>
- </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+
<artifactId>log4j</artifactId>
+ <version>1.2.17</version>
+ </dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
<dependency>
<groupId>net.sf.opencsv</groupId>
<artifactId>opencsv</artifactId>
- <version>1.8</version>
+ <version>2.3</version>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
- <version>2.1_3</version>
+ <version>2.2.2</version>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
- <version>2.1_3</version>
+ <version>2.2.2</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.2</version>
+ <version>2.6</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2</version>
+ <version>3.2.1</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.0.3</version>
+ <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>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
+ <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.4</version>
+ <version>1.0.6</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <groupId>sojo</groupId>
- <artifactId>sojo-optional</artifactId>
- <version>0.5.0</version>
+ <version>1.8.3</version>
</dependency>
<dependency>
<groupId>net.sf.json-lib</groupId>
<dependency>
<groupId>org.devlib.schmidt</groupId>
<artifactId>imageinfo</artifactId>
- <version>1.7</version>
+ <version>1.9</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
- <version>3.6</version>
+ <version>3.9</version>
</dependency>
<dependency>
<groupId>org.apache.sanselan</groupId>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
- <version>1.5</version>
+ <version>2.1</version>
</dependency>
<dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time-hibernate</artifactId>
- <version>1.0</version>
- <exclusions>
- <exclusion>
- <artifactId>ehcache</artifactId>
- <groupId>ehcache</groupId>
- </exclusion>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib-full</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- </exclusion>
- <exclusion>
- <groupId>hibernate</groupId>
- <artifactId>hibernate</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <groupId>org.jadira.usertype</groupId>
+ <artifactId>usertype.jodatime</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
<version>${lucene.version}</version>
</dependency>
<dependency>
- <groupId>org.springmodules</groupId>
- <artifactId>spring-modules-lucene</artifactId>
- <version>0.8a</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache</groupId>
- <artifactId>poi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache</groupId>
- <artifactId>poi-scratchpad</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-dao</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jca</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-support</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</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-jdbc</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.lucene</groupId>
+ <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>lsid-client</artifactId>
<dependency>
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
- <version>1.6.1</version>
+ <version>1.6.2</version>
</dependency>
<dependency>
<groupId>net.sf.dozer</groupId>
<artifactId>dozer</artifactId>
<version>5.3.0</version>
</dependency>
+
<!-- ******* XML ******* -->
<dependency>
<groupId>xml-apis</groupId>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.7.1</version>
- </dependency>
+ <version>2.11.0</version>
+ </dependency>
+ <!-- >batik-ext required by Xerces 2.11.0 for class ElementTraversal, as this is not included anymore in xml-apis 2.x-->
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-ext</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency> <!-- required by cdmlib-print -->
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>fop</artifactId>
+ <!-- version 1.1 does NOT work, because it depends on avalon-framework-api 4.2.0 which is not available in central maven repository under the given groupID -->
+ <version>1.1</version>
+ <exclusions>
+ <!-- 1.1 depends on an old version of avalon-framework which does not exist in mvn repository under this groupId (has old groupId) -->
+ <exclusion>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- not directly required, but fix mentioned to force
+ correct version number 4.3.1. Required by org.apache.xmlgraphics/fop 1.1
+ Remove when dependency in fop in corrected.
+ -->
+ <dependency>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>4.3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.odftoolkit</groupId>
+ <artifactId>odfdom-java</artifactId>
+ <version>0.8.7</version>
+ </dependency>
+
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
- <version>1.1</version>
+ <version>1.1.4</version>
</dependency>
<dependency>
- <groupId>jdom</groupId>
+ <groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
- <version>1.0</version>
+ <version>1.1.3</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.3.1</version>
+ <version>1.4.4</version>
</dependency>
<dependency>
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
- <version>1.1.3.3</version>
+ <version>1.1.4c</version>
</dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax</artifactId>
<version>1.2.0</version>
</dependency>
- <!-- ******* HIBERNATE / EJB3 ******* -->
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
+ <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>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <version>${hibernate.version}</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-commons-annotations</artifactId>
- <version>${hibernate.version}</version>
+ <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>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <version>1.0.1.Final</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-search</artifactId>
- <version>3.1.0.GA</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>${hibernate.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
+ <artifactId>hibernate-ehcache</artifactId>
<version>${hibernate.version}</version>
</dependency>
<dependency>
<artifactId>hibernate-envers</artifactId>
<version>${hibernate.version}</version>
</dependency>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.4.GA</version>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-c3p0</artifactId>
+ <version>${hibernate.version}</version>
+ <exclusions>
+ <!-- version 0.9.1.x has a bug in NewProxyPreparedStatement
+ therefore we use com.mchange/c3po 0.9.2 instead -->
+ <exclusion>
+ <groupId>c3p0</groupId>
+ <artifactId>c3p0</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.mchange</groupId>
+ <artifactId>c3p0</artifactId>
+ <version>0.9.2</version>
+ </dependency>
+
+
+ <!-- Part of hibernate-core since 3.6 -->
+<!-- <dependency> -->
+<!-- <groupId>org.hibernate</groupId> -->
+<!-- <artifactId>hibernate-annotations</artifactId> -->
+<!-- <version>3.5.6-Final</version> -->
+<!-- </dependency> -->
+ <dependency>
+ <groupId>org.hibernate.common</groupId>
+ <artifactId>hibernate-commons-annotations</artifactId>
+ <version>4.0.1.Final</version>
</dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-search</artifactId>
+ <version>4.2.0.Final</version>
+ </dependency>
+
<dependency>
+ <!-- needed?? -->
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-cglib-repack</artifactId>
- <version>2.1_3</version>
+ <artifactId>hibernate-search-engine</artifactId>
+ <version>4.2.0.Final</version>
+ <exclusions>
+ <!-- still needed ?? -->
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.17.1-GA</version>
+ </dependency>
<dependency>
<groupId>org.hibernate</groupId>
- <artifactId>hibernate-ehcache</artifactId>
- <version>${hibernate.version}</version>
+ <artifactId>hibernate-cglib-repack</artifactId>
+ <version>2.1_3</version>
</dependency>
+
<dependency>
+ <!-- still needed ?? -->
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
+ <!-- last version is 3.6.10.Final -->
<version>${hibernate.version}</version>
</dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-c3p0</artifactId>
- <version>${hibernate.version}</version>
- </dependency>
+
<!-- ******* SPRING ******* -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.expression</artifactId>
<version>${spring.version}</version>
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>org.springframework</groupId>
- <artifactId>org.springframework.agent</artifactId>
+ <artifactId>org.springframework.context.support</artifactId>
<version>${spring.version}</version>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>org.springframework.context.support</artifactId>
+ <artifactId>spring-context-support</artifactId>
<version>${spring.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.oxm</artifactId>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
- <version>3.0.5.RELEASE</version>
+ <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-expression</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-config</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-orm</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-support</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>
</exclusions>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.springframework.security</groupId>
- <artifactId>spring-security-context</artifactId>
- <version>3.0.5.RELEASE</version>
- </dependency>
+ <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>javax.servlet</groupId>
<!-- SQL Server and Sybase -->
<groupId>net.sourceforge.jtds</groupId>
<artifactId>jtds</artifactId>
- <version>1.2.2</version>
+ <version>1.3.0</version>
</dependency>
<dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.0.5</version>
+ <groupId>mysql</groupId>
+
<artifactId>mysql-connector-java</artifactId>
+ <version>5.1.24</version>
</dependency>
<dependency>
<groupId>postgresql</groupId>
<artifactId>jdbc4</artifactId>
<version>2.0</version>
</dependency>
- <!-- use SQL Server 2005 driver instead (com.microsoft.sqlserver/jdbc)
- <dependency>
- <groupId>com.microsoft.jdbcdriver</groupId>
- <artifactId>mssqlserver</artifactId>
- <version>2000.3</version>
- </dependency>
- <dependency>
- <groupId>com.microsoft.jdbcdriver</groupId>
- <artifactId>msutil</artifactId>
- <version>2000.3</version>
- </dependency>
- <dependency>
- <groupId>com.microsoft.jdbcdriver</groupId>
- <artifactId>msbase</artifactId>
- <version>2000.3</version>
- </dependency>
--->
+
<dependency>
<groupId>oracle</groupId>
<artifactId>ojdbc14</artifactId>
- <version>10.2.0.2</version>
- </dependency>
- <!--dependency>
- <groupId>oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <version>9i</version>
+ <version>10.2.0.4.0</version>
</dependency>
- <dependency>
- <groupId>oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <version>9.2.0.5</version>
- </dependency-->
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>1.1.115</version>
+<!-- <version>1.1.115</version> -->
+ <version>1.3.170</version>
</dependency>
<!-- yourkit profiler api controller (used in ..)-->
<dependency>
<groupId>com.yourkit</groupId>
<artifactId>yjp-controller-api-redist</artifactId>
- <version>8.0.1</version>
+ <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>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
- <version>1.0.CR5</version>
+ <version>1.0.0.GA</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
- <version>4.0.0.CR1</version>
+ <version>4.3.1.Final</version>
</dependency>
<dependency>
<groupId>p6spy</groupId>
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>itextpdf</artifactId>
- <version>5.0.2</version>
+ <version>5.4.0</version>
<scope>compile</scope>
</dependency>
<!-- Vaadin -->
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-client-compiler</artifactId>
- <version>${vaadin.version}</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>1.8</version>
+ <version>2.0.2</version>
</dependency>
- </dependencies>
+ <!-- AptView -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-apt</artifactId>
+ <version>${doxia.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-module-xhtml</artifactId>
+ <version>${doxia.version}</version>
+ </dependency>
+ </dependencies>
</dependencyManagement>
</project>
BGBM BDI Projects / cdmlib.git / blobdiff