diff --git a/pom.xml b/pom.xml
index be557b1bb..462a66a25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -232,7 +232,7 @@
com.spotify.fmt
fmt-maven-plugin
- 2.20
+ 2.21.1
com.github.ekryd.sortpom
diff --git a/src/apps/geoserver/wms/src/main/java/org/geoserver/cloud/autoconfigure/wms/WmsApplicationAutoConfiguration.java b/src/apps/geoserver/wms/src/main/java/org/geoserver/cloud/autoconfigure/wms/WmsApplicationAutoConfiguration.java
index 65c0b5b05..071cddfd0 100644
--- a/src/apps/geoserver/wms/src/main/java/org/geoserver/cloud/autoconfigure/wms/WmsApplicationAutoConfiguration.java
+++ b/src/apps/geoserver/wms/src/main/java/org/geoserver/cloud/autoconfigure/wms/WmsApplicationAutoConfiguration.java
@@ -61,6 +61,7 @@ public class WmsApplicationAutoConfiguration {
legendSample\
).*$\
""";
+
/**
* Required by {@link GetCapabilitiesTransformer}, excluded from gs-wms.jar
*
diff --git a/src/apps/pom.xml b/src/apps/pom.xml
index 0eece0abc..85a9a7edf 100644
--- a/src/apps/pom.xml
+++ b/src/apps/pom.xml
@@ -19,7 +19,7 @@
io.github.git-commit-id
git-commit-id-maven-plugin
- 5.0.0
+ 7.0.0
false
true
diff --git a/src/catalog/backends/pgsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/filter/PgsqlCatalogFilterSplitter.java b/src/catalog/backends/pgsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/filter/PgsqlCatalogFilterSplitter.java
index 9eb205069..8c27125da 100644
--- a/src/catalog/backends/pgsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/filter/PgsqlCatalogFilterSplitter.java
+++ b/src/catalog/backends/pgsql/src/main/java/org/geoserver/cloud/backend/pgsql/catalog/filter/PgsqlCatalogFilterSplitter.java
@@ -32,6 +32,7 @@ public static PgsqlCatalogFilterSplitter split(
filter.accept(splitter, null);
return splitter;
}
+
/**
* If the property name is supported, proceeds with the splitting, otherwise aborts splitting
* the current filter making it part of the unsupported filter result.
diff --git a/src/catalog/cache/src/main/java/org/geoserver/cloud/catalog/cache/CachingGeoServerFacade.java b/src/catalog/cache/src/main/java/org/geoserver/cloud/catalog/cache/CachingGeoServerFacade.java
index 4ae93638a..bfc2d9609 100644
--- a/src/catalog/cache/src/main/java/org/geoserver/cloud/catalog/cache/CachingGeoServerFacade.java
+++ b/src/catalog/cache/src/main/java/org/geoserver/cloud/catalog/cache/CachingGeoServerFacade.java
@@ -35,8 +35,10 @@ public interface CachingGeoServerFacade extends GeoServerFacade {
* through {@link CacheManager#getCache(String)}
*/
String CACHE_NAME = "gs-config";
+
/** Key used to cache and evict the {@link GeoServerInfo global configuration} object */
String GEOSERVERINFO_KEY = "global_GeoServer";
+
/** Key used to cache and evict the {@link LoggingInfo global logging} settings object */
String LOGGINGINFO_KEY = "global_Logging";
diff --git a/src/catalog/events/src/main/java/org/geoserver/cloud/event/GeoServerEvent.java b/src/catalog/events/src/main/java/org/geoserver/cloud/event/GeoServerEvent.java
index 5727ef221..8d3c41410 100644
--- a/src/catalog/events/src/main/java/org/geoserver/cloud/event/GeoServerEvent.java
+++ b/src/catalog/events/src/main/java/org/geoserver/cloud/event/GeoServerEvent.java
@@ -84,6 +84,7 @@ protected ToStringCreator toStringBuilder() {
* global config} itself (e.g. {@code updateSequence} and the like)
*/
private static final String GEOSERVER_ID = "geoserver";
+
/**
* {@link #getObjectId() object identifier} for changes performed to the {@link LoggingInfo}
* config
diff --git a/src/catalog/events/src/main/java/org/geoserver/cloud/event/info/InfoEvent.java b/src/catalog/events/src/main/java/org/geoserver/cloud/event/info/InfoEvent.java
index d5c45d933..657eb2481 100644
--- a/src/catalog/events/src/main/java/org/geoserver/cloud/event/info/InfoEvent.java
+++ b/src/catalog/events/src/main/java/org/geoserver/cloud/event/info/InfoEvent.java
@@ -56,6 +56,7 @@ protected InfoEvent(
* global config} itself (e.g. {@code updateSequence} and the like)
*/
private static final String GEOSERVER_ID = "geoserver";
+
/**
* {@link #getObjectId() object identifier} for changes performed to the {@link LoggingInfo}
* config
diff --git a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/dto/Dimension.java b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/dto/Dimension.java
index 13ac20839..22a6f619d 100644
--- a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/dto/Dimension.java
+++ b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/dto/Dimension.java
@@ -35,6 +35,7 @@
* @since geoserver 2.23.0
*/
private String startValue;
+
/**
* @since geoserver 2.23.0
*/
diff --git a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/dto/LayerGroup.java b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/dto/LayerGroup.java
index d205faa7d..e5ab78a56 100644
--- a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/dto/LayerGroup.java
+++ b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/dto/LayerGroup.java
@@ -37,14 +37,17 @@ public enum Mode {
protected List metadataLinks;
protected Envelope bounds;
private List keywords;
+
/**
* @since geoserver 2.20.0
*/
private Map internationalTitle;
+
/**
* @since geoserver 2.20.0
*/
private Map internationalAbstract;
+
/**
* @since geoserver 2.21.0
*/
diff --git a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/dto/Resource.java b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/dto/Resource.java
index e858bf6c2..96bb0eb0e 100644
--- a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/dto/Resource.java
+++ b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/catalog/dto/Resource.java
@@ -56,6 +56,7 @@ public enum ProjectionPolicy {
* @since geoserver 2.20.0
*/
private Map internationalTitle;
+
/**
* @since geoserver 2.20.0
*/
diff --git a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/config/dto/Contact.java b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/config/dto/Contact.java
index 49f8d2f3f..db2c1d3ed 100644
--- a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/config/dto/Contact.java
+++ b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/config/dto/Contact.java
@@ -33,54 +33,67 @@
* @since geoserver 2.20.0
*/
private Map internationalAddress;
+
/**
* @since geoserver 2.20.0
*/
private Map internationalContactFacsimile;
+
/**
* @since geoserver 2.20.0
*/
private Map internationalContactOrganization;
+
/**
* @since geoserver 2.20.0
*/
private Map internationalContactPerson;
+
/**
* @since geoserver 2.20.0
*/
private Map internationalContactPosition;
+
/**
* @since geoserver 2.20.0
*/
private Map internationalContactVoice;
+
/**
* @since geoserver 2.20.0
*/
private Map internationalOnlineResource;
+
/**
* @since geoserver 2.20.0
*/
private Map internationalAddressCity;
+
/**
* @since geoserver 2.20.0
*/
private Map internationalAddressCountry;
+
/**
* @since geoserver 2.20.0
*/
private Map internationalAddressDeliveryPoint;
+
/**
* @since geoserver 2.20.0
*/
private Map internationalAddressPostalCode;
+
/**
* @since geoserver 2.20.0
*/
private Map internationalAddressState;
+
/**
* @since geoserver 2.20.0
*/
private Map internationalAddressType;
+
/**
* @since geoserver 2.20.0
*/
diff --git a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/config/dto/Service.java b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/config/dto/Service.java
index cc5041c6d..d5b8144dc 100644
--- a/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/config/dto/Service.java
+++ b/src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/config/dto/Service.java
@@ -64,6 +64,7 @@
private String schemaBaseURL;
private boolean verbose;
private MetadataMapDto metadata;
+
// not used
// Map