Revert "gbif/pipelines#993 Use latest artifacts"

This reverts commit 71caeba.
gbif · Dec 18, 2023 · 169bc2d · 169bc2d
1 parent 665a652
commit 169bc2d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -84,20 +84,20 @@
     <spring-cloud-sleuth.version>2.2.8.RELEASE</spring-cloud-sleuth.version>
 
     <!-- GBIF -->
-    <gbif-api.version>1.13.0-SNAPSHOT</gbif-api.version>
+    <gbif-api.version>1.12.11</gbif-api.version>
     <gbif-common.version>0.59</gbif-common.version>
     <gbif-common-mybatis.version>1.3</gbif-common-mybatis.version>
     <gbif-common-ws.version>1.25</gbif-common-ws.version>
     <gbif-directory.version>1.12</gbif-directory.version>
     <gbif-doi.version>2.17</gbif-doi.version>
-    <gbif-download-query-tools.version>1.50.0-SNAPSHOT</gbif-download-query-tools.version>
+    <gbif-download-query-tools.version>1.48</gbif-download-query-tools.version>
     <gbif-httputils.version>0.10</gbif-httputils.version>
     <gbif-metadata-profile.version>2.1</gbif-metadata-profile.version>
     <gbif-metrics.version>1.2</gbif-metrics.version>
     <gbif-parsers.version>0.60</gbif-parsers.version>
     <gbif-postal-service.version>1.8.0</gbif-postal-service.version>
     <xoai.version>4.1.0-gbif-4</xoai.version>
-    <gbif-occurrence.version>0.194.0-SNAPSHOT</gbif-occurrence.version>
+    <gbif-occurrence.version>0.192.10</gbif-occurrence.version>
 
     <!-- Third party -->
     <commons-digester.version>3.2</commons-digester.version>

diff --git a/registry-doi/src/test/java/org/gbif/registry/doi/converter/DownloadTestDataProvider.java b/registry-doi/src/test/java/org/gbif/registry/doi/converter/DownloadTestDataProvider.java
@@ -18,8 +18,8 @@
 import org.gbif.api.model.occurrence.Download;
 import org.gbif.api.model.occurrence.DownloadFormat;
 import org.gbif.api.model.occurrence.PredicateDownloadRequest;
+import org.gbif.api.model.occurrence.predicate.EqualsPredicate;
 import org.gbif.api.model.occurrence.search.OccurrenceSearchParameter;
-import org.gbif.api.model.predicate.EqualsPredicate;
 import org.gbif.api.model.registry.DatasetOccurrenceDownloadUsage;
 
 import java.time.LocalDateTime;

diff --git a/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/OccurrenceDownloadIT.java b/registry-integration-tests/src/test/java/org/gbif/registry/ws/it/OccurrenceDownloadIT.java
@@ -20,7 +20,7 @@
 import org.gbif.api.model.occurrence.DownloadFormat;
 import org.gbif.api.model.occurrence.DownloadType;
 import org.gbif.api.model.occurrence.PredicateDownloadRequest;
-import org.gbif.api.model.predicate.EqualsPredicate;
+import org.gbif.api.model.occurrence.predicate.EqualsPredicate;
 import org.gbif.api.model.occurrence.search.OccurrenceSearchParameter;
 import org.gbif.api.model.registry.CountryOccurrenceDownloadUsage;
 import org.gbif.api.model.registry.Dataset;

diff --git a/...-persistence/src/main/java/org/gbif/registry/persistence/config/MyBatisConfiguration.java b/...-persistence/src/main/java/org/gbif/registry/persistence/config/MyBatisConfiguration.java
@@ -25,7 +25,7 @@
 import org.gbif.api.model.occurrence.Download;
 import org.gbif.api.model.occurrence.DownloadRequest;
 import org.gbif.api.model.occurrence.PredicateDownloadRequest;
-import org.gbif.api.model.predicate.Predicate;
+import org.gbif.api.model.occurrence.predicate.Predicate;
 import org.gbif.api.model.pipelines.PipelineExecution;
 import org.gbif.api.model.pipelines.PipelineProcess;
 import org.gbif.api.model.pipelines.PipelineStep;

diff --git a/...ence/src/main/java/org/gbif/registry/persistence/mapper/handler/PredicateTypeHandler.java b/...ence/src/main/java/org/gbif/registry/persistence/mapper/handler/PredicateTypeHandler.java
@@ -13,7 +13,7 @@
  */
 package org.gbif.registry.persistence.mapper.handler;
 
-import org.gbif.api.model.predicate.Predicate;
+import org.gbif.api.model.occurrence.predicate.Predicate;
 
 import java.sql.CallableStatement;
 import java.sql.PreparedStatement;

diff --git a/...-search/src/main/java/org/gbif/registry/search/dataset/common/EsSearchRequestBuilder.java b/...-search/src/main/java/org/gbif/registry/search/dataset/common/EsSearchRequestBuilder.java
@@ -68,7 +68,7 @@
 
 import com.google.common.annotations.VisibleForTesting;
 
-import static org.gbif.api.util.SearchTypeValidator.isNumericRange;
+import static org.gbif.api.util.SearchTypeValidator.isRange;
 import static org.gbif.registry.search.dataset.indexing.es.EsQueryUtils.LOWER_BOUND_RANGE_PARSER;
 import static org.gbif.registry.search.dataset.indexing.es.EsQueryUtils.RANGE_SEPARATOR;
 import static org.gbif.registry.search.dataset.indexing.es.EsQueryUtils.RANGE_WILDCARD;
@@ -448,7 +448,7 @@ private List<QueryBuilder> buildTermQuery(Collection<String> values, P param, St
     // collect queries for each value
     List<String> parsedValues = new ArrayList<>();
     for (String value : values) {
-      if (isNumericRange(value)) {
+      if (isRange(value)) {
         queries.add(buildRangeQuery(esField, value));
         continue;
       }