From 834b595c123893077eb0a8efdb9352b4f5cc41c2 Mon Sep 17 00:00:00 2001
From: Rijn Buve <rijn@buve.nl>
Date: Tue, 21 Apr 2020 11:31:16 +0200
Subject: [PATCH 1/2] Updated version

---
 deployment/pom.xml | 2 +-
 pom.xml            | 2 +-
 resources/pom.xml  | 2 +-
 service/pom.xml    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/deployment/pom.xml b/deployment/pom.xml
index 1b64e3c..4716cb5 100644
--- a/deployment/pom.xml
+++ b/deployment/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.mapcode</groupId>
         <artifactId>mapcode-rest-service</artifactId>
-        <version>2.4.13.0</version>
+        <version>2.4.14.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>deployment</artifactId>
diff --git a/pom.xml b/pom.xml
index 31da57e..bf6e50a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
     <artifactId>mapcode-rest-service</artifactId>
 
     <packaging>pom</packaging>
-    <version>2.4.13.0</version>
+    <version>2.4.14.0-SNAPSHOT</version>
 
     <name>Mapcode REST API Web Service</name>
     <description>
diff --git a/resources/pom.xml b/resources/pom.xml
index 5d3d12a..dc8b996 100644
--- a/resources/pom.xml
+++ b/resources/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.mapcode</groupId>
         <artifactId>mapcode-rest-service</artifactId>
-        <version>2.4.13.0</version>
+        <version>2.4.14.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>resources</artifactId>
diff --git a/service/pom.xml b/service/pom.xml
index 21a189e..cdc6527 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.mapcode</groupId>
         <artifactId>mapcode-rest-service</artifactId>
-        <version>2.4.13.0</version>
+        <version>2.4.14.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>service</artifactId>

From ea3591a6de750cb5949ecc1948bc4944d492fbca Mon Sep 17 00:00:00 2001
From: Rijn Buve <rijn@buve.nl>
Date: Tue, 21 Apr 2020 13:46:22 +0200
Subject: [PATCH 2/2] Release 2.4.14.0

