ref #5752 cleanup dependencies in taxeditor.cdmlib Part 3

diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index 6f3b2f160a039946ae959998eb569710cff99261..c34190605966dcddd09f3b0144907161803076e4 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -1,5 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+       <classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.5.2.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.7.13.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.7.13.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/slf4j-nop-1.7.13.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/batik-anim-1.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/batik-awt-util-1.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/batik-bridge-1.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/batik-css-1.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/batik-ext-1.8.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/batik-extension-1.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/batik-gvt-1.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/batik-js-1.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/batik-parser-1.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/batik-script-1.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/batik-svg-dom-1.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/batik-svggen-1.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/batik-transcoder-1.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/batik-util-1.7.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/batik-dom-1.7.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/jackson-core-asl-1.8.8.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/jackson-mapper-asl-1.8.8.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/jakarta-regexp-1.4.jar"/>
@@ -37,30 +56,10 @@
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src/main/java"/>
        <classpathentry kind="src" path="src/main/resources"/>
-       <classpathentry exported="true" kind="lib" path="lib/activation-1.1.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/antlr-2.7.7.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/aopalliance-1.0.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/apache-log4j-extras-1.2.17.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/aspectjrt-1.8.8.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/aspectjweaver-1.8.8.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/avro-1.6.3.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/batik-anim-1.7.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/batik-awt-util-1.7.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/batik-bridge-1.7.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/batik-css-1.7.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/batik-dom-1.7.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/batik-ext-1.8.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/batik-extension-1.7.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/batik-gvt-1.7.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/batik-js-1.7.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/batik-parser-1.7.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/batik-script-1.7.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/batik-svg-dom-1.7.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/batik-svggen-1.7.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/batik-transcoder-1.7.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/batik-util-1.7.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/batik-xml-1.7.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.5.2.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-4.7.0-SNAPSHOT.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-4.7.0-SNAPSHOT.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-4.7.0-SNAPSHOT.jar"/>
@@ -70,10 +69,6 @@
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-4.7.0-SNAPSHOT.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-4.7.0-SNAPSHOT.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/cdmlib-test-4.7.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cglib-3.2.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cglib-nodep-3.2.0.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/classmate-1.3.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/codemodel-2.2.11.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/com.springsource.org.aopalliance-1.0.0.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/com.springsource.org.apache.commons.logging-1.1.1.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.9.2.jar"/>
@@ -86,7 +81,6 @@
        <classpathentry exported="true" kind="lib" path="lib/commons-lang3-3.3.2.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/commons-logging-1.2.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/commons-pool-1.5.4.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/concurrent-1.3.4.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/dbunit-2.4.9.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/dozer-5.3.0.jar"/>

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 56c1dc17cbcc4b7d1c5618c11c17ff04add0b79c..25f48d08621b41b9fc62fbcae873bdf83349aa56 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -509,23 +509,7 @@ Bundle-ClassPath: .,
  lib/aspectjrt-1.8.8.jar,
  lib/aspectjweaver-1.8.8.jar,
  lib/avro-1.6.3.jar,
- lib/batik-anim-1.7.jar,
- lib/batik-awt-util-1.7.jar,
- lib/batik-bridge-1.7.jar,
- lib/batik-css-1.7.jar,
- lib/batik-dom-1.7.jar,
- lib/batik-ext-1.8.jar,
- lib/batik-extension-1.7.jar,
- lib/batik-gvt-1.7.jar,
- lib/batik-js-1.7.jar,
- lib/batik-parser-1.7.jar,
- lib/batik-script-1.7.jar,
- lib/batik-svg-dom-1.7.jar,
- lib/batik-svggen-1.7.jar,
- lib/batik-transcoder-1.7.jar,
- lib/batik-util-1.7.jar,
  lib/batik-xml-1.7.jar,
- lib/c3p0-0.9.5.2.jar,
  lib/cdmlib-commons-4.7.0-SNAPSHOT.jar,
  lib/cdmlib-ext-4.7.0-SNAPSHOT.jar,
  lib/cdmlib-io-4.7.0-SNAPSHOT.jar,
@@ -535,10 +519,6 @@ Bundle-ClassPath: .,
  lib/cdmlib-remote-4.7.0-SNAPSHOT.jar,
  lib/cdmlib-services-4.7.0-SNAPSHOT.jar,
  lib/cdmlib-test-4.7.0-SNAPSHOT.jar,
- lib/cglib-3.2.0.jar,
- lib/cglib-nodep-3.2.0.jar,
- lib/classmate-1.3.1.jar,
- lib/codemodel-2.2.11.jar,
  lib/com.springsource.org.aopalliance-1.0.0.jar,
  lib/com.springsource.org.apache.commons.logging-1.1.1.jar,
  lib/commons-beanutils-1.9.2.jar,
@@ -551,7 +531,6 @@ Bundle-ClassPath: .,
  lib/commons-lang3-3.3.2.jar,
  lib/commons-logging-1.2.jar,
  lib/commons-pool-1.5.4.jar,
- lib/concurrent-1.3.4.jar,
  lib/dbunit-2.4.9.jar,
  lib/dom4j-1.6.1.jar,
  lib/dozer-5.3.0.jar,
@@ -679,5 +658,24 @@ Bundle-ClassPath: .,
  lib/jsr250-api-1.0.jar,
  lib/jta-1.1.jar,
  lib/jtds-1.3.1.jar,
