Revert "Bump the version of webbit to 0.4.15"

This reverts commit 41b8f05. Version 0.4.15 has an issue webbit/webbit#134 that causes some selenium tests to fail, in particular ReferrerTest is broken.
Why-Not-Sky · Sep 26, 2014 · 463aff1 · 463aff1
1 parent 855c835
commit 463aff1
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 7 deletions.
diff --git a/.idea/libraries/webbit.xml b/.idea/libraries/webbit.xml
diff --git a/java/client/.classpath b/java/client/.classpath
@@ -32,7 +32,7 @@
 	<classpathentry kind="lib" path="/third-party/java/xml/xercesImpl-2.11.0.jar" sourcepath="/third-party/java/xml/xercesImpl-2.11.0-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/xml/xalan-2.7.1.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/commons-fileupload/commons-fileupload-1.2.2.jar" sourcepath="/third-party/java/commons-fileupload/commons-fileupload-1.2.2-src.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/webbit/webbit-0.4.15.jar" sourcepath="/third-party/java/webbit/webbit-0.4.15-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/webbit/webbit-0.4.14.jar" sourcepath="/third-party/java/webbit/webbit-0.4.14-src.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/little_proxy/littleproxy-0.5.3.jar" sourcepath="/third-party/java/little_proxy/littleproxy-0.5.3-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/nekohtml/nekohtml-1.9.21.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/netty/netty-3.5.7.Final.jar"/>

diff --git a/...lient/test/org/openqa/selenium/environment/webserver/PathAugmentingStaticFileHandler.java b/...lient/test/org/openqa/selenium/environment/webserver/PathAugmentingStaticFileHandler.java
@@ -45,7 +45,7 @@ protected class PathAugmentingFileWorker extends FileWorker {
     private PathAugmentingFileWorker(HttpRequest request,
                                      HttpResponse response,
                                      HttpControl control) {
-      super(request, response, control, Long.MAX_VALUE);
+      super(request, response, control);
     }
 
     @Override

diff --git a/java/server/.classpath b/java/server/.classpath
@@ -19,7 +19,7 @@
 	<classpathentry kind="lib" path="/third-party/java/jcip_annotations/jcip-annotations-1.0.jar" sourcepath="/third-party/java/jcip_annotations/jcip-annotations-1.0-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/yaml/snakeyaml-1.8.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/bouncycastle/bcpkix-jdk15on-1.48.jar" sourcepath="/third-party/java/bouncycastle/bcpkix-jdk15on-1.48-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/webbit/webbit-0.4.15.jar" sourcepath="/third-party/java/webbit/webbit-0.4.15-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/webbit/webbit-0.4.14.jar" sourcepath="/third-party/java/webbit/webbit-0.4.14-src.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/netty/netty-3.5.7.Final.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/guava-libraries/guava-15.0.jar" sourcepath="/third-party/java/guava-libraries/guava-15.0-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/mockito/mockito-core-1.9.5.jar"/>

diff --git a/maven/pom.xml b/maven/pom.xml
@@ -204,7 +204,7 @@
             <dependency>
                 <groupId>org.webbitserver</groupId>
                 <artifactId>webbit</artifactId>
-                <version>0.4.15</version>
+                <version>0.4.14</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/third_party/java/webbit/README b/third_party/java/webbit/README
@@ -0,0 +1 @@
+Snapshot compiled from https://github.com/illicitonion/webbit at commit 8d783387ce
diff --git a/third_party/java/webbit/build.desc b/third_party/java/webbit/build.desc
@@ -1,7 +1,7 @@
 
 java_library(name = "webbit",
   deps = [
-    "webbit-0.4.15.jar",
+    "webbit-0.4.14.jar",
     "//third_party/java/netty",
    ])
 
diff --git a/...rty/java/webbit/webbit-0.4.15-sources.jar → ...d_party/java/webbit/webbit-0.4.14-src.jar b/...rty/java/webbit/webbit-0.4.15-sources.jar → ...d_party/java/webbit/webbit-0.4.14-src.jar
diff --git a/third_party/java/webbit/webbit-0.4.15.jar → third_party/java/webbit/webbit-0.4.14.jar b/third_party/java/webbit/webbit-0.4.15.jar → third_party/java/webbit/webbit-0.4.14.jar
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Snapshot compiled from https://github.com/illicitonion/webbit at commit 8d783387ce