From e2d6df44ad145b8b9b1ccd53a781d4d2fd6063c8 Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Tue, 31 Oct 2023 14:54:05 +0000
Subject: [PATCH 01/24] review nginx version

---
 omero/sysadmins/version-requirements.rst | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/omero/sysadmins/version-requirements.rst b/omero/sysadmins/version-requirements.rst
index 32453b939b..59ad9a06b2 100644
--- a/omero/sysadmins/version-requirements.rst
+++ b/omero/sysadmins/version-requirements.rst
@@ -86,12 +86,16 @@ NGINX
     * - 1.12
       - |Supported|
       - |Recommended|
-      - |Supported|
+      - |Deprecated|
     * - 1.14
       - |Upcoming|
       - |Supported|
-      - |Recommended|
+      - |Deprecated|
     * - 1.16
+      - |Upcoming|
+      - |Upcoming|
+      - |Deprecated|
+    * - 1.24
       - |Upcoming|
       - |Upcoming|
       - |Recommended|

From 3d7179d02e293c0ae49307aaa85f7499a3318648 Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Thu, 2 Nov 2023 19:54:47 +0000
Subject: [PATCH 02/24] review OS section

---
 omero/sysadmins/version-requirements.rst | 72 +++++++++++++++++-------
 1 file changed, 52 insertions(+), 20 deletions(-)

diff --git a/omero/sysadmins/version-requirements.rst b/omero/sysadmins/version-requirements.rst
index 59ad9a06b2..43a6ea6587 100644
--- a/omero/sysadmins/version-requirements.rst
+++ b/omero/sysadmins/version-requirements.rst
@@ -119,7 +119,7 @@ Linux (CentOS and RHEL)
 
 General overview for `RHEL
 <https://access.redhat.com/articles/3078>`__ and `CentOS
-<https://wiki.centos.org/About/Product>`__
+<https://www.centos.org/>`__.
 
 .. list-table::
     :header-rows: 1
@@ -130,30 +130,57 @@ General overview for `RHEL
       - OMERO 5.4
       - OMERO 5.5
       - OMERO 5.6
-      - Details
-    * - 6
+    * - `RHEL 6 <https://endoflife.date/rhel>`__
       - Nov 2010
       - Nov 2020
       - |Deprecated|
       - |Dropped|
       - |Dropped|
-      - `Reference <https://wiki.centos.org/About/Product>`__
-    * - 7
+    * - `CentOS 6 <https://endoflife.date/centos>`__
+      - Nov 2010
+      - Nov 2020
+      - |Deprecated|
+      - |Dropped|
+      - |Dropped|
+    * - `RHEL 7 <https://endoflife.date/rhel>`__
       - June 2014
       - June 2024
       - |Recommended|
       - |Recommended|
+      - |Supported|
+    * - `CentOS 7 <https://endoflife.date/centos>`__
+      - June 2014
+      - June 2024
       - |Recommended|
-      - `Reference <https://wiki.centos.org/About/Product>`__
-    * - 8
+      - |Recommended|
+      - |Supported|
+    * - `RHEL 8 <https://endoflife.date/rhel>`__
       - May 2019
-      - May 2029
-      - |Upcoming|
-      - |Upcoming|
-      - |Upcoming|
-      - `Reference <https://wiki.centos.org/About/Product>`__
+      - Dec 2029
+      - |Unsupported|
+      - |Unsupported|
+      - |Unsupported|
+    * - `CentOS 8 <https://endoflife.date/centos>`__
+      - May 2019
+      - Dec 2021
+      - |Unsupported|
+      - |Unsupported|
+      - |Unsupported|
+    * - `RHEL 9 <https://endoflife.date/rhel>`__
+      - May 2022
+      - May 2032
+      - |Unsupported|
+      - |Unsupported|
+      - |Recommended|
+    * - `Rocky 9 <https://endoflife.date/rocky-linux>`__
+      - Jul 2022
+      - May 2032
+      - |Unsupported|
+      - |Unsupported|
+      - |Recommended|
+
 
-RHEL/CentOS 7 is supported at present. Given the long life
+RHEL 9/Rocky Linux 9 are supported at present. Given the long life
 of enterprise releases, we intend to support only the latest release
 at any given time or else it ties us into very old dependencies.
 
@@ -186,20 +213,25 @@ Linux (Ubuntu)
     * - 18.04 LTS
       - Apr 2018
       - Apr 2028
-      - |Upcoming|
+      - |Unsupported|
+      - |Supported|
       - |Supported|
-      - |Recommended|
     * - 20.04 LTS
       - Apr 2020
       - Apr 2030
-      - |Upcoming|
-      - |Upcoming|
-      - |Upcoming|
+      - |Unsupported|
+      - |Unsupported|
+      - |Supported|
+    * - 22.04 LTS
+      - Apr 2022
+      - Apr 2032
+      - |Unsupported|
+      - |Unsupported|
+      - |Recommended|
 
 
 Only the LTS releases are supported due to resource limitations upon
-CI and testing. Only the last two LTS releases are supported (being a
-bit more frequent than CentOS/RHEL). There is currently no CI testing
+CI and testing. Only the last LTS releases is supported. There is currently no CI testing
 for any version.
 
 Microsoft Windows

From 64de948ca3eb9e605208c7d568dafad44b3fdfda Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Thu, 2 Nov 2023 20:00:12 +0000
Subject: [PATCH 03/24] review package list

---
 omero/sysadmins/version-requirements.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/omero/sysadmins/version-requirements.rst b/omero/sysadmins/version-requirements.rst
index 43a6ea6587..a6ae2cbfb2 100644
--- a/omero/sysadmins/version-requirements.rst
+++ b/omero/sysadmins/version-requirements.rst
@@ -273,6 +273,8 @@ Package lists
       - EOL
     * - CentOS 7 / RHEL 7
       - `Reference <http://mirror.centos.org/centos/7/os/x86_64/Packages/>`__
+    * - Rocky 9
+      - `Reference <https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/Packages/>`__
     * - Ubuntu
       - `Reference <https://packages.ubuntu.com/search?keywords=foo&searchon=names&suite=all&section=all>`__
     * - Homebrew

From a1a861baaa01fb23fd55f010e62723b7ca3d7599 Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Tue, 7 Nov 2023 16:14:51 +0000
Subject: [PATCH 04/24] drop ref to 5.4 and 5.5

---
 omero/sysadmins/version-requirements.rst | 127 -----------------------
 1 file changed, 127 deletions(-)

diff --git a/omero/sysadmins/version-requirements.rst b/omero/sysadmins/version-requirements.rst
index a6ae2cbfb2..40d2324c00 100644
--- a/omero/sysadmins/version-requirements.rst
+++ b/omero/sysadmins/version-requirements.rst
@@ -52,17 +52,11 @@ Rationale: OMERO is tested on 64-bit systems only.
     :header-rows: 1
 
     * - Bitness
-      - OMERO 5.4
-      - OMERO 5.5
       - OMERO 5.6
     * - 32-bit
-      - |Deprecated| for Ice and native code [client]
-      - |Dropped|
       - |Dropped|
     * - 64-bit
       - |Recommended|
-      - |Recommended|
-      - |Recommended|
 
 NGINX
 -----
@@ -72,32 +66,18 @@ NGINX
     :align: left
 
     * - nginx
