update TaxEditor dependencies for #3332 (not yet dependencies of dependencies)

diff --git a/.gitattributes b/.gitattributes
index 85e88a8975ec3e140523b56b25c7914d19e2aabf..53a492f48e1a12b6b0899c55f3900179ec3bf4aa 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -165,8 +165,8 @@ eu.etaxonomy.taxeditor.cdmlib/lib/dozer-5.3.0src.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-1.2.3.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-1.2.3src.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/ejb3-persistence.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-1.2.3.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-1.2.3src.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/ejb3-persistence.jar -text

-eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.4.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.4src.zip -text
+eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.6-sources.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.6.jar -text

 eu.etaxonomy.taxeditor.cdmlib/lib/fop.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/google-api-translate-java-0.92.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/h2-1.1.115.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/fop.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/google-api-translate-java-0.92.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/h2-1.1.115.jar -text


@@ -184,8 +184,8 @@ eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-tools-3.2.0.ga.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-4.0.0.CR1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-4.0.0.CR1src.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/hsqldb.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-4.0.0.CR1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-4.0.0.CR1src.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/hsqldb.jar -text

-eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.0.1.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.0.1src.zip -text
+eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.2.3-sources.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.2.3.jar -text

 eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.0.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.0.1src.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar -text svneol=unset#application/zip
 eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.0.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.0.1src.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar -text svneol=unset#application/zip


@@ -194,7 +194,8 @@ eu.etaxonomy.taxeditor.cdmlib/lib/javassist.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.1.6.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-impl-2.1.6.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-impl-2.1.6src.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.1.6.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-impl-2.1.6.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-impl-2.1.6src.zip -text

-eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.2.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.4-sources.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.4.jar -text

 eu.etaxonomy.taxeditor.cdmlib/lib/jdbc-1.2.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jdbc2_0-stdext.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jdom.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jdbc-1.2.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jdbc2_0-stdext.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jdom.jar -text


@@ -206,7 +207,8 @@ eu.etaxonomy.taxeditor.cdmlib/lib/json-lib-2.2.3-jdk15src.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jsr250-api-1.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jsr250-api-1.0src.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jta.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jsr250-api-1.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jsr250-api-1.0src.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jta.jar -text

-eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.2.2.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.0-sources.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.0.jar -text

 eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.8.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.8.1src.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/log4j-1.2.14.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.8.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.8.1src.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/log4j-1.2.14.jar -text


@@ -219,14 +221,11 @@ eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spellchecker-2.4.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spellchecker-2.4.0src.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/mail-1.4.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/mail-1.4src.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spellchecker-2.4.0src.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/mail-1.4.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/mail-1.4src.zip -text

-eu.etaxonomy.taxeditor.cdmlib/lib/msbase-2000.3.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/mssqlserver-2000.3.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/msutil-2000.3.jar -text

 eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.0.5.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/odfdom-0.8-javadoc.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/odfdom-0.8-sources.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/odfdom-0.8.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.0.5.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/odfdom-0.8-javadoc.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/odfdom-0.8-sources.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/odfdom-0.8.jar -text

-eu.etaxonomy.taxeditor.cdmlib/lib/opencsv-1.8.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/opencsv-2.3.jar -text

 eu.etaxonomy.taxeditor.cdmlib/lib/org.apache.commons.codec-1.3.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20100503.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.6.2.R36x_v20110210.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.apache.commons.codec-1.3.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20100503.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.6.2.R36x_v20110210.jar -text


@@ -259,8 +258,8 @@ eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web-3.0.4.RELEASE.jar -tex
 eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web-3.0.4.RELEASEsrc.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web.servlet-3.0.4.RELEASE.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web.servlet-3.0.4.RELEASEsrc.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web-3.0.4.RELEASEsrc.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web.servlet-3.0.4.RELEASE.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web.servlet-3.0.4.RELEASEsrc.zip -text

-eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.6-src.zip -text
-eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.6.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.9-sources.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.9.jar -text

 eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-8.2-504.jdbc4.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.1-901.jdbc4.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/sanselan-0.97-incubator.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-8.2-504.jdbc4.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.1-901.jdbc4.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/sanselan-0.97-incubator.jar -text


