GeoNode · afabiani · Feb 24, 2023 · Feb 24, 2023 · Feb 24, 2023 · Feb 24, 2023
diff --git a/.env.sample b/.env.sample
@@ -106,7 +106,7 @@ OGC_REQUEST_POOL_CONNECTIONS=10
 # Java Options & Memory
 ENABLE_JSONP=true
 outFormat=text/javascript
-GEOSERVER_JAVA_OPTS=-Djava.awt.headless=true -Xms2G -Xmx4G -XX:+UnlockDiagnosticVMOptions -XX:+LogVMOutput -XX:LogFile=/var/log/jvm.log -XX:PerfDataSamplingInterval=500 -XX:SoftRefLRUPolicyMSPerMB=36000 -XX:-UseGCOverheadLimit -XX:+UseConcMarkSweepGC -XX:ParallelGCThreads=4 -Dfile.encoding=UTF8 -Djavax.servlet.request.encoding=UTF-8 -Djavax.servlet.response.encoding=UTF-8 -Duser.timezone=GMT -Dorg.geotools.shapefile.datetime=false -DGEOSERVER_CSRF_DISABLED=true -DPRINT_BASE_URL={geoserver_ui}/geoserver/pdf -DALLOW_ENV_PARAMETRIZATION=true -Xbootclasspath/a:/usr/local/tomcat/webapps/geoserver/WEB-INF/lib/marlin-0.9.3-Unsafe.jar -Dsun.java2d.renderer=org.marlin.pisces.MarlinRenderingEngine
+GEOSERVER_JAVA_OPTS=-Djava.awt.headless=true -Xms2G -Xmx4G -Dgwc.context.suffix=gwc -XX:+UnlockDiagnosticVMOptions -XX:+LogVMOutput -XX:LogFile=/var/log/jvm.log -XX:PerfDataSamplingInterval=500 -XX:SoftRefLRUPolicyMSPerMB=36000 -XX:-UseGCOverheadLimit -XX:+UseConcMarkSweepGC -XX:ParallelGCThreads=4 -Dfile.encoding=UTF8 -Djavax.servlet.request.encoding=UTF-8 -Djavax.servlet.response.encoding=UTF-8 -Duser.timezone=GMT -Dorg.geotools.shapefile.datetime=false -DGEOSERVER_CSRF_DISABLED=true -DPRINT_BASE_URL={geoserver_ui}/geoserver/pdf -DALLOW_ENV_PARAMETRIZATION=true -Xbootclasspath/a:/usr/local/tomcat/webapps/geoserver/WEB-INF/lib/marlin-0.9.3-Unsafe.jar -Dsun.java2d.renderer=org.marlin.pisces.MarlinRenderingEngine
 
 # #################
 # Security

diff --git a/dev_config.yml b/dev_config.yml
@@ -1,6 +1,6 @@
 ---
-GEOSERVER_URL: "https://artifacts.geonode.org/geoserver/2.20.5/geoserver.war"
-DATA_DIR_URL: "https://artifacts.geonode.org/geoserver/2.20.5/geonode-geoserver-ext-web-app-data.zip"
+GEOSERVER_URL: "https://artifacts.geonode.org/geoserver/2.20.7/geoserver.war"
+DATA_DIR_URL: "https://artifacts.geonode.org/geoserver/2.20.7/geonode-geoserver-ext-web-app-data.zip"
 JETTY_RUNNER_URL: "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-runner/9.4.31.v20200723/jetty-runner-9.4.31.v20200723.jar"
 WINDOWS:
   py2exe: "http://downloads.sourceforge.net/project/py2exe/py2exe/0.6.9/py2exe-0.6.9.win32-py2.7.exe"

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -89,7 +89,7 @@ services:
 
   # Geoserver backend
   geoserver:
-    image: geonode/geoserver:2.20.5
+    image: geonode/geoserver:2.20.7
     build: ./docker/geoserver/
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     healthcheck:
@@ -116,7 +116,7 @@ services:
         condition: service_healthy
 
   data-dir-conf:
-    image: geonode/geoserver_data:2.20.5
+    image: geonode/geoserver_data:2.20.7
     container_name: gsconf4${COMPOSE_PROJECT_NAME}
     entrypoint: sleep infinity
     volumes:

diff --git a/docker/geoserver/Dockerfile b/docker/geoserver/Dockerfile
@@ -10,7 +10,7 @@ ARG GEOSERVER_CORS_ALLOWED_HEADERS=*
 #
 # Set GeoServer version and data directory
 #
-ENV GEOSERVER_VERSION=2.20.5
+ENV GEOSERVER_VERSION=2.20.7
 ENV GEOSERVER_DATA_DIR="/geoserver_data/data"
 ENV GEOSERVER_CORS_ENABLED=$GEOSERVER_CORS_ENABLED
 ENV GEOSERVER_CORS_ALLOWED_ORIGINS=$GEOSERVER_CORS_ALLOWED_ORIGINS
@@ -108,6 +108,6 @@ RUN apt-get update \
 
 RUN pip install j2cli
 
