diff --git a/arlas-rest/src/main/java/io/arlas/server/rest/explore/ExploreRESTServices.java b/arlas-rest/src/main/java/io/arlas/server/rest/explore/ExploreRESTServices.java
index 45f59bd68..696c42173 100644
--- a/arlas-rest/src/main/java/io/arlas/server/rest/explore/ExploreRESTServices.java
+++ b/arlas-rest/src/main/java/io/arlas/server/rest/explore/ExploreRESTServices.java
@@ -37,10 +37,10 @@
import org.geotools.geojson.geom.GeometryJSON;
import org.geotools.referencing.CRS;
import org.geotools.referencing.crs.DefaultGeographicCRS;
-import org.opengis.feature.simple.SimpleFeature;
-import org.opengis.feature.simple.SimpleFeatureType;
-import org.opengis.referencing.FactoryException;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.geotools.api.feature.simple.SimpleFeature;
+import org.geotools.api.feature.simple.SimpleFeatureType;
+import org.geotools.api.referencing.FactoryException;
+import org.geotools.api.referencing.crs.CoordinateReferenceSystem;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/ogc-common/src/main/java/io/arlas/server/ogc/common/requestfilter/ElasticCapabilities.java b/ogc-common/src/main/java/io/arlas/server/ogc/common/requestfilter/ElasticCapabilities.java
index 2dba1274e..c18434115 100644
--- a/ogc-common/src/main/java/io/arlas/server/ogc/common/requestfilter/ElasticCapabilities.java
+++ b/ogc-common/src/main/java/io/arlas/server/ogc/common/requestfilter/ElasticCapabilities.java
@@ -24,12 +24,12 @@
import org.geotools.filter.capability.TemporalCapabilitiesImpl;
import org.geotools.filter.capability.TemporalOperatorImpl;
import org.geotools.filter.visitor.IsFullySupportedFilterVisitor;
-import org.opengis.filter.*;
-import org.opengis.filter.capability.TemporalCapabilities;
-import org.opengis.filter.capability.TemporalOperators;
-import org.opengis.filter.spatial.BBOX;
-import org.opengis.filter.spatial.Intersects;
-import org.opengis.filter.temporal.*;
+import org.geotools.api.filter.*;
+import org.geotools.api.filter.capability.TemporalCapabilities;
+import org.geotools.api.filter.capability.TemporalOperators;
+import org.geotools.api.filter.spatial.BBOX;
+import org.geotools.api.filter.spatial.Intersects;
+import org.geotools.api.filter.temporal.*;
import java.util.HashMap;
import java.util.Map;
diff --git a/ogc-common/src/main/java/io/arlas/server/ogc/common/requestfilter/ElasticFilter.java b/ogc-common/src/main/java/io/arlas/server/ogc/common/requestfilter/ElasticFilter.java
index 421e277a8..6989f364b 100644
--- a/ogc-common/src/main/java/io/arlas/server/ogc/common/requestfilter/ElasticFilter.java
+++ b/ogc-common/src/main/java/io/arlas/server/ogc/common/requestfilter/ElasticFilter.java
@@ -139,7 +139,7 @@ public static BoolQuery.Builder filter(String constraint, CollectionReferenceDes
FilterToElastic filterToElastic = new FilterToElastic(collectionDescription, service);
try {
InputStream stream = new ByteArrayInputStream(constraint.getBytes(StandardCharsets.UTF_8));
- org.opengis.filter.Filter openGisFilter = (org.opengis.filter.Filter) parser.parse(stream);
+ org.geotools.api.filter.Filter openGisFilter = (org.geotools.api.filter.Filter) parser.parse(stream);
if (ColumnFilterUtil.isValidColumnFilterPresent(columnFilter)) {
ColumnFilterUtil.assertOpenGisFilterAllowed(columnFilter, collectionDescription, OpenGISFieldsExtractor.extract(openGisFilter));
diff --git a/ogc-common/src/main/java/io/arlas/server/ogc/common/requestfilter/FilterToElastic.java b/ogc-common/src/main/java/io/arlas/server/ogc/common/requestfilter/FilterToElastic.java
index 62a432347..cd57b09ad 100644
--- a/ogc-common/src/main/java/io/arlas/server/ogc/common/requestfilter/FilterToElastic.java
+++ b/ogc-common/src/main/java/io/arlas/server/ogc/common/requestfilter/FilterToElastic.java
@@ -54,15 +54,15 @@
import org.locationtech.jts.geom.Geometry;
import org.locationtech.jts.geom.GeometryFactory;
import org.locationtech.jts.geom.LinearRing;
-import org.opengis.feature.simple.SimpleFeatureType;
-import org.opengis.feature.type.AttributeDescriptor;
-import org.opengis.filter.*;
-import org.opengis.filter.expression.*;
-import org.opengis.filter.identity.Identifier;
-import org.opengis.filter.spatial.*;
-import org.opengis.filter.temporal.*;
-import org.opengis.temporal.Instant;
-import org.opengis.temporal.Period;
+import org.geotools.api.feature.simple.SimpleFeatureType;
+import org.geotools.api.feature.type.AttributeDescriptor;
+import org.geotools.api.filter.*;
+import org.geotools.api.filter.expression.*;
+import org.geotools.api.filter.identity.Identifier;
+import org.geotools.api.filter.spatial.*;
+import org.geotools.api.filter.temporal.*;
+import org.geotools.api.temporal.Instant;
+import org.geotools.api.temporal.Period;
import org.slf4j.LoggerFactory;
import java.io.IOException;
@@ -226,7 +226,7 @@ public synchronized final Capabilities getCapabilities() {
}
- // BEGIN IMPLEMENTING org.opengis.filter.FilterVisitor METHODS
+ // BEGIN IMPLEMENTING org.geotools.api.filter.FilterVisitor METHODS
/**
* Writes the FilterBuilder for the ExcludeFilter.
@@ -661,7 +661,7 @@ public Object visit(PropertyIsNull filter, Object extraData) {
Expression expr = filter.getExpression();
- expr.accept((org.opengis.filter.expression.ExpressionVisitor) this, extraData);
+ expr.accept((org.geotools.api.filter.expression.ExpressionVisitor) this, extraData);
queryBuilder = ImmutableMap.of("bool", ImmutableMap.of("must_not", ImmutableMap.of("exists", ImmutableMap.of("field", field))));
@@ -853,7 +853,7 @@ protected Object visitBinaryTemporalOperator(BinaryTemporalOperator filter,
updateDateFormatter(key);
if (temporal.evaluate(null) instanceof Instant) {
Instant instant = (Instant) temporal.evaluate(null);
- filterFactory.literal(instant.getPosition().getDate()).accept((org.opengis.filter.expression.ExpressionVisitor) this, extraData);
+ filterFactory.literal(instant.getPosition().getDate()).accept((org.geotools.api.filter.expression.ExpressionVisitor) this, extraData);
}else{
temporal.accept(this, typeContext);
@@ -918,11 +918,11 @@ protected Object visitBinaryTemporalOperator(BinaryTemporalOperator filter,
}
void visitBegin(Period p, Object extraData) {
- filterFactory.literal(p.getBeginning().getPosition().getDate()).accept((org.opengis.filter.expression.ExpressionVisitor) this, extraData);
+ filterFactory.literal(p.getBeginning().getPosition().getDate()).accept((org.geotools.api.filter.expression.ExpressionVisitor) this, extraData);
}
void visitEnd(Period p, Object extraData) {
- filterFactory.literal(p.getEnding().getPosition().getDate()).accept((org.opengis.filter.expression.ExpressionVisitor) this, extraData);
+ filterFactory.literal(p.getEnding().getPosition().getDate()).accept((org.geotools.api.filter.expression.ExpressionVisitor) this, extraData);
}
/**
@@ -948,10 +948,10 @@ public Object visitNullFilter(Object extraData) {
return extraData;
}
- // END IMPLEMENTING org.opengis.filter.FilterVisitor METHODS
+ // END IMPLEMENTING org.geotools.api.filter.FilterVisitor METHODS
- // START IMPLEMENTING org.opengis.filter.ExpressionVisitor METHODS
+ // START IMPLEMENTING org.geotools.api.filter.ExpressionVisitor METHODS
/**
* Writes the FilterBuilder for the attribute Expression.
@@ -1229,7 +1229,7 @@ public Object visit(Function function, Object extraData) {
throw new UnsupportedOperationException("Function support not implemented");
}
- // END IMPLEMENTING org.opengis.filter.ExpressionVisitor METHODS
+ // END IMPLEMENTING org.geotools.api.filter.ExpressionVisitor METHODS
protected void updateDateFormatter(AttributeDescriptor attType) {
dateFormatter = DEFAULT_DATE_FORMATTER;
diff --git a/ogc-common/src/main/java/io/arlas/server/ogc/common/requestfilter/FilterToElasticHelper.java b/ogc-common/src/main/java/io/arlas/server/ogc/common/requestfilter/FilterToElasticHelper.java
index 97d422773..67077d6ee 100644
--- a/ogc-common/src/main/java/io/arlas/server/ogc/common/requestfilter/FilterToElasticHelper.java
+++ b/ogc-common/src/main/java/io/arlas/server/ogc/common/requestfilter/FilterToElasticHelper.java
@@ -33,10 +33,10 @@
import org.geotools.geometry.jts.JTS;
import org.locationtech.jts.geom.*;
import org.locationtech.spatial4j.shape.SpatialRelation;
-import org.opengis.filter.expression.Expression;
-import org.opengis.filter.expression.Literal;
-import org.opengis.filter.expression.PropertyName;
-import org.opengis.filter.spatial.*;
+import org.geotools.api.filter.expression.Expression;
+import org.geotools.api.filter.expression.Literal;
+import org.geotools.api.filter.expression.PropertyName;
+import org.geotools.api.filter.spatial.*;
import org.slf4j.LoggerFactory;
import java.util.*;
diff --git a/ogc-common/src/main/java/io/arlas/server/ogc/common/utils/OpenGISFieldsExtractor.java b/ogc-common/src/main/java/io/arlas/server/ogc/common/utils/OpenGISFieldsExtractor.java
index 88a856ba6..db45d0385 100644
--- a/ogc-common/src/main/java/io/arlas/server/ogc/common/utils/OpenGISFieldsExtractor.java
+++ b/ogc-common/src/main/java/io/arlas/server/ogc/common/utils/OpenGISFieldsExtractor.java
@@ -23,9 +23,9 @@
import io.arlas.commons.exceptions.InvalidParameterException;
import org.geotools.filter.BinaryLogicAbstract;
import org.geotools.filter.MultiCompareFilterImpl;
-import org.opengis.filter.*;
-import org.opengis.filter.spatial.BinarySpatialOperator;
-import org.opengis.filter.temporal.BinaryTemporalOperator;
+import org.geotools.api.filter.*;
+import org.geotools.api.filter.spatial.BinarySpatialOperator;
+import org.geotools.api.filter.temporal.BinaryTemporalOperator;
import java.util.*;
import java.util.stream.Collectors;
diff --git a/pom.xml b/pom.xml
index 7311626f0..6996534cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
4.13.2
2.2
- 5.3.2
+ 5.4.0
2.1.10
@@ -65,11 +65,11 @@
5.3.6
- 8.11.1
+ 8.12.2
- 29.2
- 3.24.3
+ 30.2
+ 3.25.3
1.14
0.8
1.19.0
@@ -77,8 +77,8 @@
3.19.2
- 1.43.0
- 22.0.5
+ 1.48.1
+ 24.0.1
1.29
1.7.3