Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-4155: upgrade jetty to 8.1.8 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1419466 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2012-12-10 14:02:32 +00:00
parent b549619dc8
commit 56df745988
27 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dev-tools/eclipse/dot.classpath
View File

@ -126,17 +126,17 @@
<classpathentry kind="lib" path="solr/solrj/lib/slf4j-jdk14-1.6.4.jar"/> <classpathentry kind="lib" path="solr/solrj/lib/slf4j-jdk14-1.6.4.jar"/>
<classpathentry kind="lib" path="solr/solrj/lib/wstx-asl-3.2.7.jar"/> <classpathentry kind="lib" path="solr/solrj/lib/wstx-asl-3.2.7.jar"/>
<classpathentry kind="lib" path="solr/solrj/lib/zookeeper-3.4.5.jar"/> <classpathentry kind="lib" path="solr/solrj/lib/zookeeper-3.4.5.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-continuation-8.1.7.v20120910.jar"/> <classpathentry kind="lib" path="solr/example/lib/jetty-continuation-8.1.8.v20121106.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-deploy-8.1.7.v20120910.jar"/> <classpathentry kind="lib" path="solr/example/lib/jetty-deploy-8.1.8.v20121106.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-http-8.1.7.v20120910.jar"/> <classpathentry kind="lib" path="solr/example/lib/jetty-http-8.1.8.v20121106.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-io-8.1.7.v20120910.jar"/> <classpathentry kind="lib" path="solr/example/lib/jetty-io-8.1.8.v20121106.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-jmx-8.1.7.v20120910.jar"/> <classpathentry kind="lib" path="solr/example/lib/jetty-jmx-8.1.8.v20121106.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-security-8.1.7.v20120910.jar"/> <classpathentry kind="lib" path="solr/example/lib/jetty-security-8.1.8.v20121106.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-server-8.1.7.v20120910.jar"/> <classpathentry kind="lib" path="solr/example/lib/jetty-server-8.1.8.v20121106.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-servlet-8.1.7.v20120910.jar"/> <classpathentry kind="lib" path="solr/example/lib/jetty-servlet-8.1.8.v20121106.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-util-8.1.7.v20120910.jar"/> <classpathentry kind="lib" path="solr/example/lib/jetty-util-8.1.8.v20121106.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-webapp-8.1.7.v20120910.jar"/> <classpathentry kind="lib" path="solr/example/lib/jetty-webapp-8.1.8.v20121106.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-xml-8.1.7.v20120910.jar"/> <classpathentry kind="lib" path="solr/example/lib/jetty-xml-8.1.8.v20121106.jar"/>
<classpathentry kind="lib" path="solr/example/lib/servlet-api-3.0.jar"/> <classpathentry kind="lib" path="solr/example/lib/servlet-api-3.0.jar"/>
<classpathentry kind="lib" path="solr/contrib/clustering/lib/carrot2-core-3.5.0.jar"/> <classpathentry kind="lib" path="solr/contrib/clustering/lib/carrot2-core-3.5.0.jar"/>
<classpathentry kind="lib" path="solr/contrib/clustering/lib/hppc-0.3.3.jar"/> <classpathentry kind="lib" path="solr/contrib/clustering/lib/hppc-0.3.3.jar"/>

2
dev-tools/maven/pom.xml.template
View File

@ -45,7 +45,7 @@
<base.specification.version>5.0.0</base.specification.version> <base.specification.version>5.0.0</base.specification.version>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format> <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
<java.compat.version>1.6</java.compat.version> <java.compat.version>1.6</java.compat.version>
<jetty.version>8.1.7.v20120910</jetty.version> <jetty.version>8.1.8.v20121106</jetty.version>
<slf4j.version>1.6.4</slf4j.version> <slf4j.version>1.6.4</slf4j.version>
<tika.version>1.2</tika.version> <tika.version>1.2</tika.version>
<httpcomponents.version>4.1.3</httpcomponents.version> <httpcomponents.version>4.1.3</httpcomponents.version>

2
solr/CHANGES.txt
View File

@ -340,6 +340,8 @@ Other Changes
* SOLR-4062: The update log location in solrconfig.xml should default to * SOLR-4062: The update log location in solrconfig.xml should default to
${solr.ulog.dir} rather than ${solr.data.dir:} (Mark Miller) ${solr.ulog.dir} rather than ${solr.data.dir:} (Mark Miller)
* SOLR-4155: Upgrade Jetty to 8.1.8. (Robert Muir)
================== 4.0.0 ================== ================== 4.0.0 ==================
Versions of Major Components Versions of Major Components

