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

Upgrade GeoTools to 24.2 #1683

Merged
merged 3 commits into from
Feb 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,38 +50,45 @@ jobs:
- run: make acceptance-tests-run

# Extract artifacts
- run: docker run --rm --detach --name=builder mapfish_print_builder
- run: docker run --rm --detach --name=builder mapfish_print_builder || true
if: always()
- run: docker cp builder:/src/core/build/ core/build/
- run: docker cp builder:/src/core/build/ core/build/ || true
if: always()

- run: docker cp mapfish-print_tests_1:/src/examples/build/ examples/build/
- run: docker cp mapfish-print_tests_1:/src/examples/build/ examples/build/ || true
if: always()

- run: docker-compose logs
- run: docker-compose logs || true
if: failure()

- run: make acceptance-tests-down

- run: mkdir -p core/build/resources/actual examples/build/reports core/build/reports
examples/build/resources/test/examples
if: always()
- uses: actions/upload-artifact@v1
with:
name: Test results
path: core/build/resources/actual
if-no-files-found: ignore
if: failure()
- uses: actions/upload-artifact@v1
with:
name: Reports examples
path: examples/build/reports
if-no-files-found: ignore
if: failure()
- uses: actions/upload-artifact@v1
with:
name: Reports core
path: core/build/reports
if-no-files-found: ignore
if: failure()
- uses: actions/upload-artifact@v1
with:
name: Examples
path: examples/build/resources/test/examples
if-no-files-found: ignore
if: failure()

- name: Collect test results
Expand Down
2 changes: 1 addition & 1 deletion core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ ext {
dependencies {
def slf4jVersion = '1.7.30'
def metricsVersion = '4.1.17'
def geotoolsVersion = '22.3'
def geotoolsVersion = '24.2'
def logbackVersion = '1.2.3'

compile(
Expand Down
29 changes: 29 additions & 0 deletions core/src/main/java/org/mapfish/print/cli/CliServletContext.java
Original file line number Diff line number Diff line change
Expand Up @@ -283,4 +283,33 @@ public void declareRoles(final String... roleNames) {
public String getVirtualServerName() {
return null;
}

@Override
public void setResponseCharacterEncoding(final String enc) {}

@Override
public String getResponseCharacterEncoding() {
return null;
}

@Override
public void setRequestCharacterEncoding(final String enc) {}

@Override
public String getRequestCharacterEncoding() {
return null;
}

@Override
public void setSessionTimeout(final int timeout) {}

@Override
public int getSessionTimeout() {
return 0;
}

@Override
public javax.servlet.ServletRegistration.Dynamic addJspFile(String p1, String p2) {
return null;
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.