Updated copyright

rijnb · rijnb · commit 902b1b721497 · 2021-04-19T10:51:34.000+02:00
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 [![Release](https://img.shields.io/github/release/mapcode-foundation/mapcode-java.svg?maxAge=3600)](https://github.com/mapcode-foundation/mapcode-java/releases)
 [![Maven Central](https://img.shields.io/maven-central/v/com.mapcode/mapcode.svg?maxAge=3600)](https://maven-badges.herokuapp.com/maven-central/com.mapcode/mapcode)
 
-**Copyright (C) 2014-2019, Stichting Mapcode Foundation (http://www.mapcode.com)**
+**Copyright (C) 2014-2021, Stichting Mapcode Foundation (http://www.mapcode.com)**
 
 This Java project contains a library to encode latitude/longitude pairs to mapcodes
 and to decode mapcodes back to latitude/longitude pairs.
@@ -477,9 +477,17 @@ Normally, one of our developers should be able to comment on them and fix.
 
 
 # Release Notes <a name="releasenotes"></a>
-mat
+
 These are the release notes for the Java library for mapcodes.
 
+### 2.4.15
+
+* Removed country code ANT (not used for mapcodes) after JDK 1.8. Fixed unit test for that.
+
+* Updated Maven dependencies for security vulnerabilities.
+
+* Updated copyrights.
+
 ### 2.4.14
 
 * Updated dependencies for security vulnerabilities.
diff --git a/pom.xml b/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+  ~ Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
     <artifactId>mapcode</artifactId>
 
     <packaging>jar</packaging>
-    <version>2.4.14</version>
+    <version>2.4.15</version>
 
     <name>Mapcode Java Library</name>
     <description>
@@ -102,7 +102,7 @@
         <!-- libraries. -->
         <gson.version>2.8.6</gson.version>
         <jsr305.version>3.0.2</jsr305.version>
-        <junit.version>4.13</junit.version>
+        <junit.version>4.13.2</junit.version>
         <log4j.version>1.2.17</log4j.version>
         <slf4j.version>1.7.30</slf4j.version>
     </properties>
diff --git a/src/main/java/com/mapcode/Alphabet.java b/src/main/java/com/mapcode/Alphabet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/mapcode/Boundary.java b/src/main/java/com/mapcode/Boundary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/mapcode/CheckArgs.java b/src/main/java/com/mapcode/CheckArgs.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/mapcode/Common.java b/src/main/java/com/mapcode/Common.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/mapcode/Data.java b/src/main/java/com/mapcode/Data.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/mapcode/DataModel.java b/src/main/java/com/mapcode/DataModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/mapcode/Decoder.java b/src/main/java/com/mapcode/Decoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/mapcode/Encoder.java b/src/main/java/com/mapcode/Encoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/mapcode/IncorrectDataModelException.java b/src/main/java/com/mapcode/IncorrectDataModelException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/mapcode/Mapcode.java b/src/main/java/com/mapcode/Mapcode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/mapcode/MapcodeCodec.java b/src/main/java/com/mapcode/MapcodeCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/mapcode/MapcodeZone.java b/src/main/java/com/mapcode/MapcodeZone.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/mapcode/Point.java b/src/main/java/com/mapcode/Point.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/mapcode/Rectangle.java b/src/main/java/com/mapcode/Rectangle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/mapcode/Territory.java b/src/main/java/com/mapcode/Territory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -960,14 +960,15 @@ public boolean hasSubdivisions() {
         // Add Clipperton Island (not recognized by Java).
         MAP_ISO3_TO_ISO2.put("CPT", "CP");
 
+        // Remove Antilles (present in Java 1.8, removed later).
+        MAP_ISO3_TO_ISO2.remove("ANT");
+
         // Create fixed sets of the keys and values.
         COUNTRY_ISO2_CODES = new HashSet<String>(MAP_ISO3_TO_ISO2.values());
         COUNTRY_ISO3_CODES = new HashSet<String>(MAP_ISO3_TO_ISO2.keySet());
     }
 
-    /**
-     * Static checking of the static data structures.
-     */
+    // Static checking of the static data structures.
     static {
         final String errorPrefix = "Initializing error: ";
         CODE_LIST = new ArrayList<Territory>();
diff --git a/src/main/java/com/mapcode/UnknownAlphabetException.java b/src/main/java/com/mapcode/UnknownAlphabetException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/mapcode/UnknownDecodeException.java b/src/main/java/com/mapcode/UnknownDecodeException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/mapcode/UnknownMapcodeException.java b/src/main/java/com/mapcode/UnknownMapcodeException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/mapcode/UnknownPrecisionFormatException.java b/src/main/java/com/mapcode/UnknownPrecisionFormatException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/com/mapcode/UnknownTerritoryException.java b/src/main/java/com/mapcode/UnknownTerritoryException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/com/mapcode/AlphabetTest.java b/src/test/java/com/mapcode/AlphabetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/com/mapcode/CheckArgsTest.java b/src/test/java/com/mapcode/CheckArgsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/com/mapcode/DataModelTest.java b/src/test/java/com/mapcode/DataModelTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/com/mapcode/DecoderTest.java b/src/test/java/com/mapcode/DecoderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/com/mapcode/EncodeDecodeTest.java b/src/test/java/com/mapcode/EncodeDecodeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/com/mapcode/EncoderTest.java b/src/test/java/com/mapcode/EncoderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/com/mapcode/MapcodeTest.java b/src/test/java/com/mapcode/MapcodeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/com/mapcode/PointTest.java b/src/test/java/com/mapcode/PointTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/com/mapcode/ReferenceFileTest.java b/src/test/java/com/mapcode/ReferenceFileTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/test/java/com/mapcode/TerritoryTest.java b/src/test/java/com/mapcode/TerritoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -307,7 +307,7 @@ public void testGetCountryISO2Codes() {
         LOG.info("testGetCountryISO2Codes");
         final Set<String> countryISO2Codes = Territory.allCountryISO2Codes();
         LOG.info("set={}", countryISO2Codes);
-        assertEquals(251, countryISO2Codes.size());
+        assertEquals(250, countryISO2Codes.size());
         assertEquals(2, countryISO2Codes.iterator().next().length());
     }
 
@@ -316,7 +316,7 @@ public void testGetCountryISO3Codes() {
         LOG.info("testGetCountryISO3Codes");
         final Set<String> countryISO3Codes = Territory.allCountryISO3Codes();
         LOG.info("set={}", countryISO3Codes);
-        assertEquals(251, countryISO3Codes.size());
+        assertEquals(250, countryISO3Codes.size());
         assertEquals(3, countryISO3Codes.iterator().next().length());
     }
 }
diff --git a/src/test/resources/log4j.xml b/src/test/resources/log4j.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
-  ~ Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+  ~ Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/src/test/resources/show3d/sketch.properties b/src/test/resources/show3d/sketch.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)
+# Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (C) 2016-2020, Stichting Mapcode Foundation (http://www.mapcode.com)`
	`2`	`+ * Copyright (C) 2016-2021, Stichting Mapcode Foundation (http://www.mapcode.com)`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`