- Bump GeoServer to version 2.17.2 (GeoNode#6336)

* - Bump GeoServer to version 2.17.2 * - Bump GeoServer to version 2.17.2 * - flake8 issues
mtnorthcott · Aug 13, 2020 · a766b21 · a766b21
1 parent 1f21c8d
commit a766b21
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 17 deletions.
diff --git a/dev_config.yml b/dev_config.yml
@@ -1,7 +1,7 @@
 ---
-GEOSERVER_URL: "https://build.geo-solutions.it/geonode/geoserver/latest/geoserver-2.17.1.war"
-DATA_DIR_URL: "https://build.geo-solutions.it/geonode/geoserver/latest/data-2.17.1.zip"
-JETTY_RUNNER_URL: "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-runner/9.4.7.v20170914/jetty-runner-9.4.7.v20170914.jar"
+GEOSERVER_URL: "https://build.geo-solutions.it/geonode/geoserver/latest/geoserver-2.17.2.war"
+DATA_DIR_URL: "https://build.geo-solutions.it/geonode/geoserver/latest/data-2.17.2.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"
   pyproj: "https://pyproj.googlecode.com/files/pyproj-1.9.3.win32-py2.7.exe"

diff --git a/docker-compose-geoserver-server.yml b/docker-compose-geoserver-server.yml
@@ -2,7 +2,7 @@ version: '2.2'
 services:
 
   data-dir-conf:
-    image: geonode/geoserver_data:2.17.1
+    image: geonode/geoserver_data:2.17.2
     restart: on-failure
     container_name: gsconf4${COMPOSE_PROJECT_NAME}
     labels:
@@ -13,7 +13,7 @@ services:
       - geoserver-data-dir:/geoserver_data/data
 
   geoserver:
-    image: geonode/geoserver:2.17.1
+    image: geonode/geoserver:2.17.2
     restart: unless-stopped
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     stdin_open: true

diff --git a/docker-compose.async.yml b/docker-compose.async.yml
@@ -59,7 +59,7 @@ services:
       - ./scripts/docker/env/${SET_DOCKER_ENV}/celery.env
 
   geoserver:
-    image: geonode/geoserver:2.17.1
+    image: geonode/geoserver:2.17.2
     restart: unless-stopped
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     stdin_open: true
@@ -118,7 +118,7 @@ services:
       - statics:/mnt/volumes/statics
 
   data-dir-conf:
-    image: geonode/geoserver_data:2.17.1
+    image: geonode/geoserver_data:2.17.2
     restart: on-failure
     container_name: gsconf4${COMPOSE_PROJECT_NAME}
     labels:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -17,7 +17,7 @@ services:
       - ./scripts/docker/env/${SET_DOCKER_ENV}/db.env
 
   geoserver:
-    image: geonode/geoserver:2.17.1
+    image: geonode/geoserver:2.17.2
     restart: unless-stopped
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     stdin_open: true
@@ -73,7 +73,7 @@ services:
       - statics:/mnt/volumes/statics
 
   data-dir-conf:
-    image: geonode/geoserver_data:2.17.1
+    image: geonode/geoserver_data:2.17.2
     restart: on-failure
     container_name: gsconf4${COMPOSE_PROJECT_NAME}
     labels:

diff --git a/geonode/security/tests.py b/geonode/security/tests.py
@@ -695,10 +695,6 @@ def test_layer_upload_with_time(self):
         self.assertEqual(len(metadata), 1)
 
         saved_layer.set_permissions(permissions)
-
-        from geonode.geoserver.views import get_layer_capabilities
-        capab = get_layer_capabilities(saved_layer, tolerant=True)
-        self.assertIsNotNone(capab)
         wms_capabilities_url = reverse('capabilities_layer', args=[saved_layer.id])
         wms_capabilities_resp = self.client.get(wms_capabilities_url)
         self.assertTrue(wms_capabilities_resp.status_code, 200)

diff --git a/scripts/docker/env/development/geoserver.env b/scripts/docker/env/development/geoserver.env
@@ -4,4 +4,4 @@ GEONODE_LB_HOST_IP
 GEONODE_LB_PORT
 PUBLIC_PORT=80
 NGINX_BASE_URL
-GEOSERVER_JAVA_OPTS=-Djava.awt.headless=true -XX:MaxPermSize=512m -XX:PermSize=256m -Xms512m -Xmx2048m -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -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
+GEOSERVER_JAVA_OPTS=-Djava.awt.headless=true -XX:MaxPermSize=512m -XX:PermSize=256m -Xms512m -Xmx2048m -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -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
diff --git a/scripts/docker/env/production/geoserver.env b/scripts/docker/env/production/geoserver.env
@@ -4,4 +4,4 @@ GEONODE_LB_HOST_IP
 GEONODE_LB_PORT
 PUBLIC_PORT=80
 NGINX_BASE_URL
-GEOSERVER_JAVA_OPTS=-Djava.awt.headless=true -Xms2G -Xmx4G -XX:PerfDataSamplingInterval=500 -XX:SoftRefLRUPolicyMSPerMB=36000 -XX:-UseGCOverheadLimit -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -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
+GEOSERVER_JAVA_OPTS=-Djava.awt.headless=true -Xms2G -Xmx4G -XX:PerfDataSamplingInterval=500 -XX:SoftRefLRUPolicyMSPerMB=36000 -XX:-UseGCOverheadLimit -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -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
diff --git a/scripts/spcgeonode/geoserver/Dockerfile b/scripts/spcgeonode/geoserver/Dockerfile
@@ -1,7 +1,7 @@
 FROM openjdk:8-jre-alpine
 
-ARG version=2.17.1
-ARG branch=2.17.1
+ARG version=2.17.2
+ARG branch=2.17.2
 ARG plugins=
 
 # Install dependencies