-      - OMERO 5.4
-      - OMERO 5.5
       - OMERO 5.6
     * - 1.8
-      - |Deprecated|
-      - |Dropped|
       - |Dropped|
     * - 1.10
-      - |Recommended|
-      - |Supported|
       - |Deprecated|
     * - 1.12
-      - |Supported|
-      - |Recommended|
       - |Deprecated|
     * - 1.14
-      - |Upcoming|
-      - |Supported|
       - |Deprecated|
     * - 1.16
-      - |Upcoming|
-      - |Upcoming|
       - |Deprecated|
     * - 1.24
-      - |Upcoming|
-      - |Upcoming|
       - |Recommended|
 
 Operating system support
@@ -127,56 +107,38 @@ General overview for `RHEL
     * - Version
       - Release date
       - Supported until
-      - OMERO 5.4
-      - OMERO 5.5
       - OMERO 5.6
     * - `RHEL 6 <https://endoflife.date/rhel>`__
       - Nov 2010
       - Nov 2020
-      - |Deprecated|
-      - |Dropped|
       - |Dropped|
     * - `CentOS 6 <https://endoflife.date/centos>`__
       - Nov 2010
       - Nov 2020
-      - |Deprecated|
-      - |Dropped|
       - |Dropped|
     * - `RHEL 7 <https://endoflife.date/rhel>`__
       - June 2014
       - June 2024
-      - |Recommended|
-      - |Recommended|
       - |Supported|
     * - `CentOS 7 <https://endoflife.date/centos>`__
       - June 2014
       - June 2024
-      - |Recommended|
-      - |Recommended|
       - |Supported|
     * - `RHEL 8 <https://endoflife.date/rhel>`__
       - May 2019
       - Dec 2029
       - |Unsupported|
-      - |Unsupported|
-      - |Unsupported|
     * - `CentOS 8 <https://endoflife.date/centos>`__
       - May 2019
       - Dec 2021
       - |Unsupported|
-      - |Unsupported|
-      - |Unsupported|
     * - `RHEL 9 <https://endoflife.date/rhel>`__
       - May 2022
       - May 2032
-      - |Unsupported|
-      - |Unsupported|
       - |Recommended|
     * - `Rocky 9 <https://endoflife.date/rocky-linux>`__
       - Jul 2022
       - May 2032
-      - |Unsupported|
-      - |Unsupported|
       - |Recommended|
 
 
@@ -195,38 +157,26 @@ Linux (Ubuntu)
     * - Version
       - Release date
       - Supported until
-      - OMERO 5.4
-      - OMERO 5.5
       - OMERO 5.6
     * - 14.04 LTS
       - Apr 2014
       - Apr 2019
-      - |Supported|
-      - |Dropped|
       - |Dropped|
     * - 16.04 LTS
       - Apr 2016
       - Apr 2021
-      - |Recommended|
-      - |Recommended|
       - |Dropped|
     * - 18.04 LTS
       - Apr 2018
       - Apr 2028
-      - |Unsupported|
-      - |Supported|
       - |Supported|
     * - 20.04 LTS
       - Apr 2020
       - Apr 2030
-      - |Unsupported|
-      - |Unsupported|
       - |Supported|
     * - 22.04 LTS
       - Apr 2022
       - Apr 2032
-      - |Unsupported|
-      - |Unsupported|
       - |Recommended|
 
 
@@ -297,62 +247,42 @@ OMERO support policies
     * - Version
       - Release date
       - Supported until
-      - OMERO 5.4
-      - OMERO 5.5
       - OMERO 5.6
     * - 9.3
       - Sep 2013
       - Sep 2018
-      - |Deprecated|
-      - |Dropped|
       - |Dropped|
     * - 9.4
       - Dec 2014
       - Dec 2019
-      - |Supported|
-      - |Deprecated|
       - |Dropped|
     * - 9.5
       - Jan 2016
       - Jan 2021
-      - |Supported|
-      - |Supported|
       - |Deprecated|
     * - 9.6
       - Sep 2016
       - Sep 2021
-      - |Recommended|
-      - |Supported|
       - |Deprecated|
     * - 10
       - Oct 2017
       - Nov 2022
-      - |Upcoming|
-      - |Recommended|
       - |Deprecated|
     * - 11
       - Oct 2018
       - Nov 2023
-      - |Upcoming|
-      - |Upcoming|
       - |Recommended|
     * - 12
       - Sep 2019
       - Nov 2024
-      - |Upcoming|
-      - |Upcoming|
       - |Supported|
     * - 13
       - Sep 2020
       - Nov 2025
-      - |Upcoming|
-      - |Upcoming|
       - |Supported|
     * - 14
       - Sep 2021
       - Nov 2026
-      - |Upcoming|
-      - |Upcoming|
       - |Supported|
 
 Version provided by distribution
@@ -412,72 +342,49 @@ OMERO support policies
     * - Version
       - Release date
       - Supported until
-      - OMERO 5.4
-      - OMERO 5.5
       - OMERO 5.6
       - Details
     * - 2.6
       - Oct 2008
       - Oct 2013
-      - |Dropped| [1]_ 
-        |Supported| [2]_ 
-      - |Dropped|
       - |Dropped|
       - `PEP 361 <https://www.python.org/dev/peps/pep-0361/>`__
     * - 2.7
       - Jul 2010
       - Jan 2020
-      - |Recommended|
-      - |Recommended|
       - |Dropped|
       - `PEP 373 <https://www.python.org/dev/peps/pep-0373/>`__
     * - 3.2
       - Feb 2011
       - Feb 2016
       - |Broken|
-      - |Broken|
-      - |Broken|
       - `PEP 392 <https://www.python.org/dev/peps/pep-0392/>`__
     * - 3.3
       - Sep 2012
       - Sep 2017
       - |Broken|
-      - |Broken|
-      - |Broken|
       - `PEP 398 <https://www.python.org/dev/peps/pep-0398/>`__
     * - 3.4
       - Mar 2014
       - Mar 2019
       - |Broken|
-      - |Broken|
-      - |Broken|
       - `PEP 429 <https://www.python.org/dev/peps/pep-0429/>`__
     * - 3.5
       - Sep 2015
       - Sep 2020
-      - |Broken|
-      - |Broken|
       - |Upcoming|
       - `PEP 478 <https://www.python.org/dev/peps/pep-0478/>`__
     * - 3.6
       - Dec 2016
       - Dec 2021
-      - |Broken|
-      - |Broken|
       - |Recommended|
       - `PEP 494 <https://www.python.org/dev/peps/pep-0494/>`__
     * - 3.7
       - Jun 2018
       - Jun 2023
-      - |Broken|
-      - |Broken|
       - |Supported|
       - `PEP 537 <https://www.python.org/dev/peps/pep-0537/>`__
 
-.. [1] For OMERO.web, Python 2.7 is the minimum supported version.
-.. [2] For OMERO.py and OMERO.server 5.4, Python 2.6 is the minimum supported
-       version.
-
 
 Version provided by distribution
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -553,15 +460,11 @@ OMERO support policies
     * - Version
       - Release date
       - Supported until
-      - OMERO 5.4
-      - OMERO 5.5
       - OMERO 5.6
       - Details
     * - 3.5
       - Mar 2013
       - Oct 2013
-      - |Deprecated|
-      - |Dropped|
       - |Dropped|
       - :zerocforum:`3.5.0 <6093/ice-3-5-0-released>`,
         :zerocforum:`3.5.1 <6283/ice-3-5-1-released>`
