Backport upgrade to GeoServer 2.25.3 and geonode OAuth2 support

.github/workflows/build-and-push.yaml

@@ -10,6 +10,7 @@ on:
       - "Makefile"
       - "pom.xml"
       - ".github/workflows/build-and-push.yaml"
+      - "config"
       - "src/**"
     tags:
       - '*'

compose/infra.yml

@@ -21,7 +21,7 @@ services:
       - acl_data:/var/lib/postgresql/data
 
   rabbitmq:
-    image: rabbitmq:3.12.12
+    image: rabbitmq:3.13.3-alpine
     user: ${GS_USER}
     tmpfs:
       - /var/lib/rabbitmq

docs/cosign/cosign.pub

@@ -0,0 +1,4 @@
+-----BEGIN PUBLIC KEY-----
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEsUudw4Y6QJfiCMwBvu3KIssgfvEx
+rCJ8pRHZL78ybbHiCPYyIwmy6RTOYaHePIFxDviZ0WZWH1fo3hrbw0b2ZQ==
+-----END PUBLIC KEY-----

src/apps/geoserver/gwc/src/main/java/org/geoserver/cloud/gwc/app/GeoWebCacheApplication.java

@@ -7,8 +7,10 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.retry.annotation.EnableRetry;
 
 @SpringBootApplication