---
 README.md                                     |  4 ++
 apidocs/swagger/index.html                    |  2 +-
 apidocs/swagger/oauth2-redirect.html          | 16 ++++++++
 deployment/pom.xml                            | 18 ++++-----
 .../java/com/mapcode/services/cli/Main.java   |  2 +-
 .../services/deployment/DeploymentModule.java |  2 +-
 .../services/deployment/StartupCheck.java     |  2 +-
 deployment/src/main/webapp/WEB-INF/web.xml    |  2 +-
 .../com/mapcode/services/cli/MainTest.java    |  2 +-
 .../deployment/DeploymentModuleTest.java      |  2 +-
 .../services/deployment/StartupCheckTest.java |  2 +-
 example/index.html                            |  2 +-
 example/monitorclient/MapcodeMonitor.css      |  2 +-
 example/monitorclient/MapcodeMonitor.js       |  2 +-
 example/monitorclient/index.html              |  5 ++-
 example/monitorclient/jolokia-cubism.js       |  2 +-
 example/monitorclient/jolokia-simple.js       |  2 +-
 example/monitorclient/jolokia.js              |  2 +-
 pom.xml                                       | 37 ++++++++++---------
 resources/pom.xml                             |  4 +-
 .../main/external-resources-test/log4j.xml    |  2 +-
 .../mapcode-secret.properties                 |  2 +-
 .../src/main/resources/mapcode.properties     |  2 +-
 service/pom.xml                               |  4 +-
 .../com/mapcode/services/ApiConstants.java    |  2 +-
 .../com/mapcode/services/MapcodeResource.java |  2 +-
 .../mapcode/services/OnlyJsonResource.java    |  2 +-
 .../com/mapcode/services/OnlyXmlResource.java |  2 +-
 .../com/mapcode/services/ResourcesModule.java |  2 +-
 .../com/mapcode/services/RootResource.java    |  2 +-
 .../com/mapcode/services/dto/AlphabetDTO.java |  2 +-
 .../mapcode/services/dto/AlphabetListDTO.java |  2 +-
 .../mapcode/services/dto/AlphabetsDTO.java    |  2 +-
 .../com/mapcode/services/dto/MapcodeDTO.java  |  2 +-
 .../mapcode/services/dto/MapcodeListDTO.java  |  2 +-
 .../com/mapcode/services/dto/MapcodesDTO.java |  2 +-
 .../com/mapcode/services/dto/PointDTO.java    |  2 +-
 .../mapcode/services/dto/RectangleDTO.java    |  2 +-
 .../mapcode/services/dto/TerritoriesDTO.java  |  2 +-
 .../mapcode/services/dto/TerritoryDTO.java    |  2 +-
 .../services/dto/TerritoryListDTO.java        |  2 +-
 .../com/mapcode/services/dto/VersionDTO.java  |  2 +-
 .../implementation/MapcodeResourceImpl.java   |  2 +-
 .../implementation/OnlyJsonResourceImpl.java  |  2 +-
 .../implementation/OnlyXmlResourceImpl.java   |  2 +-
 .../implementation/RootResourceImpl.java      |  2 +-
 .../implementation/SystemMetricsImpl.java     |  2 +-
 .../implementation/TestAsyncResponse.java     |  2 +-
 .../services/jmx/SystemMetricsAgent.java      |  2 +-
 .../services/metrics/SystemMetrics.java       |  2 +-
 .../metrics/SystemMetricsCollector.java       |  2 +-
 .../services/standalone/MainCommandLine.java  |  2 +-
 .../mapcode/services/standalone/Server.java   |  2 +-
 .../services/standalone/StandaloneModule.java |  2 +-
 .../mapcode/services/ApiAlphabetsTest.java    |  2 +-
 .../com/mapcode/services/ApiCodesTest.java    |  2 +-
 .../com/mapcode/services/ApiCoordsTest.java   |  2 +-
 .../java/com/mapcode/services/ApiDTOTest.java |  2 +-
 .../com/mapcode/services/ApiOthersTest.java   |  2 +-
 .../mapcode/services/ApiTerritoriesTest.java  |  2 +-
 .../com/mapcode/services/LocalTestServer.java |  2 +-
 .../standalone/MainCommandLineTest.java       |  2 +-
 .../standalone/StandaloneModuleTest.java      |  2 +-
 63 files changed, 110 insertions(+), 90 deletions(-)

diff --git a/README.md b/README.md
index fd2a5d2..b775741 100644
--- a/README.md
+++ b/README.md
@@ -351,6 +351,10 @@ self-hosting this service.
 
 ## Release Notes
 
+### 2.4.14.0
+
+* Updated dependencies for security vulnerabilities.
+
 ### 2.4.13.0
 
 * Updated dependencies. 
diff --git a/apidocs/swagger/index.html b/apidocs/swagger/index.html
index aecb03f..a7807be 100644
--- a/apidocs/swagger/index.html
+++ b/apidocs/swagger/index.html
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+  ~ Copyright (C) 2016-2020, 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/apidocs/swagger/oauth2-redirect.html b/apidocs/swagger/oauth2-redirect.html
index 00c7f01..3a12bb0 100644
--- a/apidocs/swagger/oauth2-redirect.html
+++ b/apidocs/swagger/oauth2-redirect.html
@@ -1,3 +1,19 @@
+<!--
+  ~ Copyright (C) 2016-2020, 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.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
 <!doctype html>
 <html lang="en-US">
 <body onload="run()">
diff --git a/deployment/pom.xml b/deployment/pom.xml
index 4716cb5..1ec7646 100644
--- a/deployment/pom.xml
+++ b/deployment/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+  ~ Copyright (C) 2016-2020, 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.
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.mapcode</groupId>
         <artifactId>mapcode-rest-service</artifactId>
-        <version>2.4.14.0-SNAPSHOT</version>
+        <version>2.4.14.0</version>
     </parent>
 
     <artifactId>deployment</artifactId>
@@ -179,24 +179,22 @@
             </plugin>
 
             <plugin>
-                <groupId>org.mortbay.jetty</groupId>
+                <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
-                <version>${maven-jetty-plugin.version}</version>
+                <version>${jetty-maven-plugin.version}</version>
                 <configuration>
                     <webApp>
                         <contextPath>${maven.httpserver.root}</contextPath>
                     </webApp>
