Updated deps and copyright

rijnb · rijnb · commit f12d4d9fbd46 · 2019-01-22T14:09:24.000+01:00
diff --git a/LICENSE b/LICENSE
@@ -176,7 +176,7 @@
 
    END OF TERMS AND CONDITIONS
 
-   Copyright 2018, Stichting Mapcode Foundation
+   Copyright 2019, Stichting Mapcode Foundation
 
    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/NOTICE b/NOTICE
@@ -5,4 +5,4 @@ MAPCODE JAVA LIBRARY
 Original C library created by Pieter Geelen. Work on Java version
 of the Mapcode library by Rijn Buve (original port by Matthew Lowden).
 
-Copyright (C) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+Copyright (C) 2014-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
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-2017, Stichting Mapcode Foundation (http://www.mapcode.com)**
+**Copyright (C) 2014-2019, 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.
@@ -480,6 +480,10 @@ Normally, one of our developers should be able to comment on them and fix.
 
 These are the release notes for the Java library for mapcodes.
 
+### 2.4.8
+
+* Updated dependencies for security patches.
+
 ### 2.4.7
 
 * Added `fromCountryISO/2/3` methods to get a `Territory` value from a 2- or 3-character ISO 3166 string.
diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
     <artifactId>mapcode</artifactId>
 
     <packaging>jar</packaging>
-    <version>2.4.7</version>
+    <version>2.4.8</version>
 
     <name>Mapcode Java Library</name>
     <description>
@@ -73,18 +73,18 @@
 
         <!-- Modules. -->
         <coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
-        <jacoco-maven-plugin.version>0.8.1</jacoco-maven-plugin.version>
-        <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
+        <jacoco-maven-plugin.version>0.8.2</jacoco-maven-plugin.version>
+        <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
         <maven-javadoc-plugin.version>3.0.0</maven-javadoc-plugin.version>
         <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
-        <maven-project-info-reports-plugin.version>2.9</maven-project-info-reports-plugin.version>
+        <maven-project-info-reports-plugin.version>3.0.0</maven-project-info-reports-plugin.version>
         <maven-site-plugin.version>3.7.1</maven-site-plugin.version>
         <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
         <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
         <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
 
         <!-- libraries. -->
-        <gson.version>2.8.4</gson.version>
+        <gson.version>2.8.5</gson.version>
         <jsr305.version>3.0.2</jsr305.version>
         <junit.version>4.12</junit.version>
         <log4j.version>1.2.17</log4j.version>
@@ -245,9 +245,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
                 <version>${maven-project-info-reports-plugin.version}</version>
-                <configuration>
-                    <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
-                </configuration>
             </plugin>
 
             <!-- JavaDoc reports. -->
diff --git a/src/main/java/com/mapcode/Alphabet.java b/src/main/java/com/mapcode/Alphabet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2014-2019, 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) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2014-2019, 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) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2014-2019, 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) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2014-2019, 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) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2014-2019, 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) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2014-2019, 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) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2014-2019, 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) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2014-2019, 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) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2014-2019, 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) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2014-2019, 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) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2014-2019, 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) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2014-2019, 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) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2014-2019, 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-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2019, 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) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2014-2019, 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/UnknownAlphabetException.java b/src/main/java/com/mapcode/UnknownAlphabetException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2014-2019, 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) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2014-2019, 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) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2014-2019, 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) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2014-2019, 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/resources/com/mapcode/README.md b/src/main/resources/com/mapcode/README.md
@@ -1,7 +1,7 @@
 The binary file "mminfo.dat" is subject to the following copyright and
 license statements:
 
-Copyright (C) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+Copyright (C) 2014-2019, 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) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2014-2019, 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) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2014-2019, 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) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2014-2019, 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) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2014-2019, 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) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2014-2019, 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) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2014-2019, 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) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2014-2019, 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) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2014-2019, 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) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2014-2019, 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) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2014-2019, 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/log4j.xml b/src/test/resources/log4j.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
- ~ Copyright (C) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+ ~ Copyright (C) 2014-2019, 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/show3d.pde b/src/test/resources/show3d/show3d.pde
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2014-2019, 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) 2014-2017, Stichting Mapcode Foundation (http://www.mapcode.com)`
	`2`	`+ * Copyright (C) 2014-2019, 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.`