+@EnableRetry
 public class GeoWebCacheApplication {
 
     public static void main(String[] args) {

src/apps/geoserver/gwc/src/main/resources/bootstrap.yml

@@ -67,9 +67,6 @@ spring:
 # override default of true, this service does not use the registry (when eureka client is enabled)
 eureka.client.fetch-registry: false
 
-logging.level:
-    '[org.springframework.retry]': debug
-
 ---
 # local profile, used for development only. Other settings like config and eureka urls in gs_cloud_bootstrap_profiles.yml
 spring.config.activate.on-profile: local

src/apps/geoserver/pom.xml

@@ -48,6 +48,11 @@
       <groupId>org.geoserver.cloud</groupId>
       <artifactId>gs-cloud-starter-observability</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.geoserver.cloud</groupId>
+      <artifactId>gs-cloud-starter-geonode</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.geoserver.cloud</groupId>
       <artifactId>spring-boot-simplejndi</artifactId>

src/apps/geoserver/restconfig/src/main/resources/bootstrap.yml

@@ -41,9 +41,6 @@ spring:
 # override default of true, this service does not use the registry (when eureka client is enabled)
 eureka.client.fetch-registry: false
 
-logging.level:
-    '[org.springframework.retry]': debug
-
 ---
 # local profile, used for development only. Other settings like config and eureka urls in gs_cloud_bootstrap_profiles.yml
 spring.config.activate.on-profile: local

src/apps/geoserver/wcs/src/main/resources/bootstrap.yml

@@ -39,9 +39,6 @@ spring:
 # override default of true, this service does not use the registry (when eureka client is enabled)
 eureka.client.fetch-registry: false
 
-logging.level:
-    '[org.springframework.retry]': debug
-
 ---
 # local profile, used for development only. Other settings like config and eureka urls in gs_cloud_bootstrap_profiles.yml
 spring.config.activate.on-profile: local

src/apps/geoserver/webui/src/main/java/org/geoserver/cloud/web/app/WebUIApplication.java

@@ -34,7 +34,7 @@ public void onApplicationReady(ApplicationReadyEvent e) {
         final String instanceId = env.getProperty("info.instance-id");
         String nodeOpts = System.getProperty("GEOSERVER_NODE_OPTS");
         if (null == nodeOpts) {
-            nodeOpts = String.format("id:%s;color:FF0000", instanceId);
+            nodeOpts = "id:%s;color:FF0000".formatted(instanceId);
             System.setProperty("GEOSERVER_NODE_OPTS", nodeOpts);
         }
     }

src/apps/geoserver/webui/src/main/java/org/geoserver/cloud/web/service/ServiceInstanceRegistry.java

@@ -62,7 +62,7 @@ private String getStatus(org.springframework.cloud.client.ServiceInstance i) {
     private String buildUrl(org.springframework.cloud.client.ServiceInstance i) {
         URI uri = i.getUri();
         if (uri == null) {
-            uri = URI.create(String.format("%s://%s:%s", i.getScheme(), i.getHost(), i.getPort()));
+            uri = URI.create("%s://%s:%s".formatted(i.getScheme(), i.getHost(), i.getPort()));
         }
         return uri.toString();
     }

src/apps/geoserver/webui/src/main/resources/bootstrap.yml

@@ -94,9 +94,6 @@ geoserver:
       resource-browser: true
       catalog-bulk-load: true
 
-logging.level:
-    '[org.springframework.retry]': debug
-
 ---
 # local profile, used for development only. Other settings like config and eureka urls in gs_cloud_bootstrap_profiles.yml
 spring.config.activate.on-profile: local

src/apps/geoserver/wfs/src/main/resources/bootstrap.yml

@@ -42,9 +42,6 @@ spring:
 # override default of true, this service does not use the registry (when eureka client is enabled)
 eureka.client.fetch-registry: false
 
-logging.level:
-    '[org.springframework.retry]': debug
-
 ---
 # local profile, used for development only. Other settings like config and eureka urls in gs_cloud_bootstrap_profiles.yml
 spring.config.activate.on-profile: local

src/apps/geoserver/wps/src/main/resources/bootstrap.yml

@@ -39,8 +39,6 @@ spring:
 # override default of true, this service does not use the registry (when eureka client is enabled)
 eureka.client.fetch-registry: false
 
-logging.level:
-    '[org.springframework.retry]': debug
 ---
 # local profile, used for development only. Other settings like config and eureka urls in gs_cloud_bootstrap_profiles.yml
 spring.config.activate.on-profile: local

src/apps/infrastructure/admin/src/main/resources/bootstrap.yml

@@ -51,9 +51,6 @@ management:
     export:
       atlas.enabled: false
 
-logging.level:
-    '[org.springframework.retry]': debug
-
 ---
 # local profile, used for development only. Other settings like config and eureka urls in gs_cloud_bootstrap_profiles.yml
 spring.config.activate.on-profile: local

src/apps/infrastructure/gateway/src/main/java/org/geoserver/cloud/gateway/predicate/RegExpQueryRoutePredicateFactory.java

@@ -98,9 +98,8 @@ public boolean test(ServerWebExchange exchange) {
 
         @Override
         public String toString() {
-            return String.format(
-                    "Query: param regexp='%s' value regexp='%s'",
-                    config.getParamRegexp(), config.getValueRegexp());
+            return "Query: param regexp='%s' value regexp='%s'"
+                    .formatted(config.getParamRegexp(), config.getValueRegexp());
         }
     }
 

src/apps/infrastructure/gateway/src/main/resources/bootstrap.yml

@@ -15,8 +15,6 @@ spring:
   application:
     name: gateway-service
   jmx.enabled: false
-logging.level:
-    '[org.springframework.retry]': debug
 
 # this service uses the registry (when eureka client is enabled)
 eureka.client:

src/catalog/backends/common/src/main/java/org/geoserver/cloud/autoconfigure/geotools/SpringEnvironmentAwareGeoToolsHttpClient.java

@@ -169,9 +169,10 @@ private HttpClientBuilder builder() {
         HttpClientBuilder builder =
                 HttpClientBuilder.create()
                         .setUserAgent(
-                                String.format(
-                                        "GeoTools/%s (%s)",
-                                        GeoTools.getVersion(), this.getClass().getSimpleName()))
+                                "GeoTools/%s (%s)"
+                                        .formatted(
+                                                GeoTools.getVersion(),
+                                                this.getClass().getSimpleName()))
                         .useSystemProperties()
                         .setConnectionManager(connectionManager);
         if (credsProvider != null) {

src/catalog/backends/common/src/main/java/org/geoserver/cloud/security/EnvironmentAdminAuthenticationProvider.java

@@ -66,22 +66,20 @@ void validateConfig() {
         final boolean passwordSet = StringUtils.hasText(adminPassword);
         if (userSet && !passwordSet) {
             String msg =
-                    String.format(
-                            """
+                    """
                     Found overriding admin username config property geoserver.admin.username=%s, \
                     but password not provided through config property geoserver.admin.password
-                    """,
-                            adminUserName);
+                    """
+                            .formatted(adminUserName);
             throw new BeanInstantiationException(getClass(), msg);
         }
         if (passwordSet && !userSet) {
             String msg =
-                    String.format(
-                            """
+                    """
                     Found overriding admin password config property geoserver.admin.password, \
                     but admin username not provided through config property geoserver.admin.username
-                    """,
-                            adminUserName);
+                    """
+                            .formatted(adminUserName);
             throw new BeanInstantiationException(getClass(), msg);
         }
         enabled = userSet && passwordSet;

src/catalog/backends/jdbcconfig/src/main/java/org/geoserver/cloud/config/catalog/backend/jdbcconfig/CloudJdbcStoreProperties.java

@@ -49,7 +49,7 @@ public File getCacheDirectory() {
 
     private static String defaultCacheDirectory() {
         String tmpdir = System.getProperty("java.io.tmpdir");
-        return String.format("%s%sgeoserver-jdbcconfig-cache", tmpdir, File.separator);
+        return "%s%sgeoserver-jdbcconfig-cache".formatted(tmpdir, File.separator);
     }
 
     /**

src/catalog/backends/jdbcconfig/src/main/java/org/geoserver/cloud/config/catalog/backend/jdbcconfig/JdbcConfigUpdateSequence.java

@@ -4,8 +4,6 @@
  */
 package org.geoserver.cloud.config.catalog.backend.jdbcconfig;
 
-import static java.lang.String.format;
-
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 
@@ -59,22 +57,21 @@ public void afterPropertiesSet() throws Exception {
         String createSequenceStatement;
         if (props.isPostgreSQL()) {
             createSequenceStatement =
-                    format("CREATE SEQUENCE IF NOT EXISTS %s AS BIGINT CYCLE", SEQUENCE_NAME);
+                    "CREATE SEQUENCE IF NOT EXISTS %s AS BIGINT CYCLE".formatted(SEQUENCE_NAME);
             // not using CURRVAL() to avoid the "currval of sequence "<name>" is not yet defined in
             // this session" error
-            getQuery = format("SELECT last_value FROM %s", SEQUENCE_NAME);
-            incrementAndGetQuery = format("SELECT NEXTVAL('%s')", SEQUENCE_NAME);
+            getQuery = "SELECT last_value FROM %s".formatted(SEQUENCE_NAME);
+            incrementAndGetQuery = "SELECT NEXTVAL('%s')".formatted(SEQUENCE_NAME);
         } else if (props.isH2()) {
-            createSequenceStatement = format("CREATE SEQUENCE IF NOT EXISTS %s", SEQUENCE_NAME);
+            createSequenceStatement = "CREATE SEQUENCE IF NOT EXISTS %s".formatted(SEQUENCE_NAME);
             getQuery =
-                    format(
-                            """
+                    """
                     SELECT CURRENT_VALUE  \
                     FROM INFORMATION_SCHEMA.SEQUENCES \
                     WHERE SEQUENCE_NAME = '%s'
-                    """,
-                            SEQUENCE_NAME.toUpperCase());
-            incrementAndGetQuery = format("SELECT NEXTVAL('%s')", SEQUENCE_NAME);
+                    """
+                            .formatted(SEQUENCE_NAME.toUpperCase());
+            incrementAndGetQuery = "SELECT NEXTVAL('%s')".formatted(SEQUENCE_NAME);
         } else {
             throw new IllegalStateException("Db is not PostgreSQL nor H2");
         }

src/catalog/event-bus/src/main/java/org/geoserver/cloud/event/bus/RemoteGeoServerEvent.java

@@ -36,13 +36,13 @@ public RemoteGeoServerEvent(
 
     @Override
     public String toString() {
-        return String.format(
-                "[%s id: '%s', originService: '%s', destinationService: '%s', payload: %s]",
-                getClass().getSimpleName(),
-                getId(),
-                getOriginService(),
-                getDestinationService(),
-                getEvent());
+        return "[%s id: '%s', originService: '%s', destinationService: '%s', payload: %s]"
+                .formatted(
+                        getClass().getSimpleName(),
+                        getId(),
+                        getOriginService(),
+                        getDestinationService(),
+                        getEvent());
     }
 
     public String toShortString() {

src/catalog/jackson-bindings/geoserver/src/test/java/org/geoserver/jackson/databind/catalog/PatchSerializationTest.java

@@ -792,9 +792,8 @@ private Patch roundtrip(Patch patch) throws JsonProcessingException {
             Class<? extends Info> type = ProxyUtils.referenceTypeOf(patchValue).orElseThrow();
             Supplier<String> desc =
                     () -> {
-                        return String.format(
-                                "Patch value of type %s shall be encoded as reference, got value %s",
-                                type.getCanonicalName(), typeName);
+                        return "Patch value of type %s shall be encoded as reference, got value %s"
+                                .formatted(type.getCanonicalName(), typeName);
                     };
             assertThat(typeName).as(desc).isEqualTo("ResolvingProxy");
         } else {
@@ -835,16 +834,14 @@ protected void assertNotAProxy(Object value) {
             assertThat(ProxyUtils.isResolvingProxy(info))
                     .as(
                             () ->
-                                    String.format(
-                                            "%s should not be a ResolvingProxy: %s",
-                                            info.getId(), typeName(info)))
+                                    "%s should not be a ResolvingProxy: %s"
+                                            .formatted(info.getId(), typeName(info)))
                     .isFalse();
             assertThat(ProxyUtils.isModificationProxy(info))
                     .as(
                             () ->
-                                    String.format(
-                                            "%s should not be a ModificationProxy: %s",
-                                            info.getId(), typeName(info)))
+                                    "%s should not be a ModificationProxy: %s"
+                                            .formatted(info.getId(), typeName(info)))
                     .isFalse();
         }
     }
@@ -853,9 +850,8 @@ protected <I extends Info> I assertModificationProxy(I info) {
         assertThat(ProxyUtils.isModificationProxy(info))
                 .as(
                         () ->
-                                String.format(
-                                        "%s should be a ModificationProxy, got %s",
-                                        info.getId(), typeName(info)))
+                                "%s should be a ModificationProxy, got %s"
+                                        .formatted(info.getId(), typeName(info)))
                 .isTrue();
 
         I real = ModificationProxy.unwrap(info);
@@ -874,19 +870,17 @@ protected void assertResolvingProxy(Info info) {
         assertThat(ProxyUtils.isResolvingProxy(info))
                 .as(
                         () ->
-                                String.format(
-                                        "%s should be a ResolvingProxy, got %s",
-                                        info.getId(), typeName(info)))
+                                "%s should be a ResolvingProxy, got %s"
+                                        .formatted(info.getId(), typeName(info)))
                 .isTrue();
     }
 
     private void assertValueObject(Object valueObject, Class<?> valueType) {
         if (valueObject instanceof Info info) {
             Supplier<String> msg =
                     () ->
-                            String.format(
-                                    "expected pure value object of type %s, got %s",
-                                    valueType.getCanonicalName(), typeName(valueObject));
+                            "expected pure value object of type %s, got %s"
+                                    .formatted(valueType.getCanonicalName(), typeName(valueObject));
             assertThat(ProxyUtils.isResolvingProxy(info)).as(msg).isFalse();
             assertThat(ProxyUtils.isModificationProxy(info)).as(msg).isFalse();
         }

src/catalog/jackson-bindings/geotools/src/test/java/org/geotools/jackson/databind/geojson/GeoToolsGeoJsonModuleTest.java

@@ -168,7 +168,7 @@ private void assertActuallyEqualsExact(Geometry g1, Geometry g2) {
         for (int i = 0; i < cs1.length; i++) {
             Coordinate c1 = cs1[i];
             Coordinate c2 = cs2[i];
-            assertTrue(c1.equals3D(c2), String.format("expected %s, got %s", c1, c2));
+            assertTrue(c1.equals3D(c2), "expected %s, got %s".formatted(c1, c2));
             assertEquals(c1.getM(), c2.getM(), 1e-9d);
         }
     }

src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/CatalogInfoLookup.java

@@ -168,11 +168,11 @@ public void add(T value) {
         synchronized (idMap) {
             if (null != idMap.putIfAbsent(value.getId(), value)) {
                 String msg =
-                        String.format(
-                                "%s:%s(%s) already exists",
-                                ClassMappings.fromImpl(value.getClass()),
-                                value.getId(),
-                                nameMapper.apply(value).getLocalPart());
+                        "%s:%s(%s) already exists"
+                                .formatted(
+                                        ClassMappings.fromImpl(value.getClass()),
+                                        value.getId(),
+                                        nameMapper.apply(value).getLocalPart());
                 LOGGER.warning(msg);
             }
             Name name = nameMapper.apply(value);

src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/Patch.java

@@ -203,8 +203,8 @@ private static boolean isCollection(Method getter) {
     public String toString() {
         String props =
                 this.getPatches().stream()
-                        .map(p -> String.format("(%s: %s)", p.getName(), p.getValue()))
+                        .map(p -> "(%s: %s)".formatted(p.getName(), p.getValue()))
                         .collect(Collectors.joining(","));
-        return String.format("%s[%s]", getClass().getSimpleName(), props);
+        return "%s[%s]".formatted(getClass().getSimpleName(), props);
     }
 }

src/catalog/plugin/src/main/java/org/geoserver/catalog/plugin/PropertyDiff.java

@@ -205,7 +205,7 @@ public static Change valueOf(String propertyName, Object oldValue, Object newVal
 
         @Override
         public String toString() {
-            return String.format("%s: {old: %s, new: %s}", propertyName, oldValue, newValue);
+            return "%s: {old: %s, new: %s}".formatted(propertyName, oldValue, newValue);
         }
     }