Skip to content

Commit

Permalink
Merge pull request geoserver#517 from groldan/dependency/upgrade_geos…
Browse files Browse the repository at this point in the history 
…erver_dependencies

Update dependencies in anticipation for GeoServer 2.26.0 release
  • Loading branch information
@groldan
groldan authored Sep 20, 2024
2 parents 846bea7 + ab83a77 commit 4be7704
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 67 deletions.
8 changes: 4 additions & 4 deletions src/apps/base-images/geoserver/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 0 additions & 3 deletions src/apps/infrastructure/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@
<module>gateway</module>
<module>admin</module>
</modules>
<properties>
<netty.version>4.1.111.Final</netty.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
71 changes: 11 additions & 60 deletions src/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,14 @@
<spring-cloud.version>2021.0.9</spring-cloud.version>
<spring-boot.version>2.7.18</spring-boot.version>
<spring.version>5.3.37</spring.version>
<spring.security.version>5.8.13</spring.security.version>
<spring.security.version>5.8.14</spring.security.version>
<jackson.version>2.17.2</jackson.version>
<gs.version>2.26.0-SNAPSHOT</gs.version>
<gt.version>32-SNAPSHOT</gt.version>
<acl.version>2.3.0</acl.version>
<postgresql.version>42.7.3</postgresql.version>
<!-- Downgrade netty.version used by spring-boot to the one used by geoserver azure client
(software.amazon.awssdk:netty-nio-client:jar:2.9.24) for COG and GWC Azure plugin -->
<netty.version>4.1.46.Final</netty.version>
<!-- Same netty.version used by geoserver for COG and GWC Azure plugin -->
<netty.version>4.1.113.Final</netty.version>
<lombok.version>1.18.30</lombok.version>
<mapstruct.version>1.6.0.Beta1</mapstruct.version>
<flyway.version>10.10.0</flyway.version>
Expand Down Expand Up @@ -1024,10 +1023,17 @@
</activation>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId>
<version>${netty.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
<version>1.19.0</version>
<version>1.20.0</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand Down Expand Up @@ -1149,61 +1155,6 @@
<artifactId>asm</artifactId>
<version>9.5</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http2</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-socks</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler-proxy</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-resolver</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
Expand Down
2 changes: 2 additions & 0 deletions ...st/java/org/geoserver/cloud/autoconfigure/wms/extensions/CssStylingConfigurationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -22,6 +23,7 @@ class CssStylingConfigurationTest {

private final ApplicationContextRunner contextRunner =
new ApplicationContextRunner()
.withBean("extensions", GeoServerExtensions.class)
.withConfiguration(AutoConfigurations.of(CssStylingConfiguration.class));

@Test
Expand Down

0 comments on commit 4be7704

Please sign in to comment.