ref #5752 remove spring-modules-cache and dependeny concurrent-1.3.4

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index a9d697a9071c85617a24179ecf90d6322fbd4222..d1fd49af06d9defeb6538fb7495ebf0c29e51ad8 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -710,7 +710,6 @@ Bundle-ClassPath: .,
  lib/spring-core-4.2.4.RELEASE.jar,
  lib/spring-expression-4.2.4.RELEASE.jar,
  lib/spring-jdbc-4.2.4.RELEASE.jar,
- lib/spring-modules-cache-0.7.jar,
  lib/spring-orm-4.2.4.RELEASE.jar,
  lib/spring-oxm-4.2.4.RELEASE.jar,
  lib/spring-plugin-core-1.2.0.RELEASE.jar,
@@ -802,7 +801,6 @@ Bundle-ClassPath: .,
  lib/cglib-nodep-3.2.0.jar,
  lib/classmate-1.3.1.jar,
  lib/codemodel-2.2.11.jar,
- lib/concurrent-1.3.4.jar,
  lib/FastInfoset-1.2.13.jar,
  lib/fop-1.1.jar,
  lib/guava-19.0.jar,

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index 876d6285fd9de5380923d89704033169b83b8741..3ee601f3e3233613cee7fa4173859a503267c6b8 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -71,7 +71,6 @@ bin.includes = META-INF/,\
                lib/spring-core-4.2.4.RELEASE.jar,\
                lib/spring-expression-4.2.4.RELEASE.jar,\
                lib/spring-jdbc-4.2.4.RELEASE.jar,\
-               lib/spring-modules-cache-0.7.jar,\
                lib/spring-orm-4.2.4.RELEASE.jar,\
                lib/spring-oxm-4.2.4.RELEASE.jar,\
                lib/spring-plugin-core-1.2.0.RELEASE.jar,\
@@ -163,7 +162,6 @@ bin.includes = META-INF/,\
                lib/cglib-nodep-3.2.0.jar,\
                lib/classmate-1.3.1.jar,\
                lib/codemodel-2.2.11.jar,\
-               lib/concurrent-1.3.4.jar,\
                lib/FastInfoset-1.2.13.jar,\
                lib/fop-1.1.jar,\
                lib/guava-19.0.jar,\

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/concurrent-1.3.4.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/concurrent-1.3.4.jar
deleted file mode 100644 (file)
index 551f347..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/concurrent-1.3.4.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-modules-cache-0.7.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-modules-cache-0.7.jar
deleted file mode 100644 (file)
index 072881e..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-modules-cache-0.7.jar and /dev/null differ