ref #5752 remove spring-security-oauth2 including jackson-mapper-asl and jackson...

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 5c5522c86e5bf718f10ce5739551d019e763d19d..64cfa481b87f6659182341594406be0eb4127243 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -559,46 +559,6 @@ Export-Package: com.google.api,
  org.springframework.security.core,
  org.springframework.security.core.context,
  org.springframework.security.core.userdetails,
- org.springframework.security.oauth2.client,
- org.springframework.security.oauth2.client.filter,
- org.springframework.security.oauth2.client.filter.state,
- org.springframework.security.oauth2.client.http,
- org.springframework.security.oauth2.client.resource,
- org.springframework.security.oauth2.client.test,
- org.springframework.security.oauth2.client.token,
- org.springframework.security.oauth2.client.token.auth,
- org.springframework.security.oauth2.client.token.grant.client,
- org.springframework.security.oauth2.client.token.grant.code,
- org.springframework.security.oauth2.client.token.grant.implicit,
- org.springframework.security.oauth2.client.token.grant.password,
- org.springframework.security.oauth2.client.token.grant.redirect,
- org.springframework.security.oauth2.common,
- org.springframework.security.oauth2.common.exceptions,
- org.springframework.security.oauth2.common.util,
- org.springframework.security.oauth2.config.annotation.builders,
- org.springframework.security.oauth2.config.annotation.configuration,
- org.springframework.security.oauth2.config.annotation.configurers,
- org.springframework.security.oauth2.config.annotation.web.configuration,
- org.springframework.security.oauth2.config.annotation.web.configurers,
- org.springframework.security.oauth2.config.xml,
- org.springframework.security.oauth2.http.converter,
- org.springframework.security.oauth2.http.converter.jaxb,
- org.springframework.security.oauth2.provider,
- org.springframework.security.oauth2.provider.approval,
- org.springframework.security.oauth2.provider.authentication,
- org.springframework.security.oauth2.provider.client,
- org.springframework.security.oauth2.provider.code,
- org.springframework.security.oauth2.provider.endpoint,
- org.springframework.security.oauth2.provider.error,
- org.springframework.security.oauth2.provider.expression,
- org.springframework.security.oauth2.provider.implicit,
- org.springframework.security.oauth2.provider.password,
- org.springframework.security.oauth2.provider.refresh,
- org.springframework.security.oauth2.provider.request,
- org.springframework.security.oauth2.provider.token,
- org.springframework.security.oauth2.provider.token.store,
- org.springframework.security.oauth2.provider.token.store.redis,
- org.springframework.security.oauth2.provider.vote,
  org.springframework.security.provisioning,
  org.springframework.stereotype,
  org.springframework.transaction;uses:="org.springframework.core",
@@ -742,13 +702,10 @@ Bundle-ClassPath: .,
  lib/xmlunit-1.6.jar,
  lib/xom-1.2.5.jar,
  lib/xsom-20140925.jar,
- lib/spring-security-oauth2-2.0.11.RELEASE.jar,
  lib/opencsv-2.3.jar,
  lib/jdbc4-2.0.jar,
  lib/junit-4.12.jar,
  lib/jackson-databind-2.6.5.jar,
- lib/jackson-core-asl-1.8.8.jar,
- lib/jackson-mapper-asl-1.8.8.jar,
  lib/jakarta-regexp-1.4.jar,
  lib/jandex-2.0.0.Final.jar,
  lib/javassist-3.20.0-GA.jar,

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index 5a216a7c5646cec55260527f0a31d2c6c858feed..cb7f73cac00a13e6d5f80c349f7aa3b75c80e94c 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -103,13 +103,10 @@ bin.includes = META-INF/,\
                lib/xmlunit-1.6.jar,\
                lib/xom-1.2.5.jar,\
                lib/xsom-20140925.jar,\
-               lib/spring-security-oauth2-2.0.11.RELEASE.jar,\
                lib/opencsv-2.3.jar,\
                lib/jdbc4-2.0.jar,\
                lib/junit-4.12.jar,\
                lib/jackson-databind-2.6.5.jar,\
-               lib/jackson-core-asl-1.8.8.jar,\
-               lib/jackson-mapper-asl-1.8.8.jar,\
                lib/jakarta-regexp-1.4.jar,\
                lib/jandex-2.0.0.Final.jar,\
                lib/javassist-3.20.0-GA.jar,\

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-core-asl-1.8.8.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-core-asl-1.8.8.jar
deleted file mode 100644 (file)
index 05f3353..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-core-asl-1.8.8.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-mapper-asl-1.8.8.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-mapper-asl-1.8.8.jar
deleted file mode 100644 (file)
index 7c7cd21..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/jackson-mapper-asl-1.8.8.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-oauth2-2.0.11.RELEASE.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-oauth2-2.0.11.RELEASE.jar
deleted file mode 100644 (file)
index a0a9a4e..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-oauth2-2.0.11.RELEASE.jar and /dev/null differ