Merge pull request #138 from geostyler/version-updates

Updates GeoServer and GeoStylyer

.github/workflows/on-pull-request.yml

@@ -34,4 +34,4 @@ jobs:
           ${{ runner.os }}-maven-
 
     - name: Build artifacts 🏗️
-      run: mvn clean package
+      run: mvn clean package -B

.github/workflows/on-push-main.yml

@@ -19,7 +19,7 @@ jobs:
         java-version: 17
 
     - name: Build artifacts 🏗️
-      run: mvn clean package
+      run: mvn clean package -B
 
     - name: Create maven settings.xml with credentials
       uses: whelk-io/maven-settings-xml-action@v2

README.md

@@ -10,7 +10,7 @@ This extension integrates the GeoStyler UI into the GeoServer styles tab.
 To install the extension to your GeoServer just proceed as follows:
 
 1. Download the **matching jar** from [this Nexus repository](https://nexus.terrestris.de/#browse/browse:geoserver-extras:org%2Fgeoserver%2Fcommunity%2Fgs-geostyler).
-2. Copy the jar into the `WEB-INF/lib` directory of your GeoServer installation. 
+2. Copy the jar into the `WEB-INF/lib` directory of your GeoServer installation.
 3. Restart GeoServer
 
 <details>
@@ -52,7 +52,8 @@ cp ./target/gs-geostyler-<VERSION>.jar ./docker/geoserver/additional_libs
 2. Run GeoServer:
 
 ```
-docker-compose up --build --force-recreate --remove-orphans
+cd docker
+docker compose up --build --force-recreate --remove-orphans
 ```
 
 ## Release 📰
@@ -65,4 +66,3 @@ Maintenance and further development of this code can be funded through the
 [GeoStyler Open Collective](https://opencollective.com/geostyler). All contributions and
 expenses can transparently be reviewed by anyone; you see what we use the donated money for.
 Thank you for any financial support you give the GeoStyler project 💞
-

docker/geoserver/Dockerfile

@@ -1,3 +1,3 @@
-FROM docker.terrestris.de/terrestris/geoserver:2.21.0
+FROM docker.osgeo.org/geoserver:2.25.1
 
-RUN rm /opt/apache-tomcat-9.0.63/webapps/geoserver/WEB-INF/lib/gs-geostyler-*.jar
+RUN rm -f /opt/apache-tomcat-9.0.68/webapps/geoserver/WEB-INF/lib/gs-geostyler-*.jar

npm-update-libs.js

@@ -44,35 +44,47 @@ const exec = utils.promisify(cp.exec);
     const targetDir = path.join('src', 'main', 'resources', 'org', 'geoserver', 'wms', 'web', 'data', 'lib');
     const packagesToUpdate = [
       {
-        from: path.join(tmpDir, 'antd', 'dist', 'antd.min.css'),
+        from: path.join(tmpDir, 'react', 'umd', 'react.production.min.js'),
         to: targetDir
       },
       {
-        from: path.join(tmpDir, 'geostyler', 'browser', 'geostyler.css'),
+        from: path.join(tmpDir, 'react-dom', 'umd', 'react-dom.production.min.js'),
         to: targetDir
       },
       {
-        from: path.join(tmpDir, 'geostyler', 'browser', 'geostyler.js'),
+        from: path.join(tmpDir, 'dayjs', 'dayjs.min.js'),
         to: targetDir
       },
       {
-        from: path.join(tmpDir, 'geostyler-geojson-parser', 'browser', 'geoJsonDataParser.js'),
+        from: path.join(tmpDir, 'antd', 'dist', 'antd.min.js'),
         to: targetDir
       },
       {
-        from: path.join(tmpDir, 'geostyler-sld-parser', 'browser', 'sldStyleParser.js'),
+        from: path.join(tmpDir, 'antd', 'dist', 'reset.css'),
         to: targetDir
       },
       {
-        from: path.join(tmpDir, 'geostyler-wfs-parser', 'browser', 'wfsDataParser.js'),
+        from: path.join(tmpDir, 'ol', 'dist', 'ol.js'),
         to: targetDir
       },
       {
-        from: path.join(tmpDir, 'react', 'umd', 'react.production.min.js'),
+        from: path.join(tmpDir, 'geostyler', 'browser', 'style.css'),
         to: targetDir
       },
       {
-        from: path.join(tmpDir, 'react-dom', 'umd', 'react-dom.production.min.js'),
+        from: path.join(tmpDir, 'geostyler', 'browser', 'geostyler.js.iife.js'),
+        to: targetDir
+      },
+      {
+        from: path.join(tmpDir, 'geostyler-geojson-parser', 'browser', 'geoJsonDataParser.js'),
+        to: targetDir
+      },
+      {
+        from: path.join(tmpDir, 'geostyler-sld-parser', 'browser', 'sldStyleParser.iife.js'),
+        to: targetDir
+      },
+      {
+        from: path.join(tmpDir, 'geostyler-wfs-parser', 'browser', 'wfsDataParser.js'),
         to: targetDir
       }
     ];