Merge pull request #161 from ahennr/geoserver-2.26.0

Update GeoServer to v2.26.0 and fix paths in Dockerfile
geostyler · Oct 10, 2024 · c7d2a74 · c7d2a74
2 parents e6ba8cb + ef59b39
commit c7d2a74
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -1,10 +1,9 @@
-version: '3.8'
 services:
   geoserver:
     build:
       context: ./geoserver
     ports:
-      - 8080:8080
+      - "8080:8080"
     environment:
       EXTRA_JAVA_OPTS: -Xms1g -Xmx2g
     volumes:

diff --git a/docker/geoserver/Dockerfile b/docker/geoserver/Dockerfile
@@ -1,3 +1,3 @@
-FROM docker.osgeo.org/geoserver:2.25.1
+FROM docker.osgeo.org/geoserver:2.26.0
 
-RUN rm -f /opt/apache-tomcat-9.0.68/webapps/geoserver/WEB-INF/lib/gs-geostyler-*.jar
+RUN rm -f /usr/local/tomcat/webapps/geoserver/WEB-INF/lib/gs-geostyler-*.jar
diff --git a/package-lock.json b/package-lock.json
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.geoserver</groupId>
     <artifactId>geoserver</artifactId>
-    <version>2.25.1</version>
+    <version>2.26.0</version>
   </parent>
 
   <groupId>org.geoserver.community</groupId>
@@ -35,33 +35,32 @@
   </distributionManagement>
 
   <properties>
-    <geoserver.version>2.25.1</geoserver.version>
     <frontend-maven-plugin.version>1.15.0</frontend-maven-plugin.version>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>org.geoserver.web</groupId>
       <artifactId>gs-web-core</artifactId>
-      <version>${geoserver.version}</version>
+      <version>${gs.version}</version>
     </dependency>
     <dependency>
       <groupId>org.geoserver.web</groupId>
       <artifactId>gs-web-wms</artifactId>
-      <version>${geoserver.version}</version>
+      <version>${gs.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.geoserver.web</groupId>
       <artifactId>gs-web-core</artifactId>
-      <version>${geoserver.version}</version>
+      <version>${gs.version}</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.geoserver</groupId>
       <artifactId>gs-main</artifactId>
-      <version>${geoserver.version}</version>
+      <version>${gs.version}</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>