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.

Sign up for GitHub

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

Switch main branch to GeoServer 2.26-SNAPSHOT #504

Merged
merged 2 commits into from
Aug 7, 2024
Merged

Switch main branch to GeoServer 2.26-SNAPSHOT #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7be0c11
Switch main branch to GeoServer 2.26-SNAPSHOT
groldan Aug 7, 2024
159e469
Disable AzureBlobStoreTest until fix is applied upstream
groldan Aug 7, 2024
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: 2 additions & 0 deletions ...blobstores/src/test/java/org/geoserver/cloud/gwc/config/blobstore/AzureBlobStoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.geowebcache.storage.TileObject;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.StaticApplicationContext;
import org.testcontainers.junit.jupiter.Container;
Expand All @@ -35,6 +36,7 @@
* @see AzuriteContainer
*/
@Testcontainers
@Disabled("disabled until https://github.com/GeoWebCache/geowebcache/pull/1298 is merged")
class AzureBlobStoreTest {

@Container static AzuriteContainer azurite = new AzuriteContainer();
Expand Down
21 changes: 8 additions & 13 deletions src/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
<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.7.12</spring.security.version>
<spring.security.version>5.8.13</spring.security.version>
<jackson.version>2.17.2</jackson.version>
<gs.version>2.25.3.0-SNAPSHOT</gs.version>
<gt.version>31.3</gt.version>
<acl.version>2.2.0</acl.version>
<gs.version>2.26.0-SNAPSHOT</gs.version>
<gt.version>32-SNAPSHOT</gt.version>
<acl.version>2.3-SNAPSHOT</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 -->
Expand Down Expand Up @@ -1026,7 +1026,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.2.0-jre</version>
<version>33.2.1-jre</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand All @@ -1051,7 +1051,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.14.0</version>
<version>3.15.0</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Expand All @@ -1061,23 +1061,18 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.12.0</version>
<version>2.16.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.10.0</version>
<version>1.12.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
<version>1.5.4</version>
</dependency>
<dependency>
<groupId>javax.measure</groupId>
<artifactId>unit-api</artifactId>
<version>2.1.3</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>findbugs</artifactId>
Expand Down
Loading