+                    <httpConnector>
+                        <port>${maven.httpserver.port}</port>
+                    </httpConnector>
                     <scanIntervalSeconds>10</scanIntervalSeconds>
                     <stopKey>stop</stopKey>
                     <stopPort>9999</stopPort>
-                    <connectors>
-                        <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
-                            <port>${maven.httpserver.port}</port>
-                            <maxIdleTime>60000</maxIdleTime>
-                        </connector>
-                    </connectors>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 </project>
+
diff --git a/deployment/src/main/java/com/mapcode/services/cli/Main.java b/deployment/src/main/java/com/mapcode/services/cli/Main.java
index d80aa39..f71c15e 100644
--- a/deployment/src/main/java/com/mapcode/services/cli/Main.java
+++ b/deployment/src/main/java/com/mapcode/services/cli/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/deployment/src/main/java/com/mapcode/services/deployment/DeploymentModule.java b/deployment/src/main/java/com/mapcode/services/deployment/DeploymentModule.java
index a3da4a0..1891996 100644
--- a/deployment/src/main/java/com/mapcode/services/deployment/DeploymentModule.java
+++ b/deployment/src/main/java/com/mapcode/services/deployment/DeploymentModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/deployment/src/main/java/com/mapcode/services/deployment/StartupCheck.java b/deployment/src/main/java/com/mapcode/services/deployment/StartupCheck.java
index 3364f4f..d2a4070 100644
--- a/deployment/src/main/java/com/mapcode/services/deployment/StartupCheck.java
+++ b/deployment/src/main/java/com/mapcode/services/deployment/StartupCheck.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/deployment/src/main/webapp/WEB-INF/web.xml b/deployment/src/main/webapp/WEB-INF/web.xml
index d94da38..7dd72d6 100644
--- a/deployment/src/main/webapp/WEB-INF/web.xml
+++ b/deployment/src/main/webapp/WEB-INF/web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+  ~ Copyright (C) 2016-2020, 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/deployment/src/test/java/com/mapcode/services/cli/MainTest.java b/deployment/src/test/java/com/mapcode/services/cli/MainTest.java
index da3e6ab..ae86ae2 100644
--- a/deployment/src/test/java/com/mapcode/services/cli/MainTest.java
+++ b/deployment/src/test/java/com/mapcode/services/cli/MainTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/deployment/src/test/java/com/mapcode/services/deployment/DeploymentModuleTest.java b/deployment/src/test/java/com/mapcode/services/deployment/DeploymentModuleTest.java
index 93add88..15f9ffc 100644
--- a/deployment/src/test/java/com/mapcode/services/deployment/DeploymentModuleTest.java
+++ b/deployment/src/test/java/com/mapcode/services/deployment/DeploymentModuleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/deployment/src/test/java/com/mapcode/services/deployment/StartupCheckTest.java b/deployment/src/test/java/com/mapcode/services/deployment/StartupCheckTest.java
index c0b99d0..4a798cc 100644
--- a/deployment/src/test/java/com/mapcode/services/deployment/StartupCheckTest.java
+++ b/deployment/src/test/java/com/mapcode/services/deployment/StartupCheckTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/example/index.html b/example/index.html
index d0ef878..a1621ea 100644
--- a/example/index.html
+++ b/example/index.html
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+  ~ Copyright (C) 2016-2020, 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/example/monitorclient/MapcodeMonitor.css b/example/monitorclient/MapcodeMonitor.css
index 1a22aff..572488e 100644
--- a/example/monitorclient/MapcodeMonitor.css
+++ b/example/monitorclient/MapcodeMonitor.css
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/example/monitorclient/MapcodeMonitor.js b/example/monitorclient/MapcodeMonitor.js
index 6e8c275..b00aec9 100644
--- a/example/monitorclient/MapcodeMonitor.js
+++ b/example/monitorclient/MapcodeMonitor.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/example/monitorclient/index.html b/example/monitorclient/index.html
index 6daf762..877d398 100644
--- a/example/monitorclient/index.html
+++ b/example/monitorclient/index.html
@@ -1,6 +1,5 @@
-<!DOCTYPE html>
 <!--
