X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/1a12a20248d2554b7424c41fc73641f8f3160ef8..ff0d856d99d160d7c4d1a200a637df43741271b0:/pom.xml diff --git a/pom.xml b/pom.xml old mode 100644 new mode 100755 index 1957f3b2ed..41be8b836a --- a/pom.xml +++ b/pom.xml @@ -3,10 +3,10 @@ 4.0.0 eu.etaxonomy cdmlib-parent - 3.0.10-SNAPSHOT + 3.3.8-SNAPSHOT CDM Library The Java implementation of the Common Data Model (CDM), the data model for EDIT's internet platform for cybertaxonomy. - http://wp5.e-taxonomy.eu/cdmlib/ + http://cybertaxonomy.eu/cdmlib/ 2007 pom @@ -21,11 +21,18 @@ cdmlib-remote-webapp - 3.0.4.RELEASE - 3.4.0-SNAPSHOT + 7.0.7 + + 1.6 + 3.2.2.RELEASE + 3.1.3.RELEASE + 4.1.10.Final UTF-8 3.3 + 3.6.2 1.8.0.10 + 4.2.3 + 1.3 scm:svn:http://dev.e-taxonomy.eu/svn/trunk/cdmlib/ @@ -36,24 +43,24 @@ dev-edit - https://webmail.mnhn.fr/wws/subrequest/dev-edit + https://listes.mnhn.fr/wwsympa.fcgi/suboptions/dev-edit - https://webmail.mnhn.fr/wws/sigrequest/dev-edit + https://listes.mnhn.fr/wwsympa.fcgi/signoff/dev-edit dev-edit@mnhn.fr - https://webmail.mnhn.fr/wws/arc/dev-edit/ + https://listes.mnhn.fr/wwsympa.fcgi/arc/dev-edit cdm-edit cdm-edit@mnhn.fr - https://webmail.mnhn.fr/wws/subrequest/cdm-edit + https://listes.mnhn.fr/wwsympa.fcgi/suboptions/cdm-edit - https://webmail.mnhn.fr/wws/sigrequest/cdm-edit + https://listes.mnhn.fr/wwsympa.fcgi/signoff/cdm-edit - https://webmail.mnhn.fr/wws/arc/cdm-edit/ + https://listes.mnhn.fr/wwsympa.fcgi/arc/cdm-edit @@ -88,28 +95,30 @@ - n.hoffmann + a.kohlbecker - Niels Hoffmann + Andreas Kohlbecker - n.hoffmann [at] bgbm.org + a.kohlbecker [at] bgbm.org - Botanic Garden Botanical Museum Berlin + Botanical Garden Botanical Museum Berlin http://www.bgbm.org/BioDivInf/ +1 + Architect Java Developer + Release Manager - + - a.kohlbecker + c.mathew - Andreas Kohlbecker + Cherian Mathew - a.kohlbecker [at] bgbm.org + c.mathew [at] bgbm.org Botanical Garden Botanical Museum Berlin @@ -156,23 +165,6 @@ - - - f.revilla - - Francisco Revilla - - f.revilla [at] bgbm.org - - Botanical Garden Botanical Museum Berlin - - http://www.bgbm.org/BioDivInf/ - +1 - - Java Developer - - - + + + local-repository + + + localrepo + + + + + EditLocalRepository + file://${localrepo}/eu/etaxonomy/ + + false + always + + + true + always + + + + + @@ -238,22 +254,46 @@ SpringSource Enterprise Bundle Repository - External Bundle Releases http://repository.springsource.com/maven/bundles/external + + + itextpdf.com + Maven Repository for iText + http://maven.itextpdf.com/ + + + + apache + Apache Repository for Snapshots + https://repository.apache.org/content/repositories/snapshots/ + + + + + vaadin-addons + http://maven.vaadin.com/vaadin-addons + + org.apache.maven.plugins maven-compiler-plugin + 2.3.2 - 1.6 - 1.6 + ${java.codelevel} + ${java.codelevel} + UTF-8 + org.apache.maven.plugins maven-surefire-plugin + 2.12 - -Xmx512M - + -Xmx512M -XX:MaxPermSize=128M + alphabetical + **/*Test.java @@ -280,9 +320,10 @@ org.apache.maven.plugins maven-site-plugin - 2.1.1 + 3.0 en + UTF-8 @@ -322,7 +363,7 @@ org.apache.maven.plugins maven-eclipse-plugin - 2.8 + 2.9 true true @@ -393,7 +434,7 @@ ${project.build.directory}/docbkx/ **/* - scpexe://160.45.63.151 + scpexe://wp5.e-taxonomy.eu wp5.e-taxonomy.eu var/www/wp5.e-taxonomy.eu/cdmlib/reference/${project.version} @@ -551,13 +592,13 @@ wp5.e-taxonomy.eu CDM Library Website - scpexe://160.45.63.151/var/www/wp5.e-taxonomy.eu/cdmlib/ + scpexe://wp5.e-taxonomy.eu/var/www/wp5.e-taxonomy.eu/cdmlib/ false wp5.e-taxonomy.eu Edit Maven Repository - scpexe://160.45.63.151/var/www/wp5.e-taxonomy.eu/mavenrepo/ + scpexe://wp5.e-taxonomy.eu/var/www/wp5.e-taxonomy.eu/mavenrepo/ default @@ -628,7 +669,7 @@ javax.xml.bind jaxb-api - 2.1.6 + 2.2.7 xml-resolver @@ -638,136 +679,135 @@ javax.activation activation - 1.1 - - - javax.xml.bind - jsr173_api - 1.0 + 1.1.1 com.sun.xml.bind jaxb-impl - 2.1.6 + 2.2-EA com.sun.xml.bind jaxb1-impl - 2.1.6 + 2.2-EA com.sun.xml.bind jaxb-xjc - 2.1.6 + 2.2-EA - + org.slf4j slf4j-api - 1.5.6 + 1.7.2 org.slf4j slf4j-log4j12 - 1.5.6 + 1.7.2 junit junit - 4.7 + 4.11 test - - com.carrotsearch - junit-benchmarks - 0.3.0 - test - - - org.unitils - unitils-core - ${unitils.version} - - - - org.unitils - unitils-database - ${unitils.version} - test - - - org.springframework - spring-jdbc - - - - - org.unitils - unitils-dbmaintainer - ${unitils.version} - test - - - org.hibernate - hibernate - - - - - org.unitils - unitils-dbunit - ${unitils.version} - test - - - org.springframework - spring-core - - - org.springframework - spring-jdbc - - - org.springframework - spring-beans - - - - - org.unitils - unitils-easymock - ${unitils.version} - test - - - org.unitils - unitils-mock - ${unitils.version} - test - - - org.unitils - unitils-inject - ${unitils.version} - test - - - org.unitils - unitils-orm - ${unitils.version} - test - - - org.springframework - spring-context - - - org.springframework - spring-orm - - - + + com.carrotsearch + junit-benchmarks + 0.5.0 + test + + + org.unitils + unitils-core + ${unitils.version} + + + + org.unitils + unitils-database + ${unitils.version} + test + + + org.springframework + spring-jdbc + + + + + org.unitils + unitils-dbmaintainer + ${unitils.version} + test + + + org.hibernate + hibernate + + + + + org.unitils + unitils-dbunit + ${unitils.version} + test + + + org.springframework + spring-core + + + org.springframework + spring-jdbc + + + org.springframework + spring-beans + + + + + org.unitils + unitils-easymock + ${unitils.version} + test + + + org.unitils + unitils-mock + ${unitils.version} + test + + + org.unitils + unitils-inject + ${unitils.version} + test + + + org.unitils + unitils-orm + ${unitils.version} + test + + + org.springframework + spring-context + + + org.springframework + spring-orm + + + javax.persistence + persistence-api + + + org.unitils unitils-spring @@ -789,44 +829,57 @@ org.springframework spring-test + + + org.springframework + spring-tx - - - org.easymock - easymock - 3.0 - test - - - xmlunit - xmlunit - 1.3 - test - - - org.dbunit - dbunit - 2.4.8 - test - - - - org.aspectj - aspectjrt - 1.6.3 - - - org.aspectj - aspectjweaver - 1.6.3 - + + + org.easymock + easymock + 3.1 + test + + + xmlunit + xmlunit + 1.4 + test + + + org.dbunit + dbunit + 2.4.9 + test + + + + commons-dbcp + commons-dbcp + 1.4 + + + + + + org.aspectj + aspectjrt + 1.7.1 + + + org.aspectj + aspectjweaver + 1.7.1 + - - log4j - log4j - 1.2.15 - + + log4j + log4j + 1.2.17 + javax.annotation jsr250-api @@ -835,7 +888,7 @@ net.sf.opencsv opencsv - 1.8 + 2.3 org.eclipse @@ -845,62 +898,87 @@ cglib cglib - 2.1_3 + 2.2.2 cglib cglib-nodep - 2.1_3 + 2.2.2 commons-lang commons-lang - 2.2 + 2.6 commons-collections commons-collections - 3.2 + 3.2.1 org.apache.httpcomponents httpclient - 4.0.3 + ${httpcomponents.version} + + org.apache.httpcomponents + httpcore + + 4.2.4 + commons-io commons-io - 1.4 + 2.4 - + + + commons-codec + commons-codec + 20041127.091804 + + + + commons-logging + commons-logging + 1.1.2 + + + + org.jboss.logging + jboss-logging + 3.1.3.GA + + + + + + net.sf.ezmorph ezmorph - 1.0.4 + 1.0.6 commons-beanutils commons-beanutils - 1.7.0 - - - sojo - sojo-optional - 0.5.0 + 1.8.3 net.sf.json-lib json-lib - 2.2.3 + 2.4 + jdk15 org.devlib.schmidt imageinfo - 1.7 + 1.9 org.apache.poi poi - 3.6 + 3.9 org.apache.sanselan @@ -911,88 +989,40 @@ joda-time joda-time - 1.5 + 2.1 - joda-time - joda-time-hibernate - 1.0 - - - ehcache - ehcache - - - cglib - cglib-full - - - org.hibernate - hibernate - - - hibernate - hibernate - - - + org.jadira.usertype + usertype.jodatime + 2.0.1 + + org.apache.lucene lucene-core - 2.4.0 + ${lucene.version} org.apache.lucene lucene-spellchecker - 2.4.0 + ${lucene.version} - org.springmodules - spring-modules-lucene - 0.8a - - - org.apache - poi - - - org.apache - poi-scratchpad - - - org.springframework - spring-dao - - - org.springframework - spring-jca - - - org.springframework - spring-support - - - org.springframework - spring-beans - - - org.springframework - spring-aop - - - org.springframework - spring-context - - - org.springframework - spring-core - - - org.springframework - spring-jdbc - - + org.apache.lucene + lucene-highlighter + ${lucene.version} + + org.apache.lucene + lucene-grouping + ${lucene.version} + + + org.apache.lucene + lucene-join + ${lucene.version} + + com.ibm.lsid lsid-client @@ -1006,13 +1036,18 @@ wsdl4j wsdl4j - 1.6.1 + 1.6.2 net.sf.dozer dozer 5.3.0 + + net.sf.ehcache + ehcache-core + 2.4.3 + xml-apis @@ -1022,48 +1057,110 @@ xerces xercesImpl - 2.7.1 - + 2.11.0 + + + + org.apache.xmlgraphics + batik-ext + 1.7 + + + org.apache.xmlgraphics + fop + + 1.1 + + + + org.apache.avalon.framework + avalon-framework-api + + + org.apache.avalon.framework + avalon-framework-impl + + + + + + org.apache.avalon.framework + avalon-framework-api + 4.3.1 + + + org.odftoolkit + odfdom-java + 0.8.7 + + jaxen jaxen - 1.1 + 1.1.4 - jdom + org.jdom jdom - 1.0 + 1.1.3 com.thoughtworks.xstream xstream - 1.3.1 + 1.4.4 xpp3 xpp3 - 1.1.3.3 + 1.1.4c stax stax 1.2.0 - - javax.persistence - persistence-api + xom + xom 1.0 + + + + com.ibm.icu + icu4j + + + - org.hibernate - hibernate-annotations - ${hibernate.version} - - - org.hibernate - hibernate-commons-annotations - ${hibernate.version} + net.sf.saxon + Saxon-HE + 9.5.1-2 + + + + org.apache.httpcomponents + httpmime + ${httpcomponents.version} + + + + org.json + json + 20090211 + + + + org.hibernate.javax.persistence + hibernate-jpa-2.0-api + 1.0.1.Final org.hibernate @@ -1072,12 +1169,12 @@ org.hibernate - hibernate-search - 3.1.0.GA + hibernate-entitymanager + ${hibernate.version} org.hibernate - hibernate-entitymanager + hibernate-ehcache ${hibernate.version} @@ -1085,36 +1182,75 @@ hibernate-envers ${hibernate.version} - - javassist - javassist - 3.4.GA + + org.hibernate + hibernate-c3p0 + ${hibernate.version} + + + + c3p0 + c3p0 + + + + com.mchange + c3p0 + 0.9.2 + + + + + + + + + + + org.hibernate.common + hibernate-commons-annotations + 4.0.1.Final + + + org.hibernate + hibernate-search + 4.2.0.Final + + + org.hibernate - hibernate-cglib-repack - 2.1_3 + hibernate-search-engine + 4.2.0.Final + + + + org.apache.lucene + lucene-core + + + + org.javassist + javassist + 3.17.1-GA + org.hibernate - hibernate-ehcache - ${hibernate.version} + hibernate-cglib-repack + 2.1_3 + + org.hibernate hibernate-parent + ${hibernate.version} - - org.hibernate - hibernate-c3p0 - ${hibernate.version} - - - javax.servlet - servlet-api - 2.5 - + org.springframework @@ -1171,66 +1307,111 @@ org.springframework.expression ${spring.version} - - org.springframework - org.springframework.agent - ${spring.version} - - + org.springframework - org.springframework.oxm + spring-context-support ${spring.version} - + org.springframework - org.springframework.context.support + org.springframework.oxm ${spring.version} org.springframework.security spring-security-core - 3.0.5.RELEASE + ${spring-security.version} + + org.springframework + spring-aop + + + org.springframework + spring-beans + + + org.springframework + spring-context + + + org.springframework + spring-core + org.springframework spring-expression + + org.springframework + spring-tx + + + + + org.springframework.security + spring-security-config + ${spring-security.version} + org.springframework + spring-aop + + + org.springframework spring-beans - - org.springframework - spring-context - - - org.springframework - spring-core - - - org.springframework - spring-orm - - - org.springframework - spring-aop - - - org.springframework - spring-support - + + org.springframework + spring-context + + + org.springframework + spring-core + + + org.springframework + spring-web + - + org.springframework.security - spring-security-context - 3.0.5.RELEASE - + spring-security-web + ${spring-security.version} + + + org.springframework + spring-aop + + + org.springframework + spring-beans + + + org.springframework + spring-context + + + org.springframework + spring-core + + + org.springframework + spring-web + + + org.springframework + spring-expression + + + + javax.servlet @@ -1242,17 +1423,18 @@ net.sourceforge.jtds jtds - 1.2.2 + 1.3.0 - mysql - mysql-connector-java - 5.0.5 + mysql + mysql-connector-java + 5.1.24 postgresql postgresql - 8.2-504.jdbc4 + + 9.1-901.jdbc4 hsqldb @@ -1265,65 +1447,117 @@ jdbc4 2.0 - - - oracle - ojdbc14 - 10.2.0.2 - - - oracle - ojdbc14 - 9i - + oracle ojdbc14 - 9.2.0.5 + 10.2.0.4.0 com.h2database h2 - 1.1.115 + + 1.3.170 com.yourkit yjp-controller-api-redist - 8.0.1 + 9.0.8 + + test javax.validation validation-api - 1.0.CR5 + 1.0.0.GA org.hibernate hibernate-validator - 4.0.0.CR1 + 4.3.1.Final p6spy p6spy 1.3 + + + identificationKeyAPI + identificationKeyAPI + 1.0-SNAPSHOT + + + com.itextpdf + itextpdf + 5.4.0 + compile + + + + com.vaadin + vaadin-server + ${vaadin.version} + + + com.vaadin + vaadin-shared + ${vaadin.version} + + + com.vaadin + vaadin-client-compiled + ${vaadin.version} + + + com.vaadin + vaadin-client + provided + ${vaadin.version} + + + com.vaadin + vaadin-themes + ${vaadin.version} + + + com.vaadin + vaadin-client-compiler + ${vaadin.version} + + + org.vaadin.addons + exporter + 0.0.5.4 + + + org.vaadin.addons + wizards-for-vaadin + 1.0.0-beta1 + + + com.vaadin.addon + jpacontainer + 3.1.1 + + + ru.xpoft.vaadin + spring-vaadin-integration + 2.0.2 + + + + org.apache.maven.doxia + doxia-module-apt + ${doxia.version} + + + org.apache.maven.doxia + doxia-module-xhtml + ${doxia.version} +