Merge pull request #15 from GeoCat/wicket8

refresh from main to resolve demo request page conflicts

.github/workflows/assembly.yml

@@ -12,22 +12,22 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             jdk: 11
             dist: 'temurin'
     steps:
     - uses: actions/checkout@v4
     - name: Set up JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.jdk }}
         distribution: ${{ matrix.dist }}
     - name: Set up Maven
-      uses: stCarolas/setup-maven@v4.5
+      uses: stCarolas/setup-maven@v5
       with:
-        maven-version: 3.9.5
+        maven-version: 3.9.8
     - name: Maven repository caching
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.m2/repository
         key: gs-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -40,12 +40,9 @@ jobs:
     - name: Package GeoServer modules and extensions
       run: |
         mvn -B -ntp -nsu -N -f src/pom.xml assembly:single
-    - name: Build community modules without tests
+    - name: Build and package community modules (without tests)
       run: |
-        mvn -B -ntp -U -T3 -DskipTests -PcommunityRelease -f src/community/pom.xml install
-    - name: Package community modules
-      run:  |
-        mvn -B -ntp -nsu -N -f src/community/pom.xml assembly:single
+        mvn -B -ntp -U -T3 -DskipTests -PcommunityRelease,assembly -f src/community/pom.xml install
     - name: Remove SNAPSHOT jars from repository
       run: |
         find ~/.m2/repository -name "*SNAPSHOT*" -type d | xargs rm -rf {}

.github/workflows/backport.yml

@@ -14,7 +14,7 @@ jobs:
       contents: write
       pull-requests: write
       issues: write
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: Backport
     steps:
       - name: Backport Bot

.github/workflows/docs.yml

@@ -11,20 +11,20 @@ env:
 
 jobs:
   docs:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
     - name: Set up JDK 11
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 11
         distribution: 'temurin'
     - name: Set up Maven
-      uses: stCarolas/setup-maven@v4.5
+      uses: stCarolas/setup-maven@v5
       with:
-        maven-version: 3.9.5
+        maven-version: 3.9.8
     - name: Setup python for docs
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.x'
         cache: 'pip' # caching pip dependencies from requirements.txt below
@@ -43,20 +43,20 @@ jobs:
         fi
 
   docs-zhcn:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
     - name: Set up JDK 11
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 11
         distribution: 'temurin'
     - name: Set up Maven
-      uses: stCarolas/setup-maven@v4.5
+      uses: stCarolas/setup-maven@v5
       with:
-        maven-version: 3.9.5
+        maven-version: 3.9.8
     - name: Setup python for docs
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: '3.x'
         cache: 'pip' # caching pip dependencies from requirements.txt below

.github/workflows/javadoc.yml

@@ -15,22 +15,22 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             jdk: 11
             dist: 'temurin'
     steps:
     - uses: actions/checkout@v4
     - name: Set up JDK 11
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.jdk }}
         distribution: ${{ matrix.dist }}
     - name: Set up Maven
-      uses: stCarolas/setup-maven@v4.5
+      uses: stCarolas/setup-maven@v5
       with:
-        maven-version: 3.9.5
+        maven-version: 3.9.8
     - name: Maven repository caching
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.m2/repository
         key: gs-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/linux.yml

@@ -16,7 +16,7 @@ jobs:
       matrix:
         jdk: [ 11, 17, 21 ]
         dist: [ 'temurin' ]
-        os: [ 'ubuntu-20.04' ]
+        os: [ 'ubuntu-22.04' ]
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -25,16 +25,16 @@ jobs:
         # 500 commits, set to 0 to get all
         fetch-depth: 500
     - name: Set up JDK ${{ matrix.jdk }}
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.jdk }}
         distribution: ${{ matrix.dist }}
     - name: Set up Maven
-      uses: stCarolas/setup-maven@v4.5
+      uses: stCarolas/setup-maven@v5
       with:
-        maven-version: 3.9.5
+        maven-version: 3.9.8
     - name: Maven repository caching
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.m2/repository
         key: gs-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/macos.yml

@@ -17,16 +17,16 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up JDK 11
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 11
         distribution: 'temurin'
     - name: Set up Maven
-      uses: stCarolas/setup-maven@v4.5
+      uses: stCarolas/setup-maven@v5
       with:
