From dd3f2e85637372750e8264b1a2bd94f034a898e9 Mon Sep 17 00:00:00 2001
From: Simon Stewart <simon.m.stewart@gmail.com>
Date: Thu, 25 Aug 2016 17:04:30 +0100
Subject: [PATCH] Add repackaged jetty to our list of maven exports

---
 Rakefile                      |  1 +
 third_party/java/jetty/BUCK   | 46 ++++++++++++++++++++++++-----------
 third_party/java/servlet/BUCK |  1 -
 3 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/Rakefile b/Rakefile
index 37e4b373ad77f..534f407c23f5b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -121,6 +121,7 @@ JAVA_RELEASE_TARGETS = [
   '//java/client/src/org/openqa/selenium:client-combined',
   '//java/server/src/com/thoughtworks/selenium:leg-rc',
   '//java/server/src/org/openqa/grid/selenium:classes',
+  '//third_party/java/jetty:jetty'
 ]
 
 
diff --git a/third_party/java/jetty/BUCK b/third_party/java/jetty/BUCK
index c4df0383e350c..3b22e90ff0247 100644
--- a/third_party/java/jetty/BUCK
+++ b/third_party/java/jetty/BUCK
@@ -1,18 +1,12 @@
 java_library(
   name = 'jetty',
-  maven_coords = 'org.seleniumhq.selenium:jetty-repacked:9.2.13.v20150730',
+  maven_coords = 'org.seleniumhq.selenium:jetty-repacked:9.2.13.v20160825',
+  maven_pom_template = 'jetty.pom',
   exported_deps = [
-    ':jetty-http-repacked',
-    ':jetty-security-repacked',
-    ':jetty-server-repacked',
-    ':jetty-servlet-repacked',
-    ':jetty-servlets-repacked',
-    ':jetty-util-repacked',
+    ':repackage',
   ],
   deps = [
-    ':jetty-continuation-repacked',
-    ':jetty-io-repacked',
-    ':jetty-jmx-repacked',
+     '//third_party/java/servlet:servlet-api',
   ],
   visibility = [
     '//java/client/test/com/thoughtworks/selenium:tests',
@@ -27,7 +21,29 @@ java_library(
     '//java/server/test/org/openqa/selenium/remote/server/auth:lib',
   ],
 )
- 
+
+# We want the deployable 'jetty-repacked' artifact to not require each of the
+# individual jars (we did, after all, repackage everything). By introducing a
+# prebuilt_jar we avoid that problem.
+prebuilt_jar(name = 'repackage',
+  binary_jar = ':bundle-jars',
+)
+
+java_binary(
+  name = 'bundle-jars',
+  deps = [
+    ':jetty-http-repacked',
+    ':jetty-security-repacked',
+    ':jetty-server-repacked',
+    ':jetty-servlet-repacked',
+    ':jetty-servlets-repacked',
+    ':jetty-util-repacked',
+    ':jetty-continuation-repacked',
+    ':jetty-io-repacked',
+    ':jetty-jmx-repacked',
+  ],
+)
+
 REPACK = [
   'jetty-continuation',
   'jetty-http',
@@ -52,13 +68,14 @@ for i in REPACK:
   prebuilt_jar(
     name = out,
     maven_coords = 'org.seleniumhq.selenium:%s:9.2.13.v20150730' % out,
-    binary_jar = ':%s' % name
+    binary_jar = ':%s' % name,
+    deps = [ '//third_party/java/servlet:servlet-api', ],
   )
 
 export_file(
   name = 'jarjar-rules',
   src = 'jetty-repack-rules',
-)  
+)
 
 prebuilt_jar(
   name = 'jetty-continuation',
@@ -76,7 +93,8 @@ prebuilt_jar(
   binary_jar = 'jetty-http-9.2.13.v20150730.jar',
   source_jar = 'jetty-http-9.2.13.v20150730-sources.jar',
   deps = [
-    ':jetty-util'
+    ':jetty-util',
+    '//third_party/java/servlet:servlet-api',
   ],
 )
 
diff --git a/third_party/java/servlet/BUCK b/third_party/java/servlet/BUCK
index 5869f4b3f8c3d..24d251a7ba9d2 100644
--- a/third_party/java/servlet/BUCK
+++ b/third_party/java/servlet/BUCK
@@ -11,7 +11,6 @@ prebuilt_jar(name = 'servlet-api',
     '//java/server/src/com/thoughtworks/selenium/webdriven:rc-emulation-servlet',
     '//java/server/test/com/thoughtworks/selenium/webdriven:webdriven',
     '//java/server/src/org/openqa/selenium/remote/server:standalone-server-lib',
-    '//java/server/src/org/openqa/selenium/server:server',
 
     # Everything under grid
     '//java/server/src/org/openqa/grid/...',