- lib/junit-benchmarks-0.7.2.jar
+ lib/junit-benchmarks-0.7.2.jar,
+ lib/batik-dom-1.7.jar,
+ lib/batik-anim-1.7.jar,
+ lib/batik-awt-util-1.7.jar,
+ lib/batik-bridge-1.7.jar,
+ lib/batik-css-1.7.jar,
+ lib/batik-ext-1.8.jar,
+ lib/batik-extension-1.7.jar,
+ lib/batik-gvt-1.7.jar,
+ lib/batik-js-1.7.jar,
+ lib/batik-parser-1.7.jar,
+ lib/batik-script-1.7.jar,
+ lib/batik-svg-dom-1.7.jar,
+ lib/batik-svggen-1.7.jar,
+ lib/batik-transcoder-1.7.jar,
+ lib/batik-util-1.7.jar,
+ lib/c3p0-0.9.5.2.jar,
+ lib/slf4j-api-1.7.13.jar,
+ lib/slf4j-log4j12-1.7.13.jar,
+ lib/slf4j-nop-1.7.13.jar
 Import-Package: eu.etaxonomy.cdm.api.application

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index 224b76d1945e222c16e99ad27def22bee0b1857b..12c7a2ff89b8de91c8d2ee3f80088aa24d33cf30 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -8,23 +8,7 @@ bin.includes = META-INF/,\
                lib/aspectjrt-1.8.8.jar,\
                lib/aspectjweaver-1.8.8.jar,\
                lib/avro-1.6.3.jar,\
-               lib/batik-anim-1.7.jar,\
-               lib/batik-awt-util-1.7.jar,\
-               lib/batik-bridge-1.7.jar,\
-               lib/batik-css-1.7.jar,\
-               lib/batik-dom-1.7.jar,\
-               lib/batik-ext-1.8.jar,\
-               lib/batik-extension-1.7.jar,\
-               lib/batik-gvt-1.7.jar,\
-               lib/batik-js-1.7.jar,\
-               lib/batik-parser-1.7.jar,\
-               lib/batik-script-1.7.jar,\
-               lib/batik-svg-dom-1.7.jar,\
-               lib/batik-svggen-1.7.jar,\
-               lib/batik-transcoder-1.7.jar,\
-               lib/batik-util-1.7.jar,\
                lib/batik-xml-1.7.jar,\
-               lib/c3p0-0.9.5.2.jar,\
                lib/cdmlib-commons-4.7.0-SNAPSHOT.jar,\
                lib/cdmlib-ext-4.7.0-SNAPSHOT.jar,\
                lib/cdmlib-io-4.7.0-SNAPSHOT.jar,\
@@ -34,10 +18,6 @@ bin.includes = META-INF/,\
                lib/cdmlib-remote-4.7.0-SNAPSHOT.jar,\
                lib/cdmlib-services-4.7.0-SNAPSHOT.jar,\
                lib/cdmlib-test-4.7.0-SNAPSHOT.jar,\
-               lib/cglib-3.2.0.jar,\
-               lib/cglib-nodep-3.2.0.jar,\
-               lib/classmate-1.3.1.jar,\
-               lib/codemodel-2.2.11.jar,\
                lib/com.springsource.org.aopalliance-1.0.0.jar,\
                lib/com.springsource.org.apache.commons.logging-1.1.1.jar,\
                lib/commons-beanutils-1.9.2.jar,\
@@ -50,7 +30,6 @@ bin.includes = META-INF/,\
                lib/commons-lang3-3.3.2.jar,\
                lib/commons-logging-1.2.jar,\
                lib/commons-pool-1.5.4.jar,\
-               lib/concurrent-1.3.4.jar,\
                lib/dbunit-2.4.9.jar,\
                lib/dom4j-1.6.1.jar,\
                lib/dozer-5.3.0.jar,\
@@ -178,7 +157,26 @@ bin.includes = META-INF/,\
                lib/jsr250-api-1.0.jar,\
                lib/jta-1.1.jar,\
                lib/jtds-1.3.1.jar,\
-               lib/junit-benchmarks-0.7.2.jar
+               lib/junit-benchmarks-0.7.2.jar,\
+               lib/batik-dom-1.7.jar,\
+               lib/batik-anim-1.7.jar,\
+               lib/batik-awt-util-1.7.jar,\
+               lib/batik-bridge-1.7.jar,\
+               lib/batik-css-1.7.jar,\
+               lib/batik-ext-1.8.jar,\
+               lib/batik-extension-1.7.jar,\
+               lib/batik-gvt-1.7.jar,\
+               lib/batik-js-1.7.jar,\
+               lib/batik-parser-1.7.jar,\
+               lib/batik-script-1.7.jar,\
+               lib/batik-svg-dom-1.7.jar,\
+               lib/batik-svggen-1.7.jar,\
+               lib/batik-transcoder-1.7.jar,\
+               lib/batik-util-1.7.jar,\
+               lib/c3p0-0.9.5.2.jar,\
+               lib/slf4j-api-1.7.13.jar,\
+               lib/slf4j-log4j12-1.7.13.jar,\
+               lib/slf4j-nop-1.7.13.jar
 
 jars.compile.order = .
 output.. = bin/