[sis] 01/01: Merge branch 'geoapi-3.1'. It allows to get the security fix with H2 upgrade. That vulnerability should have no practical incidence on SIS because H2 dependency was in tests only.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit e339e1950cbab4f662ca27eb39bb68916ca74523
Merge: 94526e6 eb9ad08
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Fri Jan 28 10:16:06 2022 +0100

    Merge branch 'geoapi-3.1'. It allows to get the security fix with H2 
upgrade.
    That vulnerability should have no practical incidence on SIS because H2 
dependency was in tests only.

 .../org/apache/sis/coverage/BandedCoverage.java    | 22 ++++++++++++++++--
 .../org/apache/sis/coverage/grid/GridCoverage.java |  9 +++++---
 .../org/apache/sis/metadata/MetadataCopier.java    | 19 ++++++++-------
 .../java/org/apache/sis/metadata/ValueMap.java     | 20 +++++++++++++++-
 .../java/org/apache/sis/metadata/package-info.java |  2 +-
 .../apache/sis/metadata/MetadataCopierTest.java    | 27 +++++++++++++++++++++-
 .../java/org/apache/sis/metadata/ValueMapTest.java | 15 +++++++++++-
 .../sis/parameter/DefaultParameterValueGroup.java  | 11 +++++----
 ide-project/NetBeans/nbproject/project.properties  |  2 +-
 pom.xml                                            |  2 +-
 .../sis/storage/geotiff/MultiResolutionImage.java  | 11 +++++++--
 11 files changed, 114 insertions(+), 26 deletions(-)

diff --cc 
core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataCopierTest.java
index 5c2634c,e2e25d7..4fbf727
--- 
a/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataCopierTest.java
+++ 
b/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataCopierTest.java
@@@ -99,4 -105,23 +105,23 @@@ public final strictfp class MetadataCop
              assertTrue(message, message.contains("DefaultCitation"));
          }
      }
+ 
+     /**
+      * Tests with a metadata containing a {@link 
DefaultMetadata#getLocalesAndCharsets()} property.
+      * This property is defined by a {@link Map}.
+      */
+     @Test
+     public void testLocaleAndCharsets() {
+         final MetadataCopier copier = new 
MetadataCopier(MetadataStandard.ISO_19115);
+         final DefaultMetadata original = new DefaultMetadata();
+         original.getLocalesAndCharsets().put(Locale.FRENCH,   
StandardCharsets.UTF_8);
+         original.getLocalesAndCharsets().put(Locale.JAPANESE, 
StandardCharsets.UTF_16);
 -        final Metadata copy = copier.copy(Metadata.class, original);
++        final DefaultMetadata copy = (DefaultMetadata) 
copier.copy(Metadata.class, original);
+         final Map<Locale,Charset> lc = copy.getLocalesAndCharsets();
+         assertEquals(StandardCharsets.UTF_8,  lc.get(Locale.FRENCH));
+         assertEquals(StandardCharsets.UTF_16, lc.get(Locale.JAPANESE));
+         assertEquals (original, copy);
+         assertNotSame(original, copy);
+         assertNotSame(original.getLocalesAndCharsets(), lc);
+     }
  }