@@ -569,8 +472,6 @@ OMERO support policies
       - June 2015
       - TBA
       - |Recommended|
-      - |Recommended|
-      - |Recommended|
       - :zerocforum:`3.6.0 <6631/ice-3-6-0-and-ice-touch-3-6-0-released>`
         (:zerocforum:`3.6.1 <45941/ice-3-6-0-and-ice-touch-3-6-1-released>` |Broken|),
         :zerocforum:`3.6.2 <46347/ice-ice-e-and-ice-touch-3-6-2-released>`,
@@ -581,8 +482,6 @@ OMERO support policies
       - July 2017
       - TBA
       - |Unsupported|
-      - |Unsupported|
-      - |Unsupported|
       - :zerocforum:`3.7.0 <46530/ice-3-7-0-and-ice-touch-3-7-0-released>`,
         :zerocforum:`3.7.1 <46620/ice-3-7-1-released>`,
         :zerocforum:`3.7.2 <46670/ice-3-7-2-released>`,
@@ -639,43 +538,31 @@ OMERO support policies
     * - Version
       - Release date
       - Supported until
-      - OMERO 5.4
-      - OMERO 5.5
       - OMERO 5.6
       - Details
     * - 7
       - Jul 2011
       - Apr 2015
-      - |Deprecated|
-      - |Dropped|
       - |Dropped|
       - `Reference <https://www.oracle.com/technetwork/java/eol-135779.html>`__
     * - 8
       - Mar 2014
       - Jun 2023
-      - |Recommended|
-      - |Recommended|
       - |Supported|
       - `Reference <https://access.redhat.com/articles/1299013>`__
     * - 11
       - Sep 2018
       - Oct 2024
-      - |Unsupported|
-      - |Supported|
       - |Recommended|
       - `Reference <https://access.redhat.com/articles/1299013>`__
     * - 12
       - Sep 2018
       - Oct 2024
-      - |Unsupported|
-      - |Unsupported|
       - |Supported|
       -
     * - 13
       - Sep 2018
       - Oct 2024
-      - |Unsupported|
-      - |Unsupported|
       - |Supported|
       -
 
@@ -732,44 +619,30 @@ OMERO support policies
     * - Version
       - Release date
       - Supported until
-      - OMERO 5.4
-      - OMERO 5.5
       - OMERO 5.6
     * - 1.6
       - Apr 2014
       - Apr 2015
-      - |Deprecated|
-      - |Dropped|
       - |Dropped|
     * - 1.8
       - Apr 2015
       - Jan 2016
-      - |Supported|
-      - |Deprecated|
       - |Dropped|
     * - 1.10
       - Apr 2016
       - Apr 2017
-      - |Recommended|
-      - |Supported|
       - |Deprecated|
     * - 1.12
       - Apr 2017
       - Apr 2018
       - |Supported|
-      - |Recommended|
-      - |Supported|
     * - 1.14
       - Apr 2018
       - Apr 2019
-      - |Upcoming|
-      - |Supported|
       - |Recommended|
     * - 1.16
       - Apr 2019
       - TBA
-      - |Upcoming|
-      - |Upcoming|
       - |Recommended|
 
 Version provided by distribution

From 425df10e141e48489383940a59a0b5a4dd3144fa Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Tue, 7 Nov 2023 16:16:50 +0000
Subject: [PATCH 05/24] drop CentOS 6

---
 omero/sysadmins/version-requirements.rst | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/omero/sysadmins/version-requirements.rst b/omero/sysadmins/version-requirements.rst
index 40d2324c00..2a77830c87 100644
--- a/omero/sysadmins/version-requirements.rst
+++ b/omero/sysadmins/version-requirements.rst
@@ -108,14 +108,6 @@ General overview for `RHEL
       - Release date
       - Supported until
       - OMERO 5.6
-    * - `RHEL 6 <https://endoflife.date/rhel>`__
-      - Nov 2010
-      - Nov 2020
-      - |Dropped|
-    * - `CentOS 6 <https://endoflife.date/centos>`__
-      - Nov 2010
-      - Nov 2020
-      - |Dropped|
     * - `RHEL 7 <https://endoflife.date/rhel>`__
       - June 2014
       - June 2024

From e5f79f40a693f25f5c39f386a90f7f317da85481 Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Tue, 7 Nov 2023 16:17:36 +0000
Subject: [PATCH 06/24] drop ubuntu 14.04 and 16.04

---
 omero/sysadmins/version-requirements.rst | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/omero/sysadmins/version-requirements.rst b/omero/sysadmins/version-requirements.rst
index 2a77830c87..a9edd5192f 100644
--- a/omero/sysadmins/version-requirements.rst
+++ b/omero/sysadmins/version-requirements.rst
@@ -150,14 +150,6 @@ Linux (Ubuntu)
       - Release date
       - Supported until
       - OMERO 5.6
-    * - 14.04 LTS
-      - Apr 2014
-      - Apr 2019
-      - |Dropped|
-    * - 16.04 LTS
-      - Apr 2016
-      - Apr 2021
-      - |Dropped|
     * - 18.04 LTS
       - Apr 2018
       - Apr 2028

From 7cbe4d0f94eb41f8e881aaa7095e10ae3da6f93b Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Tue, 7 Nov 2023 16:20:19 +0000
Subject: [PATCH 07/24] remove old nginx

---
 omero/sysadmins/version-requirements.rst | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/omero/sysadmins/version-requirements.rst b/omero/sysadmins/version-requirements.rst
index a9edd5192f..ddd49a3b6f 100644
--- a/omero/sysadmins/version-requirements.rst
+++ b/omero/sysadmins/version-requirements.rst
@@ -67,18 +67,12 @@ NGINX
 
     * - nginx
       - OMERO 5.6
-    * - 1.8
-      - |Dropped|
-    * - 1.10
-      - |Deprecated|
-    * - 1.12
-      - |Deprecated|
-    * - 1.14
-      - |Deprecated|
-    * - 1.16
-      - |Deprecated|
+    * - 1.23
+      - |Supported|
     * - 1.24
       - |Recommended|
+    * - 1.25
+      - |Upcoming|
 
 Operating system support
 ========================

From ce7b9b5e7c60f5760c9ea4c231f34e7bc92867ee Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Tue, 7 Nov 2023 16:21:13 +0000
Subject: [PATCH 08/24] remove CentOS 6 entry

---
 omero/sysadmins/version-requirements.rst | 2 --
 1 file changed, 2 deletions(-)

diff --git a/omero/sysadmins/version-requirements.rst b/omero/sysadmins/version-requirements.rst
index ddd49a3b6f..8ea587c5aa 100644
--- a/omero/sysadmins/version-requirements.rst
+++ b/omero/sysadmins/version-requirements.rst
@@ -197,8 +197,6 @@ Package lists
 
     * - Operating system
       - Details
-    * - CentOS 6 / RHEL 6
-      - EOL
     * - CentOS 7 / RHEL 7
       - `Reference <http://mirror.centos.org/centos/7/os/x86_64/Packages/>`__
     * - Rocky 9

From 160f1d399d94c18f81576a0a53b88ce2ca999fd8 Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Tue, 7 Nov 2023 16:22:43 +0000
Subject: [PATCH 09/24] review pg entries

