fix maven build for jetty 9

jmif · Oct 1, 2015 · ea71530 · ea71530
1 parent 6ffdbc6
commit ea71530
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -36,6 +36,9 @@ rb/.yardoc
 maven/*/src
 maven/target
 maven/*/target
+maven/.idea
+maven/*.iml
+maven/*/*.iml
 java/client/build/
 java/client/log.txt
 java/client/iedriver.log

diff --git a/java/server/src/org/openqa/grid/web/servlet/handler/SeleniumBasedRequest.java b/java/server/src/org/openqa/grid/web/servlet/handler/SeleniumBasedRequest.java
@@ -222,17 +222,14 @@ public synchronized void reset() throws IOException {
       throw new RuntimeException("not implemented");
     }
 
-    @Override
     public boolean isFinished() {
       return false;
     }
 
-    @Override
     public boolean isReady() {
       return true;
     }
 
-    @Override
     public void setReadListener(ReadListener readListener) {
       throw new RuntimeException("setReadListener");
     }

diff --git a/maven/server/pom.xml b/maven/server/pom.xml
@@ -35,7 +35,12 @@
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>jetty-repacked</artifactId>
-            <version>7.6.1</version>
+            <version>9.2.13.v20150730</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>