-        maven-version: 3.9.5
+        maven-version: 3.9.8
     - name: Maven repository caching
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.m2/repository
         key: gs-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/postgis_appschema_online.yml

@@ -1,6 +1,6 @@
 name: PostGIS app-schema online tests
 
-on: [pull_request]
+on: [ pull_request ]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -10,44 +10,51 @@ jobs:
   appschema-postgis:
 
     runs-on: ubuntu-latest
+    services:
+      postgis:
+        image: postgis/postgis:15-3.4
+        ports:
+          - 5432:5432
+        env:
+          POSTGRES_PASSWORD: geoserver
+          POSTGRES_USER: geoserver
+          POSTGRES_DB: appschema
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
 
     steps:
-    # amrocha just tagged v2 with the latest code as huaxk, allowing usage of postgis/postgis docker image
-    - uses: amrocha/postgis-action@v2
-      with:
-        postgresql version: '15-3.4'
-        postgresql password: 'geoserver'
-        postgresql user: 'geoserver'
-        postgresql db: 'appschema'
-    - name: Set up JDK 11
-      uses: actions/setup-java@v2
-      with:
-        java-version: 11
-        distribution: 'temurin'
-    - uses: actions/checkout@v2
-    - name: Maven repository caching
-      uses: actions/cache@v2
-      with:
-        path: ~/.m2/repository
-        key: gt-maven-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          gt-maven-
-    - name: Build GeoServer dependent modules (no tests, prepare fresh artifacts)
-      run: mvn -B clean install -T2 -U --file src/pom.xml -Prelease,app-schema-online-test -DskipTests -pl :gs-app-schema-postgis-test -am -Dspotless.apply.skip=true
-    - name: Build PostGIS app-schema online tests
-      run: |
-        mkdir ~/.geoserver
-        cat <<EOT >>   ~/.geoserver/postgis.properties
-        user=geoserver
-        port=5432
-        password=geoserver
-        passwd=geoserver
-        url=jdbc\:postgresql\://localhost/appschema
-        host=localhost
-        database=appschema
-        driver=org.postgresql.Driver
-        EOT
-        mvn -B clean install -nsu --file src/pom.xml -Prelease,app-schema-online-test -pl :gs-app-schema-postgis-test -Dspotless.apply.skip=true
-    - name: Remove SNAPSHOT jars from repository
-      run: |
-        find ~/.m2/repository -name "*SNAPSHOT*" -type d | xargs rm -rf {} 
+      - name: Set up JDK 11
+        uses: actions/setup-java@v4
+        with:
+          java-version: 11
+          distribution: 'temurin'
+      - uses: actions/checkout@v2
+      - name: Maven repository caching
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2/repository
+          key: gs-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            gs-${{ runner.os }}-maven-
+      - name: Build GeoServer dependent modules (no tests, prepare fresh artifacts)
+        run: mvn -B clean install -T2 -U --file src/pom.xml -Prelease,app-schema-online-test -DskipTests -pl :gs-app-schema-postgis-test -am -Dspotless.apply.skip=true
+      - name: Build PostGIS app-schema online tests
+        run: |
+          mkdir ~/.geoserver
+          cat <<EOT >>   ~/.geoserver/postgis.properties
+          user=geoserver
+          port=5432
+          password=geoserver
+          passwd=geoserver
+          url=jdbc\:postgresql\://localhost/appschema
+          host=localhost
+          database=appschema
+          driver=org.postgresql.Driver
+          EOT
+          mvn -B clean install -nsu --file src/pom.xml -Prelease,app-schema-online-test -pl :gs-app-schema-postgis-test -Dspotless.apply.skip=true
+      - name: Remove SNAPSHOT jars from repository
+        run: |
+          find ~/.m2/repository -name "*SNAPSHOT*" -type d | xargs rm -rf {} 

.github/workflows/qa.yml

@@ -7,20 +7,20 @@ env:
 
 jobs:
   QA:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
     - name: Set up JDK 11
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 11
         distribution: 'temurin'
     - name: Set up Maven
-      uses: stCarolas/setup-maven@v4.5
+      uses: stCarolas/setup-maven@v5
       with:
-        maven-version: 3.9.5
+        maven-version: 3.9.8
     - name: Maven repository caching
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.m2/repository
         key: gs-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/windows.yml

