Merge pull request #367 from groldan/build/plugin_updates

build: maven plugin version updates

pom.xml

@@ -232,7 +232,7 @@
         <plugin>
           <groupId>com.spotify.fmt</groupId>
           <artifactId>fmt-maven-plugin</artifactId>
-          <version>2.20</version>
+          <version>2.21.1</version>
         </plugin>
         <plugin>
           <groupId>com.github.ekryd.sortpom</groupId>

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
      *

src/apps/pom.xml

@@ -19,7 +19,7 @@
       <plugin>
         <groupId>io.github.git-commit-id</groupId>
         <artifactId>git-commit-id-maven-plugin</artifactId>
-        <version>5.0.0</version>
+        <version>7.0.0</version>
         <configuration>
           <failOnNoGitDirectory>false</failOnNoGitDirectory>
           <generateGitPropertiesFile>true</generateGitPropertiesFile>

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.

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";
 

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

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

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
      */

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<MetadataLink> metadataLinks;
     protected Envelope bounds;
     private List<Keyword> keywords;
+
     /**
      * @since geoserver 2.20.0
      */
     private Map<String, String> internationalTitle;
+
     /**
      * @since geoserver 2.20.0
      */
     private Map<String, String> internationalAbstract;
+
     /**
      * @since geoserver 2.21.0
      */

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<String, String> internationalTitle;
+
     /**
      * @since geoserver 2.20.0
      */

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<String, String> internationalAddress;
+
     /**
      * @since geoserver 2.20.0
      */
     private Map<String, String> internationalContactFacsimile;
+
     /**
      * @since geoserver 2.20.0
      */
     private Map<String, String> internationalContactOrganization;
+
     /**
      * @since geoserver 2.20.0
      */
     private Map<String, String> internationalContactPerson;
+
     /**
      * @since geoserver 2.20.0
      */
     private Map<String, String> internationalContactPosition;
+
     /**
      * @since geoserver 2.20.0
      */
     private Map<String, String> internationalContactVoice;
+
     /**
      * @since geoserver 2.20.0
      */
     private Map<String, String> internationalOnlineResource;
+
     /**
      * @since geoserver 2.20.0
      */
     private Map<String, String> internationalAddressCity;
+
     /**
      * @since geoserver 2.20.0
      */
     private Map<String, String> internationalAddressCountry;
+
     /**
      * @since geoserver 2.20.0
      */
     private Map<String, String> internationalAddressDeliveryPoint;
+
     /**
      * @since geoserver 2.20.0
      */
     private Map<String, String> internationalAddressPostalCode;
+
     /**
      * @since geoserver 2.20.0
      */
     private Map<String, String> internationalAddressState;
+
     /**
      * @since geoserver 2.20.0
      */
     private Map<String, String> internationalAddressType;
+
     /**
      * @since geoserver 2.20.0
      */

src/catalog/jackson-bindings/geoserver/src/main/java/org/geoserver/jackson/databind/config/dto/Service.java

@@ -64,17 +64,20 @@
     private String schemaBaseURL;
     private boolean verbose;
     private MetadataMapDto metadata;
+
     // not used
     // Map<Object, Object> clientProperties;
 
     /**
      * @since geoserver 2.20.0
      */
     private Locale defaultLocale;
+
     /**
      * @since geoserver 2.20.0
      */
     private Map<String, String> internationalTitle;
+
     /**
      * @since geoserver 2.20.0
      */
@@ -122,6 +125,7 @@
          * @since geoserver 2.20.0
          */
         private Map<String, String> internationalRootLayerTitle;
+
         /**
          * @since geoserver 2.20.0
          */
@@ -163,6 +167,7 @@
          * @since geoserver 2.22.0
          */
         private boolean getFeatureOutputTypeCheckingEnabled;
+
         /**
          * @since geoserver 2.22.0
          */
@@ -215,6 +220,7 @@
             private MetadataMapDto metadata;
             private List<String> roles;
         }
+
         /** DTO for {@link ProcessInfo} */
         public static @Data @Generated class Process {
             private NameDto name;

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

@@ -66,6 +66,7 @@ abstract class CatalogInfoLookup<T extends CatalogInfo> implements CatalogInfoRe
 
     /** constant no-op Comparator for {@link #providedOrder()} */
     static final Ordering<?> PROVIDED_ORDER = Ordering.allEqual();
+
     /**
      * Name mapper for {@link MapInfo}, uses simple name mapping on {@link MapInfo#getName()} as it
      * doesn't have a namespace component

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

@@ -350,6 +350,7 @@ public ValidationResult validate(MapInfo map, boolean isNew) {
                             updateNamespace(resource, rolbackNamespace);
                         });
     }
+
     // override, super calls facade.save and depends on it throwing the events
     protected @Override void rollback(StoreInfo store, StoreInfo rollbackTo) {
         // apply the rollback object properties to the real store

src/pom.xml

@@ -811,7 +811,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.1</version>
+          <version>3.11.0</version>
           <inherited>true</inherited>
           <configuration>
             <release>17</release>
@@ -824,7 +824,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>2.6</version>
+          <version>3.3.1</version>
           <configuration>
             <encoding>UTF-8</encoding>
           </configuration>
@@ -883,7 +883,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-failsafe-plugin</artifactId>
-          <version>3.0.0-M7</version>
+          <version>3.2.1</version>
           <inherited>true</inherited>
           <executions>
             <execution>
@@ -897,8 +897,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <!-- JUnit 5 requires Surefire version 2.22.0 or higher -->
-          <version>3.0.0-M5</version>
+          <version>3.2.1</version>
           <inherited>true</inherited>
           <configuration>
             <reuseForks>false</reuseForks>
@@ -908,17 +907,17 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>3.2.0</version>
+          <version>3.3.0</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>build-helper-maven-plugin</artifactId>
-          <version>3.2.0</version>
+          <version>3.4.0</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>versions-maven-plugin</artifactId>
-          <version>2.8.1</version>
+          <version>2.16.1</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -930,7 +929,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>3.4.1</version>
         <executions>
           <execution>
             <id>enforce</id>

src/starters/webmvc/src/main/java/org/geoserver/cloud/config/servlet/GeoServerServletContextConfiguration.java

@@ -36,6 +36,7 @@ public class GeoServerServletContextConfiguration {
     public @Bean RequestContextListener requestContextListener() {
         return new RequestContextListener();
     }
+
     // Filters
 
     /**

src/starters/wms-extensions/src/main/java/org/geoserver/cloud/autoconfigure/wms/extensions/WmsExtensionsConfigProperties.java

@@ -55,8 +55,10 @@
             public static @Data class VectorTilesConfigProperties {
                 /** Enable or disable MapBox VectorTiles output format */
                 private EnabledProperty mapbox = new EnabledProperty(true);
+
                 /** Enable or disable GeoJSON VectorTiles output format */
                 private EnabledProperty geojson = new EnabledProperty(true);
+
                 /** Enable or disable TopoJSON VectorTiles output format */
                 private EnabledProperty topojson = new EnabledProperty(true);