-  ~ Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+  ~ Copyright (C) 2016-2020, 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.
@@ -15,6 +14,8 @@
   ~ limitations under the License.
   -->
 
+<!DOCTYPE html>
+
 <html>
 <head>
     <title>Mapcode Monitor</title>
diff --git a/example/monitorclient/jolokia-cubism.js b/example/monitorclient/jolokia-cubism.js
index b0fe31a..3d9391c 100644
--- a/example/monitorclient/jolokia-cubism.js
+++ b/example/monitorclient/jolokia-cubism.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/example/monitorclient/jolokia-simple.js b/example/monitorclient/jolokia-simple.js
index 31a25c8..a1fdc16 100644
--- a/example/monitorclient/jolokia-simple.js
+++ b/example/monitorclient/jolokia-simple.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/example/monitorclient/jolokia.js b/example/monitorclient/jolokia.js
index 8605d2f..cd324c1 100644
--- a/example/monitorclient/jolokia.js
+++ b/example/monitorclient/jolokia.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/pom.xml b/pom.xml
index bf6e50a..c01934d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+  ~ Copyright (C) 2016-2020, 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-rest-service</artifactId>
 
     <packaging>pom</packaging>
-    <version>2.4.14.0-SNAPSHOT</version>
+    <version>2.4.14.0</version>
 
     <name>Mapcode REST API Web Service</name>
     <description>
@@ -75,43 +75,43 @@
 
         <!-- Maven plugins. -->
         <coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
-        <jacoco-maven-plugin.version>0.8.4</jacoco-maven-plugin.version>
+        <jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
+        <jetty-maven-plugin.version>9.4.28.v20200408</jetty-maven-plugin.version>
         <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
-        <maven-javadoc-plugin.version>3.1.0</maven-javadoc-plugin.version>
-        <maven-jetty-plugin.version>9.4.21.v20190926</maven-jetty-plugin.version>
+        <maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
         <maven-project-info-reports-plugin.version>3.0.0</maven-project-info-reports-plugin.version>
         <maven-remote-resources-plugin.version>1.6.0</maven-remote-resources-plugin.version>
         <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
-        <maven-source-plugin.version>3.1.0</maven-source-plugin.version>
+        <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
         <maven-war-plugin.version>3.2.3</maven-war-plugin.version>
         <swagger-maven-plugin.version>3.1.8</swagger-maven-plugin.version>
 
         <!-- Library versions - these are not re-used from the top-level POM to simulate stand-alone usage. -->
-        <commons-lang3.version>3.9</commons-lang3.version>
+        <commons-lang3.version>3.10</commons-lang3.version>
         <commons-text.version>1.8</commons-text.version>
         <commons-httpclient.version>3.1</commons-httpclient.version>
         <gson.version>2.8.6</gson.version>
-        <guava.version>27.1-jre</guava.version>
-        <guice.version>4.2.2</guice.version>
-        <jackson.version>2.10.1</jackson.version>
-        <jackson-databind.version>2.10.1</jackson-databind.version>
+        <guava.version>29.0-jre</guava.version>
+        <guice.version>4.2.3</guice.version>
+        <jackson.version>2.10.3</jackson.version>
+        <jackson-databind.version>2.10.3</jackson-databind.version>
         <javax.inject.version>1</javax.inject.version>
         <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
         <jaxb-api.version>2.3.1</jaxb-api.version>
         <joda-time.version>2.10.5</joda-time.version>
-        <jolokia.version>1.6.1</jolokia.version>
+        <jolokia.version>1.6.2</jolokia.version>
         <jsr305.version>3.0.2</jsr305.version>
-        <junit.version>4.12</junit.version>
+        <junit.version>4.13</junit.version>
         <log4j.version>1.2.17</log4j.version>
