diff options
| -rw-r--r-- | jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/ServletAccessLoggingTest.java | 2 | ||||
| -rw-r--r-- | parent/pom.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/ServletAccessLoggingTest.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/ServletAccessLoggingTest.java index 29c5531b275..7c3d73a0cd6 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/ServletAccessLoggingTest.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/servlet/ServletAccessLoggingTest.java @@ -23,7 +23,7 @@ import static org.mockito.Mockito.verify; * @author bakksjo */ public class ServletAccessLoggingTest extends ServletTestBase { - private static final int MAX_LOG_WAIT_TIME_MILLIS = (int) TimeUnit.SECONDS.toMillis(60); + private static final long MAX_LOG_WAIT_TIME_MILLIS = TimeUnit.SECONDS.toMillis(60); @Test public void accessLogIsInvokedForNonJDiscServlet() throws Exception { diff --git a/parent/pom.xml b/parent/pom.xml index 89929089e99..995c15b9fdf 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -638,7 +638,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>1.9.5</version> + <version>1.10.19</version> <scope>test</scope> </dependency> <dependency> |