From 5fbf2e5f41d56c6b5e34e8dac01e26cf3cf3c658 Mon Sep 17 00:00:00 2001 From: Patrick Plitzner Date: Thu, 6 Apr 2017 19:04:12 +0200 Subject: [PATCH] ref #5752 cleanup dependencies in taxeditor.cdmlib --- eu.etaxonomy.taxeditor.cdmlib/.classpath | 18 ----------------- .../META-INF/MANIFEST.MF | 20 ------------------- .../build.properties | 18 ----------------- .../META-INF/MANIFEST.MF | 1 + 4 files changed, 1 insertion(+), 56 deletions(-) diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath index a1be7f26d..0ad0d799b 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/.classpath +++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath @@ -56,11 +56,6 @@ - - - - - @@ -95,8 +90,6 @@ - - @@ -161,13 +154,7 @@ - - - - - - @@ -211,11 +198,6 @@ - - - - - diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF index d09e9df7a..1fbc7c69e 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF @@ -281,8 +281,6 @@ Export-Package: com.google.api, org.apache.lucene.util, org.apache.sanselan;uses:="org.apache.sanselan.common,org.apache.sanselan.common.byteSources", org.apache.xerces.dom, - org.eclipse.osgi.internal.loader, - org.eclipse.osgi.util, org.h2.jdbc, org.hamcrest, org.hibernate, @@ -568,11 +566,6 @@ Bundle-ClassPath: ., lib/concurrent-1.3.4.jar, lib/dbunit-2.4.9.jar, lib/dom4j-1.6.1.jar, - lib/doxia-core-1.6.jar, - lib/doxia-logging-api-1.6.jar, - lib/doxia-module-apt-1.6.jar, - lib/doxia-module-xhtml-1.6.jar, - lib/doxia-sink-api-1.6.jar, lib/dozer-5.3.0.jar, lib/dtd-parser-1.1.jar, lib/easymock-2.3.jar, @@ -607,8 +600,6 @@ Bundle-ClassPath: ., lib/httpmime-4.5.1.jar, lib/icu4j-2.6.1.jar, lib/identificationKeyAPI-1.0.jar, - lib/istack-commons-runtime-2.21.jar, - lib/istack-commons-tools-2.21.jar, lib/itextpdf-5.5.8.jar, lib/jackson-annotations-2.6.5.jar, lib/jackson-core-2.6.5.jar, @@ -673,13 +664,7 @@ Bundle-ClassPath: ., lib/odfdom-java-0.8.7.jar, lib/ognl-2.6.9.jar, lib/opencsv-2.3.jar, - lib/org.osgi.core-1.0.0.jar, - lib/osgi-3.6.0.jar, lib/paranamer-2.3.jar, - lib/plexus-classworlds-1.2-alpha-9.jar, - lib/plexus-component-annotations-1.5.5.jar, - lib/plexus-container-default-1.0-alpha-30.jar, - lib/plexus-utils-3.0.15.jar, lib/poi-3.13.jar, lib/poi-ooxml-3.13.jar, lib/poi-ooxml-schemas-3.13.jar, @@ -723,11 +708,6 @@ Bundle-ClassPath: ., lib/springfox-swagger-common-2.3.1.jar, lib/springfox-swagger2-2.3.1.jar, lib/standard-1.1.2.jar, - lib/stax-1.2.0.jar, - lib/stax-api-1.0.1.jar, - lib/stax-ex-1.7.7.jar, - lib/swagger-annotations-1.5.6.jar, - lib/swagger-models-1.5.5.jar, lib/tools.jar, lib/txw2-2.2.11.jar, lib/unitils-core-3.4.2.jar, diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties index cd75cd0c3..dd8f1fd39 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/build.properties +++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties @@ -53,11 +53,6 @@ bin.includes = META-INF/,\ lib/concurrent-1.3.4.jar,\ lib/dbunit-2.4.9.jar,\ lib/dom4j-1.6.1.jar,\ - lib/doxia-core-1.6.jar,\ - lib/doxia-logging-api-1.6.jar,\ - lib/doxia-module-apt-1.6.jar,\ - lib/doxia-module-xhtml-1.6.jar,\ - lib/doxia-sink-api-1.6.jar,\ lib/dozer-5.3.0.jar,\ lib/dtd-parser-1.1.jar,\ lib/easymock-2.3.jar,\ @@ -92,8 +87,6 @@ bin.includes = META-INF/,\ lib/httpmime-4.5.1.jar,\ lib/icu4j-2.6.1.jar,\ lib/identificationKeyAPI-1.0.jar,\ - lib/istack-commons-runtime-2.21.jar,\ - lib/istack-commons-tools-2.21.jar,\ lib/itextpdf-5.5.8.jar,\ lib/jackson-annotations-2.6.5.jar,\ lib/jackson-core-2.6.5.jar,\ @@ -158,13 +151,7 @@ bin.includes = META-INF/,\ lib/odfdom-java-0.8.7.jar,\ lib/ognl-2.6.9.jar,\ lib/opencsv-2.3.jar,\ - lib/org.osgi.core-1.0.0.jar,\ - lib/osgi-3.6.0.jar,\ lib/paranamer-2.3.jar,\ - lib/plexus-classworlds-1.2-alpha-9.jar,\ - lib/plexus-component-annotations-1.5.5.jar,\ - lib/plexus-container-default-1.0-alpha-30.jar,\ - lib/plexus-utils-3.0.15.jar,\ lib/poi-3.13.jar,\ lib/poi-ooxml-3.13.jar,\ lib/poi-ooxml-schemas-3.13.jar,\ @@ -208,11 +195,6 @@ bin.includes = META-INF/,\ lib/springfox-swagger-common-2.3.1.jar,\ lib/springfox-swagger2-2.3.1.jar,\ lib/standard-1.1.2.jar,\ - lib/stax-1.2.0.jar,\ - lib/stax-api-1.0.1.jar,\ - lib/stax-ex-1.7.7.jar,\ - lib/swagger-annotations-1.5.6.jar,\ - lib/swagger-models-1.5.5.jar,\ lib/tools.jar,\ lib/txw2-2.2.11.jar,\ lib/unitils-core-3.4.2.jar,\ diff --git a/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF index 168a86746..acae2c9f1 100644 --- a/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF @@ -24,6 +24,7 @@ Import-Package: org.eclipse.core.resources, org.eclipse.core.runtime, org.eclipse.core.runtime.jobs, org.eclipse.equinox.app, + org.eclipse.osgi.util;version="1.1.0", org.eclipse.ui.forms.widgets, org.osgi.framework Bundle-Activator: eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin -- 2.34.1