Merge pull request #3383 from mapfish/audit-3.28

Fix CVE
mapfish · Aug 30, 2024 · 6d15db2 · 6d15db2
2 parents 0b16540 + c7f27b4
commit 6d15db2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/core/build.gradle b/core/build.gradle
@@ -113,13 +113,13 @@ configurations {
 }
 
 ext {
-    springVersion = '5.3.37'
+    springVersion = '5.3.39'
 }
 
 dependencies {
     def slf4jVersion = '1.7.36'
     def metricsVersion = '4.2.26'
-    def geotoolsVersion = '24.7'
+    def geotoolsVersion = '27.5'
     def logbackVersion = '1.4.14'
 
     compile(
@@ -141,7 +141,8 @@ dependencies {
             // Indirect dependencies
             'org.apache.commons:commons-text:1.10.0',
             'org.hsqldb:hsqldb:2.7.3',
-            'com.fasterxml.jackson.core:jackson-databind:2.13.5'
+            'com.fasterxml.jackson.core:jackson-databind:2.13.5',
+            'org.testng:testng:7.5.1',
     )
     metrics(
             "io.dropwizard.metrics:metrics-core:$metricsVersion",
@@ -172,7 +173,7 @@ dependencies {
     )
     compile fileTree(dir: "$projectDir/libs", include: '*.jar')
     compile(
-            'com.google.guava:guava:30.1.1-jre',
+            'com.google.guava:guava:32.0.0-jre',
             "org.slf4j:slf4j-api:${slf4jVersion}",
             "org.slf4j:jcl-over-slf4j:${slf4jVersion}",
             "org.slf4j:jul-to-slf4j:${slf4jVersion}",

diff --git a/core/src/main/java/org/mapfish/print/map/geotools/grid/GridParam.java b/core/src/main/java/org/mapfish/print/map/geotools/grid/GridParam.java
@@ -1,5 +1,6 @@
 package org.mapfish.print.map.geotools.grid;
 
+import org.geotools.measure.Units;
 import org.geotools.referencing.CRS;
 import org.geotools.referencing.operation.transform.IdentityTransform;
 import org.locationtech.jts.util.Assert;
@@ -14,6 +15,8 @@
 import java.util.Arrays;
 import java.util.IllegalFormatException;
 
+import javax.measure.Unit;
+
 /**
  * Parameters relevant to creating Grid layers.
  */
@@ -244,14 +247,14 @@ public void postConstruct() {
      * @param mapCrs the crs of the map, used if the {@link #labelProjection} is not defined.
      */
     public String calculateLabelUnit(final CoordinateReferenceSystem mapCrs) {
-        String unit;
+        Unit unit;
         if (this.labelProjection != null) {
-            unit = this.labelCRS.getCoordinateSystem().getAxis(0).getUnit().toString();
+            unit = this.labelCRS.getCoordinateSystem().getAxis(0).getUnit();
         } else {
-            unit = mapCrs.getCoordinateSystem().getAxis(0).getUnit().toString();
+            unit = mapCrs.getCoordinateSystem().getAxis(0).getUnit();
         }
 
-        return unit;
+        return Units.toSymbol(unit);
     }
 
     /**