@@ -17,16 +17,16 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up JDK 11
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 11
         distribution: 'temurin'
     - name: Set up Maven
-      uses: stCarolas/setup-maven@v4.5
+      uses: stCarolas/setup-maven@v5
       with:
-        maven-version: 3.9.5
+        maven-version: 3.9.8
     - name: Maven repository caching
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.m2/repository
         key: gs-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

README.md

@@ -40,10 +40,11 @@ for more details.
 GeoServer uses [JIRA](https://osgeo-org.atlassian.net/projects/GEOS), hosted by 
 [Atlassian](https://www.atlassian.com/), for issue tracking.
 
-## Mailing Lists
+<a id="mailing-lists"></a> <!-- to retain the existing anchor tag -->
+## Community support
 
-The [mailing list page](https://geoserver.org/comm/) on the GeoServer web site provides
-access to the various mailing list, as well as some indication of the [code of conduct](https://geoserver.org/comm/userlist-guidelines.html) when posting to the lists
+The [Community support page](https://geoserver.org/comm/) on the GeoServer web site provides
+access to the various channels of communication, as well as some indication of the [code of conduct](https://geoserver.org/comm/userlist-guidelines.html) when posting to the groups.
 
 ## Contributing
 

SECURITY.md

@@ -12,15 +12,15 @@ Each GeoServer release is supported with bug fixes for a year, with releases mad
 
 This approach provides ample time for upgrading ensuring you are always working with a supported GeoServer release.
 
-If your organisation is making use of a GeoServer version that is no longer in use by the community all is not lost.
+If your organization is making use of a GeoServer version that is no longer in use by the community all is not lost.
 You can volunteer on the developer list to make additional releases, or engage with one of our
 [Commercial Support](http://geoserver.org/support/) providers.
 
 ## Reporting a Vulnerability
 
 If you encounter a security vulnerability in GeoServer please take care to report in a responsible fashion:
 
-1. Keep exploit details out of public mailing lists and issue tracker.
+1. Keep exploit details out of public forums, mailing lists, and issue tracker.
 
 2. There are two options to report a security vulnerability:
 
@@ -33,7 +33,7 @@ If you encounter a security vulnerability in GeoServer please take care to repor
 
    * To report via GitHub:
 
-     Navigate to [security](https://github.com/geoserver/geoserver/security) page, use link for *Private vulnerability reporting*.
+     Navigate to [security](https://github.com/geoserver/geoserver/security) page, use link for [Private vulnerability reporting](https://github.com/geoserver/geoserver/security/advisories/new).
 
      For more information see [GitHub documentation](https://docs.github.com/en/code-security/security-advisories/guidance-on-reporting-and-writing-information-about-vulnerabilities/privately-reporting-a-security-vulnerability#privately-reporting-a-security-vulnerability).
 
@@ -53,6 +53,6 @@ Disclosure policy:
 4. A fix is included for the "stable" and "maintenance" downloads ([released as scheduled](https://github.com/geoserver/geoserver/wiki/Release-Schedule), or issued via emergency update)
 6. The CVE vulnerability is published with mitigation and patch instructions
 
-This represents a balance between transparency and particpation that does not overwhelm particpants. 
+This represents a balance between transparency and participation that does not overwhelm participants. 
 Those seeking greater visibility are encouraged to volunteer with the geoserver-security list;
 or work with one of the [commercial support providers](https://geoserver.org/support/) who participate on behalf of their customers.

data/release/demo/WCS_getCoverage.xml

@@ -33,6 +33,6 @@
   </rangeSubset>
   <output>
       <crs>EPSG:32633</crs>
-      <format>GeoTIFF</format>
+      <format>image/png</format>
   </output>
 </GetCoverage>

doc/en/api/1.0.0/coverages.yaml

@@ -6,8 +6,8 @@ info:
   description: A coverage is a raster data set which originates from a coverage store.
   contact:
     name: GeoServer
-    email: 'geoserver-users@sourceforge.net'
-    url: 'http://geoserver.org/comm/'
+    email: 'geoserver-users@osgeo.org'
+    url: 'https://geoserver.org/comm/'
 host: localhost:8080
 basePath: /geoserver/rest