24
solr/example/ivy.xml
View File

@ -25,18 +25,18 @@
</configurations> </configurations>
<dependencies> <dependencies>
<dependency org="org.eclipse.jetty" name="jetty-continuation" rev="8.1.7.v20120910" transitive="false" conf="jetty->default"/> <dependency org="org.eclipse.jetty" name="jetty-continuation" rev="8.1.8.v20121106" transitive="false" conf="jetty->default"/>
<dependency org="org.eclipse.jetty" name="jetty-deploy" rev="8.1.7.v20120910" transitive="false" conf="jetty->default"/> <dependency org="org.eclipse.jetty" name="jetty-deploy" rev="8.1.8.v20121106" transitive="false" conf="jetty->default"/>
<dependency org="org.eclipse.jetty" name="jetty-http" rev="8.1.7.v20120910" transitive="false" conf="jetty->default"/> <dependency org="org.eclipse.jetty" name="jetty-http" rev="8.1.8.v20121106" transitive="false" conf="jetty->default"/>
<dependency org="org.eclipse.jetty" name="jetty-io" rev="8.1.7.v20120910" transitive="false" conf="jetty->default"/> <dependency org="org.eclipse.jetty" name="jetty-io" rev="8.1.8.v20121106" transitive="false" conf="jetty->default"/>
<dependency org="org.eclipse.jetty" name="jetty-jmx" rev="8.1.7.v20120910" transitive="false" conf="jetty->default"/> <dependency org="org.eclipse.jetty" name="jetty-jmx" rev="8.1.8.v20121106" transitive="false" conf="jetty->default"/>
<dependency org="org.eclipse.jetty" name="jetty-security" rev="8.1.7.v20120910" transitive="false" conf="jetty->default"/> <dependency org="org.eclipse.jetty" name="jetty-security" rev="8.1.8.v20121106" transitive="false" conf="jetty->default"/>
<dependency org="org.eclipse.jetty" name="jetty-server" rev="8.1.7.v20120910" transitive="false" conf="jetty->default"/> <dependency org="org.eclipse.jetty" name="jetty-server" rev="8.1.8.v20121106" transitive="false" conf="jetty->default"/>
<dependency org="org.eclipse.jetty" name="jetty-servlet" rev="8.1.7.v20120910" transitive="false" conf="jetty->default"/> <dependency org="org.eclipse.jetty" name="jetty-servlet" rev="8.1.8.v20121106" transitive="false" conf="jetty->default"/>
<dependency org="org.eclipse.jetty" name="jetty-util" rev="8.1.7.v20120910" transitive="false" conf="jetty->default"/> <dependency org="org.eclipse.jetty" name="jetty-util" rev="8.1.8.v20121106" transitive="false" conf="jetty->default"/>
<dependency org="org.eclipse.jetty" name="jetty-webapp" rev="8.1.7.v20120910" transitive="false" conf="jetty->default"/> <dependency org="org.eclipse.jetty" name="jetty-webapp" rev="8.1.8.v20121106" transitive="false" conf="jetty->default"/>
<dependency org="org.eclipse.jetty" name="jetty-xml" rev="8.1.7.v20120910" transitive="false" conf="jetty->default"/> <dependency org="org.eclipse.jetty" name="jetty-xml" rev="8.1.8.v20121106" transitive="false" conf="jetty->default"/>
<dependency org="org.eclipse.jetty" name="jetty-start" rev="8.1.7.v20120910" transitive="false" conf="start->default"/> <dependency org="org.eclipse.jetty" name="jetty-start" rev="8.1.8.v20121106" transitive="false" conf="start->default"/>
<dependency org="org.eclipse.jetty.orbit" name="javax.servlet" rev="3.0.0.v201112011016" transitive="false" conf="servlet->default"> <dependency org="org.eclipse.jetty.orbit" name="javax.servlet" rev="3.0.0.v201112011016" transitive="false" conf="servlet->default">
<artifact name="javax.servlet" type="orbit" ext="jar"/> <artifact name="javax.servlet" type="orbit" ext="jar"/>
</dependency> </dependency>

1
solr/licenses/jetty-continuation-8.1.7.v20120910.jar.sha1
View File

@ -1 +0,0 @@
f60cfe6267038000b459508529c88737601081e4

