From 8e03c53b39197c9ca24015605a66afb85dfd29aa Mon Sep 17 00:00:00 2001
From: Giovanni Allegri <giohappy@gmail.com>
Date: Wed, 10 Jan 2024 17:17:11 +0100
Subject: [PATCH] Release 4.2.0 (#11827)

* Bump client to 4.2.0 and importer to version 1.0.6

* Bump version to 4.2.0

* fixed docker image tags for test and dev compose files
---
 docker-compose-dev.yml  | 10 +++++-----
 docker-compose-test.yml | 10 +++++-----
 geonode/__init__.py     |  2 +-
 requirements.txt        |  5 ++---
 setup.cfg               |  4 ++--
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index 7c21d3ec374..7c355038429 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -52,7 +52,7 @@ services:
 
   # Nginx is serving django static and media files and proxies to django and geonode
   geonode:
-    image: geonode/nginx:latest
+    image: geonode/nginx:1.25.3-v1
     build: ./scripts/docker/nginx/
     container_name: nginx4${COMPOSE_PROJECT_NAME}
     env_file:
@@ -70,7 +70,7 @@ services:
 
   # Gets and installs letsencrypt certificates
   letsencrypt:
-    image: geonode/letsencrypt:latest
+    image: geonode/letsencrypt:2.6.0-v1
     container_name: letsencrypt4${COMPOSE_PROJECT_NAME}
     env_file:
       - .env
@@ -80,7 +80,7 @@ services:
 
   # Geoserver backend
   geoserver:
-    image: geonode/geoserver:latest
+    image: geonode/geoserver:2.23.3-v1
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     healthcheck:
       test: "curl -m 10 --fail --silent --write-out 'HTTP CODE : %{http_code}\n' --output /dev/null http://geoserver:8080/geoserver/ows"
@@ -106,7 +106,7 @@ services:
         condition: service_healthy
 
   data-dir-conf:
-    image: geonode/geoserver_data:latest
+    image: geonode/geoserver_data:2.23.3-v1
     container_name: gsconf4${COMPOSE_PROJECT_NAME}
     entrypoint: sleep infinity
     volumes:
@@ -118,7 +118,7 @@ services:
   # PostGIS database.
   db:
     # use geonode official postgis 15 image
-    image: geonode/postgis:latest
+    image: geonode/postgis:15.3-v1
     command: postgres -c "max_connections=${POSTGRESQL_MAX_CONNECTIONS}"
     container_name: db4${COMPOSE_PROJECT_NAME}
     env_file:
diff --git a/docker-compose-test.yml b/docker-compose-test.yml
index 8780e0aea7b..276523a3a4d 100644
--- a/docker-compose-test.yml
+++ b/docker-compose-test.yml
@@ -52,7 +52,7 @@ services:
 
   # Nginx is serving django static and media files and proxies to django and geonode
   geonode:
-    image: geonode/nginx:latest
+    image: geonode/nginx:1.25.3-v1
     container_name: nginx4${COMPOSE_PROJECT_NAME}
     env_file:
       - .env_test
@@ -82,7 +82,7 @@ services:
 
   # Gets and installs letsencrypt certificates
   letsencrypt:
-    image: geonode/letsencrypt:latest
+    image: geonode/letsencrypt:2.6.0-v1
     container_name: letsencrypt4${COMPOSE_PROJECT_NAME}
     env_file:
       - .env_test
@@ -92,7 +92,7 @@ services:
 
   # Geoserver backend
   geoserver:
-    image: geonode/geoserver:latest
+    image: geonode/geoserver:2.23.3-v1
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     healthcheck:
       test: "curl -m 10 --fail --silent --write-out 'HTTP CODE : %{http_code}\n' --output /dev/null http://geoserver:8080/geoserver/ows"
@@ -118,7 +118,7 @@ services:
         condition: service_healthy
 
   data-dir-conf:
-    image: geonode/geoserver_data:latest
+    image: geonode/geoserver_data:2.23.3-v1
     container_name: gsconf4${COMPOSE_PROJECT_NAME}
     entrypoint: sleep infinity
     volumes:
@@ -130,7 +130,7 @@ services:
   # PostGIS database.
   db:
     # use geonode official postgis 15 image
-    image: geonode/postgis:latest
+    image: geonode/postgis:15.3-v1
     command: postgres -c "max_connections=${POSTGRESQL_MAX_CONNECTIONS}"
     container_name: db4${COMPOSE_PROJECT_NAME}
     env_file:
diff --git a/geonode/__init__.py b/geonode/__init__.py
index 9b1e32fbb4d..5d15032b0a3 100644
--- a/geonode/__init__.py
+++ b/geonode/__init__.py
@@ -19,7 +19,7 @@
 
 import os
 
-__version__ = (4, 2, 0, "dev", 0)
+__version__ = (4, 2, 0, "final", 0)
 
 
 default_app_config = "geonode.apps.AppConfig"
diff --git a/requirements.txt b/requirements.txt
index 81a794a4559..124910335d9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -88,9 +88,8 @@ pinax-notifications==6.0.0
 pinax-ratings==4.0.0
 
 # GeoNode org maintained apps.
-# django-geonode-mapstore-client==4.0.5
--e git+https://github.com/GeoNode/geonode-mapstore-client.git@master#egg=django_geonode_mapstore_client
--e git+https://github.com/GeoNode/geonode-importer.git@master#egg=geonode-importer
+django-geonode-mapstore-client==4.2.0
+geonode-importer==1.0.6
 django-avatar==7.1.1
 geonode-oauth-toolkit==2.2.2
 geonode-user-messages==2.0.2
diff --git a/setup.cfg b/setup.cfg
index 37e8ae01318..5e24e8fd6be 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -114,8 +114,8 @@ install_requires =
     pinax-ratings==4.0.0
 
     # GeoNode org maintained apps.
-    django-geonode-mapstore-client>=4.0.5,<5.0.0
-    geonode-importer>=1.0.2
+    django-geonode-mapstore-client==4.2.0
+    geonode-importer==1.0.6
     django-avatar==7.1.1
     geonode-oauth-toolkit==2.2.2
     geonode-user-messages==2.0.2