---
 omero/sysadmins/version-requirements.rst | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/omero/sysadmins/version-requirements.rst b/omero/sysadmins/version-requirements.rst
index 8ea587c5aa..9a1bb6cd0a 100644
--- a/omero/sysadmins/version-requirements.rst
+++ b/omero/sysadmins/version-requirements.rst
@@ -224,30 +224,10 @@ OMERO support policies
       - Release date
       - Supported until
       - OMERO 5.6
-    * - 9.3
-      - Sep 2013
-      - Sep 2018
-      - |Dropped|
-    * - 9.4
-      - Dec 2014
-      - Dec 2019
-      - |Dropped|
-    * - 9.5
-      - Jan 2016
-      - Jan 2021
-      - |Deprecated|
-    * - 9.6
-      - Sep 2016
-      - Sep 2021
-      - |Deprecated|
-    * - 10
-      - Oct 2017
-      - Nov 2022
-      - |Deprecated|
     * - 11
       - Oct 2018
       - Nov 2023
-      - |Recommended|
+      - |Supported|
     * - 12
       - Sep 2019
       - Nov 2024
@@ -255,7 +235,7 @@ OMERO support policies
     * - 13
       - Sep 2020
       - Nov 2025
-      - |Supported|
+      - |Recommended|
     * - 14
       - Sep 2021
       - Nov 2026

From e0bef1dc40d9c1ff931919b9847b38ea5db11611 Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Tue, 7 Nov 2023 16:29:31 +0000
Subject: [PATCH 10/24] review pg section

---
 omero/sysadmins/version-requirements.rst | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/omero/sysadmins/version-requirements.rst b/omero/sysadmins/version-requirements.rst
index 9a1bb6cd0a..67c49a44de 100644
--- a/omero/sysadmins/version-requirements.rst
+++ b/omero/sysadmins/version-requirements.rst
@@ -255,23 +255,23 @@ If no version is provided, a suitable repository is indicated.
       - Homebrew
       - FreeBSD Ports
     * - 11
-      - 6 (`postgresql <https://yum.postgresql.org/11/redhat/rhel-6-x86_64/>`__), 7 (`postgresql <https://yum.postgresql.org/11/redhat/rhel-7-x86_64/>`__), 8 (`postgresql <https://yum.postgresql.org/11/redhat/rhel-8-x86_64/>`__)
-      - 16.04, 18.04, 20.04 (`postgresql <https://apt.postgresql.org/pub/repos/apt/>`__)
+      - 7 (`postgresql <https://yum.postgresql.org/11/redhat/rhel-7-x86_64/>`__), 8 (`postgresql <https://yum.postgresql.org/11/redhat/rhel-8-x86_64/>`__), 9 (`postgresql <https://download.postgresql.org/pub/repos/yum/11/redhat/rhel-9-x86_64/>`__)
+      - 18.04, 20.04 (`postgresql <https://apt.postgresql.org/pub/repos/apt/>`__)
       - Yes
       - Yes
     * - 12
-      - 6 (`postgresql <https://yum.postgresql.org/12/redhat/rhel-6-x86_64/>`__), 7 (`postgresql <https://yum.postgresql.org/12/redhat/rhel-7-x86_64/>`__), 8 (`postgresql <https://yum.postgresql.org/12/redhat/rhel-8-x86_64/>`__)
-      - 16.04, 18.04, 20.04 (`postgresql <https://apt.postgresql.org/pub/repos/apt/>`__)
+      - 7 (`postgresql <https://yum.postgresql.org/12/redhat/rhel-7-x86_64/>`__), 8 (`postgresql <https://yum.postgresql.org/12/redhat/rhel-8-x86_64/>`__), 9 (`postgresql <https://download.postgresql.org/pub/repos/yum/12/redhat/rhel-9-x86_64/>`__)
+      - 18.04, 20.04 (`postgresql <https://apt.postgresql.org/pub/repos/apt/>`__)
       - Yes
       - Yes
     * - 13
       - 7 (`postgresql <https://yum.postgresql.org/13/redhat/rhel-7-x86_64/>`__)
-      - 16.04, 18.04, 20.04 (`postgresql <https://apt.postgresql.org/pub/repos/apt/>`__)
+      - 18.04, 20.04, 22.04 (`postgresql <https://apt.postgresql.org/pub/repos/apt/>`__)
       - Yes
       - Yes
     * - 14
       - 7 (`postgresql <https://yum.postgresql.org/14/redhat/rhel-7-x86_64/>`__)
-      - 18.04, 20.04 (`postgresql <https://apt.postgresql.org/pub/repos/apt/>`__)
+      - 18.04, 20.04, 22.04 (`postgresql <https://apt.postgresql.org/pub/repos/apt/>`__)
       - Yes
       - Yes
     * - Details

From 1e44e936d19875a18a81603a4b658354df0bd986 Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Tue, 7 Nov 2023 16:41:11 +0000
Subject: [PATCH 11/24] add python versions

---
 omero/sysadmins/version-requirements.rst | 59 +++++++++++-------------
 1 file changed, 27 insertions(+), 32 deletions(-)

diff --git a/omero/sysadmins/version-requirements.rst b/omero/sysadmins/version-requirements.rst
index 67c49a44de..ddd8fa3e59 100644
--- a/omero/sysadmins/version-requirements.rst
+++ b/omero/sysadmins/version-requirements.rst
@@ -300,46 +300,41 @@ OMERO support policies
       - Supported until
       - OMERO 5.6
       - Details
-    * - 2.6
-      - Oct 2008
-      - Oct 2013
-      - |Dropped|
-      - `PEP 361 <https://www.python.org/dev/peps/pep-0361/>`__
-    * - 2.7
-      - Jul 2010
-      - Jan 2020
-      - |Dropped|
-      - `PEP 373 <https://www.python.org/dev/peps/pep-0373/>`__
-    * - 3.2
-      - Feb 2011
-      - Feb 2016
-      - |Broken|
-      - `PEP 392 <https://www.python.org/dev/peps/pep-0392/>`__
-    * - 3.3
-      - Sep 2012
-      - Sep 2017
-      - |Broken|
-      - `PEP 398 <https://www.python.org/dev/peps/pep-0398/>`__
-    * - 3.4
-      - Mar 2014
-      - Mar 2019
-      - |Broken|
-      - `PEP 429 <https://www.python.org/dev/peps/pep-0429/>`__
-    * - 3.5
-      - Sep 2015
-      - Sep 2020
-      - |Upcoming|
-      - `PEP 478 <https://www.python.org/dev/peps/pep-0478/>`__
     * - 3.6
       - Dec 2016
       - Dec 2021
-      - |Recommended|
+      - |Dropped|
       - `PEP 494 <https://www.python.org/dev/peps/pep-0494/>`__
     * - 3.7
       - Jun 2018
       - Jun 2023
-      - |Supported|
+      - |Dropped|
       - `PEP 537 <https://www.python.org/dev/peps/pep-0537/>`__