-        <mapcode.version>2.4.13</mapcode.version>
-        <mockito-core.version>3.2.0</mockito-core.version>
-        <resteasy.version>3.7.0.Final</resteasy.version>
-        <scala.version>2.12.8</scala.version>
+        <mapcode.version>2.4.14</mapcode.version>
+        <mockito-core.version>3.3.3</mockito-core.version>
+        <resteasy.version>3.11.2.Final</resteasy.version>
+        <scala.version>2.12.11</scala.version>
         <slf4j.version>1.7.25</slf4j.version>
         <speedtools.version>3.2.19</speedtools.version>
-        <swagger.version>1.6.0</swagger.version>
+        <swagger.version>1.6.1</swagger.version>
     </properties>
 
     <distributionManagement>
@@ -637,3 +637,4 @@
         </profile>
     </profiles>
 </project>
+
diff --git a/resources/pom.xml b/resources/pom.xml
index dc8b996..e3d8aed 100644
--- a/resources/pom.xml
+++ b/resources/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+  ~ Copyright (C) 2016-2020, 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.
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.mapcode</groupId>
         <artifactId>mapcode-rest-service</artifactId>
-        <version>2.4.14.0-SNAPSHOT</version>
+        <version>2.4.14.0</version>
     </parent>
 
     <artifactId>resources</artifactId>
diff --git a/resources/src/main/external-resources-test/log4j.xml b/resources/src/main/external-resources-test/log4j.xml
index 28aae2a..798a363 100644
--- a/resources/src/main/external-resources-test/log4j.xml
+++ b/resources/src/main/external-resources-test/log4j.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
-  ~ Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+  ~ Copyright (C) 2016-2020, 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/resources/src/main/external-resources-test/mapcode-secret.properties b/resources/src/main/external-resources-test/mapcode-secret.properties
index 942c8fe..4408cc6 100644
--- a/resources/src/main/external-resources-test/mapcode-secret.properties
+++ b/resources/src/main/external-resources-test/mapcode-secret.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+# Copyright (C) 2016-2020, 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/resources/src/main/resources/mapcode.properties b/resources/src/main/resources/mapcode.properties
index f524402..5ea8d78 100644
--- a/resources/src/main/resources/mapcode.properties
+++ b/resources/src/main/resources/mapcode.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+# Copyright (C) 2016-2020, 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/service/pom.xml b/service/pom.xml
index cdc6527..a790e1f 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+  ~ Copyright (C) 2016-2020, 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.
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.mapcode</groupId>
         <artifactId>mapcode-rest-service</artifactId>
-        <version>2.4.14.0-SNAPSHOT</version>
+        <version>2.4.14.0</version>
     </parent>
 
     <artifactId>service</artifactId>