@@ -282,8 +281,8 @@ eu.etaxonomy.taxeditor.cdmlib/lib/spring-modules-lucene-0.8asrc.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-3.0.5.RELEASE.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-3.0.5.RELEASE.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/spring-xml-1.5.6.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-3.0.5.RELEASE.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-3.0.5.RELEASE.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/spring-xml-1.5.6.jar -text

-eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.1.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.1src.zip -text
+eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.2-sources.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.2.jar -text

 eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.7.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xalan.BCEL.LICENSE.txt -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xalan.LICENSE.txt -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.7.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xalan.BCEL.LICENSE.txt -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xalan.LICENSE.txt -text


@@ -315,6 +314,8 @@ eu.etaxonomy.taxeditor.cdmlib/lib/xmlgraphics-commons-1.3.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xmlgraphics-commons.LICENSE.txt -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xmlgraphics-commons.NOTICE.txt -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xom-1.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xmlgraphics-commons.LICENSE.txt -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xmlgraphics-commons.NOTICE.txt -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xom-1.0.jar -text

+eu.etaxonomy.taxeditor.cdmlib/lib/xpp3-1.1.4c-sources.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/xpp3-1.1.4c.jar -text

 eu.etaxonomy.taxeditor.cdmlib/lib/xsltc.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.3.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.3.1src.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xsltc.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.3.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.3.1src.zip -text

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 63685296a18da21bf58747f61533a9f7d48b640b..5afe03dcb27bbec43472c9dd18318a8d194b23cb 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -794,7 +794,8 @@ Bundle-ClassPath: .,
  lib/dozer-5.3.0.jar,
  lib/ehcache-1.2.3.jar,
  lib/ejb3-persistence.jar,
  lib/dozer-5.3.0.jar,
  lib/ehcache-1.2.3.jar,
  lib/ejb3-persistence.jar,

- lib/ezmorph-1.0.4.jar,
+ lib/ezmorph-1.0.6.jar,
+ lib/ezmorph-1.0.6-sources.jar,

  lib/fop.jar,
  lib/google-api-translate-java-0.92.jar,
  lib/h2-1.1.115.jar,
  lib/fop.jar,
  lib/google-api-translate-java-0.92.jar,
  lib/h2-1.1.115.jar,


@@ -805,12 +806,13 @@ Bundle-ClassPath: .,
  lib/hibernate-tools-3.2.0.ga.jar,
  lib/hibernate-validator-4.0.0.CR1.jar,
  lib/hsqldb.jar,
  lib/hibernate-tools-3.2.0.ga.jar,
  lib/hibernate-validator-4.0.0.CR1.jar,
  lib/hsqldb.jar,

- lib/httpclient-4.0.1.jar,
- lib/httpcore-4.0.1.jar,
+ lib/httpclient-4.2.3.jar,
+ lib/httpclient-4.2.3-sources.jar,

  lib/javassist.jar,
  lib/jaxb-api-2.1.6.jar,
  lib/jaxb-impl-2.1.6.jar,
  lib/javassist.jar,
  lib/jaxb-api-2.1.6.jar,
  lib/jaxb-impl-2.1.6.jar,

- lib/jaxen-1.1.2.jar,
+ lib/jaxen-1.1.4.jar,
+ lib/jaxen-1.1.4-sources.jar,

  lib/jdbc-1.2.jar,
  lib/jdbc2_0-stdext.jar,
  lib/jdom.jar,
  lib/jdbc-1.2.jar,
  lib/jdbc2_0-stdext.jar,
  lib/jdom.jar,


@@ -819,7 +821,8 @@ Bundle-ClassPath: .,
  lib/json-lib-2.2.3-jdk15.jar,
  lib/jsr250-api-1.0.jar,
  lib/jta.jar,
  lib/json-lib-2.2.3-jdk15.jar,
  lib/jsr250-api-1.0.jar,
  lib/jta.jar,