+    * - 3.8
+      - Oct 2018
+      - Oct 2024
+      - |Supported|
+      - `PEP 569 <https://peps.python.org/pep-0569/>`__
+    * - 3.9
+      - Oct 2020
+      - Oct 2025
+      - |Recommended|
+      - `PEP 596 <https://peps.python.org/pep-0596/>`__
+    * - 3.10
+      - Oct 2021
+      - Oct 2026
+      - |Supported|
+      - `PEP 619 <https://peps.python.org/pep-0619/>`__
+    * - 3.11
+      - Oct 2022
+      - Oct 2027
+      - |Supported|
+      - `PEP 664 <https://peps.python.org/pep-0664/>`__
+    * - 3.12
+      - Oct 2023
+      - Oct 2028
+      - |Upcoming|
+      - `PEP 693 <https://peps.python.org/pep-0693/>`__
 
 
 Version provided by distribution

From 7e2014f03d6157dc181bba3ecb546d04674a94ca Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Tue, 7 Nov 2023 17:15:53 +0000
Subject: [PATCH 12/24] ice: point to release notes

---
 omero/sysadmins/version-requirements.rst | 56 +++---------------------
 1 file changed, 7 insertions(+), 49 deletions(-)

diff --git a/omero/sysadmins/version-requirements.rst b/omero/sysadmins/version-requirements.rst
index ddd8fa3e59..c9d918cfab 100644
--- a/omero/sysadmins/version-requirements.rst
+++ b/omero/sysadmins/version-requirements.rst
@@ -349,51 +349,18 @@ Version provided by distribution
       - Ubuntu
       - Homebrew
       - FreeBSD Ports
-    * - 2.6
-      - 6
-      - 10.04
-      - N/A
-      - Yes
-    * - 2.7
-      - 7
-      - 14.04, 16.04, 18.04
-      - Yes
-      - Yes
-    * - 3.2
-      - N/A
-      - N/A
-      - N/A
-      - Yes
-    * - 3.3
-      - N/A
-      - N/A
-      - N/A
-      - Yes
-    * - 3.4
+    * - 3.6
       - 7 (`EPEL <https://dl.fedoraproject.org/pub/epel/7/x86_64/>`__)
-      - 14.04
-      - N/A
+      - 18.04
       - Yes
-    * - 3.5
-      - N/A
-      - 16.04
-      - N/A
       - Yes
-    * - 3.6
+    * - 3.7
       - 7 (`EPEL <https://dl.fedoraproject.org/pub/epel/7/x86_64/>`__)
       - 18.04
       - Yes
       - Yes
-    * - Details
-      - 
-      - `Python 2 <https://packages.ubuntu.com/search?keywords=python2&searchon=names&suite=all&section=all>`__
-        `Python 3 <https://packages.ubuntu.com/search?keywords=python3&searchon=names&suite=all&section=all>`__
-      - 
-      - 
-
-Python 2.7 support ends in 2020;
 
-The Django version used by OMERO.web (1.11.26) is supported on Python 3.5, 3.6 and 3.7
+The Django version used by OMERO.web (5.23.0) requires Python 3.8 or higher.
 
 .. _ice-requirements:
 
@@ -417,26 +384,17 @@ OMERO support policies
       - Mar 2013
       - Oct 2013
       - |Dropped|
-      - :zerocforum:`3.5.0 <6093/ice-3-5-0-released>`,
-        :zerocforum:`3.5.1 <6283/ice-3-5-1-released>`
+      - `Release notes <https://doc.zeroc.com/display/Ice35/Ice+Release+Notes>`__ 
     * - 3.6
       - June 2015
       - TBA
       - |Recommended|
-      - :zerocforum:`3.6.0 <6631/ice-3-6-0-and-ice-touch-3-6-0-released>`
-        (:zerocforum:`3.6.1 <45941/ice-3-6-0-and-ice-touch-3-6-1-released>` |Broken|),
-        :zerocforum:`3.6.2 <46347/ice-ice-e-and-ice-touch-3-6-2-released>`,
-        :zerocforum:`3.6.3 <46475/ice-ice-e-and-ice-touch-3-6-3-released>`,
-        :zerocforum:`3.6.4 <46550/ice-ice-e-and-ice-touch-3-6-4-released>`,
-        :zerocforum:`3.6.5 <46700/ice-3-6-5-released>`.
+      -  `Release notes <https://doc.zeroc.com/ice/3.6/ice-release-notes>`__
     * - 3.7
       - July 2017
       - TBA
       - |Unsupported|
-      - :zerocforum:`3.7.0 <46530/ice-3-7-0-and-ice-touch-3-7-0-released>`,
-        :zerocforum:`3.7.1 <46620/ice-3-7-1-released>`,
-        :zerocforum:`3.7.2 <46670/ice-3-7-2-released>`,
-        :zerocforum:`3.7.3 <46704/ice-3-7-3-released>`.
+      - `Release notes <https://doc.zeroc.com/ice/3.7/release-notes>`__
 
 
 Version provided by distribution

From e44a36ef013ad84c8fcf4a9d88377c952f58a7e9 Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Tue, 7 Nov 2023 17:24:17 +0000
Subject: [PATCH 13/24] remove homebrew and freebsd

---
 omero/sysadmins/version-requirements.rst | 60 +-----------------------
 1 file changed, 1 insertion(+), 59 deletions(-)

diff --git a/omero/sysadmins/version-requirements.rst b/omero/sysadmins/version-requirements.rst
index c9d918cfab..b5ffbc2e8b 100644
--- a/omero/sysadmins/version-requirements.rst
+++ b/omero/sysadmins/version-requirements.rst
@@ -81,12 +81,6 @@ The following subsections detail the versions of each operating system
 which are supported by both its upstream developers (for security and
 general updates) and by OME for OMERO building and server deployment.
 
-UNIX (FreeBSD)
---------------
-
-It only really makes sense to support the base toolchain for major
-releases and the Ports tree (which is continually updated); these will
-be covered in the dependencies, below.
 
 Linux (CentOS and RHEL)
 -----------------------
@@ -203,10 +197,6 @@ Package lists
       - `Reference <https://download.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os/Packages/>`__
     * - Ubuntu
       - `Reference <https://packages.ubuntu.com/search?keywords=foo&searchon=names&suite=all&section=all>`__
-    * - Homebrew
-      - `Reference <https://github.com/Homebrew/homebrew-core/tree/master/Formula>`__
-    * - FreeBSD Ports
-      - `Reference <https://svnweb.freebsd.org/ports/head/>`__
 
 
 PostgreSQL
@@ -252,33 +242,22 @@ If no version is provided, a suitable repository is indicated.
     * - Version
       - CentOS/RHEL
       - Ubuntu
-      - Homebrew
-      - FreeBSD Ports
     * - 11
       - 7 (`postgresql <https://yum.postgresql.org/11/redhat/rhel-7-x86_64/>`__), 8 (`postgresql <https://yum.postgresql.org/11/redhat/rhel-8-x86_64/>`__), 9 (`postgresql <https://download.postgresql.org/pub/repos/yum/11/redhat/rhel-9-x86_64/>`__)
       - 18.04, 20.04 (`postgresql <https://apt.postgresql.org/pub/repos/apt/>`__)
-      - Yes
-      - Yes
     * - 12
       - 7 (`postgresql <https://yum.postgresql.org/12/redhat/rhel-7-x86_64/>`__), 8 (`postgresql <https://yum.postgresql.org/12/redhat/rhel-8-x86_64/>`__), 9 (`postgresql <https://download.postgresql.org/pub/repos/yum/12/redhat/rhel-9-x86_64/>`__)
       - 18.04, 20.04 (`postgresql <https://apt.postgresql.org/pub/repos/apt/>`__)
