From 47d03bee034da5c52fbd68b7f5481b82a178dc47 Mon Sep 17 00:00:00 2001 From: kapil-agnihotri Date: Thu, 10 Nov 2022 16:32:38 +0100 Subject: [PATCH] squash --- .../META-INF/MANIFEST.MF | 1 - .../META-INF/MANIFEST.MF | 1 - .../META-INF/MANIFEST.MF | 1 - .../META-INF/MANIFEST.MF | 7 +++---- .../eu.esdihumboldt.cst.test/META-INF/MANIFEST.MF | 9 +++------ 5 files changed, 6 insertions(+), 13 deletions(-) diff --git a/common/plugins/eu.esdihumboldt.hale.common.align.test/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.align.test/META-INF/MANIFEST.MF index d4f4327a21..a379a9a447 100644 --- a/common/plugins/eu.esdihumboldt.hale.common.align.test/META-INF/MANIFEST.MF +++ b/common/plugins/eu.esdihumboldt.hale.common.align.test/META-INF/MANIFEST.MF @@ -9,7 +9,6 @@ Import-Package: com.google.common.collect;version="11.0.1", eu.esdihumboldt.hale.common.filter, eu.esdihumboldt.hale.common.test, eu.esdihumboldt.util.io, - org.exolab.castor.core.exceptions, org.geotools.filter.text.cql2;version="21.0.0.combined" Require-Bundle: eu.esdihumboldt.hale.common.align;bundle-version="2.5.0", eu.esdihumboldt.hale.common.core;bundle-version="2.5.0", diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.align/META-INF/MANIFEST.MF index 1752e67d3e..b4eeb1352f 100644 --- a/common/plugins/eu.esdihumboldt.hale.common.align/META-INF/MANIFEST.MF +++ b/common/plugins/eu.esdihumboldt.hale.common.align/META-INF/MANIFEST.MF @@ -52,7 +52,6 @@ Import-Package: com.google.common.base;version="1.6.0", javax.annotation;version="[1.2.0,1.2.0]", net.jcip.annotations, org.apache.commons.lang;version="2.4.0", - org.exolab.castor.core.exceptions, org.locationtech.jts.geom, org.slf4j;version="1.5.11", org.springframework.core.convert;version="5.2.0", diff --git a/common/plugins/eu.esdihumboldt.hale.common.core/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.core/META-INF/MANIFEST.MF index c36538e572..5694b2cdea 100644 --- a/common/plugins/eu.esdihumboldt.hale.common.core/META-INF/MANIFEST.MF +++ b/common/plugins/eu.esdihumboldt.hale.common.core/META-INF/MANIFEST.MF @@ -37,7 +37,6 @@ Import-Package: com.google.common.base;version="1.6.0", org.apache.http.client, org.apache.http.impl, org.apache.http.impl.client, - org.exolab.castor.core.exceptions;version="1.1.2", org.osgi.framework;version="1.3.0", org.slf4j;version="1.5.11", org.springframework.core.convert;version="5.2.0", diff --git a/common/plugins/eu.esdihumboldt.hale.common.test/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.test/META-INF/MANIFEST.MF index a7e4371137..a2cd62b372 100644 --- a/common/plugins/eu.esdihumboldt.hale.common.test/META-INF/MANIFEST.MF +++ b/common/plugins/eu.esdihumboldt.hale.common.test/META-INF/MANIFEST.MF @@ -23,13 +23,12 @@ Import-Package: de.fhg.igd.osgi.util, eu.esdihumboldt.hale.io.gml.reader.internal, eu.esdihumboldt.hale.io.xsd.reader, eu.esdihumboldt.util.io, - org.castor.xml;version="1.4.1", - org.exolab.castor.core.exceptions;version="1.3.2", - org.exolab.castor.mapping;version="1.4.1", org.osgi.framework;version="1.6.0", org.springframework.core.convert;version="5.2.0" Export-Package: eu.esdihumboldt.hale.common.test Bundle-Vendor: data harmonisation panel Automatic-Module-Name: eu.esdihumboldt.hale.common.test Require-Bundle: jakarta.xml.bind-api;bundle-version="4.0.0", - org.junit;bundle-version="4.13.0" + org.junit;bundle-version="4.13.0", + org.codehaus.castor.core;bundle-version="1.4.1", + org.codehaus.castor.xml;bundle-version="1.4.1" diff --git a/cst/plugins/eu.esdihumboldt.cst.test/META-INF/MANIFEST.MF b/cst/plugins/eu.esdihumboldt.cst.test/META-INF/MANIFEST.MF index 60387e69af..3bbd7fc349 100644 --- a/cst/plugins/eu.esdihumboldt.cst.test/META-INF/MANIFEST.MF +++ b/cst/plugins/eu.esdihumboldt.cst.test/META-INF/MANIFEST.MF @@ -8,7 +8,9 @@ Require-Bundle: eu.esdihumboldt.cst;bundle-version="2.5.0", eu.esdihumboldt.hale.common.align;bundle-version="2.5.0", org.eclipse.core.contenttype;bundle-version="3.4.100", groovy;bundle-version="2.5.19", - org.junit;bundle-version="4.13.0" + org.junit;bundle-version="4.13.0", + org.codehaus.castor.core;bundle-version="1.4.1", + org.codehaus.castor.xml;bundle-version="1.4.1" Import-Package: com.google.common.collect;version="17.0.0", de.fhg.igd.slf4jplus, eu.esdihumboldt.cst.functions.core.join, @@ -24,11 +26,6 @@ Import-Package: com.google.common.collect;version="17.0.0", eu.esdihumboldt.hale.common.test, eu.esdihumboldt.util, javax.annotation;version="[1.2.0,1.2.0]", - org.castor.core.exception;version="1.4.1", - org.castor.core.exceptions;version="1.4.1", - org.castor.mapping;version="1.4.1", - org.exolab.castor.core.exceptions;version="1.4.1", - org.exolab.castor.xml;version="1.4.1", org.slf4j;version="1.5.11" Export-Package: eu.esdihumboldt.cst.test Bundle-Vendor: data harmonisation panel