diff --git a/dev-tools/eclipse/dot.classpath b/dev-tools/eclipse/dot.classpath
index 09772edf8b9..c503081200a 100644
--- a/dev-tools/eclipse/dot.classpath
+++ b/dev-tools/eclipse/dot.classpath
@@ -126,17 +126,17 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dev-tools/maven/pom.xml.template b/dev-tools/maven/pom.xml.template
index e6f5262906e..effbea39c2f 100644
--- a/dev-tools/maven/pom.xml.template
+++ b/dev-tools/maven/pom.xml.template
@@ -45,7 +45,7 @@
5.0.0
yyyy-MM-dd HH:mm:ss
1.6
- 8.1.7.v20120910
+ 8.1.8.v20121106
1.6.4
1.2
4.1.3
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 7d4de18afa0..96a4b1b590b 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -340,6 +340,8 @@ Other Changes
* SOLR-4062: The update log location in solrconfig.xml should default to
${solr.ulog.dir} rather than ${solr.data.dir:} (Mark Miller)
+* SOLR-4155: Upgrade Jetty to 8.1.8. (Robert Muir)
+
================== 4.0.0 ==================
Versions of Major Components
diff --git a/solr/example/ivy.xml b/solr/example/ivy.xml
index ad4a7d7754e..d0ed8778d9d 100644
--- a/solr/example/ivy.xml
+++ b/solr/example/ivy.xml
@@ -25,18 +25,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/solr/licenses/jetty-continuation-8.1.7.v20120910.jar.sha1 b/solr/licenses/jetty-continuation-8.1.7.v20120910.jar.sha1
deleted file mode 100644
index 31faf6e0022..00000000000
--- a/solr/licenses/jetty-continuation-8.1.7.v20120910.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f60cfe6267038000b459508529c88737601081e4
diff --git a/solr/licenses/jetty-continuation-8.1.8.v20121106.jar.sha1 b/solr/licenses/jetty-continuation-8.1.8.v20121106.jar.sha1
new file mode 100644
index 00000000000..c209db50e79
--- /dev/null
+++ b/solr/licenses/jetty-continuation-8.1.8.v20121106.jar.sha1
@@ -0,0 +1 @@
+a237d7057c35ae73b821b0f601746dc9a578c361
diff --git a/solr/licenses/jetty-deploy-8.1.7.v20120910.jar.sha1 b/solr/licenses/jetty-deploy-8.1.7.v20120910.jar.sha1
deleted file mode 100644
index 1228eb15f12..00000000000
--- a/solr/licenses/jetty-deploy-8.1.7.v20120910.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c2b1ae7c87eaa2efbaba46b9dc05c931554e660f
diff --git a/solr/licenses/jetty-deploy-8.1.8.v20121106.jar.sha1 b/solr/licenses/jetty-deploy-8.1.8.v20121106.jar.sha1
new file mode 100644
index 00000000000..006b26c039d
--- /dev/null
+++ b/solr/licenses/jetty-deploy-8.1.8.v20121106.jar.sha1
@@ -0,0 +1 @@
+30672b112c7f72a721d8e92d6b5ba250be57d094
diff --git a/solr/licenses/jetty-http-8.1.7.v20120910.jar.sha1 b/solr/licenses/jetty-http-8.1.7.v20120910.jar.sha1
deleted file mode 100644
index 178aeacb1ed..00000000000
--- a/solr/licenses/jetty-http-8.1.7.v20120910.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-10126433876cd74534695f7f99c4362596555493
diff --git a/solr/licenses/jetty-http-8.1.8.v20121106.jar.sha1 b/solr/licenses/jetty-http-8.1.8.v20121106.jar.sha1
new file mode 100644
index 00000000000..1ead45e0ef4
--- /dev/null
+++ b/solr/licenses/jetty-http-8.1.8.v20121106.jar.sha1
@@ -0,0 +1 @@
+5f3f0a4b1dbc4a36f97649c9fee940134fe584ca
diff --git a/solr/licenses/jetty-io-8.1.7.v20120910.jar.sha1 b/solr/licenses/jetty-io-8.1.7.v20120910.jar.sha1
deleted file mode 100644
index bfe8eaf7be5..00000000000
--- a/solr/licenses/jetty-io-8.1.7.v20120910.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a81f746ae1b10c37e1bb0a01d1374c202c0bd549
diff --git a/solr/licenses/jetty-io-8.1.8.v20121106.jar.sha1 b/solr/licenses/jetty-io-8.1.8.v20121106.jar.sha1
new file mode 100644
index 00000000000..558d9e0ea83
--- /dev/null
+++ b/solr/licenses/jetty-io-8.1.8.v20121106.jar.sha1
@@ -0,0 +1 @@
+b413448bb6d474b82bb3d988604d3df988a689e3
diff --git a/solr/licenses/jetty-jmx-8.1.7.v20120910.jar.sha1 b/solr/licenses/jetty-jmx-8.1.7.v20120910.jar.sha1
deleted file mode 100644
index 05dce0ce1f2..00000000000
--- a/solr/licenses/jetty-jmx-8.1.7.v20120910.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f650fd9b13164b4111dafb6e73ee7ab19dc9ac94
diff --git a/solr/licenses/jetty-jmx-8.1.8.v20121106.jar.sha1 b/solr/licenses/jetty-jmx-8.1.8.v20121106.jar.sha1
new file mode 100644
index 00000000000..d4e12194fa3
--- /dev/null
+++ b/solr/licenses/jetty-jmx-8.1.8.v20121106.jar.sha1
@@ -0,0 +1 @@
+a798ea58162ac462657a21497c84c76a57f20d4f
diff --git a/solr/licenses/jetty-security-8.1.7.v20120910.jar.sha1 b/solr/licenses/jetty-security-8.1.7.v20120910.jar.sha1
deleted file mode 100644
index a6af28692bc..00000000000
--- a/solr/licenses/jetty-security-8.1.7.v20120910.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8d78beb7a07f4cccee05a3f16a264f1025946258
diff --git a/solr/licenses/jetty-security-8.1.8.v20121106.jar.sha1 b/solr/licenses/jetty-security-8.1.8.v20121106.jar.sha1
new file mode 100644
index 00000000000..10545888c22
--- /dev/null
+++ b/solr/licenses/jetty-security-8.1.8.v20121106.jar.sha1
@@ -0,0 +1 @@
+b3efb0450900cf30932c9acf6e47deb936fac2d7
diff --git a/solr/licenses/jetty-server-8.1.7.v20120910.jar.sha1 b/solr/licenses/jetty-server-8.1.7.v20120910.jar.sha1
deleted file mode 100644
index 568405b56a6..00000000000
--- a/solr/licenses/jetty-server-8.1.7.v20120910.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6c81f733f28713919e99c2f8952e6ca5178033cd
diff --git a/solr/licenses/jetty-server-8.1.8.v20121106.jar.sha1 b/solr/licenses/jetty-server-8.1.8.v20121106.jar.sha1
new file mode 100644
index 00000000000..73d71178687
--- /dev/null
+++ b/solr/licenses/jetty-server-8.1.8.v20121106.jar.sha1
@@ -0,0 +1 @@
+61e7c2d0cb168d82696f8fabb8c4da834d736e78
diff --git a/solr/licenses/jetty-servlet-8.1.7.v20120910.jar.sha1 b/solr/licenses/jetty-servlet-8.1.7.v20120910.jar.sha1
deleted file mode 100644
index 9861888652a..00000000000
--- a/solr/licenses/jetty-servlet-8.1.7.v20120910.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-93da01e3ea26e70449e9a1a0affa5c31436be5a0
diff --git a/solr/licenses/jetty-servlet-8.1.8.v20121106.jar.sha1 b/solr/licenses/jetty-servlet-8.1.8.v20121106.jar.sha1
new file mode 100644
index 00000000000..56b39be9f07
--- /dev/null
+++ b/solr/licenses/jetty-servlet-8.1.8.v20121106.jar.sha1
@@ -0,0 +1 @@
+285ea47746e9ab988a8291ea9fd6545b537e0ce9
diff --git a/solr/licenses/jetty-util-8.1.7.v20120910.jar.sha1 b/solr/licenses/jetty-util-8.1.7.v20120910.jar.sha1
deleted file mode 100644
index baee1947aed..00000000000
--- a/solr/licenses/jetty-util-8.1.7.v20120910.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7eb2004ab2c22fd3b00095bd9ba0f32a9e88f6a5
diff --git a/solr/licenses/jetty-util-8.1.8.v20121106.jar.sha1 b/solr/licenses/jetty-util-8.1.8.v20121106.jar.sha1
new file mode 100644
index 00000000000..7c12f4ab4ae
--- /dev/null
+++ b/solr/licenses/jetty-util-8.1.8.v20121106.jar.sha1
@@ -0,0 +1 @@
+03174e8d53033e3c4d350eba3112efdc170b40dc
diff --git a/solr/licenses/jetty-webapp-8.1.7.v20120910.jar.sha1 b/solr/licenses/jetty-webapp-8.1.7.v20120910.jar.sha1
deleted file mode 100644
index 0e34b2830ba..00000000000
--- a/solr/licenses/jetty-webapp-8.1.7.v20120910.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e964c4dbf09984e681eebdad616ed8634b6ae3f7
diff --git a/solr/licenses/jetty-webapp-8.1.8.v20121106.jar.sha1 b/solr/licenses/jetty-webapp-8.1.8.v20121106.jar.sha1
new file mode 100644
index 00000000000..6cceaf86424
--- /dev/null
+++ b/solr/licenses/jetty-webapp-8.1.8.v20121106.jar.sha1
@@ -0,0 +1 @@
+5beadb7635372ed38c543dd82e2e270a409b1ab8
diff --git a/solr/licenses/jetty-xml-8.1.7.v20120910.jar.sha1 b/solr/licenses/jetty-xml-8.1.7.v20120910.jar.sha1
deleted file mode 100644
index cfddd5bec70..00000000000
--- a/solr/licenses/jetty-xml-8.1.7.v20120910.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0be726182398f93ae9917775886b2ebd1de55ca4
diff --git a/solr/licenses/jetty-xml-8.1.8.v20121106.jar.sha1 b/solr/licenses/jetty-xml-8.1.8.v20121106.jar.sha1
new file mode 100644
index 00000000000..643f7a9f848
--- /dev/null
+++ b/solr/licenses/jetty-xml-8.1.8.v20121106.jar.sha1
@@ -0,0 +1 @@
+1f03630eea10f58899442af3626ac0aba33d7ea2
diff --git a/solr/licenses/start.jar.sha1 b/solr/licenses/start.jar.sha1
index e2ffddc37dc..44d32ab8351 100644
--- a/solr/licenses/start.jar.sha1
+++ b/solr/licenses/start.jar.sha1
@@ -1 +1 @@
-b90a67a4f1f6db9e9cea94663e82c320d70e8982
+5f657368cd61ab70babe98bcd6709e199a4829d9