- lib/jtds-1.2.2.jar,
+ lib/jtds-1.3.0.jar,
+ lib/jtds-1.3.0-sources.jar,

  lib/junit-4.4.jar,
  lib/junit-4.8.1-sources.jar,
  lib/junit-4.8.1.jar,
  lib/junit-4.4.jar,
  lib/junit-4.8.1-sources.jar,
  lib/junit-4.8.1.jar,


@@ -829,12 +832,9 @@ Bundle-ClassPath: .,
  lib/lucene-core-2.4.0.jar,
  lib/lucene-spellchecker-2.4.0.jar,
  lib/mail-1.4.jar,
  lib/lucene-core-2.4.0.jar,
  lib/lucene-spellchecker-2.4.0.jar,
  lib/mail-1.4.jar,

- lib/msbase-2000.3.jar,
- lib/mssqlserver-2000.3.jar,
- lib/msutil-2000.3.jar,

  lib/mysql-connector-java-5.0.5.jar,
  lib/odfdom-0.8.jar,
  lib/mysql-connector-java-5.0.5.jar,
  lib/odfdom-0.8.jar,

- lib/opencsv-1.8.jar,
+ lib/opencsv-2.3.jar,

  lib/org.apache.commons.codec-1.3.0.jar,
  lib/org.eclipse.equinox.common-3.6.0.v20100503.jar,
  lib/org.eclipse.osgi-3.6.2.R36x_v20110210.jar,
  lib/org.apache.commons.codec-1.3.0.jar,
  lib/org.eclipse.equinox.common-3.6.0.v20100503.jar,
  lib/org.eclipse.osgi-3.6.2.R36x_v20110210.jar,


@@ -852,7 +852,8 @@ Bundle-ClassPath: .,
  lib/org.springframework.transaction-3.0.4.RELEASE.jar,
  lib/org.springframework.web-3.0.4.RELEASE.jar,
  lib/org.springframework.web.servlet-3.0.4.RELEASE.jar,
  lib/org.springframework.transaction-3.0.4.RELEASE.jar,
  lib/org.springframework.web-3.0.4.RELEASE.jar,
  lib/org.springframework.web.servlet-3.0.4.RELEASE.jar,

- lib/poi-3.6.jar,
+ lib/poi-3.9.jar,
+ lib/poi-3.9-sources.jar,

  lib/sanselan-0.97-incubator.jar,
  lib/saxon9he.jar,
  lib/serializer-2.7.0.jar,
  lib/sanselan-0.97-incubator.jar,
  lib/saxon9he.jar,
  lib/serializer-2.7.0.jar,


@@ -864,7 +865,8 @@ Bundle-ClassPath: .,
  lib/spring-modules-lucene-0.8a.jar,
  lib/spring-security-config-3.0.5.RELEASE.jar,
  lib/spring-security-core-3.0.5.RELEASE.jar,
  lib/spring-modules-lucene-0.8a.jar,
  lib/spring-security-config-3.0.5.RELEASE.jar,
  lib/spring-security-core-3.0.5.RELEASE.jar,

- lib/wsdl4j-1.6.1.jar,
+ lib/wsdl4j-1.6.2.jar,
+ lib/wsdl4j-1.6.2-sources.jar,

  lib/xalan-2.7.0.jar,
  lib/xercesImpl-2.7.1.jar,
  lib/xercesImpl.jar,
  lib/xalan-2.7.0.jar,
  lib/xercesImpl-2.7.1.jar,
  lib/xercesImpl.jar,


@@ -874,6 +876,8 @@ Bundle-ClassPath: .,
  lib/xml-resolver-1.2.jar,
  lib/xmlgraphics-commons-1.3.1.jar,
  lib/xom-1.0.jar,
  lib/xml-resolver-1.2.jar,
  lib/xmlgraphics-commons-1.3.1.jar,
  lib/xom-1.0.jar,

