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

Update Tomcat version in Dockerfile #263

Merged
merged 3 commits into from
Mar 20, 2025
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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ RUN --mount=type=cache,id=m2_repo,target=/root/.m2/repository \
&& find target -maxdepth 1 -type d -name 'ERDDAP-*' -exec mv {} target/ERDDAP \;

# Run the built erddap war via a tomcat instance
FROM tomcat:10.1.19-jdk21-temurin-jammy
FROM tomcat:10.1.39-jdk21-temurin-jammy

RUN apt-get update && apt-get install -y \
gosu \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,7 @@ void testQuotes() throws Throwable {
* 2016-10-03 to deal with this problem.
*/
@org.junit.jupiter.api.Test
@TagExternalERDDAP
void testChukchiSea() throws Throwable {
// testVerboseOn();
int language = 0;
Expand Down
2 changes: 2 additions & 0 deletions src/test/java/jetty/JettyTests.java
Original file line number Diff line number Diff line change
Expand Up @@ -6625,6 +6625,8 @@ void testForBrokenLinks(String tUrl) throws Exception {
// (temporary?) early 2025
// pcreview site down early 2025
"https://www.pcreview.co.uk/threads/datetime-accounts-for-leap-seconds.1357623/",
// site returns 403 in test, but works in browser
"https://www.cnmoc.usff.navy.mil/Our-Commands/United-States-Naval-Observatory/Precise-Time-Department/The-USNO-Master-Clock/Definitions-of-Systems-of-Time/",
};
// https://unitsofmeasure.org/ucum.html fails in tests because of certificate,
// but succeeds in my browser. Others are like this, too.
Expand Down
Loading