Merge pull request #1952 from rodekruis/chore.upgrade-geoserver

chore: upgrade geoserver AB#33134
rodekruis · Jan 29, 2025 · edd66f7 · edd66f7
2 parents d44aea4 + 039250f
commit edd66f7
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 15 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -72,10 +72,10 @@ services:
 
   ibf-geoserver:
     container_name: ibf-geoserver
-    image: kartoza/geoserver:2.19.2
+    image: kartoza/geoserver:2.26.1
     environment:
       - GEOSERVER_ADMIN_PASSWORD=${GEOSERVER_ADMIN_PASSWORD}
-      - JAVA_OPTS="-DALLOW_ENV_PARAMETRIZATION=true"
+      - CATALINA_OPTS="-DALLOW_ENV_PARAMETRIZATION=true"
     ports:
       - 8081:8080
     volumes:

diff --git a/...es/API-service/geoserver-volume/geoserver-layers/postgis_db/buildings_MWI/featuretype.xml b/...es/API-service/geoserver-volume/geoserver-layers/postgis_db/buildings_MWI/featuretype.xml
@@ -38,11 +38,6 @@
           <type>Geometry</type>
           <srid>-1</srid>
         </geometry>
-        <parameter>
-          <name>leadTime</name>
-          <defaultValue>2-hour</defaultValue>
-          <regexpValidator>^[\w\d\s-]+$</regexpValidator>
-        </parameter>
       </virtualTable>
     </entry>
     <entry key="cachingEnabled">false</entry>
@@ -52,6 +47,8 @@
   </store>
   <serviceConfiguration>false</serviceConfiguration>
   <simpleConversionEnabled>false</simpleConversionEnabled>
+  <internationalTitle/>
+  <internationalAbstract/>
   <maxFeatures>0</maxFeatures>
   <numDecimals>0</numDecimals>
   <padWithZeros>false</padWithZeros>

diff --git a/services/API-service/geoserver-volume/geoserver-layers/postgis_db/buildings_MWI/layer.xml b/services/API-service/geoserver-volume/geoserver-layers/postgis_db/buildings_MWI/layer.xml
@@ -13,5 +13,5 @@
     <logoHeight>0</logoHeight>
   </attribution>
   <dateCreated>2023-06-05 08:28:08.247 UTC</dateCreated>
-  <dateModified>2023-07-10 11:49:36.2 UTC</dateModified>
+  <dateModified>2025-01-28 16:09:13.753 UTC</dateModified>
 </layer>
diff --git a/services/API-service/geoserver-volume/geoserver-layers/postgis_db/roads_MWI/featuretype.xml b/services/API-service/geoserver-volume/geoserver-layers/postgis_db/roads_MWI/featuretype.xml
@@ -38,11 +38,6 @@
           <type>Geometry</type>
           <srid>-1</srid>
         </geometry>
-        <parameter>
-          <name>leadTime</name>
-          <defaultValue>2-hour</defaultValue>
-          <regexpValidator>^[\w\d\s-]+$</regexpValidator>
-        </parameter>
       </virtualTable>
     </entry>
     <entry key="cachingEnabled">false</entry>
@@ -52,6 +47,8 @@
   </store>
   <serviceConfiguration>false</serviceConfiguration>
   <simpleConversionEnabled>false</simpleConversionEnabled>
+  <internationalTitle/>
+  <internationalAbstract/>
   <maxFeatures>0</maxFeatures>
   <numDecimals>0</numDecimals>
   <padWithZeros>false</padWithZeros>

diff --git a/services/API-service/geoserver-volume/geoserver-layers/postgis_db/roads_MWI/layer.xml b/services/API-service/geoserver-volume/geoserver-layers/postgis_db/roads_MWI/layer.xml
@@ -13,5 +13,5 @@
     <logoHeight>0</logoHeight>
   </attribution>
   <dateCreated>2023-06-12 07:37:29.376 UTC</dateCreated>
-  <dateModified>2023-07-10 11:52:25.85 UTC</dateModified>
+  <dateModified>2025-01-28 16:09:33.348 UTC</dateModified>
 </layer>
diff --git a/tests/e2e/Pages/MapComponent.ts b/tests/e2e/Pages/MapComponent.ts
@@ -129,7 +129,7 @@ class MapComponent extends DashboardPage {
   async assertAdminBoundariesVisible() {
     await this.page.waitForLoadState('networkidle');
     await this.page.waitForLoadState('domcontentloaded');
-    // await this.page.waitForTimeout(500); // This is a workaround for the issue with the map not loading in the same moment as the dom
+    await this.page.waitForTimeout(500); // This is a workaround for the issue with the map not loading in the same moment as the dom
     await this.page.waitForSelector('.leaflet-interactive');
 
     const adminBoundaries = this.adminBoundry;