-      - Yes
-      - Yes
     * - 13
       - 7 (`postgresql <https://yum.postgresql.org/13/redhat/rhel-7-x86_64/>`__)
       - 18.04, 20.04, 22.04 (`postgresql <https://apt.postgresql.org/pub/repos/apt/>`__)
-      - Yes
-      - Yes
     * - 14
       - 7 (`postgresql <https://yum.postgresql.org/14/redhat/rhel-7-x86_64/>`__)
       - 18.04, 20.04, 22.04 (`postgresql <https://apt.postgresql.org/pub/repos/apt/>`__)
-      - Yes
-      - Yes
     * - Details
       - 
       - `Reference <https://packages.ubuntu.com/search?keywords=postgresql&searchon=names&suite=all&section=all>`__
-      - 
-      - 
+
 
 The PostgreSQL project provides `packages
 <https://www.postgresql.org/download/>`__ for supported platforms
@@ -347,18 +326,12 @@ Version provided by distribution
     * - Version
       - CentOS/RHEL
       - Ubuntu
-      - Homebrew
-      - FreeBSD Ports
     * - 3.6
       - 7 (`EPEL <https://dl.fedoraproject.org/pub/epel/7/x86_64/>`__)
       - 18.04
-      - Yes
-      - Yes
     * - 3.7
       - 7 (`EPEL <https://dl.fedoraproject.org/pub/epel/7/x86_64/>`__)
       - 18.04
-      - Yes
-      - Yes
 
 The Django version used by OMERO.web (5.23.0) requires Python 3.8 or higher.
 
@@ -408,28 +381,18 @@ If no version is provided, a suitable repository is indicated.
     * - Version
       - CentOS/RHEL
       - Ubuntu
-      - Homebrew
-      - FreeBSD Ports
     * - 3.5
       - 6, 7 (`zeroc <https://zeroc.com/downloads/ice/3.5/>`__)
       - 14.04, 16.04
-      - N/A
-      - N/A
     * - 3.6
       - 6, 7 (`zeroc <https://zeroc.com/downloads/ice/3.6/>`__)
       - 14.04, 16.04 (`zeroc <https://zeroc.com/downloads/ice/3.6/>`__)
-      - Yes
-      - Yes
     * - 3.7
       - 7 (`zeroc <https://zeroc.com/downloads/ice/3.7/>`__)
       - 16.04, 18.04 (`zeroc <https://zeroc.com/downloads/ice/3.7/>`__)
-      - Yes
-      - Yes
     * - Details
       -
       - `Reference <https://packages.ubuntu.com/search?keywords=ice&searchon=names&suite=all&section=all>`__
-      -
-      -
 
 .. _version requirements java:
 
@@ -485,28 +448,18 @@ Version provided by distribution
     * - Version
       - CentOS/RHEL
       - Ubuntu
-      - Homebrew
-      - FreeBSD Ports
     * - 7
       - 6, 7
       - 14.04
-      - N/A
-      - Yes
     * - 8
       - 6, 7
       - 16.04, 18.04
-      - N/A
-      - N/A
     * - 11
       - 7
       - 18.04
-      - N/A
-      - Yes
     * - Details
       - 
       - `Reference <https://packages.ubuntu.com/search?keywords=jdk&searchon=names&suite=all&section=all>`__
-      - 
-      - 
 
 Note that all distributions provide OpenJDK due to distribution restrictions
 by Oracle. `Oracle Java
@@ -565,23 +518,12 @@ If no version is provided, a suitable repository is indicated.
     * - Version
       - CentOS/RHEL
       - Ubuntu
-      - Homebrew
-      - FreeBSD Ports
     * - 1.12
       - 7 (`EPEL <https://dl.fedoraproject.org/pub/epel/7/x86_64/>`__)
       - 14.04 (`nginx <https://launchpad.net/~nginx/+archive/ubuntu/stable>`__)
-      - N/A
-      - Yes
     * - 1.14
       - N/A
       - 16.04, 18.04 (`nginx <https://launchpad.net/~nginx/+archive/ubuntu/stable>`__)
-      - Yes
-      - Yes
-    * - Details
-      - 
-      - 
-      - `Reference <https://packages.ubuntu.com/search?keywords=nginx&searchon=names&suite=all&section=all>`__
-      - 
 
 .. _support-levels:
 

From c88bf5607ef50d5faa3dff7881570637422c5262 Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Tue, 7 Nov 2023 21:19:02 +0000
Subject: [PATCH 14/24] review nginx

---
 omero/sysadmins/version-requirements.rst | 43 +++++++++---------------
 1 file changed, 16 insertions(+), 27 deletions(-)

diff --git a/omero/sysadmins/version-requirements.rst b/omero/sysadmins/version-requirements.rst
index b5ffbc2e8b..7d7221a834 100644
--- a/omero/sysadmins/version-requirements.rst
+++ b/omero/sysadmins/version-requirements.rst
@@ -482,30 +482,19 @@ OMERO support policies
       - Release date
       - Supported until
       - OMERO 5.6
-    * - 1.6
-      - Apr 2014
-      - Apr 2015
-      - |Dropped|
-    * - 1.8
-      - Apr 2015
-      - Jan 2016
-      - |Dropped|
-    * - 1.10
-      - Apr 2016
-      - Apr 2017
-      - |Deprecated|
-    * - 1.12
-      - Apr 2017
-      - Apr 2018
+    * - 1.23
+      - Jun 2022
+      - May 2023
       - |Supported|
-    * - 1.14
-      - Apr 2018
-      - Apr 2019
-      - |Recommended|
-    * - 1.16
-      - Apr 2019
+    * - 1.24
+      - Apr 2023
       - TBA
       - |Recommended|
+    * - 1.25
+      - May 2023
+      - TBA
+      - |Upcoming|
+
 
 Version provided by distribution
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -516,14 +505,14 @@ If no version is provided, a suitable repository is indicated.
     :align: left
 
     * - Version
-      - CentOS/RHEL
+      - RHEL/Rocky Linux
       - Ubuntu
-    * - 1.12
-      - 7 (`EPEL <https://dl.fedoraproject.org/pub/epel/7/x86_64/>`__)
-      - 14.04 (`nginx <https://launchpad.net/~nginx/+archive/ubuntu/stable>`__)
-    * - 1.14
+    * - 1.23
+      - 9 (`repo <http://nginx.org/packages/centos/9/x86_64/>`__)
       - N/A
-      - 16.04, 18.04 (`nginx <https://launchpad.net/~nginx/+archive/ubuntu/stable>`__)
+    * - 1.24
+      - 9 (`repo <http://nginx.org/packages/centos/9/x86_64/>`__)
+      - 22.04
 
 .. _support-levels:
 

From 61df479fcca0c1bc705139e3fdc6ffcc4a417d3c Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Tue, 7 Nov 2023 21:59:14 +0000
Subject: [PATCH 15/24] review Java

---
 omero/sysadmins/version-requirements.rst | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/omero/sysadmins/version-requirements.rst b/omero/sysadmins/version-requirements.rst
index 7d7221a834..1928b4a0f5 100644
--- a/omero/sysadmins/version-requirements.rst
+++ b/omero/sysadmins/version-requirements.rst
@@ -419,7 +419,7 @@ OMERO support policies
       - `Reference <https://www.oracle.com/technetwork/java/eol-135779.html>`__
     * - 8
       - Mar 2014
