Release 2.4.14.0

rijnb · Apr 21, 2020 · c3df848 · c3df848
1 parent 6957dfc
commit c3df848
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 29 deletions.
diff --git a/deployment/pom.xml b/deployment/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.mapcode.stats</groupId>
         <artifactId>mapcode-stats-service</artifactId>
-        <version>2.4.13.0</version>
+        <version>2.4.14.0</version>
     </parent>
 
     <artifactId>deployment</artifactId>
@@ -147,22 +147,19 @@
             </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>

diff --git a/pom.xml b/pom.xml
@@ -24,7 +24,7 @@
     <artifactId>mapcode-stats-service</artifactId>
 
     <packaging>pom</packaging>
-    <version>2.4.13.0</version>
+    <version>2.4.14.0</version>
 
     <name>Mapcode Stats Service</name>
     <description>
@@ -75,42 +75,42 @@
 
         <!-- 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-install-plugin.version>2.5.2</maven-install-plugin.version>
-        <maven-javadoc-plugin.version>3.1.0</maven-javadoc-plugin.version>
-        <maven-jetty-plugin.version>8.1.9.v20130131</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.0.1</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>
 
         <!-- Library versions - these are not re-used from the top-level POM to simulate stand-alone usage. -->
         <commons-collections4.version>4.4</commons-collections4.version>
-        <commons-lang3.version>3.9</commons-lang3.version>
-        <commons-text.version>1.6</commons-text.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>
-        <geojson-jackson.version>1.12</geojson-jackson.version>
+        <geojson-jackson.version>1.14</geojson-jackson.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.7</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>
     </properties>

diff --git a/resources/pom.xml b/resources/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.mapcode.stats</groupId>
         <artifactId>mapcode-stats-service</artifactId>
-        <version>2.4.13.0</version>
+        <version>2.4.14.0</version>
     </parent>
 
     <artifactId>resources</artifactId>

diff --git a/service/pom.xml b/service/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.mapcode.stats</groupId>
         <artifactId>mapcode-stats-service</artifactId>
-        <version>2.4.13.0</version>
+        <version>2.4.14.0</version>
     </parent>
 
     <artifactId>service</artifactId>