Skip to content

Commit f933a65

Browse files
authored
Verwijder ondersteuning voor EOL PostgreSQL 13, voeg ondersteuning voor PostgreSQL 18 / Postgis 3.6 toe (#2556)
1 parent 519a61d commit f933a65

File tree

4 files changed

+9
-12
lines changed

4 files changed

+9
-12
lines changed

.github/SECURITY.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44

55
| Release | Datum | Ondersteund/supported | valid database versions (fully patched/mainstream support) | runtime (fully patched) |
66
|----------------|-------------|-----------------------|-------------------------------------------------------------------------------------------|---------------------------------------|
7-
| 6.0.x-SNAPSHOT | | ❌ (development) | Current PostgreSQL 13 - 17 + PostGIS 3.5, Oracle 19c/21c/23ai + Spatial, 21 XE, 23ai Free | Java 17, Java 21, Tomcat 9, Docker 28 |
8-
| 6.0.0 | | ✔️ | Current PostgreSQL 13 - 17 + PostGIS 3.5, Oracle 19c/21c/23ai + Spatial, 21 XE, 23ai Free | Java 17, Java 21, Tomcat 9, Docker 28 |
9-
| 5.0.2 | 16-may-2025 | ✔️ (deprecated) | PostgreSQL 13 - 17 + PostGIS 3.5, Oracle 19c/21c/23ai + Spatial, 21 XE, 23ai Free | Java 17, Java 21, Tomcat 9, Docker 27 |
10-
| 5.0.1 | 27-feb-2025 | ❌ (superceded) | PostgreSQL 13 - 17 + PostGIS 3.5, Oracle 19c/21c/23ai + Spatial, 21 XE, 23ai Free | Java 17, Java 21, Tomcat 9, Docker 27 |
11-
| 5.0.0 | 27-dec-2024 | ❌ (superceded) | PostgreSQL 13 - 17 + PostGIS 3.5, Oracle 19c/21c/23ai + Spatial, 21 XE, 23ai Free | Java 17, Java 21, Tomcat 9, Docker 27 |
7+
| 6.0.x-SNAPSHOT | | ❌ (development) | Current PostgreSQL 14 - 18 + PostGIS 3.6, Oracle 19c/21c/23ai + Spatial, 21 XE, 23ai Free | Java 17, Java 21, Tomcat 9, Docker 28 |
8+
| 6.0.1 | | ✔️ | Current PostgreSQL 13 - 17 + PostGIS 3.5, Oracle 19c/21c/23ai + Spatial, 21 XE, 23ai Free | Java 17, Java 21, Tomcat 9, Docker 28 |
9+
| 6.0.0 | | ✔️ (deprecated) | Current PostgreSQL 13 - 17 + PostGIS 3.5, Oracle 19c/21c/23ai + Spatial, 21 XE, 23ai Free | Java 17, Java 21, Tomcat 9, Docker 28 |
10+
| =< 5.0.2 | 16-may-2025 | ❌ (superceded) | PostgreSQL 13 - 17 + PostGIS 3.5, Oracle 19c/21c/23ai + Spatial, 21 XE, 23ai Free | Java 17, Java 21, Tomcat 9, Docker 27 |
1211
| 4.0.0 | 15-nov-2024 || PostgreSQL 13 - 17 + PostGIS 3.5, Oracle 19c/21c/23ai + Spatial, 21 XE, 23ai Free | Java 17, Java 21, Tomcat 9, Docker 27 |
1312
| =< 3.0.2 | 7-feb-2024 || PostgreSQL 12 - 16 + PostGIS 3.4, Oracle 19c/21c + Spatial | Java 11, Tomcat 9, Docker 25 |
1413
| =< 2.3.x | 29-nov-2022 || PostgreSQL 11 - 15 + PostGIS 3.3, Oracle 19c/21c + Spatial | Java 11, Tomcat 8.5/9, Docker 20 |

.github/workflows/linux.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,18 @@ jobs:
3030
# docker image tags from https://hub.docker.com/r/postgis/postgis/tags?page=1&ordering=last_updated
3131
# zie ook https://www.postgresql.org/support/versioning/
3232
postgis:
33-
# t/m november 2025
34-
- 13-3.5-alpine
3533
# t/m november 2027
3634
- 15-3.5-alpine
3735
# t/m november 2028
3836
- 16-3.5-alpine
3937
# t/m november 2029
40-
- 17-3.5-alpine
38+
- 17-3.6-alpine
39+
# t/m november 2030
40+
#- 18-3.6-alpine
4141
include:
4242
- java: 21
4343
java-dist: 'temurin'
44-
postgis: 17-3.5-alpine
44+
postgis: 18-3.6-alpine
4545

4646
steps:
4747
- uses: actions/checkout@v5

.github/workflows/upgrade-pgsql.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ jobs:
8383
.build/ci/pgsql-execute-upgrades.sh rsgbbgt
8484
.build/ci/pgsql-execute-upgrades.sh bag
8585
.build/ci/pgsql-execute-upgrades.sh brk
86-
# de topnl database/user worden niet (meer) aangemaakt
87-
# .build/ci/pgsql-execute-upgrade-extras.sh topnl
8886
8987
- name: 'Test'
9088
run: |

docker/src/main/docker/pg_conf/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM postgis/postgis:17-3.5-alpine
1+
FROM postgis/postgis:17-3.6-alpine
22

33
ARG TZ="Europe/Amsterdam"
44
ARG BRMO_VERSION="snapshot"

0 commit comments

Comments
 (0)