-      - Jun 2023
+      - Nov 2026
       - |Supported|
       - `Reference <https://access.redhat.com/articles/1299013>`__
     * - 11
@@ -427,16 +427,11 @@ OMERO support policies
       - Oct 2024
       - |Recommended|
       - `Reference <https://access.redhat.com/articles/1299013>`__
-    * - 12
-      - Sep 2018
-      - Oct 2024
-      - |Supported|
-      -
-    * - 13
+    * - 17
       - Sep 2018
-      - Oct 2024
+      - Oct 2027
       - |Supported|
-      -
+      - `Reference <https://access.redhat.com/articles/1299013>`__
 
 Version provided by distribution
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -448,15 +443,9 @@ Version provided by distribution
     * - Version
       - CentOS/RHEL
       - Ubuntu
-    * - 7
-      - 6, 7
-      - 14.04
-    * - 8
-      - 6, 7
-      - 16.04, 18.04
     * - 11
-      - 7
-      - 18.04
+      - 9
+      - 22.04
     * - Details
       - 
       - `Reference <https://packages.ubuntu.com/search?keywords=jdk&searchon=names&suite=all&section=all>`__

From 072a0b80cc9bbc259143aa25f35bb699644ce79b Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Tue, 7 Nov 2023 22:07:02 +0000
Subject: [PATCH 16/24] simplify python

---
 omero/sysadmins/version-requirements.rst | 25 ++++++++----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/omero/sysadmins/version-requirements.rst b/omero/sysadmins/version-requirements.rst
index 1928b4a0f5..21230c6c75 100644
--- a/omero/sysadmins/version-requirements.rst
+++ b/omero/sysadmins/version-requirements.rst
@@ -326,12 +326,12 @@ Version provided by distribution
     * - Version
       - CentOS/RHEL
       - Ubuntu
-    * - 3.6
-      - 7 (`EPEL <https://dl.fedoraproject.org/pub/epel/7/x86_64/>`__)
-      - 18.04
-    * - 3.7
-      - 7 (`EPEL <https://dl.fedoraproject.org/pub/epel/7/x86_64/>`__)
-      - 18.04
+    * - 3.9
+      - 9
+      - 
+    * - 3.10
+      - 
+      - 22.04
 
 The Django version used by OMERO.web (5.23.0) requires Python 3.8 or higher.
 
@@ -381,18 +381,9 @@ If no version is provided, a suitable repository is indicated.
     * - Version
       - CentOS/RHEL
       - Ubuntu
-    * - 3.5
-      - 6, 7 (`zeroc <https://zeroc.com/downloads/ice/3.5/>`__)
-      - 14.04, 16.04
     * - 3.6
-      - 6, 7 (`zeroc <https://zeroc.com/downloads/ice/3.6/>`__)
-      - 14.04, 16.04 (`zeroc <https://zeroc.com/downloads/ice/3.6/>`__)
-    * - 3.7
-      - 7 (`zeroc <https://zeroc.com/downloads/ice/3.7/>`__)
-      - 16.04, 18.04 (`zeroc <https://zeroc.com/downloads/ice/3.7/>`__)
-    * - Details
-      -
-      - `Reference <https://packages.ubuntu.com/search?keywords=ice&searchon=names&suite=all&section=all>`__
+      - 9 (`zeroc-ice-rhel9-x86_64 <https://github.com/glencoesoftware/zeroc-ice-rhel9-x86_64>`__)
+      - 22.04 (`zeroc-ice-ubuntu2204-x86_64  <https://github.com/glencoesoftware/zeroc-ice-ubuntu2204-x86_64>`__)
 
 .. _version requirements java:
 

From 08351d5d9e077928662c1fe09f097069579e6cd6 Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Tue, 7 Nov 2023 22:10:48 +0000
Subject: [PATCH 17/24] review postgresql

---
 omero/sysadmins/version-requirements.rst | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/omero/sysadmins/version-requirements.rst b/omero/sysadmins/version-requirements.rst
index 21230c6c75..650f73cca7 100644
--- a/omero/sysadmins/version-requirements.rst
+++ b/omero/sysadmins/version-requirements.rst
@@ -243,20 +243,17 @@ If no version is provided, a suitable repository is indicated.
       - CentOS/RHEL
       - Ubuntu
     * - 11
-      - 7 (`postgresql <https://yum.postgresql.org/11/redhat/rhel-7-x86_64/>`__), 8 (`postgresql <https://yum.postgresql.org/11/redhat/rhel-8-x86_64/>`__), 9 (`postgresql <https://download.postgresql.org/pub/repos/yum/11/redhat/rhel-9-x86_64/>`__)
-      - 18.04, 20.04 (`postgresql <https://apt.postgresql.org/pub/repos/apt/>`__)
+      - 9 (`postgresql <https://download.postgresql.org/pub/repos/yum/11/redhat/rhel-9-x86_64/>`__)
+      - 22.04 (`postgresql <https://apt.postgresql.org/pub/repos/apt/dists/jammy-pgdg/>`__)
     * - 12
-      - 7 (`postgresql <https://yum.postgresql.org/12/redhat/rhel-7-x86_64/>`__), 8 (`postgresql <https://yum.postgresql.org/12/redhat/rhel-8-x86_64/>`__), 9 (`postgresql <https://download.postgresql.org/pub/repos/yum/12/redhat/rhel-9-x86_64/>`__)
-      - 18.04, 20.04 (`postgresql <https://apt.postgresql.org/pub/repos/apt/>`__)
+      - 9 (`postgresql <https://download.postgresql.org/pub/repos/yum/12/redhat/rhel-9-x86_64/>`__)
+      - 22.04 (`postgresql <https://apt.postgresql.org/pub/repos/apt/dists/jammy-pgdg/>`__)
     * - 13
-      - 7 (`postgresql <https://yum.postgresql.org/13/redhat/rhel-7-x86_64/>`__)
-      - 18.04, 20.04, 22.04 (`postgresql <https://apt.postgresql.org/pub/repos/apt/>`__)
+      - 9
+      - 22.04 (`postgresql <https://apt.postgresql.org/pub/repos/apt/dists/jammy-pgdg/>`__)
     * - 14
-      - 7 (`postgresql <https://yum.postgresql.org/14/redhat/rhel-7-x86_64/>`__)
-      - 18.04, 20.04, 22.04 (`postgresql <https://apt.postgresql.org/pub/repos/apt/>`__)
-    * - Details
-      - 
-      - `Reference <https://packages.ubuntu.com/search?keywords=postgresql&searchon=names&suite=all&section=all>`__
+      - 9 (`postgresql <https://yum.postgresql.org/14/redhat/rhel-9-x86_64/>`__)
+      - 22.04
 
 
 The PostgreSQL project provides `packages

From 4971ca5b0a00efc72736f36bf95e90cc5cb18035 Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Tue, 7 Nov 2023 22:11:23 +0000
Subject: [PATCH 18/24] remove reference to next release

---
 omero/sysadmins/version-requirements.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/omero/sysadmins/version-requirements.rst b/omero/sysadmins/version-requirements.rst
index 650f73cca7..5de6fd2763 100644
--- a/omero/sysadmins/version-requirements.rst
+++ b/omero/sysadmins/version-requirements.rst
@@ -14,7 +14,7 @@ Support is limited to those environments on which OMERO is
 routinely tested.
 
 This page details the minimum version requirements for the current
-(|current_version|) release and also **possible** changes for the next release.
+(|current_version|) release.
 
 It is intended to provide a roadmap in order that sysadmins may
 plan ahead and ensure that prerequisites are in place for future upgrades.

From 23711878f4b42010e54e157081f9950b6257eaac Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Thu, 9 Nov 2023 09:15:56 +0000
Subject: [PATCH 19/24] adjust Java

---
 omero/sysadmins/version-requirements.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/omero/sysadmins/version-requirements.rst b/omero/sysadmins/version-requirements.rst
index 5de6fd2763..6be90e629b 100644
--- a/omero/sysadmins/version-requirements.rst
+++ b/omero/sysadmins/version-requirements.rst
@@ -418,7 +418,7 @@ OMERO support policies
     * - 17
       - Sep 2018
       - Oct 2027
-      - |Supported|
+      - |Upcoming|
       - `Reference <https://access.redhat.com/articles/1299013>`__
 
 Version provided by distribution

