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 Jan 17, 2024
1 parent 0acfc9b commit 7070bec
Show file tree
Hide file tree
Showing 62 changed files with 228 additions and 261 deletions.
14 changes: 0 additions & 14 deletions build/bundleArtifactMap.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
100 changes: 43 additions & 57 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 @@ -288,13 +288,6 @@
version="0.0.0"
unpack="false"/>

<plugin
id="commons-httpclient"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="it.geosolutions.imageio-ext.tiff"
download-size="0"
Expand Down Expand Up @@ -338,7 +331,7 @@
unpack="false"/>

<plugin
id="jgridshift"
id="it.geosolutions.jgridshift.core"
download-size="0"
install-size="0"
version="0.0.0"
Expand Down Expand Up @@ -435,13 +428,6 @@
version="0.0.0"
unpack="false"/>

<plugin
id="xpp3.xpp3_min"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="xerces.xercesImpl"
download-size="0"
Expand Down Expand Up @@ -526,13 +512,6 @@
version="0.0.0"
unpack="false"/>

<plugin
id="org.jdom.2"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="javax.annotation.extensions"
download-size="0"
Expand Down Expand Up @@ -752,48 +731,13 @@
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"
download-size="0"
Expand Down Expand Up @@ -1537,4 +1481,46 @@
version="0.0.0"
unpack="false"/>

<plugin
id="com.google.re2j"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

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

<plugin
id="tech.units.indriya"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.apiguardian.api"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

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

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

</feature>
4 changes: 2 additions & 2 deletions 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 @@ -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
Expand All @@ -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
4 changes: 2 additions & 2 deletions 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,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"
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
4 changes: 2 additions & 2 deletions 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 @@ -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
1 change: 0 additions & 1 deletion ...boldt.hale.common.filter.test/src/eu/esdihumboldt/hale/common/filter/CQLFilterTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}

}
4 changes: 2 additions & 2 deletions 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 @@ -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
2 changes: 1 addition & 1 deletion common/plugins/eu.esdihumboldt.hale.common.headless.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.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,
Expand Down
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
12 changes: 6 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,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,
Expand Down
Loading

0 comments on commit 7070bec

Please sign in to comment.