+ lib/xpp3-1.1.4c.jar,
+ lib/xpp3-1.1.4c-sources.jar,

  lib/xsltc.jar,
  lib/xstream-1.3.1.jar,
  lib/hibernate-envers-3.4.0-SNAPSHOT.jar,
  lib/xsltc.jar,
  lib/xstream-1.3.1.jar,
  lib/hibernate-envers-3.4.0-SNAPSHOT.jar,

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index 770516093f76d1bce6204d226a36f827527e44f1..6816ca1429d7baa7babed2a14614c7ba276fa76e 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -38,7 +38,6 @@ bin.includes = META-INF/,\
                lib/dozer-5.3.0.jar,\\r
                lib/ehcache-1.2.3.jar,\\r
                lib/ejb3-persistence.jar,\\r
                lib/dozer-5.3.0.jar,\\r
                lib/ehcache-1.2.3.jar,\\r
                lib/ejb3-persistence.jar,\\r

-               lib/ezmorph-1.0.4.jar,\\r

                lib/fop.jar,\\r
                lib/google-api-translate-java-0.92.jar,\\r
                lib/h2-1.1.115.jar,\\r
                lib/fop.jar,\\r
                lib/google-api-translate-java-0.92.jar,\\r
                lib/h2-1.1.115.jar,\\r


@@ -49,12 +48,9 @@ bin.includes = META-INF/,\
                lib/hibernate-tools-3.2.0.ga.jar,\\r
                lib/hibernate-validator-4.0.0.CR1.jar,\\r
                lib/hsqldb.jar,\\r
                lib/hibernate-tools-3.2.0.ga.jar,\\r
                lib/hibernate-validator-4.0.0.CR1.jar,\\r
                lib/hsqldb.jar,\\r

-               lib/httpclient-4.0.1.jar,\\r
-               lib/httpcore-4.0.1.jar,\\r

                lib/javassist.jar,\\r
                lib/jaxb-api-2.1.6.jar,\\r
                lib/jaxb-impl-2.1.6.jar,\\r
                lib/javassist.jar,\\r
                lib/jaxb-api-2.1.6.jar,\\r
                lib/jaxb-impl-2.1.6.jar,\\r

-               lib/jaxen-1.1.2.jar,\\r

                lib/jdbc-1.2.jar,\\r
                lib/jdbc2_0-stdext.jar,\\r
                lib/jdom.jar,\\r
                lib/jdbc-1.2.jar,\\r
                lib/jdbc2_0-stdext.jar,\\r
                lib/jdom.jar,\\r


@@ -63,7 +59,6 @@ bin.includes = META-INF/,\
                lib/json-lib-2.2.3-jdk15.jar,\\r
                lib/jsr250-api-1.0.jar,\\r
                lib/jta.jar,\\r
                lib/json-lib-2.2.3-jdk15.jar,\\r
                lib/jsr250-api-1.0.jar,\\r
                lib/jta.jar,\\r

-               lib/jtds-1.2.2.jar,\\r

                lib/junit-4.8.1.jar,\\r
                lib/log4j-1.2.14.jar,\\r
                lib/lsid-client-1.1.2.jar,\\r
                lib/junit-4.8.1.jar,\\r
                lib/log4j-1.2.14.jar,\\r
                lib/lsid-client-1.1.2.jar,\\r


@@ -71,12 +66,8 @@ bin.includes = META-INF/,\
                lib/lucene-core-2.4.0.jar,\\r
                lib/lucene-spellchecker-2.4.0.jar,\\r
                lib/mail-1.4.jar,\\r
                lib/lucene-core-2.4.0.jar,\\r
                lib/lucene-spellchecker-2.4.0.jar,\\r
                lib/mail-1.4.jar,\\r

-               lib/msbase-2000.3.jar,\\r
-               lib/mssqlserver-2000.3.jar,\\r
-               lib/msutil-2000.3.jar,\\r

                lib/mysql-connector-java-5.0.5.jar,\\r
                lib/odfdom-0.8.jar,\\r
                lib/mysql-connector-java-5.0.5.jar,\\r
                lib/odfdom-0.8.jar,\\r

