Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from geoserver:main #40

Open
wants to merge 36 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
693385e
[GEOS-11588] Use JDBCConfiguration.validateConfiguration to provide f…
jodygarnett Oct 29, 2024
2fbb244
[GEOS-11580] Improve embedded GWC meta-tiling performance
Mar 2, 2024
1caac1c
[GEOS-11580] Improve embedded GWC meta-tiling performance: review, QA…
aaime Oct 18, 2024
ff7f94d
[GEOS-11580] Review feedback
aaime Oct 25, 2024
aef8bc2
Bump GeoFence to 3.7.2
etj Oct 30, 2024
54cf2e0
[GEOS-11141] Change docs to workspace admin recommendation
jodygarnett Oct 30, 2024
5cf0c28
Use the capabilities getmap / gettile url as the "base" for templates…
prushforth Oct 30, 2024
c1a4f75
[GEOS-11590] Upgrade log4j to 2.24.1 and slf4j to 2.0.16
sikeoka Oct 29, 2024
9e0f31b
More Windows VM tolerance for this test
aaime Oct 28, 2024
95852c2
Declare all GeoTools dependencies in the root pom's dependency manage…
groldan Aug 6, 2024
ce448e4
Merge pull request #7808 from groldan/remove_gt_version_use_version_f…
groldan Nov 4, 2024
ef583aa
Have OGC API features build fully and pass QA
aaime Nov 4, 2024
f26ece8
Increasing OGC API core test coverage, in preparation for graduation
aaime Nov 5, 2024
fb78bd9
Remove duplicate dependency declaration for gt-cql2-text in the root pom
groldan Nov 5, 2024
b99c295
Small refresh of OGC API - Features documentation
aaime Nov 6, 2024
f082b20
Clarify the requirements for Content dependent legends parameters
giohappy Nov 7, 2024
3a43a09
hideEmptyRules doesn't require countMatched to be true
giohappy Nov 7, 2024
5974933
Re-align the Features - Part 3, Filtering implementation with the fin…
aaime Nov 7, 2024
22c8346
Make sure the storage-crs is in the target crs list
aaime Nov 8, 2024
f099c0e
Update SQL Server supported versions (#8003)
mprins Nov 13, 2024
14d8a74
Cancel running github actions workflows when pull requests are updated
groldan Nov 12, 2024
1430c3f
Add a data directory to run ogcapi-features-1.0 CITE tests
groldan Nov 8, 2024
e3e37dd
Run CITE tests for ogcapi-features 1.0
groldan Nov 5, 2024
fc6d487
[GEOS-11604] Switch to YAML official mime type in OGC API
aaime Nov 8, 2024
14eb96e
Fix ogcapi-features10-localhost make target for CITE tests
groldan Nov 14, 2024
15485c1
ogcapi-features10 CITE: swap default published CRS 3857 by 4087
groldan Nov 14, 2024
564a275
ogcapi-features CITE tests: set numDecimals to 7 to match CITE test l…
groldan Nov 17, 2024
f182e56
Use a patched ogccite/ets-ogcapi-features10 Docker image with additio…
groldan Nov 14, 2024
aa4f25c
Merge pull request #8034 from groldan/ogcapi-features/cite
groldan Nov 17, 2024
570ff11
Add tests to check ogcapi-features respect the configured decimal places
groldan Nov 15, 2024
09f405b
Make spatial extent in an ogcapi-features Collection document respect…
groldan Nov 17, 2024
5e463c9
Build the war with just the required modules, make parallelism propor…
aaime Nov 16, 2024
034ed4e
WFS 1.0 tests running and passing
aaime Nov 16, 2024
b509070
WFS 1.1 tests running and passing
aaime Nov 16, 2024
3a652d6
[GEOS-11610] Update Jetty from 9.4.55.v20240627 to 9.4.56.v20240826 (…
mprins Nov 18, 2024
9900767
[GEOS-11609] Bump XStream from 1.4.20 to 1.4.21 (#8030)
mprins Nov 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions .github/workflows/assembly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ name: Assembly GitHub CI
on:
pull_request

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

env:
MAVEN_OPTS: -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3 -Xmx756m -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Dspotless.apply.skip=true

Expand Down
127 changes: 127 additions & 0 deletions .github/workflows/cite.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
name: Run CITE Tests

on:
pull_request:
paths-ignore:
- '**/src/main/resources/GeoServerApplication_*.properties'
- '!**/src/main/resources/GeoServerApplication_fr.properties'

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
build-war:
runs-on: ubuntu-latest
name: Build GeoServer WAR
steps:
- name: Checkout repository (shallow clone)
uses: actions/checkout@v4
with:
fetch-depth: 1

- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
- name: Set up Maven
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.9.8
- 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.war
working-directory: build/cite
run: make war

- name: Upload geoserver.war as artifact
uses: actions/upload-artifact@v3
with:
name: geoserver-war
path: build/cite/geoserver/geoserver.war

run-cite-tests:
needs: build-war
runs-on: ubuntu-latest
name: CITE
strategy:
fail-fast: false # Prevents other matrix jobs from being canceled if one fails
matrix:
#suite: [ogcapi-features10, wcs10, wcs11, wfs10, wfs11, wms10, wms11, wms13]
suite: [ogcapi-features10, wms11, wfs10, wfs11, wcs11]

steps:
- name: Checkout repository (shallow clone)
uses: actions/checkout@v4
with:
fetch-depth: 1

- name: Download geoserver.war artifact
uses: actions/download-artifact@v3
with:
name: geoserver-war
path: build/cite/geoserver/

- name: Print services and images used for the ${{ matrix.suite }} test run
# in case there's a jq syntax error
continue-on-error: true
working-directory: build/cite
run: make print-services suite=${{ matrix.suite }}

- name: Pull teamengine and other required images
working-directory: build/cite
continue-on-error: true
run: make pull suite=${{ matrix.suite }}

- name: Build ogccite/geoserver:${{ matrix.suite }} docker image
working-directory: build/cite
run: make build-geoserver-image suite=${{ matrix.suite }}

- name: Build the ETS docker image
working-directory: build/cite
run: make build-ets-image suite=${{ matrix.suite }}

# optional, used to print out a human readable summary of test failures from the testng results xml
- name: Install the optional xmlstarlet utility
run: |
sudo apt-get update && sudo apt-get install -y xmlstarlet

- name: Run the ${{ matrix.suite }} CITE test suite
working-directory: build/cite
run: |
chmod o+w logs
make test suite=${{ matrix.suite }}

- name: Print full failures report
if: always()
working-directory: build/cite
run: make print-full-failures

- name: Print GeoServer logs
if: always()
working-directory: build/cite
run: make print-logs suite=${{ matrix.suite }} service=geoserver

- name: Print TeamEngine logs
if: always()
working-directory: build/cite
run: make print-logs suite=${{ matrix.suite }} service=teamengine

- name: Shutdown containers
if: always()
working-directory: build/cite
run: make stop

- name: Upload logs folder
if: always()
uses: actions/upload-artifact@v3
with:
name: cite-${{ matrix.suite }}-logs
path: build/cite/logs/
4 changes: 4 additions & 0 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ on:
- doc/**
- src/pom.xml

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

env:
MAVEN_OPTS: -Xmx1024m -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3 -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Dspotless.apply.skip=true

Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/javadoc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ on:
- '**/src/main/resources/GeoServerApplication_*.properties'
- '!**/src/main/resources/GeoServerApplication_fr.properties'

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

env:
MAVEN_OPTS: -Xmx1024m -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3 -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Dspotless.apply.skip=true

Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ on:
- '**/src/main/resources/GeoServerApplication_*.properties'
- '!**/src/main/resources/GeoServerApplication_fr.properties'

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

env:
MAVEN_OPTS: -Xmx1024m -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3 -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Dspotless.apply.skip=true

Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ on:
- '**/src/main/resources/GeoServerApplication_*.properties'
- '!**/src/main/resources/GeoServerApplication_fr.properties'

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

env:
MAVEN_OPTS: -Xmx1024m -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3 -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Dspotless.apply.skip=true

Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/qa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ name: QA GitHub CI

on: [pull_request]

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

env:
MAVEN_OPTS: -Xmx1024m -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3 -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn

Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ on:
- '**/src/main/resources/GeoServerApplication_*.properties'
- '!**/src/main/resources/GeoServerApplication_fr.properties'

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

env:
MAVEN_OPTS: -Xmx1024m -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3 -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Dspotless.apply.skip=true

Expand Down
Loading