Skip to content

Commit

Permalink
build: hale: GeoTools update
Browse files Browse the repository at this point in the history 
Update hale»studio with GeoTools 29.1

ING-4083
  • Loading branch information
@emanuelaepure10
emanuelaepure10 committed Dec 13, 2023
1 parent 0acfc9b commit 66fddf9
Show file tree
Hide file tree
Showing 54 changed files with 138 additions and 191 deletions.
41 changes: 0 additions & 41 deletions common/features/eu.esdihumboldt.hale.common.feature.core/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -752,47 +752,6 @@
version="0.0.0"
unpack="false"/>

<plugin
id="systems.uom.systems-common-java8"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="tec.uom.se"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="si.uom.si-quantity"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="tec.uom.lib.uom-lib-common"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="si.uom.si-units-java8"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="systems.uom.systems-quantity"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="it.geosolutions.jaiext.scale.jt-scale"
Expand Down
2 changes: 1 addition & 1 deletion common/plugins/eu.esdihumboldt.hale.common.align.merge.test/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion common/plugins/eu.esdihumboldt.hale.common.align.test/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ 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",
Expand Down
4 changes: 2 additions & 2 deletions common/plugins/eu.esdihumboldt.hale.common.cache/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions common/plugins/eu.esdihumboldt.hale.common.core/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion common/plugins/eu.esdihumboldt.hale.common.filter.test/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Require-Bundle: eu.esdihumboldt.hale.common.filter;bundle-version="2.5.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.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
2 changes: 1 addition & 1 deletion common/plugins/eu.esdihumboldt.hale.common.filter/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ Export-Package: eu.esdihumboldt.hale.common.filter,
eu.esdihumboldt.hale.common.filter.definition
Require-Bundle: org.opengis;bundle-version="8.0.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
4 changes: 2 additions & 2 deletions common/plugins/eu.esdihumboldt.hale.common.instance.orient/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
25 changes: 13 additions & 12 deletions ...ce.orient/src/eu/esdihumboldt/hale/common/instance/orient/internal/ExtendedWKBReader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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;
Expand All @@ -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());
Expand Down
6 changes: 3 additions & 3 deletions common/plugins/eu.esdihumboldt.hale.common.instance.test/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
13 changes: 7 additions & 6 deletions common/plugins/eu.esdihumboldt.hale.common.instance/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,13 @@ 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;version="29.1.0.combined",
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,
Expand Down
2 changes: 1 addition & 1 deletion common/plugins/eu.esdihumboldt.hale.common.propertyaccessor/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion common/plugins/eu.esdihumboldt.hale.common.referencing.test/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.geotools;bundle-version="29.1.0",
org.opengis;bundle-version="12.2.0",
org.junit;bundle-version="4.12.0"
Automatic-Module-Name: eu.esdihumboldt.hale.common.referencing.test
2 changes: 1 addition & 1 deletion common/plugins/eu.esdihumboldt.hale.common.referencing/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion common/plugins/eu.esdihumboldt.hale.common.schema/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion common/plugins/eu.esdihumboldt.hale.common.style/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ 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,
Expand Down
6 changes: 0 additions & 6 deletions common/plugins/eu.esdihumboldt.hale.common.test/Tests.product
View file
Original file line number Diff line number Diff line change
Expand Up @@ -548,14 +548,8 @@
<plugin id="ru.yandex.qatools.allure.java-aspects"/>
<plugin id="ru.yandex.qatools.allure.model"/>
<plugin id="ru.yandex.qatools.properties.loader"/>
<plugin id="si.uom.si-quantity"/>
<plugin id="si.uom.si-units-java8"/>
<plugin id="slf4j.api"/>
<plugin id="slf4j.ext"/>
<plugin id="systems.uom.systems-common-java8"/>
<plugin id="systems.uom.systems-quantity"/>
<plugin id="tec.uom.lib.uom-lib-common"/>
<plugin id="tec.uom.se"/>
<plugin id="xerces.xercesImpl"/>
<plugin id="xpp3.xpp3_min"/>
</plugins>
Expand Down
2 changes: 1 addition & 1 deletion cst/plugins/eu.esdihumboldt.cst.functions.geometric.test/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Require-Bundle: org.locationtech.jts.jts-core;bundle-version="1.13.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.geotools;bundle-version="29.1.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",
Expand Down
2 changes: 1 addition & 1 deletion cst/plugins/eu.esdihumboldt.cst.functions.geometric/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion cst/plugins/eu.esdihumboldt.cst.functions.inspire/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions doc/plugins/eu.esdihumboldt.cst.doc.functions.dynamic/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 0 additions & 4 deletions doc/plugins/eu.esdihumboldt.hale.doc.application/Infocenter.product
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,12 +290,8 @@
<plugin id="org.xerial.sqlite-jdbc"/>
<plugin id="oro"/>
<plugin id="picocontainer"/>
<plugin id="si.uom.si-quantity"/>
<plugin id="si.uom.si-units-java8"/>
<plugin id="slf4j.api"/>
<plugin id="slf4j.ext"/>
<plugin id="tec.uom.lib.uom-lib-common"/>
<plugin id="tec.uom.se"/>
<plugin id="xerces.xercesImpl"/>
<plugin id="xpp3.xpp3_min"/>
</plugins>
Expand Down
2 changes: 1 addition & 1 deletion ext/styledmap/de.fhg.igd.mapviewer.server.wms/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions ext/styledmap/de.fhg.igd.mapviewer/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
Loading

0 comments on commit 66fddf9

Please sign in to comment.