From 43a052fe46f2472011a85b77ebf1d6fb8b50f145 Mon Sep 17 00:00:00 2001 From: Emanuela Epure <67077116+emanuelaepure10@users.noreply.github.com> Date: Wed, 6 Dec 2023 15:32:38 +0100 Subject: [PATCH] build: hale: GeoTools update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update hale»studio with GeoTools 29.1 ING-4083 --- build/bundleArtifactMap.json | 14 --- .../feature.xml | 107 ++++++++---------- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 2 - .../META-INF/MANIFEST.MF | 4 +- .../hale/common/filter/CQLFilterTest.groovy | 1 - .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../orient/internal/ExtendedWKBReader.java | 25 ++-- .../META-INF/MANIFEST.MF | 6 +- .../META-INF/MANIFEST.MF | 12 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../Tests.product | 16 ++- .../META-INF/MANIFEST.MF | 12 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 1 - .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../Infocenter.product | 7 -- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../de.fhg.igd.mapviewer/META-INF/MANIFEST.MF | 6 +- .../META-INF/MANIFEST.MF | 40 +++---- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 14 +-- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 10 +- .../META-INF/MANIFEST.MF | 12 +- .../META-INF/MANIFEST.MF | 8 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 16 +-- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 6 +- platform/hale-platform.target | 4 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 24 ++-- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 14 +-- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 12 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 6 +- .../META-INF/MANIFEST.MF | 2 +- 62 files changed, 235 insertions(+), 259 deletions(-) diff --git a/build/bundleArtifactMap.json b/build/bundleArtifactMap.json index 838f7595db..26fec5fb8b 100644 --- a/build/bundleArtifactMap.json +++ b/build/bundleArtifactMap.json @@ -484,13 +484,6 @@ "2.3.2.i20150413": "2.3.2" } }, - "commons-httpclient": { - "group": "commons-httpclient", - "name": "commons-httpclient", - "versions": { - "3.1.0.i20150413": "3.1" - } - }, "org.apache.commons.compress": { "group": "org.apache.commons", "name": "commons-compress", @@ -1219,13 +1212,6 @@ "2.0.16.i20150413": "2.0.16" } }, - "xpp3.xpp3_min": { - "group": "xpp3", - "name": "xpp3_min", - "versions": { - "1.1.4.c-i20150413": "1.1.4c" - } - }, "org.eclipse.xsd": { "group": "org.eclipse.xsd", "name": "xsd", diff --git a/common/features/eu.esdihumboldt.hale.common.feature.core/feature.xml b/common/features/eu.esdihumboldt.hale.common.feature.core/feature.xml index 81e939b870..8f70bc4844 100644 --- a/common/features/eu.esdihumboldt.hale.common.feature.core/feature.xml +++ b/common/features/eu.esdihumboldt.hale.common.feature.core/feature.xml @@ -288,13 +288,6 @@ version="0.0.0" unpack="false"/> - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/common/plugins/eu.esdihumboldt.hale.common.align.merge.test/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.align.merge.test/META-INF/MANIFEST.MF index a97659f88a..68fd2b13f7 100644 --- a/common/plugins/eu.esdihumboldt.hale.common.align.merge.test/META-INF/MANIFEST.MF +++ b/common/plugins/eu.esdihumboldt.hale.common.align.merge.test/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: groovy;bundle-version="2.5.19", eu.esdihumboldt.hale.common.headless;bundle-version="3.3.0", eu.esdihumboldt.hale.common.core, eu.esdihumboldt.hale.common.cli, - org.junit;bundle-version="4.12.0", + org.junit;bundle-version="4.13.0", jakarta.xml.bind-api;bundle-version="4.0.0" Export-Package: eu.esdihumboldt.hale.common.align.merge.test, eu.esdihumboldt.hale.common.align.merge.test.impl @@ -28,6 +28,6 @@ Import-Package: com.google.common.cache;version="17.0.0", eu.esdihumboldt.hale.common.instance.model, eu.esdihumboldt.hale.common.schema.model, javax.annotation;version="[1.2.0,1.2.0]", - org.geotools.filter.text.cql2;version="21.0.0.combined", + org.geotools.filter.text.cql2;version="29.1.0.combined", org.slf4j;version="1.7.12" Automatic-Module-Name: eu.esdihumboldt.hale.common.align.merge.test 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 6b21e08698..73db0ee349 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,14 +9,14 @@ 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.geotools.filter.text.cql2;version="21.0.0.combined" + org.geotools.filter.text.cql2;version="29.1.0.combined" Require-Bundle: eu.esdihumboldt.hale.common.align;bundle-version="2.5.0", eu.esdihumboldt.hale.common.core;bundle-version="2.5.0", eu.esdihumboldt.hale.common.instance;bundle-version="2.5.0", eu.esdihumboldt.hale.common.schema;bundle-version="2.5.0", eu.esdihumboldt.hale.common.schema.groovy;bundle-version="3.3.0", groovy;bundle-version="2.5.19", - org.junit;bundle-version="4.12.0", + org.junit;bundle-version="4.13.0", jakarta.xml.bind-api;bundle-version="4.0.0", org.codehaus.castor.core;bundle-version="1.4.1", org.codehaus.castor.xml;bundle-version="1.4.1" diff --git a/common/plugins/eu.esdihumboldt.hale.common.cache/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.cache/META-INF/MANIFEST.MF index 06bc85fea3..a5f47b15eb 100644 --- a/common/plugins/eu.esdihumboldt.hale.common.cache/META-INF/MANIFEST.MF +++ b/common/plugins/eu.esdihumboldt.hale.common.cache/META-INF/MANIFEST.MF @@ -20,8 +20,8 @@ Import-Package: com.google.common.io;version="9.0.0", org.apache.log4j, org.osgi.framework, org.slf4j;version="1.5.11" -Require-Bundle: org.apache.httpcomponents.httpclient;bundle-version="4.3.3", - org.apache.httpcomponents.httpcore;bundle-version="4.3.2", +Require-Bundle: org.apache.httpcomponents.httpclient;bundle-version="4.5.13", + org.apache.httpcomponents.httpcore;bundle-version="4.4.13", org.eclipse.core.runtime;bundle-version="3.7.0", groovy;bundle-version="2.5.19" Bundle-ActivationPolicy: lazy 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 a548b81398..d068af381c 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 @@ -74,8 +74,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0", org.codehaus.castor.xml;bundle-version="1.4.1", org.codehaus.castor.core;bundle-version="1.4.1", xerces.xercesImpl;bundle-version="2.12.2", - tec.uom.se;bundle-version="1.0.8", - si.uom.si-quantity;bundle-version="0.7.1", jakarta.xml.bind-api;bundle-version="4.0.0" Bundle-Vendor: data harmonisation panel Automatic-Module-Name: eu.esdihumboldt.hale.common.core diff --git a/common/plugins/eu.esdihumboldt.hale.common.filter.test/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.filter.test/META-INF/MANIFEST.MF index 5ea202a737..6c2147b2a8 100644 --- a/common/plugins/eu.esdihumboldt.hale.common.filter.test/META-INF/MANIFEST.MF +++ b/common/plugins/eu.esdihumboldt.hale.common.filter.test/META-INF/MANIFEST.MF @@ -42,8 +42,8 @@ Require-Bundle: eu.esdihumboldt.hale.common.filter;bundle-version="2.5.0", eu.esdihumboldt.hale.common.instance.groovy;bundle-version="3.3.0", eu.esdihumboldt.hale.common.schema.groovy;bundle-version="3.3.0", groovy;bundle-version="2.5.19", - org.opengis;bundle-version="12.2.0", - org.geotools;bundle-version="21.0.0", + org.opengis;bundle-version="29.1.0", + org.geotools;bundle-version="29.1.0", org.junit;bundle-version="4.13.0" Bundle-Vendor: data harmonisation panel Automatic-Module-Name: eu.esdihumboldt.hale.common.filter.test diff --git a/common/plugins/eu.esdihumboldt.hale.common.filter.test/src/eu/esdihumboldt/hale/common/filter/CQLFilterTest.groovy b/common/plugins/eu.esdihumboldt.hale.common.filter.test/src/eu/esdihumboldt/hale/common/filter/CQLFilterTest.groovy index 4957d41ddb..ee07397854 100644 --- a/common/plugins/eu.esdihumboldt.hale.common.filter.test/src/eu/esdihumboldt/hale/common/filter/CQLFilterTest.groovy +++ b/common/plugins/eu.esdihumboldt.hale.common.filter.test/src/eu/esdihumboldt/hale/common/filter/CQLFilterTest.groovy @@ -417,5 +417,4 @@ class CQLFilterTest extends AbstractFilterTest { assertTrue(filter("moreDates TEQUALS 2000-12-24T12:00:00Z").match(max)) assertFalse(filter("moreDates TEQUALS 2016-12-01T12:00:00Z").match(max)) } - } diff --git a/common/plugins/eu.esdihumboldt.hale.common.filter/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.filter/META-INF/MANIFEST.MF index 4bafef2626..34a60f2fe5 100644 --- a/common/plugins/eu.esdihumboldt.hale.common.filter/META-INF/MANIFEST.MF +++ b/common/plugins/eu.esdihumboldt.hale.common.filter/META-INF/MANIFEST.MF @@ -21,8 +21,8 @@ Import-Package: de.fhg.igd.slf4jplus, Bundle-ClassPath: . Export-Package: eu.esdihumboldt.hale.common.filter, eu.esdihumboldt.hale.common.filter.definition -Require-Bundle: org.opengis;bundle-version="8.0.0", +Require-Bundle: org.opengis;bundle-version="29.1.0", eu.esdihumboldt.util.groovy, - org.geotools;bundle-version="21.0.0" + org.geotools;bundle-version="29.1.0" Bundle-Vendor: data harmonisation panel Automatic-Module-Name: eu.esdihumboldt.hale.common.filter diff --git a/common/plugins/eu.esdihumboldt.hale.common.headless.test/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.headless.test/META-INF/MANIFEST.MF index d9c5c8f9da..7dff96db8a 100644 --- a/common/plugins/eu.esdihumboldt.hale.common.headless.test/META-INF/MANIFEST.MF +++ b/common/plugins/eu.esdihumboldt.hale.common.headless.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: eu.esdihumboldt.hale.common.headless.test Bundle-Version: 5.1.0.qualifier Bundle-Vendor: wetransform GmbH Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.junit;bundle-version="4.12.0", +Require-Bundle: org.junit;bundle-version="4.13.0", eu.esdihumboldt.hale.common.headless;bundle-version="3.4.0", eu.esdihumboldt.hale.common.core;bundle-version="3.4.0" Import-Package: com.google.common.cache, diff --git a/common/plugins/eu.esdihumboldt.hale.common.instance.orient/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.instance.orient/META-INF/MANIFEST.MF index e4740072be..6aa8aabdb9 100644 --- a/common/plugins/eu.esdihumboldt.hale.common.instance.orient/META-INF/MANIFEST.MF +++ b/common/plugins/eu.esdihumboldt.hale.common.instance.orient/META-INF/MANIFEST.MF @@ -24,8 +24,8 @@ Import-Package: com.google.common.base;version="11.0.1", eu.esdihumboldt.util.groovy.collector, gnu.trove, net.jcip.annotations, - org.apache.commons.codec;version="1.3.0", - org.apache.commons.codec.net;version="1.5.0", + org.apache.commons.codec;version="1.13.0", + org.apache.commons.codec.net;version="1.13.0", org.slf4j;version="1.5.11", org.springframework.core.convert;version="5.2.0" Export-Package: eu.esdihumboldt.hale.common.instance.orient, diff --git a/common/plugins/eu.esdihumboldt.hale.common.instance.orient/src/eu/esdihumboldt/hale/common/instance/orient/internal/ExtendedWKBReader.java b/common/plugins/eu.esdihumboldt.hale.common.instance.orient/src/eu/esdihumboldt/hale/common/instance/orient/internal/ExtendedWKBReader.java index ca04fb91d6..ac05bb76fd 100644 --- a/common/plugins/eu.esdihumboldt.hale.common.instance.orient/src/eu/esdihumboldt/hale/common/instance/orient/internal/ExtendedWKBReader.java +++ b/common/plugins/eu.esdihumboldt.hale.common.instance.orient/src/eu/esdihumboldt/hale/common/instance/orient/internal/ExtendedWKBReader.java @@ -96,15 +96,15 @@ private static int hexToInt(char hex) { private static final String INVALID_GEOM_TYPE_MSG = "Invalid geometry type encountered in "; - private GeometryFactory factory; - private CoordinateSequenceFactory csFactory; - private PrecisionModel precisionModel; + private final GeometryFactory factory; + private final CoordinateSequenceFactory csFactory; + private final PrecisionModel precisionModel; // default dimension - will be set on read private int inputDimension = 2; private boolean hasSRID = false; // private int SRID = 0; - private boolean isRepairRings = false; - private ByteOrderDataInStream dis = new ByteOrderDataInStream(); + private final boolean isRepairRings = false; + private final ByteOrderDataInStream dis = new ByteOrderDataInStream(); private double[] ordValues; /** @@ -228,25 +228,25 @@ private Geometry setSRID(Geometry g, int SRID) { return g; } - private Point readPoint() throws IOException { + private Point readPoint() throws IOException, ParseException { CoordinateSequence pts = readCoordinateSequence(1); return factory.createPoint(pts); } - private LineString readLineString() throws IOException { + private LineString readLineString() throws IOException, ParseException { int size = dis.readInt(); CoordinateSequence pts = readCoordinateSequence(size); return factory.createLineString(pts); } - private LinearRing readLinearRing() throws IOException { + private LinearRing readLinearRing() throws IOException, ParseException { int size = dis.readInt(); CoordinateSequence pts = readCoordinateSequenceRing(size); return factory.createLinearRing(pts); } @SuppressWarnings("null") - private Polygon readPolygon() throws IOException { + private Polygon readPolygon() throws IOException, ParseException { int numRings = dis.readInt(); LinearRing[] holes = null; if (numRings > 1) @@ -304,7 +304,7 @@ private GeometryCollection readGeometryCollection() throws IOException, ParseExc return factory.createGeometryCollection(geoms); } - private CoordinateSequence readCoordinateSequence(int size) throws IOException { + private CoordinateSequence readCoordinateSequence(int size) throws IOException, ParseException { CoordinateSequence seq = csFactory.create(size, inputDimension); int targetDim = seq.getDimension(); if (targetDim > inputDimension) @@ -318,7 +318,8 @@ private CoordinateSequence readCoordinateSequence(int size) throws IOException { return seq; } - private CoordinateSequence readCoordinateSequenceRing(int size) throws IOException { + private CoordinateSequence readCoordinateSequenceRing(int size) + throws IOException, ParseException { CoordinateSequence seq = readCoordinateSequence(size); if (!isRepairRings) return seq; @@ -333,7 +334,7 @@ private CoordinateSequence readCoordinateSequenceRing(int size) throws IOExcepti * * @throws IOException if an error occurs reading the coordinate */ - private void readCoordinate() throws IOException { + private void readCoordinate() throws IOException, ParseException { for (int i = 0; i < inputDimension; i++) { if (i <= 1) { ordValues[i] = precisionModel.makePrecise(dis.readDouble()); diff --git a/common/plugins/eu.esdihumboldt.hale.common.instance.test/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.instance.test/META-INF/MANIFEST.MF index 00df64d27e..e9824af38b 100644 --- a/common/plugins/eu.esdihumboldt.hale.common.instance.test/META-INF/MANIFEST.MF +++ b/common/plugins/eu.esdihumboldt.hale.common.instance.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: eu.esdihumboldt.hale.instance.test Bundle-Version: 5.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: eu.esdihumboldt.hale.common.instance;bundle-version="2.5.0", - org.geotools;bundle-version="21.0.0", + org.geotools;bundle-version="29.1.0", eu.esdihumboldt.hale.common.convert;bundle-version="2.5.0", org.springframework.spring-core;bundle-version="5.2.0", org.junit;bundle-version="4.13.0" @@ -32,7 +32,7 @@ Import-Package: de.fhg.igd.osgi.util;version="1.0.0", eu.esdihumboldt.hale.io.xsd.constraint, eu.esdihumboldt.hale.io.xsd.model, eu.esdihumboldt.hale.io.xsd.reader, - org.opengis.referencing;version="12.2.0", - org.opengis.referencing.crs;version="12.2.0" + org.opengis.referencing;version="29.1.0", + org.opengis.referencing.crs;version="29.1.0" Bundle-Vendor: data harmonisation panel Automatic-Module-Name: eu.esdihumboldt.hale.instance.test diff --git a/common/plugins/eu.esdihumboldt.hale.common.instance/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.instance/META-INF/MANIFEST.MF index 4ca4bfa6e6..9da5676aea 100644 --- a/common/plugins/eu.esdihumboldt.hale.common.instance/META-INF/MANIFEST.MF +++ b/common/plugins/eu.esdihumboldt.hale.common.instance/META-INF/MANIFEST.MF @@ -38,12 +38,12 @@ Import-Package: com.google.common.base;version="1.6.0", eu.esdihumboldt.util.geometry.interpolation.split, eu.esdihumboldt.util.groovy.collector, net.jcip.annotations, - org.apache.commons.codec;version="1.3.0", - org.apache.commons.codec.net;version="1.3.0", - org.geotools.feature;version="21.0.0.combined", - org.geotools.geometry.jts;version="21.0.0.combined", - org.geotools.gml2;version="21.0.0.combined", - org.geotools.referencing;version="21.0.0.combined", + org.apache.commons.codec;version="1.13.0", + org.apache.commons.codec.net;version="1.13.0", + org.geotools.feature;version="29.1.0.combined", + org.geotools.geometry.jts;version="29.1.0.combined", + org.geotools.gml2;version="29.1.0.combined", + org.geotools.referencing;version="29.1.0.combined", org.locationtech.jts.algorithm;version="1.13.0", org.locationtech.jts.geom, org.locationtech.jts.io, diff --git a/common/plugins/eu.esdihumboldt.hale.common.propertyaccessor/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.propertyaccessor/META-INF/MANIFEST.MF index c22adcf918..0c3c2ec10a 100644 --- a/common/plugins/eu.esdihumboldt.hale.common.propertyaccessor/META-INF/MANIFEST.MF +++ b/common/plugins/eu.esdihumboldt.hale.common.propertyaccessor/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Instance PropertyAccessor Bundle-SymbolicName: eu.esdihumboldt.hale.common.propertyaccessor Bundle-Version: 5.1.0.qualifier -Fragment-Host: org.geotools;bundle-version="21.0.0" +Fragment-Host: org.geotools;bundle-version="29.1.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: eu.esdihumboldt.hale.common.instance.helper, eu.esdihumboldt.hale.common.instance.model, diff --git a/common/plugins/eu.esdihumboldt.hale.common.referencing.test/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.referencing.test/META-INF/MANIFEST.MF index 62f08202b7..deb5bd5ff8 100644 --- a/common/plugins/eu.esdihumboldt.hale.common.referencing.test/META-INF/MANIFEST.MF +++ b/common/plugins/eu.esdihumboldt.hale.common.referencing.test/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 5.1.0.qualifier Bundle-Vendor: wetransform GmbH Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: groovy;bundle-version="2.5.19", - org.geotools;bundle-version="21.0.0", - org.opengis;bundle-version="12.2.0", + org.geotools;bundle-version="29.1.0", + org.opengis;bundle-version="29.1.0", org.junit;bundle-version="4.12.0" Automatic-Module-Name: eu.esdihumboldt.hale.common.referencing.test diff --git a/common/plugins/eu.esdihumboldt.hale.common.referencing/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.referencing/META-INF/MANIFEST.MF index 7a1eadcfb2..1b968d6a8e 100644 --- a/common/plugins/eu.esdihumboldt.hale.common.referencing/META-INF/MANIFEST.MF +++ b/common/plugins/eu.esdihumboldt.hale.common.referencing/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Extensions to GeoTools Referencing Bundle-SymbolicName: eu.esdihumboldt.hale.common.referencing;singleton:=true Bundle-Version: 5.1.0.qualifier Bundle-Vendor: wetransform GmbH -Fragment-Host: org.geotools;bundle-version="21.0.0" +Fragment-Host: org.geotools;bundle-version="29.1.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.opengis Import-Package: javax.measure;version="1.0.0" diff --git a/common/plugins/eu.esdihumboldt.hale.common.schema/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.schema/META-INF/MANIFEST.MF index 477dfd2616..93bc2c44c5 100644 --- a/common/plugins/eu.esdihumboldt.hale.common.schema/META-INF/MANIFEST.MF +++ b/common/plugins/eu.esdihumboldt.hale.common.schema/META-INF/MANIFEST.MF @@ -26,7 +26,7 @@ Import-Package: com.google.common.base, groovy.xml.dom;version="2.1.5", net.jcip.annotations, org.apache.commons.lang;version="2.6.0", - org.opengis.referencing.crs;version="8.0.0", + org.opengis.referencing.crs;version="29.1.0", org.slf4j;version="1.5.11" Export-Package: eu.esdihumboldt.hale.common.schema, eu.esdihumboldt.hale.common.schema.geometry, diff --git a/common/plugins/eu.esdihumboldt.hale.common.style/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.style/META-INF/MANIFEST.MF index 62c1c6fd0a..c43ce5698c 100644 --- a/common/plugins/eu.esdihumboldt.hale.common.style/META-INF/MANIFEST.MF +++ b/common/plugins/eu.esdihumboldt.hale.common.style/META-INF/MANIFEST.MF @@ -8,9 +8,9 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: eu.esdihumboldt.hale.common.style.io, eu.esdihumboldt.hale.common.style.io.impl Require-Bundle: eu.esdihumboldt.hale.common.core;bundle-version="2.9.3", - org.geotools;bundle-version="21.0.0", + org.geotools;bundle-version="29.1.0", org.eclipse.core.runtime;bundle-version="3.10.0" Import-Package: com.google.common.io;version="17.0.0", eu.esdihumboldt.util.io, - org.opengis.filter;version="12.2.0" + org.opengis.filter;version="29.1.0" Automatic-Module-Name: eu.esdihumboldt.hale.common.style diff --git a/common/plugins/eu.esdihumboldt.hale.common.test/Tests.product b/common/plugins/eu.esdihumboldt.hale.common.test/Tests.product index 94da4530fb..c5febfca95 100644 --- a/common/plugins/eu.esdihumboldt.hale.common.test/Tests.product +++ b/common/plugins/eu.esdihumboldt.hale.common.test/Tests.product @@ -59,6 +59,7 @@ + @@ -128,7 +129,6 @@ - @@ -311,6 +311,7 @@ + @@ -325,11 +326,14 @@ + + + @@ -415,6 +419,7 @@ + @@ -515,7 +520,6 @@ - @@ -548,16 +552,16 @@ + - - - + + + - diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.geometric.test/META-INF/MANIFEST.MF b/cst/plugins/eu.esdihumboldt.cst.functions.geometric.test/META-INF/MANIFEST.MF index c31a9c0896..7ce75eea7c 100644 --- a/cst/plugins/eu.esdihumboldt.cst.functions.geometric.test/META-INF/MANIFEST.MF +++ b/cst/plugins/eu.esdihumboldt.cst.functions.geometric.test/META-INF/MANIFEST.MF @@ -6,7 +6,9 @@ Bundle-Version: 5.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: data harmonisation panel Import-Package: eu.esdihumboldt.cst.test, - eu.esdihumboldt.util.svg.test + eu.esdihumboldt.util.svg.test, + org.geotools.geometry.jts;version="29.1.0.combined", + org.geotools.referencing;version="29.1.0.combined" Require-Bundle: org.locationtech.jts.jts-core;bundle-version="1.13.0", eu.esdihumboldt.hale.common.core;bundle-version="2.9.1", eu.esdihumboldt.hale.common.schema;bundle-version="2.9.2", @@ -16,14 +18,14 @@ Require-Bundle: org.locationtech.jts.jts-core;bundle-version="1.13.0", eu.esdihumboldt.hale.io.xsd;bundle-version="2.9.2", eu.esdihumboldt.hale.common.align;bundle-version="2.9.2", eu.esdihumboldt.cst;bundle-version="2.9.0", - org.opengis;bundle-version="12.2.0", + org.opengis;bundle-version="29.1.0", eu.esdihumboldt.hale.common.schema.groovy;bundle-version="3.3.0", eu.esdihumboldt.cst.functions.geometric;bundle-version="3.3.0", groovy;bundle-version="2.5.19", - org.junit;bundle-version="4.12.0", - org.geotools;bundle-version="21.0.0", + org.junit;bundle-version="4.13.0", com.sun.xml.bind.jaxb-impl;bundle-version="4.0.1", org.codehaus.castor.core;bundle-version="1.4.1", org.codehaus.castor.xml;bundle-version="1.4.1", - xerces.xercesImpl;bundle-version="2.12.2" + xerces.xercesImpl;bundle-version="2.12.2", + javax.measure.unit-api;bundle-version="2.1.3" Automatic-Module-Name: eu.esdihumboldt.cst.functions.geometric.test diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.geometric/META-INF/MANIFEST.MF b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/META-INF/MANIFEST.MF index 27f1cc8941..b6d809a697 100644 --- a/cst/plugins/eu.esdihumboldt.cst.functions.geometric/META-INF/MANIFEST.MF +++ b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: eu.esdihumboldt.hale.common.align;bundle-version="2.5.0", groovy;bundle-version="2.5.19", eu.esdihumboldt.hale.common.instance;bundle-version="3.3.0", eu.esdihumboldt.hale.common.schema, - org.geotools;bundle-version="21.0.0" + org.geotools;bundle-version="29.1.0" Import-Package: com.google.common.base;version="17.0.0", com.google.common.collect;version="9.0.0", com.iabcinc.jmep, diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.inspire/META-INF/MANIFEST.MF b/cst/plugins/eu.esdihumboldt.cst.functions.inspire/META-INF/MANIFEST.MF index 71323df6a9..5f2e63a7a7 100644 --- a/cst/plugins/eu.esdihumboldt.cst.functions.inspire/META-INF/MANIFEST.MF +++ b/cst/plugins/eu.esdihumboldt.cst.functions.inspire/META-INF/MANIFEST.MF @@ -20,7 +20,6 @@ Import-Package: com.google.common.base;version="9.0.0", eu.esdihumboldt.hale.common.schema.model.constraint, eu.esdihumboldt.util, net.jcip.annotations, - org.apache.commons.codec.binary;version="1.5.0", org.springframework.core.convert;version="5.2.0" Export-Package: eu.esdihumboldt.cst.functions.inspire, eu.esdihumboldt.cst.functions.inspire.data diff --git a/cst/plugins/eu.esdihumboldt.hale.common.instance.index.test/META-INF/MANIFEST.MF b/cst/plugins/eu.esdihumboldt.hale.common.instance.index.test/META-INF/MANIFEST.MF index a8e9238347..918b8685c9 100644 --- a/cst/plugins/eu.esdihumboldt.hale.common.instance.index.test/META-INF/MANIFEST.MF +++ b/cst/plugins/eu.esdihumboldt.hale.common.instance.index.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: eu.esdihumboldt.hale.common.instance.index.test Bundle-Version: 5.1.0.qualifier Bundle-Vendor: wetransform GmbH Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.junit;bundle-version="4.12.0", +Require-Bundle: org.junit;bundle-version="4.13.0", eu.esdihumboldt.hale.common.instance.index, eu.esdihumboldt.hale.common.schema, eu.esdihumboldt.hale.common.align, diff --git a/doc/plugins/eu.esdihumboldt.cst.doc.functions.dynamic/META-INF/MANIFEST.MF b/doc/plugins/eu.esdihumboldt.cst.doc.functions.dynamic/META-INF/MANIFEST.MF index b615ffa465..e65d9db757 100644 --- a/doc/plugins/eu.esdihumboldt.cst.doc.functions.dynamic/META-INF/MANIFEST.MF +++ b/doc/plugins/eu.esdihumboldt.cst.doc.functions.dynamic/META-INF/MANIFEST.MF @@ -29,8 +29,8 @@ Import-Package: com.google.common.base;version="9.0.0", eu.esdihumboldt.hale.ui.util;resolution:=optional, eu.esdihumboldt.hale.ui.util.graph;resolution:=optional, eu.esdihumboldt.util.xml, - org.apache.commons.codec;version="1.3.0", - org.apache.commons.codec.net;version="1.6.0", + org.apache.commons.codec;version="1.13.0", + org.apache.commons.codec.net;version="1.13.0", org.apache.commons.io;version="1.4.0", org.apache.commons.lang;version="2.6.0", org.apache.velocity;version="1.6.2", diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.application/Infocenter.product b/doc/plugins/eu.esdihumboldt.hale.doc.application/Infocenter.product index 4404c50c49..7ceb1ad2ef 100644 --- a/doc/plugins/eu.esdihumboldt.hale.doc.application/Infocenter.product +++ b/doc/plugins/eu.esdihumboldt.hale.doc.application/Infocenter.product @@ -75,7 +75,6 @@ - @@ -274,7 +273,6 @@ - @@ -290,14 +288,9 @@ - - - - - diff --git a/ext/adv/eu.esdihumboldt.hale.adv.merge.test/META-INF/MANIFEST.MF b/ext/adv/eu.esdihumboldt.hale.adv.merge.test/META-INF/MANIFEST.MF index a3e2864ebd..98d6030b6a 100644 --- a/ext/adv/eu.esdihumboldt.hale.adv.merge.test/META-INF/MANIFEST.MF +++ b/ext/adv/eu.esdihumboldt.hale.adv.merge.test/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: eu.esdihumboldt.hale.adv.merge;bundle-version="3.3.2", eu.esdihumboldt.hale.common.align;bundle-version="3.3.2", groovy;bundle-version="2.5.19", eu.esdihumboldt.hale.common.headless;bundle-version="3.3.2", - org.junit;bundle-version="4.12.0", + org.junit;bundle-version="4.13.0", eu.esdihumboldt.hale.common.core;bundle-version="4.2.0", eu.esdihumboldt.hale.common.instance;bundle-version="4.2.0" Import-Package: com.google.common.cache;version="17.0.0", diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/META-INF/MANIFEST.MF b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/META-INF/MANIFEST.MF index 0f10226419..c0605813bf 100644 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/META-INF/MANIFEST.MF +++ b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Import-Package: de.fhg.igd.eclipse.ui.util.extension, edu.umd.cs.findbugs.annotations, eu.esdihumboldt.util.http, org.apache.commons.logging, - org.geotools.referencing;version="21.0.0.combined", + org.geotools.referencing;version="29.1.0.combined", org.jdesktop.swingx.graphics, org.jdesktop.swingx.mapviewer;version="1.0.0", org.jdesktop.swingx.mapviewer.empty;version="1.0.0", diff --git a/ext/styledmap/de.fhg.igd.mapviewer/META-INF/MANIFEST.MF b/ext/styledmap/de.fhg.igd.mapviewer/META-INF/MANIFEST.MF index e9b6f81fd4..1e22c89c9f 100644 --- a/ext/styledmap/de.fhg.igd.mapviewer/META-INF/MANIFEST.MF +++ b/ext/styledmap/de.fhg.igd.mapviewer/META-INF/MANIFEST.MF @@ -24,7 +24,7 @@ Import-Package: com.google.common.base, de.fhg.igd.swingrcp;version="1.0.0", edu.umd.cs.findbugs.annotations, gnu.trove, - javax.measure;version="1.0.0", + javax.measure, javax.measure.quantity, org.apache.commons.beanutils;version="1.7.0", org.apache.commons.io;version="1.4.0", @@ -33,8 +33,8 @@ Import-Package: com.google.common.base, org.eclipse.core.runtime;version="3.4.0", org.eclipse.jface.action, org.eclipse.swt.widgets, - org.geotools.referencing;version="21.0.0.combined", - org.geotools.referencing.crs;version="21.0.0.combined", + org.geotools.referencing;version="29.1.0.combined", + org.geotools.referencing.crs;version="29.1.0.combined", org.jdesktop.swingx.graphics, org.jdesktop.swingx.mapviewer;version="1.0.0", org.jdesktop.swingx.mapviewer.empty;version="1.0.0", diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/META-INF/MANIFEST.MF b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/META-INF/MANIFEST.MF index 9992efa528..723b03536b 100644 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/META-INF/MANIFEST.MF +++ b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/META-INF/MANIFEST.MF @@ -52,31 +52,31 @@ Import-Package: de.fhg.igd.eclipse.ui.util.extension, eu.esdihumboldt.hale.ui.views.data, gnu.trove, org.apache.commons.logging, - org.geotools.geometry;version="21.0.0.combined", - org.geotools.geometry.jts;version="21.0.0.combined", - org.geotools.referencing;version="21.0.0.combined", - org.geotools.renderer.lite;version="21.0.0.combined", - org.geotools.renderer.style;version="21.0.0.combined", - org.geotools.styling;version="21.0.0.combined", - org.geotools.util;version="21.0.0.combined", + org.geotools.geometry;version="29.1.0.combined", + org.geotools.geometry.jts;version="29.1.0.combined", + org.geotools.referencing;version="29.1.0.combined", + org.geotools.renderer.lite;version="29.1.0.combined", + org.geotools.renderer.style;version="29.1.0.combined", + org.geotools.styling;version="29.1.0.combined", + org.geotools.util;version="29.1.0.combined", org.jdesktop.beans, org.jdesktop.swingx.image, org.jdesktop.swingx.mapviewer;version="1.0.0", org.jdesktop.swingx.painter, org.locationtech.jts.geom, - org.opengis.feature;version="8.0.0", - org.opengis.feature.simple;version="8.0.0", - org.opengis.feature.type;version="8.0.0", - org.opengis.filter;version="8.0.0", - org.opengis.filter.identity;version="8.0.0", - org.opengis.geometry;version="8.0.0", - org.opengis.metadata;version="8.0.0", - org.opengis.referencing;version="8.0.0", - org.opengis.referencing.crs;version="8.0.0", - org.opengis.referencing.cs;version="8.0.0", - org.opengis.referencing.operation;version="8.0.0", - org.opengis.style;version="8.0.0", - org.opengis.util;version="8.0.0", + org.opengis.feature;version="29.1.0", + org.opengis.feature.simple;version="29.1.0", + org.opengis.feature.type;version="29.1.0", + org.opengis.filter;version="29.1.0", + org.opengis.filter.identity;version="29.1.0", + org.opengis.geometry;version="29.1.0", + org.opengis.metadata;version="29.1.0", + org.opengis.referencing;version="29.1.0", + org.opengis.referencing.crs;version="29.1.0", + org.opengis.referencing.cs;version="29.1.0", + org.opengis.referencing.operation;version="29.1.0", + org.opengis.style;version="29.1.0", + org.opengis.util;version="29.1.0", org.slf4j;version="1.5.11", org.springframework.core.convert;version="5.2.0" Export-Package: eu.esdihumboldt.hale.ui.views.styledmap, diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/META-INF/MANIFEST.MF b/ext/styledmap/org.jdesktop.swingx.mapviewer/META-INF/MANIFEST.MF index e41cd427bb..7775838b17 100644 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/META-INF/MANIFEST.MF +++ b/ext/styledmap/org.jdesktop.swingx.mapviewer/META-INF/MANIFEST.MF @@ -27,8 +27,8 @@ Import-Package: com.google.common.cache;version="27.0.0", org.apache.http.client, org.apache.http.client.methods, org.apache.http.impl.client, - org.geotools.geometry;version="21.0.0.combined", - org.geotools.referencing;version="21.0.0.combined", + org.geotools.geometry;version="29.1.0.combined", + org.geotools.referencing;version="29.1.0.combined", org.opengis.geometry, org.opengis.referencing, org.opengis.referencing.crs, diff --git a/io/plugins/eu.esdihumboldt.hale.io.csv/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.csv/META-INF/MANIFEST.MF index 29929a6fd4..7303cfdfce 100644 --- a/io/plugins/eu.esdihumboldt.hale.io.csv/META-INF/MANIFEST.MF +++ b/io/plugins/eu.esdihumboldt.hale.io.csv/META-INF/MANIFEST.MF @@ -42,7 +42,7 @@ Import-Package: au.com.bytecode.opencsv;version="2.3.0", net.jcip.annotations, org.apache.commons.io;version="2.4.0", org.eclipse.osgi.util;version="1.1.0", - org.geotools.data;version="21.0.0.combined", + org.geotools.data;version="29.1.0.combined", org.locationtech.jts.geom, org.opengis.feature.simple, org.opengis.feature.type, diff --git a/io/plugins/eu.esdihumboldt.hale.io.geopackage.test/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.geopackage.test/META-INF/MANIFEST.MF index 48df86ff42..a4b282f1af 100644 --- a/io/plugins/eu.esdihumboldt.hale.io.geopackage.test/META-INF/MANIFEST.MF +++ b/io/plugins/eu.esdihumboldt.hale.io.geopackage.test/META-INF/MANIFEST.MF @@ -12,14 +12,14 @@ Require-Bundle: eu.esdihumboldt.hale.io.geopackage;bundle-version="4.0.0", eu.esdihumboldt.hale.common.instance;bundle-version="4.0.0", eu.esdihumboldt.hale.common.schema.persist;bundle-version="4.0.0", groovy;bundle-version="2.5.19", - org.junit;bundle-version="4.12.0", + org.junit;bundle-version="4.13.0", org.eclipse.core.runtime;bundle-version="3.14.0", eu.esdihumboldt.hale.common.schema.groovy;bundle-version="4.0.0", eu.esdihumboldt.hale.common.instance.groovy;bundle-version="4.0.0", mil.nga.sf;bundle-version="2.0.2", eu.esdihumboldt.cst.functions.geometric;bundle-version="4.0.0", eu.esdihumboldt.util;bundle-version="4.0.0", - org.opengis;bundle-version="12.2.0", + org.opengis;bundle-version="29.1.0", eu.esdihumboldt.hale.common.test;bundle-version="4.2.0", eu.esdihumboldt.hale.common.align;bundle-version="4.2.0", assertj-core;bundle-version="3.22.0" diff --git a/io/plugins/eu.esdihumboldt.hale.io.geopackage/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.geopackage/META-INF/MANIFEST.MF index 1876e5e56e..65546ba2d1 100644 --- a/io/plugins/eu.esdihumboldt.hale.io.geopackage/META-INF/MANIFEST.MF +++ b/io/plugins/eu.esdihumboldt.hale.io.geopackage/META-INF/MANIFEST.MF @@ -26,15 +26,15 @@ Import-Package: com.google.common.cache;version="18.0.0", eu.esdihumboldt.hale.common.align.model, eu.esdihumboldt.util.io, mil.nga.sf.proj;version="3.0.2", - org.geotools.geometry.jts;version="21.0.0.combined", - org.geotools.referencing;version="21.0.0.combined", + org.geotools.geometry.jts;version="29.1.0.combined", + org.geotools.referencing;version="29.1.0.combined", org.locationtech.jts.awt;version="1.13.0", org.locationtech.jts.geom;version="1.13.0", org.locationtech.jts.io;version="1.13.0", - org.opengis.metadata;version="12.2.0", - org.opengis.referencing;version="12.2.0", - org.opengis.referencing.crs;version="12.2.0", - org.opengis.referencing.operation;version="12.2.0", - org.opengis.util;version="12.2.0", + org.opengis.metadata;version="29.1.0", + org.opengis.referencing;version="29.1.0", + org.opengis.referencing.crs;version="29.1.0", + org.opengis.referencing.operation;version="29.1.0", + org.opengis.util;version="29.1.0", org.slf4j;version="1.7.2" Export-Package: eu.esdihumboldt.hale.io.geopackage diff --git a/io/plugins/eu.esdihumboldt.hale.io.gml.geometry/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.gml.geometry/META-INF/MANIFEST.MF index 4026aa16d8..2aa2115255 100644 --- a/io/plugins/eu.esdihumboldt.hale.io.gml.geometry/META-INF/MANIFEST.MF +++ b/io/plugins/eu.esdihumboldt.hale.io.gml.geometry/META-INF/MANIFEST.MF @@ -27,9 +27,9 @@ Import-Package: com.google.common.base;version="9.0.0", eu.esdihumboldt.util.geometry.interpolation.model.impl, eu.esdihumboldt.util.reflection, javax.annotation;version="[1.2.0,1.2.0]", - org.geotools.gml2;version="21.0.0.combined", + org.geotools.gml2;version="29.1.0.combined", org.locationtech.jts.geom, - org.opengis.referencing.crs;version="8.0.0", + org.opengis.referencing.crs;version="29.1.0", org.slf4j;version="1.5.11", org.springframework.core.convert;version="5.2.0" Export-Package: eu.esdihumboldt.hale.io.gml.geometry, diff --git a/io/plugins/eu.esdihumboldt.hale.io.gml.test/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.gml.test/META-INF/MANIFEST.MF index c1585bc34a..1cf3c27521 100644 --- a/io/plugins/eu.esdihumboldt.hale.io.gml.test/META-INF/MANIFEST.MF +++ b/io/plugins/eu.esdihumboldt.hale.io.gml.test/META-INF/MANIFEST.MF @@ -41,11 +41,11 @@ Import-Package: com.google.common.base;version="9.0.0", org.osgi.framework;version="1.6.0", org.slf4j;version="1.5.11" Require-Bundle: eu.esdihumboldt.hale.io.gml;bundle-version="1.0.0", - org.geotools;bundle-version="21.0.0", + org.geotools;bundle-version="29.1.0", eu.esdihumboldt.hale.common.core;bundle-version="2.2.0", eu.esdihumboldt.hale.io.xml, eu.esdihumboldt.hale.common.convert;bundle-version="2.5.0", - org.opengis;bundle-version="8.0.0", + org.opengis;bundle-version="29.1.0", groovy;bundle-version="2.5.19", eu.esdihumboldt.hale.common.instance.groovy;bundle-version="2.9.5", org.eclipse.core.runtime;bundle-version="3.11.1", diff --git a/io/plugins/eu.esdihumboldt.hale.io.gml.ui/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.gml.ui/META-INF/MANIFEST.MF index d1f0263078..f212aa24b3 100644 --- a/io/plugins/eu.esdihumboldt.hale.io.gml.ui/META-INF/MANIFEST.MF +++ b/io/plugins/eu.esdihumboldt.hale.io.gml.ui/META-INF/MANIFEST.MF @@ -10,8 +10,8 @@ Require-Bundle: eu.esdihumboldt.hale.ui;bundle-version="2.2.0", eu.esdihumboldt.hale.common.core;bundle-version="2.2.0", org.eclipse.ui;bundle-version="3.5.1", org.eclipse.core.runtime;bundle-version="3.5.0", - org.geotools;bundle-version="21.0.0", - org.opengis;bundle-version="8.0.0" + org.geotools;bundle-version="29.1.0", + org.opengis;bundle-version="29.1.0" Import-Package: com.google.common.io;version="1.6.0", org.locationtech.jts, org.locationtech.jts.geom, diff --git a/io/plugins/eu.esdihumboldt.hale.io.gml/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.gml/META-INF/MANIFEST.MF index a86df8a155..39091c660e 100644 --- a/io/plugins/eu.esdihumboldt.hale.io.gml/META-INF/MANIFEST.MF +++ b/io/plugins/eu.esdihumboldt.hale.io.gml/META-INF/MANIFEST.MF @@ -4,11 +4,11 @@ Bundle-Name: GML/XML Instance I/O Bundle-SymbolicName: eu.esdihumboldt.hale.io.gml;singleton:=true Bundle-Version: 5.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.geotools;bundle-version="21.0.0", +Require-Bundle: org.geotools;bundle-version="29.1.0", eu.esdihumboldt.hale.common.core;bundle-version="2.2.0", eu.esdihumboldt.hale.common.convert;bundle-version="2.2.0", org.eclipse.core.contenttype;bundle-version="3.4.100", - org.opengis;bundle-version="8.0.0", + org.opengis;bundle-version="29.1.0", groovy;bundle-version="2.5.19", eu.esdihumboldt.hale.common.instance;bundle-version="3.2.0", eu.esdihumboldt.hale.common.instance.graph;bundle-version="3.3.0", diff --git a/io/plugins/eu.esdihumboldt.hale.io.jdbc.mssql/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.jdbc.mssql/META-INF/MANIFEST.MF index a5de803d6b..68578523ad 100644 --- a/io/plugins/eu.esdihumboldt.hale.io.jdbc.mssql/META-INF/MANIFEST.MF +++ b/io/plugins/eu.esdihumboldt.hale.io.jdbc.mssql/META-INF/MANIFEST.MF @@ -19,13 +19,13 @@ Import-Package: com.google.common.io;version="17.0.0", eu.esdihumboldt.hale.common.schema.persist, eu.esdihumboldt.util.io, microsoft.sql;version="4.2.0", - org.geotools.geometry.jts;version="21.0.0.combined", - org.geotools.referencing;version="21.0.0.combined", + org.geotools.geometry.jts;version="29.1.0.combined", + org.geotools.referencing;version="29.1.0.combined", org.locationtech.jts.geom;version="1.13.0", org.locationtech.jts.io;version="1.13.0", - org.opengis.referencing;version="12.2.0", - org.opengis.referencing.crs;version="12.2.0", - org.opengis.referencing.operation;version="12.2.0", + org.opengis.referencing;version="29.1.0", + org.opengis.referencing.crs;version="29.1.0", + org.opengis.referencing.operation;version="29.1.0", org.osgi.framework;version="1.8.0", org.slf4j;version="1.7.10", schemacrawler.schema;version="12.4.2" diff --git a/io/plugins/eu.esdihumboldt.hale.io.jdbc.postgresql/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.jdbc.postgresql/META-INF/MANIFEST.MF index 608d5b23e9..e94bd52e7e 100644 --- a/io/plugins/eu.esdihumboldt.hale.io.jdbc.postgresql/META-INF/MANIFEST.MF +++ b/io/plugins/eu.esdihumboldt.hale.io.jdbc.postgresql/META-INF/MANIFEST.MF @@ -10,14 +10,14 @@ Import-Package: de.fhg.igd.slf4jplus, eu.esdihumboldt.hale.common.core.report, eu.esdihumboldt.hale.common.instance.geometry, eu.esdihumboldt.hale.common.instance.geometry.impl, - org.geotools.geometry.jts;version="21.0.0.combined", - org.geotools.referencing;version="21.0.0.combined", + org.geotools.geometry.jts;version="29.1.0.combined", + org.geotools.referencing;version="29.1.0.combined", org.locationtech.jts, org.locationtech.jts.geom, - org.opengis.geometry;version="8.0.0", - org.opengis.referencing;version="8.0.0", - org.opengis.referencing.crs;version="8.0.0", - org.opengis.referencing.operation;version="8.0.0", + org.opengis.geometry;version="29.1.0", + org.opengis.referencing;version="29.1.0", + org.opengis.referencing.crs;version="29.1.0", + org.opengis.referencing.operation;version="29.1.0", org.osgi.framework;version="1.3.0", org.postgis, org.postgresql;version="8.3.604", diff --git a/io/plugins/eu.esdihumboldt.hale.io.jdbc.spatialite/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.jdbc.spatialite/META-INF/MANIFEST.MF index 39d9da9715..7a110a6ca9 100644 --- a/io/plugins/eu.esdihumboldt.hale.io.jdbc.spatialite/META-INF/MANIFEST.MF +++ b/io/plugins/eu.esdihumboldt.hale.io.jdbc.spatialite/META-INF/MANIFEST.MF @@ -13,12 +13,12 @@ Import-Package: com.google.common.cache;version="17.0.0", eu.esdihumboldt.hale.common.instance.geometry.impl, eu.esdihumboldt.hale.common.schema.persist, eu.esdihumboldt.util.io, - org.geotools.geometry.jts;version="21.0.0.combined", - org.geotools.referencing;version="21.0.0.combined", + org.geotools.geometry.jts;version="29.1.0.combined", + org.geotools.referencing;version="29.1.0.combined", org.locationtech.jts.geom, org.locationtech.jts.io, - org.opengis.referencing.crs;version="8.0.0", - org.opengis.referencing.operation;version="8.0.0", + org.opengis.referencing.crs;version="29.1.0", + org.opengis.referencing.operation;version="29.1.0", org.osgi.framework;version="1.3.0", org.slf4j;version="1.5.11" Bundle-ActivationPolicy: lazy diff --git a/io/plugins/eu.esdihumboldt.hale.io.jdbc/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.jdbc/META-INF/MANIFEST.MF index 71be166cde..7e680d29a5 100644 --- a/io/plugins/eu.esdihumboldt.hale.io.jdbc/META-INF/MANIFEST.MF +++ b/io/plugins/eu.esdihumboldt.hale.io.jdbc/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Import-Package: com.google.common.base;version="1.0.0", eu.esdihumboldt.hale.common.schema.persist, eu.esdihumboldt.util.groovy.builder, eu.esdihumboldt.util.io, - org.opengis.referencing.crs;version="12.2.0", + org.opengis.referencing.crs;version="29.1.0", org.slf4j;version="1.5.11", org.sqlite;version="3.28.0", org.sqlite.core;version="3.28.0", diff --git a/io/plugins/eu.esdihumboldt.hale.io.json/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.json/META-INF/MANIFEST.MF index 326ba2c3bd..1db930c4e4 100644 --- a/io/plugins/eu.esdihumboldt.hale.io.json/META-INF/MANIFEST.MF +++ b/io/plugins/eu.esdihumboldt.hale.io.json/META-INF/MANIFEST.MF @@ -45,13 +45,13 @@ Import-Package: com.google.common.base;version="1.6.0", eu.esdihumboldt.util.io, eu.esdihumboldt.util.xml, net.jcip.annotations, - org.apache.commons.codec;version="1.3.0", - org.apache.commons.codec.net;version="1.3.0", - org.geotools.feature;version="21.0.0.combined", - org.geotools.geojson.feature;version="21.0.0.combined", - org.geotools.geojson.geom;version="21.0.0.combined", - org.geotools.geometry.jts;version="21.0.0.combined", - org.geotools.referencing;version="21.0.0.combined", + org.apache.commons.codec;version="1.13.0", + org.apache.commons.codec.net;version="1.13.0", + org.geotools.feature;version="29.1.0.combined", + org.geotools.geojson.feature;version="29.1.0.combined", + org.geotools.geojson.geom;version="29.1.0.combined", + org.geotools.geometry.jts;version="29.1.0.combined", + org.geotools.referencing;version="29.1.0.combined", org.locationtech.jts.geom, org.locationtech.jts.io, org.opengis.feature, @@ -59,7 +59,7 @@ Import-Package: com.google.common.base;version="1.6.0", org.opengis.metadata, org.opengis.referencing, org.opengis.referencing.crs, - org.opengis.referencing.operation;version="21.0.0", + org.opengis.referencing.operation;version="29.1.0", org.osgi.framework;version="1.3.0", org.slf4j;version="1.5.11" Export-Package: eu.esdihumboldt.hale.io.json, diff --git a/io/plugins/eu.esdihumboldt.hale.io.oml/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.oml/META-INF/MANIFEST.MF index b9990fb5aa..c3af61283d 100644 --- a/io/plugins/eu.esdihumboldt.hale.io.oml/META-INF/MANIFEST.MF +++ b/io/plugins/eu.esdihumboldt.hale.io.oml/META-INF/MANIFEST.MF @@ -30,7 +30,7 @@ Import-Package: com.google.common.base;version="9.0.0", eu.esdihumboldt.util.io, org.apache.log4j, org.glassfish.jaxb.core.marshaller;version="4.0.1", - org.opengis.feature;version="8.0.0", + org.opengis.feature;version="29.1.0", org.slf4j;version="1.5.11" Require-Bundle: org.eclipse.core.contenttype;bundle-version="3.4.100", eu.esdihumboldt.hale.common.core, diff --git a/io/plugins/eu.esdihumboldt.hale.io.shp/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.shp/META-INF/MANIFEST.MF index 25509d7174..70998aaf2f 100644 --- a/io/plugins/eu.esdihumboldt.hale.io.shp/META-INF/MANIFEST.MF +++ b/io/plugins/eu.esdihumboldt.hale.io.shp/META-INF/MANIFEST.MF @@ -46,9 +46,9 @@ Import-Package: com.google.common.collect;version="15.0.0", org.locationtech.jts.io;version="1.16.0", org.slf4j;version="1.5.11", org.springframework.core.convert;version="5.2.0" -Require-Bundle: org.geotools;bundle-version="21.0.0", +Require-Bundle: org.geotools;bundle-version="29.1.0", org.eclipse.core.contenttype;bundle-version="3.4.100", - org.opengis;bundle-version="8.0.0", + org.opengis;bundle-version="29.1.0", eu.esdihumboldt.hale.common.convert;bundle-version="4.1.0" Export-Package: eu.esdihumboldt.hale.io.shp, eu.esdihumboldt.hale.io.shp.internal;x-internal:=true, diff --git a/io/plugins/eu.esdihumboldt.hale.io.topojson.test/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.topojson.test/META-INF/MANIFEST.MF index 2f1973e857..8229ecb0ec 100644 --- a/io/plugins/eu.esdihumboldt.hale.io.topojson.test/META-INF/MANIFEST.MF +++ b/io/plugins/eu.esdihumboldt.hale.io.topojson.test/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Require-Bundle: eu.esdihumboldt.hale.io.topojson;bundle-version="4.2.0", org.locationtech.jts.jts-core;bundle-version="1.16.0", eu.esdihumboldt.hale.common.schema.groovy;bundle-version="4.2.0", eu.esdihumboldt.hale.common.instance.groovy;bundle-version="4.2.0", - org.opengis;bundle-version="21.0.0", + org.opengis;bundle-version="29.1.0", org.eclipse.core.runtime;bundle-version="3.17.100", com.fasterxml.jackson.core.jackson-core;bundle-version="2.13.4", com.fasterxml.jackson.core.jackson-databind;bundle-version="2.13.4" diff --git a/io/plugins/eu.esdihumboldt.hale.io.topojson/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.topojson/META-INF/MANIFEST.MF index 52d663a2b9..0e1acd651f 100644 --- a/io/plugins/eu.esdihumboldt.hale.io.topojson/META-INF/MANIFEST.MF +++ b/io/plugins/eu.esdihumboldt.hale.io.topojson/META-INF/MANIFEST.MF @@ -7,12 +7,12 @@ Bundle-Vendor: wetransform GmbH Automatic-Module-Name: eu.esdihumboldt.hale.io.topojson Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: eu.esdihumboldt.hale.io.shp;bundle-version="4.2.0", - com.github.wetransform-os.topojson-j;bundle-version="1.0.0", + com.github.wetransform-os.topojson-j;bundle-version="1.1.0", eu.esdihumboldt.hale.common.instance;bundle-version="4.2.0", eu.esdihumboldt.hale.common.core;bundle-version="4.2.0", eu.esdihumboldt.hale.common.schema;bundle-version="4.2.0", org.eclipse.core.runtime;bundle-version="3.17.100", - org.opengis;bundle-version="21.0.0", + org.opengis;bundle-version="29.1.0", eu.esdihumboldt.util;bundle-version="4.2.0", eu.esdihumboldt.hale.io.json;bundle-version="4.2.0", com.fasterxml.jackson.core.jackson-core;bundle-version="2.13.4", diff --git a/io/plugins/eu.esdihumboldt.hale.io.wfs.ui/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.wfs.ui/META-INF/MANIFEST.MF index 7d2bf46efd..62b63b07ec 100644 --- a/io/plugins/eu.esdihumboldt.hale.io.wfs.ui/META-INF/MANIFEST.MF +++ b/io/plugins/eu.esdihumboldt.hale.io.wfs.ui/META-INF/MANIFEST.MF @@ -11,8 +11,7 @@ Require-Bundle: eu.esdihumboldt.hale.ui, eu.esdihumboldt.hale.io.wfs;bundle-version="2.9.1", groovy;bundle-version="2.5.19", org.eclipse.jface.text;bundle-version="3.9.1", - org.geotools;bundle-version="21.0.0", - org.opengis;bundle-version="12.2.0", + org.opengis;bundle-version="29.1.0", de.fhg.igd.mapviewer;bundle-version="2.9.5", org.jdesktop.swingx;bundle-version="1.0.0", org.jdesktop.swingx.mapviewer;bundle-version="2.9.5", diff --git a/io/plugins/eu.esdihumboldt.hale.io.xsd/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.xsd/META-INF/MANIFEST.MF index 3952ddc0e4..778ce20fe0 100644 --- a/io/plugins/eu.esdihumboldt.hale.io.xsd/META-INF/MANIFEST.MF +++ b/io/plugins/eu.esdihumboldt.hale.io.xsd/META-INF/MANIFEST.MF @@ -47,9 +47,9 @@ Import-Package: com.google.common.base;version="1.6.0", org.apache.ws.commons.schema.resolver, org.apache.ws.commons.schema.utils, org.eclipse.osgi.util, - org.geotools.feature;version="21.0.0.combined", - org.geotools.feature.type;version="21.0.0.combined", - org.geotools.xs;version="21.0.0.combined", + org.geotools.feature;version="29.1.0.combined", + org.geotools.feature.type;version="29.1.0.combined", + org.geotools.xs;version="29.1.0.combined", org.opengis.feature.type, org.opengis.util, org.slf4j;version="1.5.11" diff --git a/platform/hale-platform.target b/platform/hale-platform.target index 76098a5b21..fc38686676 100644 --- a/platform/hale-platform.target +++ b/platform/hale-platform.target @@ -48,8 +48,8 @@ - - + + \ No newline at end of file diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.application/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.application/META-INF/MANIFEST.MF index c5f69375ec..ce78bcf9bd 100644 --- a/ui/plugins/eu.esdihumboldt.hale.ui.application/META-INF/MANIFEST.MF +++ b/ui/plugins/eu.esdihumboldt.hale.ui.application/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0", org.eclipse.ui;bundle-version="3.6.2", org.eclipse.equinox.security;bundle-version="1.0.200", - org.opengis;bundle-version="8.0.0", + org.opengis;bundle-version="29.1.0", eu.esdihumboldt.hale.ui.launchaction;bundle-version="2.5.0", eu.esdihumboldt.hale.common.app;bundle-version="2.5.0" Import-Package: com.google.common.collect;version="15.0.0", @@ -42,7 +42,7 @@ Import-Package: com.google.common.collect;version="15.0.0", org.apache.commons.io, org.apache.commons.lang3;version="3.8.1", org.eclipse.e4.ui.css.swt.theme, - org.geotools.referencing;version="21.0.0.combined", + org.geotools.referencing;version="29.1.0.combined", org.slf4j;version="1.5.11", org.slf4j.bridge Bundle-ActivationPolicy: lazy diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.common/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.common/META-INF/MANIFEST.MF index 61f96114c9..0e5aec9e84 100644 --- a/ui/plugins/eu.esdihumboldt.hale.ui.common/META-INF/MANIFEST.MF +++ b/ui/plugins/eu.esdihumboldt.hale.ui.common/META-INF/MANIFEST.MF @@ -48,19 +48,19 @@ Import-Package: com.google.common.base;version="9.0.0", org.eclipse.help, org.eclipse.jface.text, org.eclipse.jface.text.source, - org.geotools.factory;version="21.0.0.combined", - org.geotools.filter.text.cql2;version="21.0.0.combined", - org.geotools.map.legend;version="21.0.0.combined", - org.geotools.metadata;version="21.0.0.combined", - org.geotools.metadata.iso;version="21.0.0.combined", - org.geotools.metadata.iso.citation;version="21.0.0.combined", - org.geotools.referencing;version="21.0.0.combined", - org.geotools.referencing.factory;version="21.0.0.combined", - org.geotools.styling;version="21.0.0.combined", - org.geotools.util;version="21.0.0.combined", - org.geotools.util.factory;version="21.0.0.combined", + org.geotools.factory;version="29.1.0.combined", + org.geotools.filter.text.cql2;version="29.1.0.combined", + org.geotools.map.legend;version="29.1.0.combined", + org.geotools.metadata;version="29.1.0.combined", + org.geotools.metadata.iso;version="29.1.0.combined", + org.geotools.metadata.iso.citation;version="29.1.0.combined", + org.geotools.referencing;version="29.1.0.combined", + org.geotools.referencing.factory;version="29.1.0.combined", + org.geotools.styling;version="29.1.0.combined", + org.geotools.util;version="29.1.0.combined", + org.geotools.util.factory;version="29.1.0.combined", org.locationtech.jts.geom, - org.opengis.feature.simple;version="12.2.0", + org.opengis.feature.simple;version="29.1.0", org.opengis.feature.type, org.opengis.filter, org.opengis.metadata.citation, diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.filter/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.filter/META-INF/MANIFEST.MF index 217595a5fa..5c482fb43e 100644 --- a/ui/plugins/eu.esdihumboldt.hale.ui.filter/META-INF/MANIFEST.MF +++ b/ui/plugins/eu.esdihumboldt.hale.ui.filter/META-INF/MANIFEST.MF @@ -17,6 +17,7 @@ Import-Package: de.fhg.igd.eclipse.util.extension, eu.esdihumboldt.hale.ui.common, eu.esdihumboldt.hale.ui.common.definition.selector, eu.esdihumboldt.hale.ui.util.selector, + org.geotools.filter.text.cql2;version="29.1.0.combined", org.slf4j;version="1.5.11" Export-Package: eu.esdihumboldt.hale.ui.filter, eu.esdihumboldt.hale.ui.filter.cql, @@ -24,8 +25,7 @@ Export-Package: eu.esdihumboldt.hale.ui.filter, eu.esdihumboldt.hale.ui.filter.internal;x-internal:=true Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0", org.eclipse.ui;bundle-version="3.6.2", - eu.esdihumboldt.hale.common.instance, - org.geotools;bundle-version="21.0.0" + eu.esdihumboldt.hale.common.instance Bundle-Activator: eu.esdihumboldt.hale.ui.filter.internal.FilterUIPlugin Bundle-ActivationPolicy: lazy Automatic-Module-Name: eu.esdihumboldt.hale.ui.filter diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.functions.geometric/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.functions.geometric/META-INF/MANIFEST.MF index 8a78e6a2ee..1c99c1eed9 100644 --- a/ui/plugins/eu.esdihumboldt.hale.ui.functions.geometric/META-INF/MANIFEST.MF +++ b/ui/plugins/eu.esdihumboldt.hale.ui.functions.geometric/META-INF/MANIFEST.MF @@ -12,7 +12,6 @@ Require-Bundle: eu.esdihumboldt.hale.ui, com.google.guava, org.eclipse.ui, org.opengis, - org.geotools;bundle-version="21.0.0", eu.esdihumboldt.hale.common.instance, org.eclipse.core.runtime;bundle-version="3.11.1", de.fhg.igd.slf4jplus;bundle-version="1.2.0", @@ -26,5 +25,6 @@ Import-Package: de.fhg.igd.eclipse.util.extension, eu.esdihumboldt.hale.common.schema.model, eu.esdihumboldt.hale.ui.util.viewer, eu.esdihumboldt.util.definition, + org.geotools.referencing;version="29.1.0.combined", org.slf4j;version="1.7.12" Automatic-Module-Name: eu.esdihumboldt.hale.ui.functions.geometric diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.style/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.style/META-INF/MANIFEST.MF index ceab7af38f..af24a7528b 100644 --- a/ui/plugins/eu.esdihumboldt.hale.ui.style/META-INF/MANIFEST.MF +++ b/ui/plugins/eu.esdihumboldt.hale.ui.style/META-INF/MANIFEST.MF @@ -50,13 +50,13 @@ Import-Package: com.google.common.collect;version="9.0.0", eu.esdihumboldt.util, org.eclipse.jface.text, org.eclipse.jface.text.source, - org.geotools.factory;version="21.0.0.combined", - org.geotools.feature;version="21.0.0.combined", - org.geotools.filter.visitor;version="21.0.0.combined", - org.geotools.map.legend;version="21.0.0.combined", - org.geotools.styling;version="21.0.0.combined", - org.geotools.xml.styling;version="21.0.0.combined", - org.geotools.xml.transform;version="21.0.0.combined", + org.geotools.factory;version="29.1.0.combined", + org.geotools.feature;version="29.1.0.combined", + org.geotools.filter.visitor;version="29.1.0.combined", + org.geotools.map.legend;version="29.1.0.combined", + org.geotools.styling;version="29.1.0.combined", + org.geotools.xml.styling;version="29.1.0.combined", + org.geotools.xml.transform;version="29.1.0.combined", org.locationtech.jts.geom, org.opengis.feature.simple, org.opengis.feature.type, diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.views.data/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.views.data/META-INF/MANIFEST.MF index f4701e7dcd..19a14c333d 100644 --- a/ui/plugins/eu.esdihumboldt.hale.ui.views.data/META-INF/MANIFEST.MF +++ b/ui/plugins/eu.esdihumboldt.hale.ui.views.data/META-INF/MANIFEST.MF @@ -55,8 +55,8 @@ Import-Package: com.google.common.collect;version="9.0.0", eu.esdihumboldt.hale.ui.views.properties, eu.esdihumboldt.util, org.eclipse.ui.internal.views.properties.tabbed, - org.geotools.data.memory;version="21.0.0.combined", - org.geotools.feature;version="21.0.0.combined", + org.geotools.data.memory;version="29.1.0.combined", + org.geotools.feature;version="29.1.0.combined", org.opengis.feature, org.opengis.feature.simple, org.opengis.feature.type, diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.views.properties/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.views.properties/META-INF/MANIFEST.MF index 6a5cbb8235..5546e13ee3 100644 --- a/ui/plugins/eu.esdihumboldt.hale.ui.views.properties/META-INF/MANIFEST.MF +++ b/ui/plugins/eu.esdihumboldt.hale.ui.views.properties/META-INF/MANIFEST.MF @@ -50,7 +50,7 @@ Import-Package: com.google.common.collect;version="11.0.1", org.eclipse.zest.layouts, org.eclipse.zest.layouts.algorithms, org.eclipse.zest.layouts.dataStructures, - org.geotools.filter.text.cql2;version="21.0.0.combined", + org.geotools.filter.text.cql2;version="29.1.0.combined", org.slf4j;version="1.5.11" Export-Package: eu.esdihumboldt.hale.ui.views.properties, eu.esdihumboldt.hale.ui.views.properties.definition, diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.views.schemas/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.views.schemas/META-INF/MANIFEST.MF index a6617c60d9..1b922ab2fc 100644 --- a/ui/plugins/eu.esdihumboldt.hale.ui.views.schemas/META-INF/MANIFEST.MF +++ b/ui/plugins/eu.esdihumboldt.hale.ui.views.schemas/META-INF/MANIFEST.MF @@ -44,8 +44,8 @@ Import-Package: com.google.common.collect;version="9.0.0", eu.esdihumboldt.hale.ui.util.tree, eu.esdihumboldt.hale.ui.util.viewer, eu.esdihumboldt.hale.ui.util.viewer.tree, - org.geotools.feature;version="21.0.0.combined", - org.geotools.styling;version="21.0.0.combined", + org.geotools.feature;version="29.1.0.combined", + org.geotools.styling;version="29.1.0.combined", org.opengis.feature, org.opengis.feature.type, org.slf4j;version="1.5.11" diff --git a/ui/plugins/eu.esdihumboldt.hale.ui/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui/META-INF/MANIFEST.MF index 2158ae5f44..4bea16fe20 100644 --- a/ui/plugins/eu.esdihumboldt.hale.ui/META-INF/MANIFEST.MF +++ b/ui/plugins/eu.esdihumboldt.hale.ui/META-INF/MANIFEST.MF @@ -6,10 +6,9 @@ Bundle-Version: 5.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0", org.eclipse.ui;bundle-version="3.5.1", - org.geotools;bundle-version="21.0.0", org.eclipse.core.expressions;bundle-version="3.4.200", eu.esdihumboldt.hale.common.align, - org.opengis;bundle-version="8.0.0", + org.opengis;bundle-version="29.1.0", eu.esdihumboldt.hale.ui.util, eu.esdihumboldt.hale.common.instance, groovy;bundle-version="2.5.19", @@ -122,9 +121,10 @@ Import-Package: com.google.common.base;version="1.6.0", gnu.trove, javax.annotation;version="[1.2.0,1.2.0]", net.jcip.annotations, - org.apache.commons.codec;version="1.3.0", + org.apache.commons.codec;version="1.13.0", org.apache.commons.collections.buffer, org.apache.commons.io, + org.deegree.cs.coordinatesystems;version="3.4.13", org.eclipse.draw2d, org.eclipse.draw2d.geometry, org.eclipse.help, @@ -134,11 +134,13 @@ Import-Package: com.google.common.base;version="1.6.0", org.eclipse.zest.core.widgets, org.eclipse.zest.layouts, org.eclipse.zest.layouts.algorithms, + org.geotools.gml2;version="29.1.0.combined", + org.geotools.referencing;version="29.1.0.combined", + org.geotools.referencing.datum;version="29.1.0.combined", org.joda.time;version="2.1.0", org.joda.time.base;version="2.1.0", org.locationtech.jts.geom, - org.slf4j;version="1.5.11", - si.uom + org.slf4j;version="1.5.11" Bundle-ActivationPolicy: lazy Bundle-Activator: eu.esdihumboldt.hale.ui.internal.HALEUIPlugin Export-Package: eu.esdihumboldt.hale.ui, diff --git a/util/plugins/eu.esdihumboldt.util.geometry.test/META-INF/MANIFEST.MF b/util/plugins/eu.esdihumboldt.util.geometry.test/META-INF/MANIFEST.MF index fb9ceab254..7008db433d 100644 --- a/util/plugins/eu.esdihumboldt.util.geometry.test/META-INF/MANIFEST.MF +++ b/util/plugins/eu.esdihumboldt.util.geometry.test/META-INF/MANIFEST.MF @@ -8,7 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.google.common.cache;version="17.0.0", eu.esdihumboldt.util.format, eu.esdihumboldt.util.svg.test, - org.geotools.referencing;version="21.0.0.combined", + org.geotools.referencing;version="29.1.0.combined", org.hamcrest.core;version="1.3.0", ru.yandex.qatools.allure.annotations;version="1.5.0" Automatic-Module-Name: eu.esdihumboldt.util.geometry.test diff --git a/util/plugins/eu.esdihumboldt.util.geometry/META-INF/MANIFEST.MF b/util/plugins/eu.esdihumboldt.util.geometry/META-INF/MANIFEST.MF index 8814fbf640..bc2579370c 100644 --- a/util/plugins/eu.esdihumboldt.util.geometry/META-INF/MANIFEST.MF +++ b/util/plugins/eu.esdihumboldt.util.geometry/META-INF/MANIFEST.MF @@ -11,9 +11,9 @@ Import-Package: org.locationtech.jts;version="1.13.0", de.fhg.igd.slf4jplus, eu.esdihumboldt.util, javax.annotation;version="[1.2.0,1.2.0]", - org.opengis.referencing.crs;version="12.2.0", - org.opengis.referencing.cs;version="12.2.0", - org.opengis.util;version="12.2.0", + org.opengis.referencing.crs;version="29.1.0", + org.opengis.referencing.cs;version="29.1.0", + org.opengis.util;version="29.1.0", org.slf4j;version="1.7.2" Export-Package: eu.esdihumboldt.util.geometry, eu.esdihumboldt.util.geometry.interpolation, diff --git a/util/plugins/eu.esdihumboldt.util.groovy.test/META-INF/MANIFEST.MF b/util/plugins/eu.esdihumboldt.util.groovy.test/META-INF/MANIFEST.MF index 37fdb0befd..7aac73c18c 100644 --- a/util/plugins/eu.esdihumboldt.util.groovy.test/META-INF/MANIFEST.MF +++ b/util/plugins/eu.esdihumboldt.util.groovy.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: eu.esdihumboldt.util.groovy.test Bundle-Version: 5.1.0.qualifier Bundle-Vendor: Data Harmonisation Panel Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.junit;bundle-version="4.12.0", +Require-Bundle: org.junit;bundle-version="4.13.0", eu.esdihumboldt.util.groovy;bundle-version="3.4.0", groovy;bundle-version="2.5.19" Automatic-Module-Name: eu.esdihumboldt.util.groovy.test