Update ondersteunde versies voor 4.0.0

B3Partners · Nov 15, 2024 · 416a105 · 416a105
1 parent b3d4003
commit 416a105
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 18 deletions.
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
@@ -2,15 +2,16 @@
 
 ## Ondersteund / Supported
 
-| Release      | Datum        | Ondersteund/supported  | valid database versions (fully patched/mainstream support)                                      | runtime (fully patched)                 |
-|--------------|--------------|------------------------|-------------------------------------------------------------------------------------------------|-----------------------------------------|
-| 4.x-SNAPSHOT |              | ❌ (development)       | Current PostgreSQL 13 - 17 + PostGIS 3.4 - 3.5, Oracle 19c/21c/23ai + Spatial, 21 XE, 23ai Free | Java 17, Java 21, Tomcat 9, Docker 27   |
-| 3.0.2        | 7-feb-2024   | ✔️                      | PostgreSQL 12 - 16 + PostGIS 3.4, Oracle 19c/21c + Spatial                                      | Java 11, Tomcat 9, Docker 25            |
-| 3.0.1        | 13-jul-2023  | ❌ (superceded)        | PostgreSQL 11 - 15 + PostGIS 3.3, Oracle 19c/21c + Spatial                                      | Java 11, Tomcat 9, Docker 24            |
-| 3.0.0        | 6-feb-2023   | ❌ (superceded)        | PostgreSQL 11 - 15 + PostGIS 3.3, Oracle 19c/21c + Spatial                                      | Java 11, Tomcat 9, Docker 23            |
-| 3.0.0-rc1    | 13-jan-2023  | ❌ (superceded)        | PostgreSQL 11 - 15 + PostGIS 3.3, Oracle 19c/21c + Spatial                                      | Java 11, Tomcat 9, Docker 23            |
-| 2.3.3        | 29-nov-2022  | ❌                     | PostgreSQL 11 - 15 + PostGIS 3.3, Oracle 19c/21c + Spatial                                      | Java 11, Tomcat 8.5/9, Docker 20        |
-| =< 2.3.2     | 29-sept-2022 | ❌                     | PostgreSQL 10 - 14 + PostGIS 3.2, Oracle 19c/21c + Spatial                                      | Java 11, Tomcat 8.5                     |
+| Release        | Datum        | Ondersteund/supported | valid database versions (fully patched/mainstream support)                                | runtime (fully patched)               |
+|----------------|--------------|-----------------------|-------------------------------------------------------------------------------------------|---------------------------------------|
+| 4.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 27 |
+| 4.0.0          | 15-nov-2024  | ✔️                    | PostgreSQL 13 - 17 + PostGIS 3.4 - 3.5, Oracle 19c/21c/23ai + Spatial, 21 XE, 23ai Free   | Java 17, Java 21, Tomcat 9, Docker 27 |
+| 3.0.2          | 7-feb-2024   | ✔️ (deprecated)       | PostgreSQL 12 - 16 + PostGIS 3.4, Oracle 19c/21c + Spatial                                | Java 11, Tomcat 9, Docker 25          |
+| 3.0.1          | 13-jul-2023  | ❌ (superceded)        | PostgreSQL 11 - 15 + PostGIS 3.3, Oracle 19c/21c + Spatial                                | Java 11, Tomcat 9, Docker 24          |
+| 3.0.0          | 6-feb-2023   | ❌ (superceded)        | PostgreSQL 11 - 15 + PostGIS 3.3, Oracle 19c/21c + Spatial                                | Java 11, Tomcat 9, Docker 23          |
+| 3.0.0-rc1      | 13-jan-2023  | ❌ (superceded)        | PostgreSQL 11 - 15 + PostGIS 3.3, Oracle 19c/21c + Spatial                                | Java 11, Tomcat 9, Docker 23          |
+| 2.3.3          | 29-nov-2022  | ❌                     | PostgreSQL 11 - 15 + PostGIS 3.3, Oracle 19c/21c + Spatial                                | Java 11, Tomcat 8.5/9, Docker 20      |
+| =< 2.3.2       | 29-sept-2022 | ❌                     | PostgreSQL 10 - 14 + PostGIS 3.2, Oracle 19c/21c + Spatial                                | Java 11, Tomcat 8.5                   |
 
 _zie ook/see also: https://github.com/B3Partners/brmo/wiki/Systeemeisen_
 
@@ -20,8 +21,8 @@ Neem contact op met het team via support@b3partners.nl met alle details van het
 Indien u beschikt over een Github account geeft u die AUB ook door. Eventueel kunt u een PR maken met een fix
 van de kwetsbaarheid; gebruik https://github.com/B3Partners/brmo/security/advisories om een private branch te maken.
 
-Wees verantwoordelijk in uw openbaarmaking en probeer te voorkomen dat het probleem wordt onthuld via Github-issues
-of commit-berichten.
+Wees verantwoordelijk in uw openbaarmaking en probeer te voorkomen dat het probleem wordt onthuld via Github-issues,
+pull-requests of commit-berichten.
 
 Uw e-mail moet binnen 1 werkdag (maandag-vrijdag) worden bevestigd door het ondersteuningsteam en/of een ontwikkelaar.
 
@@ -31,7 +32,7 @@ Please contact the team by email through support@b3partners.nl with all details
 a Github account, please provide that as well. Optionally you can make a PR to provide a fix of the vulnerability;
 use https://github.com/B3Partners/brmo/security/advisories to create a private branch.
 
-Please be responsible in your disclosure and try to prevent disclosing the problem through Github issues or
-commit messages.
+Please be responsible in your disclosure and try to prevent disclosing the problem through Github issues, pull-requests
+or commit messages.
 
 Your mail should be notified within 1 working day (monday-friday) by the support team and/or a developer.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -31,9 +31,9 @@ jobs:
         # zie ook https://www.postgresql.org/support/versioning/
         postgis: 
             # t/m november 2025
-            - 13-3.4-alpine
+            - 13-3.5-alpine
             # t/m november 2027
-            - 15-3.4-alpine
+            - 15-3.5-alpine
             # t/m november 2028
             - 16-3.5-alpine
             # t/m november 2029

diff --git a/.github/workflows/upgrade-pgsql.yml b/.github/workflows/upgrade-pgsql.yml
@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        postgis: [ 13-3.4 ]
+        postgis: [ 13-3.5 ]
 
     services:
       postgres:

diff --git a/pom.xml b/pom.xml
@@ -880,7 +880,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-site-plugin</artifactId>
-                    <version>4.0.0-M16</version>
+                    <version>3.21.0</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>

diff --git a/src/site/markdown/developer-notes.md b/src/site/markdown/developer-notes.md
@@ -51,7 +51,7 @@ _Zorg dat de tabellen en views zijn aangemaakt (BAG!)._
 ```bash
 export POSTGRES_PASSWORD=postgres
 export PGPASSWORD=postgres
-.build/ci/pgsql-start-docker.sh 16-3.4-alpine
+.build/ci/pgsql-start-docker.sh 17-3.5-alpine
 .build/ci/pgsql-create-databases.sh
 .build/ci/pgsql-setup.sh
 mvn -e verify -B -Ppostgresql -T1 -Dtest.onlyITs=true -pl 'bag2-loader' -DskipQA=true