diff --git a/service/src/main/java/com/mapcode/services/ApiConstants.java b/service/src/main/java/com/mapcode/services/ApiConstants.java
index 2e5aed3..7723be0 100644
--- a/service/src/main/java/com/mapcode/services/ApiConstants.java
+++ b/service/src/main/java/com/mapcode/services/ApiConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/main/java/com/mapcode/services/MapcodeResource.java b/service/src/main/java/com/mapcode/services/MapcodeResource.java
index b75f5d9..1723d34 100644
--- a/service/src/main/java/com/mapcode/services/MapcodeResource.java
+++ b/service/src/main/java/com/mapcode/services/MapcodeResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/main/java/com/mapcode/services/OnlyJsonResource.java b/service/src/main/java/com/mapcode/services/OnlyJsonResource.java
index 981e240..353b5f0 100644
--- a/service/src/main/java/com/mapcode/services/OnlyJsonResource.java
+++ b/service/src/main/java/com/mapcode/services/OnlyJsonResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/main/java/com/mapcode/services/OnlyXmlResource.java b/service/src/main/java/com/mapcode/services/OnlyXmlResource.java
index 5aa2a01..d31909e 100644
--- a/service/src/main/java/com/mapcode/services/OnlyXmlResource.java
+++ b/service/src/main/java/com/mapcode/services/OnlyXmlResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/main/java/com/mapcode/services/ResourcesModule.java b/service/src/main/java/com/mapcode/services/ResourcesModule.java
index c0190c6..105f7fc 100644
--- a/service/src/main/java/com/mapcode/services/ResourcesModule.java
+++ b/service/src/main/java/com/mapcode/services/ResourcesModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/main/java/com/mapcode/services/RootResource.java b/service/src/main/java/com/mapcode/services/RootResource.java
index fb46e61..1256c30 100644
--- a/service/src/main/java/com/mapcode/services/RootResource.java
+++ b/service/src/main/java/com/mapcode/services/RootResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/main/java/com/mapcode/services/dto/AlphabetDTO.java b/service/src/main/java/com/mapcode/services/dto/AlphabetDTO.java
index b932083..f47ab2d 100644
--- a/service/src/main/java/com/mapcode/services/dto/AlphabetDTO.java
+++ b/service/src/main/java/com/mapcode/services/dto/AlphabetDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/main/java/com/mapcode/services/dto/AlphabetListDTO.java b/service/src/main/java/com/mapcode/services/dto/AlphabetListDTO.java
index c35b2af..04418a1 100644
--- a/service/src/main/java/com/mapcode/services/dto/AlphabetListDTO.java
+++ b/service/src/main/java/com/mapcode/services/dto/AlphabetListDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/main/java/com/mapcode/services/dto/AlphabetsDTO.java b/service/src/main/java/com/mapcode/services/dto/AlphabetsDTO.java
index 394c40c..5e1813b 100644
--- a/service/src/main/java/com/mapcode/services/dto/AlphabetsDTO.java
+++ b/service/src/main/java/com/mapcode/services/dto/AlphabetsDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/main/java/com/mapcode/services/dto/MapcodeDTO.java b/service/src/main/java/com/mapcode/services/dto/MapcodeDTO.java
index 5cdd4b8..2787bbc 100644
--- a/service/src/main/java/com/mapcode/services/dto/MapcodeDTO.java
+++ b/service/src/main/java/com/mapcode/services/dto/MapcodeDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/main/java/com/mapcode/services/dto/MapcodeListDTO.java b/service/src/main/java/com/mapcode/services/dto/MapcodeListDTO.java
index 38a2b67..6ed453d 100644
--- a/service/src/main/java/com/mapcode/services/dto/MapcodeListDTO.java
+++ b/service/src/main/java/com/mapcode/services/dto/MapcodeListDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/main/java/com/mapcode/services/dto/MapcodesDTO.java b/service/src/main/java/com/mapcode/services/dto/MapcodesDTO.java
index 3d111ff..cae6e24 100644
--- a/service/src/main/java/com/mapcode/services/dto/MapcodesDTO.java
+++ b/service/src/main/java/com/mapcode/services/dto/MapcodesDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/main/java/com/mapcode/services/dto/PointDTO.java b/service/src/main/java/com/mapcode/services/dto/PointDTO.java
index 827070a..6a81bc3 100644
--- a/service/src/main/java/com/mapcode/services/dto/PointDTO.java
+++ b/service/src/main/java/com/mapcode/services/dto/PointDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/main/java/com/mapcode/services/dto/RectangleDTO.java b/service/src/main/java/com/mapcode/services/dto/RectangleDTO.java
index 1eef362..e12213d 100644
--- a/service/src/main/java/com/mapcode/services/dto/RectangleDTO.java
+++ b/service/src/main/java/com/mapcode/services/dto/RectangleDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/main/java/com/mapcode/services/dto/TerritoriesDTO.java b/service/src/main/java/com/mapcode/services/dto/TerritoriesDTO.java
index 7118b09..0cbb173 100644
--- a/service/src/main/java/com/mapcode/services/dto/TerritoriesDTO.java
+++ b/service/src/main/java/com/mapcode/services/dto/TerritoriesDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/main/java/com/mapcode/services/dto/TerritoryDTO.java b/service/src/main/java/com/mapcode/services/dto/TerritoryDTO.java
index f326cf8..afbfdb6 100644
--- a/service/src/main/java/com/mapcode/services/dto/TerritoryDTO.java
+++ b/service/src/main/java/com/mapcode/services/dto/TerritoryDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/main/java/com/mapcode/services/dto/TerritoryListDTO.java b/service/src/main/java/com/mapcode/services/dto/TerritoryListDTO.java
index d37ee8f..7319702 100644
--- a/service/src/main/java/com/mapcode/services/dto/TerritoryListDTO.java
+++ b/service/src/main/java/com/mapcode/services/dto/TerritoryListDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/main/java/com/mapcode/services/dto/VersionDTO.java b/service/src/main/java/com/mapcode/services/dto/VersionDTO.java
index eeee933..141593b 100644
--- a/service/src/main/java/com/mapcode/services/dto/VersionDTO.java
+++ b/service/src/main/java/com/mapcode/services/dto/VersionDTO.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/main/java/com/mapcode/services/implementation/MapcodeResourceImpl.java b/service/src/main/java/com/mapcode/services/implementation/MapcodeResourceImpl.java
index eccc02b..300d7b3 100644
--- a/service/src/main/java/com/mapcode/services/implementation/MapcodeResourceImpl.java
+++ b/service/src/main/java/com/mapcode/services/implementation/MapcodeResourceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/main/java/com/mapcode/services/implementation/OnlyJsonResourceImpl.java b/service/src/main/java/com/mapcode/services/implementation/OnlyJsonResourceImpl.java
index a3b7d2c..d756a38 100644
--- a/service/src/main/java/com/mapcode/services/implementation/OnlyJsonResourceImpl.java
+++ b/service/src/main/java/com/mapcode/services/implementation/OnlyJsonResourceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/main/java/com/mapcode/services/implementation/OnlyXmlResourceImpl.java b/service/src/main/java/com/mapcode/services/implementation/OnlyXmlResourceImpl.java
index 1376b59..b900c35 100644
--- a/service/src/main/java/com/mapcode/services/implementation/OnlyXmlResourceImpl.java
+++ b/service/src/main/java/com/mapcode/services/implementation/OnlyXmlResourceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/main/java/com/mapcode/services/implementation/RootResourceImpl.java b/service/src/main/java/com/mapcode/services/implementation/RootResourceImpl.java
index 0f57efb..c62a8b6 100644
--- a/service/src/main/java/com/mapcode/services/implementation/RootResourceImpl.java
+++ b/service/src/main/java/com/mapcode/services/implementation/RootResourceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/main/java/com/mapcode/services/implementation/SystemMetricsImpl.java b/service/src/main/java/com/mapcode/services/implementation/SystemMetricsImpl.java
index 11401e0..8989d65 100644
--- a/service/src/main/java/com/mapcode/services/implementation/SystemMetricsImpl.java
+++ b/service/src/main/java/com/mapcode/services/implementation/SystemMetricsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/main/java/com/mapcode/services/implementation/TestAsyncResponse.java b/service/src/main/java/com/mapcode/services/implementation/TestAsyncResponse.java
index 3b267f0..58c3749 100644
--- a/service/src/main/java/com/mapcode/services/implementation/TestAsyncResponse.java
+++ b/service/src/main/java/com/mapcode/services/implementation/TestAsyncResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/main/java/com/mapcode/services/jmx/SystemMetricsAgent.java b/service/src/main/java/com/mapcode/services/jmx/SystemMetricsAgent.java
index a5b6abf..2460b34 100644
--- a/service/src/main/java/com/mapcode/services/jmx/SystemMetricsAgent.java
+++ b/service/src/main/java/com/mapcode/services/jmx/SystemMetricsAgent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/main/java/com/mapcode/services/metrics/SystemMetrics.java b/service/src/main/java/com/mapcode/services/metrics/SystemMetrics.java
index 5b3673d..d406326 100644
--- a/service/src/main/java/com/mapcode/services/metrics/SystemMetrics.java
+++ b/service/src/main/java/com/mapcode/services/metrics/SystemMetrics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/main/java/com/mapcode/services/metrics/SystemMetricsCollector.java b/service/src/main/java/com/mapcode/services/metrics/SystemMetricsCollector.java
index 7e860cc..caf956d 100644
--- a/service/src/main/java/com/mapcode/services/metrics/SystemMetricsCollector.java
+++ b/service/src/main/java/com/mapcode/services/metrics/SystemMetricsCollector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/main/java/com/mapcode/services/standalone/MainCommandLine.java b/service/src/main/java/com/mapcode/services/standalone/MainCommandLine.java
index 2be1f27..504fbdd 100644
--- a/service/src/main/java/com/mapcode/services/standalone/MainCommandLine.java
+++ b/service/src/main/java/com/mapcode/services/standalone/MainCommandLine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/main/java/com/mapcode/services/standalone/Server.java b/service/src/main/java/com/mapcode/services/standalone/Server.java
index 177d047..875a5bf 100644
--- a/service/src/main/java/com/mapcode/services/standalone/Server.java
+++ b/service/src/main/java/com/mapcode/services/standalone/Server.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/main/java/com/mapcode/services/standalone/StandaloneModule.java b/service/src/main/java/com/mapcode/services/standalone/StandaloneModule.java
index fc10f90..42764a0 100644
--- a/service/src/main/java/com/mapcode/services/standalone/StandaloneModule.java
+++ b/service/src/main/java/com/mapcode/services/standalone/StandaloneModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/test/java/com/mapcode/services/ApiAlphabetsTest.java b/service/src/test/java/com/mapcode/services/ApiAlphabetsTest.java
index 4f93951..94c7692 100644
--- a/service/src/test/java/com/mapcode/services/ApiAlphabetsTest.java
+++ b/service/src/test/java/com/mapcode/services/ApiAlphabetsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/test/java/com/mapcode/services/ApiCodesTest.java b/service/src/test/java/com/mapcode/services/ApiCodesTest.java
index 0fea7d8..9fb4665 100644
--- a/service/src/test/java/com/mapcode/services/ApiCodesTest.java
+++ b/service/src/test/java/com/mapcode/services/ApiCodesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/test/java/com/mapcode/services/ApiCoordsTest.java b/service/src/test/java/com/mapcode/services/ApiCoordsTest.java
index f04c1bd..7357106 100644
--- a/service/src/test/java/com/mapcode/services/ApiCoordsTest.java
+++ b/service/src/test/java/com/mapcode/services/ApiCoordsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/test/java/com/mapcode/services/ApiDTOTest.java b/service/src/test/java/com/mapcode/services/ApiDTOTest.java
index 4100ecd..76e22f3 100644
--- a/service/src/test/java/com/mapcode/services/ApiDTOTest.java
+++ b/service/src/test/java/com/mapcode/services/ApiDTOTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/test/java/com/mapcode/services/ApiOthersTest.java b/service/src/test/java/com/mapcode/services/ApiOthersTest.java
index 51431d8..9cb8996 100644
--- a/service/src/test/java/com/mapcode/services/ApiOthersTest.java
+++ b/service/src/test/java/com/mapcode/services/ApiOthersTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/test/java/com/mapcode/services/ApiTerritoriesTest.java b/service/src/test/java/com/mapcode/services/ApiTerritoriesTest.java
index aebc018..93a79c5 100644
--- a/service/src/test/java/com/mapcode/services/ApiTerritoriesTest.java
+++ b/service/src/test/java/com/mapcode/services/ApiTerritoriesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/test/java/com/mapcode/services/LocalTestServer.java b/service/src/test/java/com/mapcode/services/LocalTestServer.java
index d611e57..b3a1826 100644
--- a/service/src/test/java/com/mapcode/services/LocalTestServer.java
+++ b/service/src/test/java/com/mapcode/services/LocalTestServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/test/java/com/mapcode/services/standalone/MainCommandLineTest.java b/service/src/test/java/com/mapcode/services/standalone/MainCommandLineTest.java
index 9b13263..9248b3a 100644
--- a/service/src/test/java/com/mapcode/services/standalone/MainCommandLineTest.java
+++ b/service/src/test/java/com/mapcode/services/standalone/MainCommandLineTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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/service/src/test/java/com/mapcode/services/standalone/StandaloneModuleTest.java b/service/src/test/java/com/mapcode/services/standalone/StandaloneModuleTest.java
index 13d13a1..1e95a40 100644
--- a/service/src/test/java/com/mapcode/services/standalone/StandaloneModuleTest.java
+++ b/service/src/test/java/com/mapcode/services/standalone/StandaloneModuleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2019, Stichting Mapcode Foundation (http://www.mapcode.com)
+ * Copyright (C) 2016-2020, 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.