1
solr/licenses/jetty-continuation-8.1.8.v20121106.jar.sha1 Normal file
View File

@ -0,0 +1 @@
a237d7057c35ae73b821b0f601746dc9a578c361

1
solr/licenses/jetty-deploy-8.1.7.v20120910.jar.sha1
View File

@ -1 +0,0 @@
c2b1ae7c87eaa2efbaba46b9dc05c931554e660f

1
solr/licenses/jetty-deploy-8.1.8.v20121106.jar.sha1 Normal file
View File

@ -0,0 +1 @@
30672b112c7f72a721d8e92d6b5ba250be57d094

1
solr/licenses/jetty-http-8.1.7.v20120910.jar.sha1
View File

@ -1 +0,0 @@
10126433876cd74534695f7f99c4362596555493

1
solr/licenses/jetty-http-8.1.8.v20121106.jar.sha1 Normal file
View File

@ -0,0 +1 @@
5f3f0a4b1dbc4a36f97649c9fee940134fe584ca

1
solr/licenses/jetty-io-8.1.7.v20120910.jar.sha1
View File

@ -1 +0,0 @@
a81f746ae1b10c37e1bb0a01d1374c202c0bd549

1
solr/licenses/jetty-io-8.1.8.v20121106.jar.sha1 Normal file
View File

@ -0,0 +1 @@
b413448bb6d474b82bb3d988604d3df988a689e3

1
solr/licenses/jetty-jmx-8.1.7.v20120910.jar.sha1
View File

@ -1 +0,0 @@
f650fd9b13164b4111dafb6e73ee7ab19dc9ac94

1
solr/licenses/jetty-jmx-8.1.8.v20121106.jar.sha1 Normal file
View File

@ -0,0 +1 @@
a798ea58162ac462657a21497c84c76a57f20d4f

1
solr/licenses/jetty-security-8.1.7.v20120910.jar.sha1
View File

@ -1 +0,0 @@
8d78beb7a07f4cccee05a3f16a264f1025946258

1
solr/licenses/jetty-security-8.1.8.v20121106.jar.sha1 Normal file
View File

@ -0,0 +1 @@
b3efb0450900cf30932c9acf6e47deb936fac2d7

1
solr/licenses/jetty-server-8.1.7.v20120910.jar.sha1
View File

@ -1 +0,0 @@
6c81f733f28713919e99c2f8952e6ca5178033cd

1
solr/licenses/jetty-server-8.1.8.v20121106.jar.sha1 Normal file
View File

@ -0,0 +1 @@
61e7c2d0cb168d82696f8fabb8c4da834d736e78

1
solr/licenses/jetty-servlet-8.1.7.v20120910.jar.sha1
View File

@ -1 +0,0 @@
93da01e3ea26e70449e9a1a0affa5c31436be5a0

1
solr/licenses/jetty-servlet-8.1.8.v20121106.jar.sha1 Normal file
View File

@ -0,0 +1 @@
285ea47746e9ab988a8291ea9fd6545b537e0ce9

1
solr/licenses/jetty-util-8.1.7.v20120910.jar.sha1
View File

@ -1 +0,0 @@
7eb2004ab2c22fd3b00095bd9ba0f32a9e88f6a5

1
solr/licenses/jetty-util-8.1.8.v20121106.jar.sha1 Normal file
View File

@ -0,0 +1 @@
03174e8d53033e3c4d350eba3112efdc170b40dc

1
solr/licenses/jetty-webapp-8.1.7.v20120910.jar.sha1
View File

@ -1 +0,0 @@
e964c4dbf09984e681eebdad616ed8634b6ae3f7

1
solr/licenses/jetty-webapp-8.1.8.v20121106.jar.sha1 Normal file
View File

@ -0,0 +1 @@
5beadb7635372ed38c543dd82e2e270a409b1ab8

1
solr/licenses/jetty-xml-8.1.7.v20120910.jar.sha1
View File

@ -1 +0,0 @@
0be726182398f93ae9917775886b2ebd1de55ca4

1
solr/licenses/jetty-xml-8.1.8.v20121106.jar.sha1 Normal file
View File

@ -0,0 +1 @@
1f03630eea10f58899442af3626ac0aba33d7ea2

2
solr/licenses/start.jar.sha1
View File

@ -1 +1 @@
b90a67a4f1f6db9e9cea94663e82c320d70e8982 5f657368cd61ab70babe98bcd6709e199a4829d9