build: hale: GeoTools update

Update hale»studio with GeoTools 29.1 ING-4083
kapil-agnihotri · Feb 1, 2024 · bb04e1d · bb04e1d
1 parent 84e981e
commit bb04e1d
Show file tree

Hide file tree

Showing 69 changed files with 418 additions and 403 deletions.
diff --git 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
@@ -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"
@@ -338,7 +331,7 @@
          unpack="false"/>
 
    <plugin
-         id="jgridshift"
+         id="it.geosolutions.jgridshift.core"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -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"
@@ -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"
@@ -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"
@@ -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>
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -42,8 +42,9 @@ 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.junit;bundle-version="4.13.0"
+ org.opengis;bundle-version="29.1.0",
+ org.geotools;bundle-version="29.1.0",
+ org.junit;bundle-version="4.13.0",
+ eu.esdihumboldt.util
 Bundle-Vendor: data harmonisation panel
 Automatic-Module-Name: eu.esdihumboldt.hale.common.filter.test
diff --git a/...boldt.hale.common.filter.test/src/eu/esdihumboldt/hale/common/filter/CQLFilterTest.groovy b/...boldt.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))
 	}
-
 }
-Original file 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))
     	}
     }