From f66aa43cd1af71a96294beff638e0ec6a6fe7158 Mon Sep 17 00:00:00 2001 From: Gabriel Roldan Date: Thu, 19 Sep 2024 22:16:45 -0300 Subject: [PATCH 1/3] Update dependencies in anticipation for GeoServer 2.26.0 release * `netty.version:4.1.46.Final` -> `4.1.113.Final` (as from `gwc-azure-blob` and `imageio-ext:1.4.13`'s S3 and Azure range readers. * `spring.security.version:5.8.13` -> `5.8.14` * `JTS:1.19.0` -> `1.20.0` --- src/apps/infrastructure/pom.xml | 3 -- src/pom.xml | 71 +++++---------------------------- 2 files changed, 11 insertions(+), 63 deletions(-) diff --git a/src/apps/infrastructure/pom.xml b/src/apps/infrastructure/pom.xml index dee7918c0..a93604f26 100644 --- a/src/apps/infrastructure/pom.xml +++ b/src/apps/infrastructure/pom.xml @@ -15,9 +15,6 @@ gateway admin - - 4.1.111.Final - org.springframework.boot diff --git a/src/pom.xml b/src/pom.xml index c75b572f1..9c679ed4e 100644 --- a/src/pom.xml +++ b/src/pom.xml @@ -23,15 +23,14 @@ 2021.0.9 2.7.18 5.3.37 - 5.8.13 + 5.8.14 2.17.2 2.26.0-SNAPSHOT 32-SNAPSHOT 2.3.0 42.7.3 - - 4.1.46.Final + + 4.1.113.Final 1.18.30 1.6.0.Beta1 10.10.0 @@ -1024,10 +1023,17 @@ + + io.netty + netty-bom + ${netty.version} + pom + import + org.locationtech.jts jts-core - 1.19.0 + 1.20.0 com.google.guava @@ -1149,61 +1155,6 @@ asm 9.5 - - io.netty - netty-buffer - ${netty.version} - - - io.netty - netty-codec - ${netty.version} - - - io.netty - netty-codec-http - ${netty.version} - - - io.netty - netty-codec-http2 - ${netty.version} - - - io.netty - netty-codec-socks - ${netty.version} - - - io.netty - netty-common - ${netty.version} - - - io.netty - netty-handler - ${netty.version} - - - io.netty - netty-handler-proxy - ${netty.version} - - - io.netty - netty-resolver - ${netty.version} - - - io.netty - netty-transport - ${netty.version} - - - io.netty - netty-transport-native-unix-common - ${netty.version} - org.postgresql postgresql From 81def64d5da0c71d4b6f02b1c86e9c5042fd64c2 Mon Sep 17 00:00:00 2001 From: Gabriel Roldan Date: Thu, 19 Sep 2024 22:49:10 -0300 Subject: [PATCH 2/3] Remove yourkit java profiler agent from Dockerfile --- src/apps/base-images/geoserver/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/apps/base-images/geoserver/Dockerfile b/src/apps/base-images/geoserver/Dockerfile index 4b1de6fe5..95b159d42 100644 --- a/src/apps/base-images/geoserver/Dockerfile +++ b/src/apps/base-images/geoserver/Dockerfile @@ -8,9 +8,9 @@ COPY ${JAR_FILE} application.jar RUN java -Djarmode=layertools -jar application.jar extract -RUN wget -q https://www.yourkit.com/download/docker/YourKit-JavaProfiler-2023.9-docker.zip -P /tmp/ && \ - unzip /tmp/YourKit-JavaProfiler-2023.9-docker.zip -d /tmp && \ - rm /tmp/YourKit-JavaProfiler-2023.9-docker.zip +#RUN wget -q https://www.yourkit.com/download/docker/YourKit-JavaProfiler-2023.9-docker.zip -P /tmp/ && \ +# unzip /tmp/YourKit-JavaProfiler-2023.9-docker.zip -d /tmp && \ +# rm /tmp/YourKit-JavaProfiler-2023.9-docker.zip ########## FROM geoservercloud/gs-cloud-base-spring-boot:$TAG @@ -33,7 +33,7 @@ fonts-roboto \ && rm -rf /var/cache/apt/* \ && rm -rf /var/lib/apt/lists/* -COPY --from=builder /tmp/YourKit-JavaProfiler-2023.9 /usr/local/YourKit-JavaProfiler-2023.9 +#COPY --from=builder /tmp/YourKit-JavaProfiler-2023.9 /usr/local/YourKit-JavaProfiler-2023.9 RUN mkdir -p /opt/app/data_directory /data/geowebcache \ && chmod 0777 /opt/app/data_directory /data/geowebcache From ab83a77d6c8240fee857f7e3b98dd121c6c73d26 Mon Sep 17 00:00:00 2001 From: Gabriel Roldan Date: Fri, 20 Sep 2024 00:32:24 -0300 Subject: [PATCH 3/3] Fix CssStylingConfigurationTest, it now requires the GeoServerExtensions bean Sine upstream commit 6e6ace9871c793311fefcaf0df72f70589e1ba34, `org.geoserver.community.css.web.CssHandler` requires the extensions bean on its constructor. Add it to the AutoConfiguration test. --- .../wms/extensions/CssStylingConfigurationTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/starters/wms-extensions/src/test/java/org/geoserver/cloud/autoconfigure/wms/extensions/CssStylingConfigurationTest.java b/src/starters/wms-extensions/src/test/java/org/geoserver/cloud/autoconfigure/wms/extensions/CssStylingConfigurationTest.java index ee6f4fa24..c13b58986 100644 --- a/src/starters/wms-extensions/src/test/java/org/geoserver/cloud/autoconfigure/wms/extensions/CssStylingConfigurationTest.java +++ b/src/starters/wms-extensions/src/test/java/org/geoserver/cloud/autoconfigure/wms/extensions/CssStylingConfigurationTest.java @@ -8,6 +8,7 @@ import org.geoserver.catalog.SLDHandler; import org.geoserver.community.css.web.CssHandler; +import org.geoserver.platform.GeoServerExtensions; import org.geoserver.platform.ModuleStatusImpl; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; @@ -22,6 +23,7 @@ class CssStylingConfigurationTest { private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() + .withBean("extensions", GeoServerExtensions.class) .withConfiguration(AutoConfigurations.of(CssStylingConfiguration.class)); @Test