-               lib/opencsv-1.8.jar,\\r

                lib/org.apache.commons.codec-1.3.0.jar,\\r
                lib/org.eclipse.equinox.common-3.6.0.v20100503.jar,\\r
                lib/org.eclipse.osgi-3.6.2.R36x_v20110210.jar,\\r
                lib/org.apache.commons.codec-1.3.0.jar,\\r
                lib/org.eclipse.equinox.common-3.6.0.v20100503.jar,\\r
                lib/org.eclipse.osgi-3.6.2.R36x_v20110210.jar,\\r


@@ -105,7 +96,6 @@ bin.includes = META-INF/,\
                lib/spring-modules-lucene-0.8a.jar,\\r
                lib/spring-security-config-3.0.5.RELEASE.jar,\\r
                lib/spring-security-core-3.0.5.RELEASE.jar,\\r
                lib/spring-modules-lucene-0.8a.jar,\\r
                lib/spring-security-config-3.0.5.RELEASE.jar,\\r
                lib/spring-security-core-3.0.5.RELEASE.jar,\\r

-               lib/wsdl4j-1.6.1.jar,\\r

                lib/xalan-2.7.0.jar,\\r
                lib/xercesImpl-2.7.1.jar,\\r
                lib/xercesImpl.jar,\\r
                lib/xalan-2.7.0.jar,\\r
                lib/xercesImpl-2.7.1.jar,\\r
                lib/xercesImpl.jar,\\r


@@ -117,7 +107,6 @@ bin.includes = META-INF/,\
                lib/xom-1.0.jar,\\r
                lib/xsltc.jar,\\r
                lib/xstream-1.3.1.jar,\\r
                lib/xom-1.0.jar,\\r
                lib/xsltc.jar,\\r
                lib/xstream-1.3.1.jar,\\r

-               lib/poi-3.6.jar,\\r

                lib/hibernate-envers-3.4.0-SNAPSHOT.jar,\\r
                lib/spring-xml-1.5.6.jar,\\r
                lib/postgresql-9.1-901.jdbc4.jar,\\r
                lib/hibernate-envers-3.4.0-SNAPSHOT.jar,\\r
                lib/spring-xml-1.5.6.jar,\\r
                lib/postgresql-9.1-901.jdbc4.jar,\\r


@@ -138,7 +127,22 @@ bin.includes = META-INF/,\
                lib/cdmlib-remote-3.1.4-SNAPSHOT-sources.jar,\\r
                lib/cdmlib-remote-3.1.4-SNAPSHOT.jar,\\r
                lib/cdmlib-services-3.1.4-SNAPSHOT-sources.jar,\\r
                lib/cdmlib-remote-3.1.4-SNAPSHOT-sources.jar,\\r
                lib/cdmlib-remote-3.1.4-SNAPSHOT.jar,\\r
                lib/cdmlib-services-3.1.4-SNAPSHOT-sources.jar,\\r

