diff --git a/.gitignore b/.gitignore index 19ba0e5..bd7e011 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ target/ out/ *.versionsBackup +.gitnexus diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 5c98b42..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# Default ignored files -/workspace.xml \ No newline at end of file diff --git a/README.md b/README.md index 4ceff96..04fb346 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,11 @@ # Mapcode Library for Java -[![Codacy Badge](https://api.codacy.com/project/badge/Grade/0c9f11645f504b50bd154a80fb95a5c3)](https://www.codacy.com/app/rijnb/mapcode-java?utm_source=github.com&utm_medium=referral&utm_content=mapcode-foundation/mapcode-java&utm_campaign=Badge_Grade) -[![Build Status](https://img.shields.io/travis/mapcode-foundation/mapcode-java.svg?maxAge=3600&branch=master)](https://travis-ci.org/mapcode-foundation/mapcode-java) [![Coverage Status](https://coveralls.io/repos/github/mapcode-foundation/mapcode-java/badge.svg?branch=master&maxAge=3600)](https://coveralls.io/github/mapcode-foundation/mapcode-java?branch=master) [![License](http://img.shields.io/badge/license-APACHE2-blue.svg)]() [![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-2026, 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 +475,26 @@ Normally, one of our developers should be able to comment on them and fix. # Release Notes -mat + These are the release notes for the Java library for mapcodes. +### 2.4.19 + +* Added synonyms for territories Maco CN-MO and Mexico MX-CMX. +* Updated dependencies. + +### 2.4.16-2.4.18 + +* Updated `log4j` and `gson` dependencies. + +### 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 index 82139b9..a2b93fc 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,5 @@ - 2.8.6 + 2.14.0 3.0.2 - 4.13 - 1.2.17 - 1.7.30 + 4.13.2 + 2.26.0 + 1.7.36 - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - @@ -215,16 +208,15 @@ - + - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus-staging-maven-plugin.version} + org.sonatype.central + central-publishing-maven-plugin + ${central-publishing-maven-plugin.version} true - ossrh - https://oss.sonatype.org/ - false + central + false @@ -299,8 +291,14 @@ - log4j - log4j + org.apache.logging.log4j + log4j-api + ${log4j.version} + + + + org.apache.logging.log4j + log4j-core ${log4j.version} diff --git a/src/main/java/com/mapcode/Alphabet.java b/src/main/java/com/mapcode/Alphabet.java index 61492b6..ebdd79d 100644 --- 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 index 29c0c35..4e456ee 100644 --- 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 index 4af6fd7..c6a2e84 100644 --- 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 index 0d23252..499cf45 100644 --- 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 index 26d4a50..2eb7e37 100644 --- 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 index 7c3d5af..72a8543 100644 --- 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 index 6ad8329..195ad2e 100644 --- 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 index b644008..8f2f459 100644 --- 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 index 333daf9..dd7f410 100644 --- 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 index a9ad857..e32a310 100644 --- 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 index f992763..b0e3405 100644 --- 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 index 632ba2f..29300c4 100644 --- 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 index 0361bcf..7544446 100644 --- 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 index e2be172..4eebac9 100644 --- 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 index a9089f2..5f4879f 100644 --- 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. @@ -48,7 +48,7 @@ public enum Territory { BLM(5, "Saint-Barthelemy"), NRU(6, "Nauru"), TUV(7, "Tuvalu"), - MAC(8, "Macau", new Alphabet[]{Alphabet.CHINESE, Alphabet.ROMAN}, null, new String[]{"CN-92", "CHN-92", "CN-MC", "CHN-MC"}, new String[]{"Aomen"}), + MAC(8, "Macau", new Alphabet[]{Alphabet.CHINESE, Alphabet.ROMAN}, null, new String[]{"CN-92", "CHN-92", "CN-MC", "CHN-MC", "CN-MO", "CHN-MO"}, new String[]{"Aomen"}), SXM(9, "Sint Maarten"), MAF(10, "Saint-Martin"), NFK(11, "Norfolk and Philip Island", null, null, new String[]{"AU-NF", "AUS-NF"}, @@ -277,7 +277,7 @@ public enum Territory { LBY(230, "Libya", new Alphabet[]{Alphabet.ARABIC, Alphabet.ROMAN, Alphabet.TIFINAGH}), SDN(231, "Sudan", new Alphabet[]{Alphabet.ARABIC, Alphabet.ROMAN}), IDN(232, "Indonesia"), - MX_DIF(233, "Federal District", null, MEX, new String[]{"MX-DF"}), + MX_DIF(233, "Federal District", null, MEX, new String[]{"MX-DF", "MX-CMX"}), MX_TLA(234, "Tlaxcala", null, MEX, new String[]{"MX-TL"}), MX_MOR(235, "Morelos", null, MEX, new String[]{"MX-MO"}), MX_AGU(236, "Aguascalientes", null, MEX, new String[]{"MX-AG"}), @@ -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(MAP_ISO3_TO_ISO2.values()); COUNTRY_ISO3_CODES = new HashSet(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(); diff --git a/src/main/java/com/mapcode/UnknownAlphabetException.java b/src/main/java/com/mapcode/UnknownAlphabetException.java index 9db00cd..0519e78 100644 --- 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 index 7c1d4af..ef38c63 100644 --- 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 index ce759be..2bd7a24 100644 --- 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 index 5c76398..732610e 100644 --- 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 index d1bbf8b..d2d38b8 100644 --- 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 index a4b11e5..47b4c98 100644 --- 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 index 4bfe7fe..eb42f78 100644 --- 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 index 1501ee0..358e166 100644 --- 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 index 491318c..213ad00 100644 --- 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 index b6892eb..a0e4f1a 100644 --- 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 index 556d17b..e1ac239 100644 --- 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 index 2da85e9..c8b0db2 100644 --- 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 index 1ec4222..1ca5d6c 100644 --- 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 index 411ed3a..0d9a8dc 100644 --- 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 index 656ad0c..b0c23fc 100644 --- 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 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 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 index d723c1c..26da1c8 100644 --- a/src/test/resources/log4j.xml +++ b/src/test/resources/log4j.xml @@ -1,6 +1,6 @@