Merge pull request #28 from mapcode-foundation/2.4.14.0

Release 2.4.14.0
mapcode-foundation · Apr 21, 2020 · fddd261 · fddd261
2 parents 6cfdd30 + ea3591a
commit fddd261
Show file tree

Hide file tree

Showing 63 changed files with 110 additions and 90 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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.13.0</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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.13.0</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
@@ -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.13.0</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
@@ -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
@@ -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
@@ -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
@@ -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.13.0</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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.