upgrade dependencies

I had to fix JettyServerTest because Jetty behaviour has been changed: now it throws IllegalArgumentException if maxThreads < minThreads

pom.xml

@@ -30,9 +30,9 @@
 
     <properties>
         <java.version>1.8</java.version>
-        <jetty.version>9.4.8.v20171121</jetty.version>
+        <jetty.version>9.4.11.v20180605</jetty.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <powermock.version>1.6.6</powermock.version>
+        <powermock.version>1.7.4</powermock.version>
         <mockito.version>1.10.19</mockito.version>
     </properties>
 
@@ -103,19 +103,19 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.1</version>
+            <version>4.5.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.freemarker</groupId>
             <artifactId>freemarker</artifactId>
-            <version>2.3.23</version>
+            <version>2.3.28</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.4</version>
+            <version>2.8.5</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -124,12 +124,14 @@
             <version>${jetty.version}</version>
             <scope>test</scope>
         </dependency>
+<!--
         <dependency>
             <groupId>org.powermock.tests</groupId>
             <artifactId>powermock-tests-utils</artifactId>
-            <version>${powermock.version}</version>
+            <version>1.6.6</version>
             <scope>test</scope>
         </dependency>
+-->
     </dependencies>
 
     <build>
@@ -155,7 +157,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.3</version>
+                <version>3.7.0</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
@@ -166,7 +168,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.4</version>
+                <version>1.4.1</version>
                 <executions>
                     <execution>
                         <id>enforce-java</id>
@@ -186,7 +188,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.18.1</version>
+                <version>2.22.0</version>
                 <configuration>
                     <forkCount>1</forkCount>
                     <reuseForks>false</reuseForks>
@@ -195,15 +197,15 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.3</version>
+                <version>3.0.1</version>
                 <configuration>
                     <failOnError>false</failOnError>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.5.3</version>
+                <version>3.5.1</version>
                 <extensions>true</extensions>
             </plugin>
         </plugins>

src/test/java/spark/embeddedserver/jetty/JettyServerTest.java

@@ -3,43 +3,51 @@
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 import org.junit.Test;
-import org.mockito.internal.util.reflection.Whitebox;
+import org.powermock.reflect.Whitebox;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 public class JettyServerTest {
-
     @Test
-    public void testCreateServer_useDefaults() throws Exception {
-
+    public void testCreateServer_useDefaults() {
         Server server = new JettyServer().create(0, 0, 0);
 
         QueuedThreadPool threadPool = (QueuedThreadPool) server.getThreadPool();
 
-        int minThreads = (int) Whitebox.getInternalState(threadPool, "_minThreads");
-        int maxThreads = (int) Whitebox.getInternalState(threadPool, "_maxThreads");
-        int idleTimeout = (int) Whitebox.getInternalState(threadPool, "_idleTimeout");
+        int minThreads = Whitebox.getInternalState(threadPool, "_minThreads");
+        int maxThreads = Whitebox.getInternalState(threadPool, "_maxThreads");
+        int idleTimeout = Whitebox.getInternalState(threadPool, "_idleTimeout");
 
         assertEquals("Server thread pool default minThreads should be 8", 8, minThreads);
         assertEquals("Server thread pool default maxThreads should be 200", 200, maxThreads);
         assertEquals("Server thread pool default idleTimeout should be 60000", 60000, idleTimeout);
-
     }
 
     @Test
-    public void testCreateServer_whenNonDefaultMaxThreadOnly_thenUseDefaultMinThreadAndTimeout() throws Exception {
-
-        Server server = new JettyServer().create(1, 0, 0);
+    public void testCreateServer_whenNonDefaultMaxThreadsOnly_thenUseDefaultMinThreadsAndTimeout() {
+        Server server = new JettyServer().create(9, 0, 0);
 
         QueuedThreadPool threadPool = (QueuedThreadPool) server.getThreadPool();
 
-        int minThreads = (int) Whitebox.getInternalState(threadPool, "_minThreads");
-        int maxThreads = (int) Whitebox.getInternalState(threadPool, "_maxThreads");
-        int idleTimeout = (int) Whitebox.getInternalState(threadPool, "_idleTimeout");
+        int minThreads = Whitebox.getInternalState(threadPool, "_minThreads");
+        int maxThreads = Whitebox.getInternalState(threadPool, "_maxThreads");
+        int idleTimeout = Whitebox.getInternalState(threadPool, "_idleTimeout");
 
-        assertEquals("Server thread pool default minThreads should be 1", 1, minThreads);
-        assertEquals("Server thread pool default maxThreads should be the same as specified", 1, maxThreads);
+        assertEquals("Server thread pool default minThreads should be 8", 8, minThreads);
+        assertEquals("Server thread pool default maxThreads should be the same as specified", 9, maxThreads);
         assertEquals("Server thread pool default idleTimeout should be 60000", 60000, idleTimeout);
 
     }
+
+    @Test
+    public void testCreateServer_whenNonDefaultMaxThreads_isLessThanDefaultMinThreads() {
+        try {
+            new JettyServer().create(2, 0, 0);
+            fail("expected IllegalArgumentException");
+        }
+        catch (IllegalArgumentException expected) {
+            assertEquals("max threads (2) less than min threads (8)", expected.getMessage());
+        }
+    }
 }