-               lib/cdmlib-services-3.1.4-SNAPSHOT.jar\r
+               lib/cdmlib-services-3.1.4-SNAPSHOT.jar,\\r
+               lib/opencsv-2.3.jar,\\r
+               lib/jtds-1.3.0-sources.jar,\\r
+               lib/jtds-1.3.0.jar,\\r
+               lib/ezmorph-1.0.6-sources.jar,\\r
+               lib/ezmorph-1.0.6.jar,\\r
+               lib/poi-3.9-sources.jar,\\r
+               lib/poi-3.9.jar,\\r
+               lib/httpclient-4.2.3-sources.jar,\\r
+               lib/httpclient-4.2.3.jar,\\r
+               lib/wsdl4j-1.6.2-sources.jar,\\r
+               lib/wsdl4j-1.6.2.jar,\\r
+               lib/jaxen-1.1.4-sources.jar,\\r
+               lib/jaxen-1.1.4.jar,\\r
+               lib/xpp3-1.1.4c-sources.jar,\\r
+               lib/xpp3-1.1.4c.jar\r

 jars.compile.order = cdmLibrary.jar\r
 src.includes = lib/\r
 bin.excludes = lib/activation-1.1src.zip,\\r
 jars.compile.order = cdmLibrary.jar\r
 src.includes = lib/\r
 bin.excludes = lib/activation-1.1src.zip,\\r

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.4.jar
deleted file mode 100644 (file)
index 7625af6..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.4.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.4src.zip b/eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.4src.zip
deleted file mode 100644 (file)
index f2e7d52..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.4src.zip and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.6-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.6-sources.jar
new file mode 100644 (file)
index 0000000..8d56b6b
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.6-sources.jar differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.6.jar
new file mode 100644 (file)
index 0000000..30fad12
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.6.jar differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.0.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.0.1.jar
deleted file mode 100644 (file)
index ad32285..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.0.1.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.0.1src.zip b/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.0.1src.zip
deleted file mode 100644 (file)
index 9daa2d0..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.0.1src.zip and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.2.3-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.2.3-sources.jar
new file mode 100644 (file)
index 0000000..a3bca69
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.2.3-sources.jar differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.2.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.2.3.jar
new file mode 100644 (file)
index 0000000..53c1c26
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.2.3.jar differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.4-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.4-sources.jar
new file mode 100644 (file)
index 0000000..9f5f1a8
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.4-sources.jar differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.4.jar
similarity index 75%
rename from eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.2.jar
rename to eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.4.jar
index 69de309875a1c9f70578b6084000f0d91db966b9..c2016095f03194490ee64f014acef38ca46864f1 100644 (file)
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.2.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.4.jar differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.2.2.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.2.2.jar
deleted file mode 100644 (file)
index d0d8c95..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.2.2.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.0-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.0-sources.jar
new file mode 100644 (file)
index 0000000..0a47b40
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.0-sources.jar differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.0.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.0.jar
new file mode 100644 (file)
index 0000000..60f119c
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.0.jar differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/msbase-2000.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/msbase-2000.3.jar
deleted file mode 100644 (file)
index 7d5f83e..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/msbase-2000.3.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/mssqlserver-2000.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/mssqlserver-2000.3.jar
deleted file mode 100644 (file)
index b14b1e2..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/mssqlserver-2000.3.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/msutil-2000.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/msutil-2000.3.jar
deleted file mode 100644 (file)
index 34c6ef1..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/msutil-2000.3.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/opencsv-1.8.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/opencsv-1.8.jar
deleted file mode 100644 (file)
index cc8200b..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/opencsv-1.8.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/opencsv-2.3.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/opencsv-2.3.jar
new file mode 100644 (file)
index 0000000..01f82ca
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/opencsv-2.3.jar differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.6-src.zip b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.6-src.zip
deleted file mode 100644 (file)
index 7661e26..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.6-src.zip and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.6.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.6.jar
deleted file mode 100644 (file)
index 9972d97..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.6.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.9-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.9-sources.jar
new file mode 100644 (file)
index 0000000..50034e9
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.9-sources.jar differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.9.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.9.jar
new file mode 100644 (file)
index 0000000..0f46288
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.9.jar differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.1src.zip b/eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.2-sources.jar
similarity index 54%
rename from eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.1src.zip
rename to eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.2-sources.jar
index 02cac94c23be6cc568131a3858377dd352959cdc..9fb73b4e39b173e71b5ca2a6c8f8c9327b1dc665 100644 (file)
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.1src.zip and b/eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.2-sources.jar differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.1.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.2.jar
similarity index 78%
rename from eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.1.jar
rename to eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.2.jar
index 67a35fcbaa7e0e1b2bd8dae40f9b718f5db8d458..b9ffc36b9f5b1f4f707aa767abc7a356d1f0db50 100644 (file)
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.1.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.2.jar differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xpp3-1.1.4c-sources.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xpp3-1.1.4c-sources.jar
new file mode 100644 (file)
index 0000000..036c7b7
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/xpp3-1.1.4c-sources.jar differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/xpp3-1.1.4c.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/xpp3-1.1.4c.jar
new file mode 100644 (file)
index 0000000..451ac82
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/xpp3-1.1.4c.jar differ