-ENV JAVA_OPTS="-Djava.awt.headless=true -XX:+UnlockDiagnosticVMOptions -XX:+LogVMOutput -XX:LogFile=/var/log/jvm.log -XX:MaxPermSize=512m -XX:PermSize=256m -Xms512m -Xmx2048m -XX:+UseConcMarkSweepGC -XX:ParallelGCThreads=4 -Dfile.encoding=UTF8 -Djavax.servlet.request.encoding=UTF-8 -Djavax.servlet.response.encoding=UTF-8 -Duser.timezone=GMT -Dorg.geotools.shapefile.datetime=false -DGEOSERVER_CSRF_DISABLED=true -DPRINT_BASE_URL=http://geoserver:8080/geoserver/pdf -Xbootclasspath/a:/usr/local/tomcat/webapps/geoserver/WEB-INF/lib/marlin-0.9.3.jar -Dsun.java2d.renderer=org.marlin.pisces.MarlinRenderingEngine"
+ENV JAVA_OPTS="-Djava.awt.headless=true -XX:+UnlockDiagnosticVMOptions -XX:+LogVMOutput -XX:LogFile=/var/log/jvm.log -XX:MaxPermSize=512m -XX:PermSize=256m -Xms512m -Xmx2048m -Dgwc.context.suffix=gwc -XX:+UseConcMarkSweepGC -XX:ParallelGCThreads=4 -Dfile.encoding=UTF8 -Djavax.servlet.request.encoding=UTF-8 -Djavax.servlet.response.encoding=UTF-8 -Duser.timezone=GMT -Dorg.geotools.shapefile.datetime=false -DGEOSERVER_CSRF_DISABLED=true -DPRINT_BASE_URL=http://geoserver:8080/geoserver/pdf -Xbootclasspath/a:/usr/local/tomcat/webapps/geoserver/WEB-INF/lib/marlin-0.9.3.jar -Dsun.java2d.renderer=org.marlin.pisces.MarlinRenderingEngine"
 
 CMD ["/usr/local/tomcat/tmp/entrypoint.sh"]
diff --git a/docker/geoserver/docker-compose.yml b/docker/geoserver/docker-compose.yml
@@ -15,7 +15,7 @@ services:
     restart: on-failure
 
   geoserver:
-    image: geonode/geoserver:2.20.5
+    image: geonode/geoserver:2.20.7
     build:
       context: .
       args:
@@ -47,7 +47,7 @@ services:
     restart: on-failure
 
   data-dir-conf:
-    image: geonode/geoserver_data:2.20.5
+    image: geonode/geoserver_data:2.20.7
     container_name: geoserver_data_dir # named data container
     entrypoint: sleep infinity
     volumes:

diff --git a/geonode-stack.yml b/geonode-stack.yml
@@ -95,7 +95,7 @@ services:
   # Geoserver backend
   geoserver:
     deploy: *default-common-swarm-deploy
-    image: geonode/geoserver:2.20.5
+    image: geonode/geoserver:2.20.7
     build: ./docker/geoserver/
     env_file:
       - .env
@@ -115,7 +115,7 @@ services:
       - tmp:/tmp
 
   data-dir-conf:
-    image: geonode/geoserver_data:2.20.5
+    image: geonode/geoserver_data:2.20.7
     command: /bin/true
     volumes:
       - geoserver-data-dir:/geoserver_data/data

diff --git a/playbook.yml b/playbook.yml
@@ -10,7 +10,7 @@
     branch_name: master
     virtualenv_dir: "/home/ubuntu/.venvs"
     site_url: "http://localhost:8000/" # The public url of the GeoNode instance
-    geoserver_url: "https://artifacts.geonode.org/geoserver/2.20.5/geoserver.war" # geoserver_url should match what is found in dev_config.yml
+    geoserver_url: "https://artifacts.geonode.org/geoserver/2.20.7/geoserver.war" # geoserver_url should match what is found in dev_config.yml
     pg_max_connections: 100
     pg_shared_buffers: 128MB
     tomcat_xms: "1024M"

diff --git a/src/dev_config.yml b/src/dev_config.yml
@@ -1,6 +1,6 @@
 ---
-GEOSERVER_URL: "https://artifacts.geonode.org/geoserver/2.20.5/geoserver.war"
-DATA_DIR_URL: "https://artifacts.geonode.org/geoserver/2.20.5/geonode-geoserver-ext-web-app-data.zip"
+GEOSERVER_URL: "https://artifacts.geonode.org/geoserver/2.20.7/geoserver.war"
+DATA_DIR_URL: "https://artifacts.geonode.org/geoserver/2.20.7/geonode-geoserver-ext-web-app-data.zip"
 JETTY_RUNNER_URL: "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-runner/9.4.31.v20200723/jetty-runner-9.4.31.v20200723.jar"
 WINDOWS:
   py2exe: "http://downloads.sourceforge.net/project/py2exe/py2exe/0.6.9/py2exe-0.6.9.win32-py2.7.exe"

diff --git a/src/pavement.py b/src/pavement.py
@@ -699,7 +699,7 @@ def start_geoserver(options):
                 javapath = f"START /B \"\" \"{javapath_opt}\""
 
             sh(
-                '%(javapath)s -Xms512m -Xmx2048m -server -XX:+UseConcMarkSweepGC -XX:MaxPermSize=512m'
+                '%(javapath)s -Xms512m -Xmx2048m -server -Dgwc.context.suffix=gwc -XX:+UseConcMarkSweepGC -XX:MaxPermSize=512m'
                 ' -DGEOSERVER_DATA_DIR=%(data_dir)s'
                 ' -DGEOSERVER_CSRF_DISABLED=true'
                 ' -Dgeofence.dir=%(geofence_dir)s'

diff --git a/src/requirements.txt b/src/requirements.txt
@@ -1,2 +1,3 @@
-git+https://github.com/GeoNode/geonode-mapstore-client.git@4.0.x#egg=django_geonode_mapstore_client
-git+https://github.com/GeoNode/geonode.git@4.0.x#egg=GeoNode
+# git+https://github.com/GeoNode/geonode-mapstore-client.git@4.0.x#egg=django_geonode_mapstore_client
+# git+https://github.com/GeoNode/geonode.git@4.0.x#egg=GeoNode
+GeoNode==4.0.3