From becc6f3436dda5fc46d140a17aaee253980d4288 Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Thu, 9 Nov 2023 11:09:53 +0000
Subject: [PATCH 20/24] add psql 15

---
 omero/sysadmins/version-requirements.rst | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/omero/sysadmins/version-requirements.rst b/omero/sysadmins/version-requirements.rst
index 6be90e629b..76e0bd5958 100644
--- a/omero/sysadmins/version-requirements.rst
+++ b/omero/sysadmins/version-requirements.rst
@@ -214,10 +214,6 @@ OMERO support policies
       - Release date
       - Supported until
       - OMERO 5.6
-    * - 11
-      - Oct 2018
-      - Nov 2023
-      - |Supported|
     * - 12
       - Sep 2019
       - Nov 2024
@@ -230,6 +226,10 @@ OMERO support policies
       - Sep 2021
       - Nov 2026
       - |Supported|
+    * - 15
+      - Sep 2022
+      - Nov 2027
+      - |Supported|
 
 Version provided by distribution
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -254,6 +254,9 @@ If no version is provided, a suitable repository is indicated.
     * - 14
       - 9 (`postgresql <https://yum.postgresql.org/14/redhat/rhel-9-x86_64/>`__)
       - 22.04
+    * - 15
+      - 9 (`postgresql <https://yum.postgresql.org/15/redhat/rhel-9-x86_64/>`__)
+      - 22.04 (`postgresql <https://apt.postgresql.org/pub/repos/apt/dists/jammy-pgdg/>`__)
 
 
 The PostgreSQL project provides `packages

From 6535000eca7b4fe6f3e534a6d406599a7540ef3d Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Thu, 9 Nov 2023 11:10:57 +0000
Subject: [PATCH 21/24] remove psql 11

---
 omero/sysadmins/version-requirements.rst | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/omero/sysadmins/version-requirements.rst b/omero/sysadmins/version-requirements.rst
index 76e0bd5958..93541f49a0 100644
--- a/omero/sysadmins/version-requirements.rst
+++ b/omero/sysadmins/version-requirements.rst
@@ -242,9 +242,6 @@ If no version is provided, a suitable repository is indicated.
     * - Version
       - CentOS/RHEL
       - Ubuntu
-    * - 11
-      - 9 (`postgresql <https://download.postgresql.org/pub/repos/yum/11/redhat/rhel-9-x86_64/>`__)
-      - 22.04 (`postgresql <https://apt.postgresql.org/pub/repos/apt/dists/jammy-pgdg/>`__)
     * - 12
       - 9 (`postgresql <https://download.postgresql.org/pub/repos/yum/12/redhat/rhel-9-x86_64/>`__)
       - 22.04 (`postgresql <https://apt.postgresql.org/pub/repos/apt/dists/jammy-pgdg/>`__)

From 91785d44b3a8f20cad216ea5613e4162b897d74a Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Tue, 14 Nov 2023 10:12:33 +0000
Subject: [PATCH 22/24] fix psql recommended version

---
 omero/sysadmins/version-requirements.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/omero/sysadmins/version-requirements.rst b/omero/sysadmins/version-requirements.rst
index 93541f49a0..b400c1a420 100644
--- a/omero/sysadmins/version-requirements.rst
+++ b/omero/sysadmins/version-requirements.rst
@@ -221,11 +221,11 @@ OMERO support policies
     * - 13
       - Sep 2020
       - Nov 2025
-      - |Recommended|
+      - |Supported|
     * - 14
       - Sep 2021
       - Nov 2026
-      - |Supported|
+      - |Recommended|
     * - 15
       - Sep 2022
       - Nov 2027

From 08d52ae8a842f8f9411375ca42e74f140443e59f Mon Sep 17 00:00:00 2001
From: Jean-Marie Burel <j.burel@dundee.ac.uk>
Date: Tue, 14 Nov 2023 10:27:47 +0000
Subject: [PATCH 23/24] review status

---
 omero/sysadmins/version-requirements.rst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/omero/sysadmins/version-requirements.rst b/omero/sysadmins/version-requirements.rst
index b400c1a420..37485e8412 100644
--- a/omero/sysadmins/version-requirements.rst
+++ b/omero/sysadmins/version-requirements.rst
@@ -99,11 +99,11 @@ General overview for `RHEL
     * - `RHEL 7 <https://endoflife.date/rhel>`__
       - June 2014
       - June 2024
-      - |Supported|
+      - |Deprecated|
     * - `CentOS 7 <https://endoflife.date/centos>`__
       - June 2014
       - June 2024
-      - |Supported|
+      - |Deprecated|
     * - `RHEL 8 <https://endoflife.date/rhel>`__
       - May 2019
       - Dec 2029
@@ -141,11 +141,11 @@ Linux (Ubuntu)
     * - 18.04 LTS
       - Apr 2018
       - Apr 2028
-      - |Supported|
+      - |Dropped|
     * - 20.04 LTS
       - Apr 2020
       - Apr 2030
-      - |Supported|
+      - |Deprecated|
     * - 22.04 LTS
       - Apr 2022
       - Apr 2032
@@ -304,7 +304,7 @@ OMERO support policies
     * - 3.11
       - Oct 2022
       - Oct 2027
-      - |Supported|
+      - |Upcoming|
       - `PEP 664 <https://peps.python.org/pep-0664/>`__
     * - 3.12
       - Oct 2023

From 42be6731e7bf9e9a8d013825668ee54e98e5a051 Mon Sep 17 00:00:00 2001
From: jean-marie burel <j.burel@dundee.ac.uk>
Date: Wed, 22 Nov 2023 10:07:21 +0000
Subject: [PATCH 24/24] Update omero/sysadmins/version-requirements.rst

Co-authored-by: pwalczysko <p.walczysko@dundee.ac.uk>
---
 omero/sysadmins/version-requirements.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/omero/sysadmins/version-requirements.rst b/omero/sysadmins/version-requirements.rst
index 37485e8412..f5e9971f5e 100644
--- a/omero/sysadmins/version-requirements.rst
+++ b/omero/sysadmins/version-requirements.rst
@@ -153,7 +153,7 @@ Linux (Ubuntu)
 
 
 Only the LTS releases are supported due to resource limitations upon
-CI and testing. Only the last LTS releases is supported. There is currently no CI testing
+CI and testing. Only the last LTS release is supported. There is currently no CI testing
 for any version.
 
 Microsoft Windows