You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2014/01/31 16:52:16 UTC
svn commit: r1563153 - in /qpid/trunk/qpid/java: ./
amqp-1-0-client-websocket/ broker-plugins/management-http/
broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/
broker-plugins/websocket/ jca/ jca/example/ lib/poms/
Author: robbie
Date: Fri Jan 31 15:52:15 2014
New Revision: 1563153
URL: http://svn.apache.org/r1563153
Log:
QPID-5527: Upgrade to Jetty 8
Applied patch from Emmanuel Bourg.
Added:
qpid/trunk/qpid/java/lib/poms/geronimo-servlet_3.0_spec-1.0.xml
- copied, changed from r1563012, qpid/trunk/qpid/java/lib/poms/geronimo-servlet_2.5_spec-1.2.xml
qpid/trunk/qpid/java/lib/poms/jetty-continuation-8.1.14.v20131031.xml
- copied, changed from r1563012, qpid/trunk/qpid/java/lib/poms/jetty-continuation-7.6.10.v20130312.xml
qpid/trunk/qpid/java/lib/poms/jetty-http-8.1.14.v20131031.xml
- copied, changed from r1563012, qpid/trunk/qpid/java/lib/poms/jetty-http-7.6.10.v20130312.xml
qpid/trunk/qpid/java/lib/poms/jetty-io-8.1.14.v20131031.xml
- copied, changed from r1563012, qpid/trunk/qpid/java/lib/poms/jetty-io-7.6.10.v20130312.xml
qpid/trunk/qpid/java/lib/poms/jetty-security-8.1.14.v20131031.xml
- copied, changed from r1563012, qpid/trunk/qpid/java/lib/poms/jetty-security-7.6.10.v20130312.xml
qpid/trunk/qpid/java/lib/poms/jetty-server-8.1.14.v20131031.xml
- copied, changed from r1563012, qpid/trunk/qpid/java/lib/poms/jetty-server-7.6.10.v20130312.xml
qpid/trunk/qpid/java/lib/poms/jetty-servlet-8.1.14.v20131031.xml
- copied, changed from r1563012, qpid/trunk/qpid/java/lib/poms/jetty-servlet-7.6.10.v20130312.xml
qpid/trunk/qpid/java/lib/poms/jetty-util-8.1.14.v20131031.xml
- copied, changed from r1563012, qpid/trunk/qpid/java/lib/poms/jetty-util-7.6.10.v20130312.xml
qpid/trunk/qpid/java/lib/poms/jetty-websocket-8.1.14.v20131031.xml
- copied, changed from r1563012, qpid/trunk/qpid/java/lib/poms/jetty-websocket-7.6.10.v20130312.xml
Removed:
qpid/trunk/qpid/java/lib/poms/geronimo-servlet_2.5_spec-1.2.xml
qpid/trunk/qpid/java/lib/poms/jetty-continuation-7.6.10.v20130312.xml
qpid/trunk/qpid/java/lib/poms/jetty-http-7.6.10.v20130312.xml
qpid/trunk/qpid/java/lib/poms/jetty-io-7.6.10.v20130312.xml
qpid/trunk/qpid/java/lib/poms/jetty-security-7.6.10.v20130312.xml
qpid/trunk/qpid/java/lib/poms/jetty-server-7.6.10.v20130312.xml
qpid/trunk/qpid/java/lib/poms/jetty-servlet-7.6.10.v20130312.xml
qpid/trunk/qpid/java/lib/poms/jetty-util-7.6.10.v20130312.xml
qpid/trunk/qpid/java/lib/poms/jetty-websocket-7.6.10.v20130312.xml
Modified:
qpid/trunk/qpid/java/amqp-1-0-client-websocket/pom.xml
qpid/trunk/qpid/java/broker-plugins/management-http/pom.xml
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
qpid/trunk/qpid/java/broker-plugins/websocket/pom.xml
qpid/trunk/qpid/java/build.deps
qpid/trunk/qpid/java/ivy.retrieve.xml
qpid/trunk/qpid/java/jca/build.xml
qpid/trunk/qpid/java/jca/example/build-geronimo-properties.xml
qpid/trunk/qpid/java/jca/pom.xml
Modified: qpid/trunk/qpid/java/amqp-1-0-client-websocket/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/amqp-1-0-client-websocket/pom.xml?rev=1563153&r1=1563152&r2=1563153&view=diff
==============================================================================
--- qpid/trunk/qpid/java/amqp-1-0-client-websocket/pom.xml (original)
+++ qpid/trunk/qpid/java/amqp-1-0-client-websocket/pom.xml Fri Jan 31 15:52:15 2014
@@ -44,15 +44,15 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>1.2</version>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <version>1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -73,14 +73,14 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-continuation</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -105,7 +105,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -118,7 +118,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -131,14 +131,14 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-websocket</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<scope>compile</scope>
<exclusions>
<exclusion>
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/pom.xml?rev=1563153&r1=1563152&r2=1563153&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/pom.xml Fri Jan 31 15:52:15 2014
@@ -50,15 +50,15 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>1.2</version>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <version>1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -79,14 +79,14 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-continuation</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -99,7 +99,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -112,7 +112,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -125,7 +125,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -138,14 +138,14 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-websocket</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<scope>compile</scope>
<exclusions>
<exclusion>
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java?rev=1563153&r1=1563152&r2=1563153&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java Fri Jan 31 15:52:15 2014
@@ -29,6 +29,7 @@ import javax.net.ssl.KeyManager;
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
+import javax.servlet.DispatcherType;
import org.apache.log4j.Logger;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
@@ -77,7 +78,6 @@ import org.apache.qpid.server.plugin.Plu
import org.apache.qpid.server.util.MapValueConverter;
import org.apache.qpid.transport.network.security.ssl.QpidMultipleTrustManager;
import org.eclipse.jetty.server.Connector;
-import org.eclipse.jetty.server.DispatcherType;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.SessionManager;
import org.eclipse.jetty.server.nio.SelectChannelConnector;
@@ -396,7 +396,7 @@ public class HttpManagement extends Abst
root.addServlet(new ServletHolder(new LogFileServlet()), "/rest/logfile");
final SessionManager sessionManager = root.getSessionHandler().getSessionManager();
- sessionManager.setSessionCookie(JSESSIONID_COOKIE_PREFIX + lastPort);
+ sessionManager.getSessionCookieConfig().setName(JSESSIONID_COOKIE_PREFIX + lastPort);
sessionManager.setMaxInactiveInterval((Integer)getAttribute(TIME_OUT));
return server;
Modified: qpid/trunk/qpid/java/broker-plugins/websocket/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/websocket/pom.xml?rev=1563153&r1=1563152&r2=1563153&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/websocket/pom.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/websocket/pom.xml Fri Jan 31 15:52:15 2014
@@ -38,15 +38,15 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>1.2</version>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <version>1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -67,14 +67,14 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-continuation</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -87,7 +87,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -113,7 +113,7 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -126,14 +126,14 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-websocket</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<scope>compile</scope>
<exclusions>
<exclusion>
Modified: qpid/trunk/qpid/java/build.deps
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.deps?rev=1563153&r1=1563152&r2=1563153&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.deps (original)
+++ qpid/trunk/qpid/java/build.deps Fri Jan 31 15:52:15 2014
@@ -35,7 +35,7 @@ geronimo-j2ee=lib/required/geronimo-j2ee
geronimo-jta=lib/required/geronimo-jta_1.1_spec-1.1.1.jar
geronimo-kernel=lib/required/geronimo-kernel-2.2.1.jar
geronimo-openejb=lib/required/geronimo-ejb_3.0_spec-1.0.1.jar
-geronimo-servlet=lib/required/geronimo-servlet_2.5_spec-1.2.jar
+geronimo-servlet=lib/required/geronimo-servlet_3.0_spec-1.0.jar
junit=lib/required/junit-3.8.1.jar
mockito-all=lib/required/mockito-all-1.9.0.jar
@@ -49,14 +49,14 @@ slf4j-log4j=lib/required/slf4j-log4j12-1
xalan=lib/required/xalan-2.7.0.jar
-jetty=lib/required/jetty-server-7.6.10.v20130312.jar
-jetty-continuation=lib/required/jetty-continuation-7.6.10.v20130312.jar
-jetty-security=lib/required/jetty-security-7.6.10.v20130312.jar
-jetty-util=lib/required/jetty-util-7.6.10.v20130312.jar
-jetty-io=lib/required/jetty-io-7.6.10.v20130312.jar
-jetty-http=lib/required/jetty-http-7.6.10.v20130312.jar
-jetty-servlet=lib/required/jetty-servlet-7.6.10.v20130312.jar
-jetty-websocket=lib/required/jetty-websocket-7.6.10.v20130312.jar
+jetty=lib/required/jetty-server-8.1.14.v20131031.jar
+jetty-continuation=lib/required/jetty-continuation-8.1.14.v20131031.jar
+jetty-security=lib/required/jetty-security-8.1.14.v20131031.jar
+jetty-util=lib/required/jetty-util-8.1.14.v20131031.jar
+jetty-io=lib/required/jetty-io-8.1.14.v20131031.jar
+jetty-http=lib/required/jetty-http-8.1.14.v20131031.jar
+jetty-servlet=lib/required/jetty-servlet-8.1.14.v20131031.jar
+jetty-websocket=lib/required/jetty-websocket-8.1.14.v20131031.jar
servlet-api=${geronimo-servlet}
dojo-version=1.9.1
Modified: qpid/trunk/qpid/java/ivy.retrieve.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/ivy.retrieve.xml?rev=1563153&r1=1563152&r2=1563153&view=diff
==============================================================================
--- qpid/trunk/qpid/java/ivy.retrieve.xml (original)
+++ qpid/trunk/qpid/java/ivy.retrieve.xml Fri Jan 31 15:52:15 2014
@@ -49,7 +49,7 @@
<dependency org="org.apache.geronimo.specs" name="geronimo-j2ee-connector_1.5_spec" rev="2.0.0" transitive="false"/>
<dependency org="org.apache.geronimo.specs" name="geronimo-jms_1.1_spec" rev="1.0" transitive="false"/>
<dependency org="org.apache.geronimo.specs" name="geronimo-jta_1.1_spec" rev="1.1.1" transitive="false"/>
- <dependency org="org.apache.geronimo.specs" name="geronimo-servlet_2.5_spec" rev="1.2" transitive="false"/>
+ <dependency org="org.apache.geronimo.specs" name="geronimo-servlet_3.0_spec" rev="1.0" transitive="false"/>
<dependency org="com.google.code.gson" name="gson" rev="2.0" transitive="false"/>
<dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="1.9.0" transitive="false"/>
<dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="1.9.0" transitive="false"/>
@@ -61,14 +61,14 @@
<dependency org="org.mockito" name="mockito-all" rev="1.9.0" transitive="false"/>
<dependency org="org.slf4j" name="slf4j-api" rev="1.6.4" transitive="false"/>
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.4" transitive="false"/>
- <dependency org="org.eclipse.jetty" name="jetty-server" rev="7.6.10.v20130312" transitive="false"/>
- <dependency org="org.eclipse.jetty" name="jetty-websocket" rev="7.6.10.v20130312" transitive="false"/>
- <dependency org="org.eclipse.jetty" name="jetty-continuation" rev="7.6.10.v20130312" transitive="false"/>
- <dependency org="org.eclipse.jetty" name="jetty-io" rev="7.6.10.v20130312" transitive="false"/>
- <dependency org="org.eclipse.jetty" name="jetty-http" rev="7.6.10.v20130312" transitive="false"/>
- <dependency org="org.eclipse.jetty" name="jetty-security" rev="7.6.10.v20130312" transitive="false"/>
- <dependency org="org.eclipse.jetty" name="jetty-servlet" rev="7.6.10.v20130312" transitive="false"/>
- <dependency org="org.eclipse.jetty" name="jetty-util" rev="7.6.10.v20130312" transitive="false"/>
+ <dependency org="org.eclipse.jetty" name="jetty-server" rev="8.1.14.v20131031" transitive="false"/>
+ <dependency org="org.eclipse.jetty" name="jetty-websocket" rev="8.1.14.v20131031" transitive="false"/>
+ <dependency org="org.eclipse.jetty" name="jetty-continuation" rev="8.1.14.v20131031" transitive="false"/>
+ <dependency org="org.eclipse.jetty" name="jetty-io" rev="8.1.14.v20131031" transitive="false"/>
+ <dependency org="org.eclipse.jetty" name="jetty-http" rev="8.1.14.v20131031" transitive="false"/>
+ <dependency org="org.eclipse.jetty" name="jetty-security" rev="8.1.14.v20131031" transitive="false"/>
+ <dependency org="org.eclipse.jetty" name="jetty-servlet" rev="8.1.14.v20131031" transitive="false"/>
+ <dependency org="org.eclipse.jetty" name="jetty-util" rev="8.1.14.v20131031" transitive="false"/>
<dependency org="xalan" name="xalan" rev="2.7.0" transitive="false"/>
<dependency org="velocity" name="velocity" rev="1.4" transitive="false"/>
<dependency org="velocity" name="velocity-dep" rev="1.4" transitive="false"/>
Modified: qpid/trunk/qpid/java/jca/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/jca/build.xml?rev=1563153&r1=1563152&r2=1563153&view=diff
==============================================================================
--- qpid/trunk/qpid/java/jca/build.xml (original)
+++ qpid/trunk/qpid/java/jca/build.xml Fri Jan 31 15:52:15 2014
@@ -24,7 +24,7 @@
<property name="module.name" value="jca"/>
<property name="module.genpom" value="true"/>
- <property name="module.genpom.args" value="-Sgeronimo-j2ee-connector_1.5_spec=provided -Sgeronimo-jta_1.1_spec=provided -Sgeronimo-jms_1.1_spec=provided -Sgeronimo-ejb_3.0_spec=provided -Sgeronimo-servlet_2.5_spec=provided -Sgeronimo-kernel=provided"/>
+ <property name="module.genpom.args" value="-Sgeronimo-j2ee-connector_1.5_spec=provided -Sgeronimo-jta_1.1_spec=provided -Sgeronimo-jms_1.1_spec=provided -Sgeronimo-ejb_3.0_spec=provided -Sgeronimo-servlet_3.0_spec=provided -Sgeronimo-kernel=provided"/>
<import file="../module.xml"/>
Modified: qpid/trunk/qpid/java/jca/example/build-geronimo-properties.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/jca/example/build-geronimo-properties.xml?rev=1563153&r1=1563152&r2=1563153&view=diff
==============================================================================
--- qpid/trunk/qpid/java/jca/example/build-geronimo-properties.xml (original)
+++ qpid/trunk/qpid/java/jca/example/build-geronimo-properties.xml Fri Jan 31 15:52:15 2014
@@ -87,7 +87,6 @@
<path id="compile.classpath">
<fileset dir="${geronimo.home}/repository/org/apache/geronimo/specs">
<include name="geronimo-jms_1.1_spec/1.1.1/geronimo-jms_1.1_spec-1.1.1.jar"/>
- <include name="geronimo-servlet_2.5_spec/1.2/geronimo-servlet_2.5_spec-1.2.jar"/>
<include name="geronimo-ejb_3.0_spec/1.0.1/geronimo-ejb_3.0_spec-1.0.1.jar"/>
<include name="geronimo-jta_1.1_spec/1.1.1/geronimo-jta_1.1_spec-1.1.1.jar"/>
@@ -113,7 +112,7 @@
<fileset dir="${geronimo.home}/repository/org/apache/geronimo/specs">
<include name="geronimo-j2ee-connector_1.5_spec/2.0.0/geronimo-j2ee-connector_1.5_spec-2.0.0.jar"/>
<include name="geronimo-jms_1.1_spec/1.1.1/geronimo-jms_1.1_spec-1.1.1.jar"/>
- <include name="geronimo-servlet_2.5_spec/1.2/geronimo-servlet_2.5_spec-1.2.jar"/>
+ <include name="geronimo-servlet_3.0_spec/1.0/geronimo-servlet_3.0_spec-1.0.jar"/>
<include name="geronimo-ejb_3.0_spec/1.0.1/geronimo-ejb_3.0_spec-1.0.1.jar"/>
<include name="geronimo-jta_1.1_spec/1.1.1/geronimo-jta_1.1_spec-1.1.1.jar"/>
</fileset>
Modified: qpid/trunk/qpid/java/jca/pom.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/jca/pom.xml?rev=1563153&r1=1563152&r2=1563153&view=diff
==============================================================================
--- qpid/trunk/qpid/java/jca/pom.xml (original)
+++ qpid/trunk/qpid/java/jca/pom.xml Fri Jan 31 15:52:15 2014
@@ -70,8 +70,8 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>1.2</version>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <version>1.0</version>
<scope>provided</scope>
</dependency>
Copied: qpid/trunk/qpid/java/lib/poms/geronimo-servlet_3.0_spec-1.0.xml (from r1563012, qpid/trunk/qpid/java/lib/poms/geronimo-servlet_2.5_spec-1.2.xml)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/lib/poms/geronimo-servlet_3.0_spec-1.0.xml?p2=qpid/trunk/qpid/java/lib/poms/geronimo-servlet_3.0_spec-1.0.xml&p1=qpid/trunk/qpid/java/lib/poms/geronimo-servlet_2.5_spec-1.2.xml&r1=1563012&r2=1563153&rev=1563153&view=diff
==============================================================================
--- qpid/trunk/qpid/java/lib/poms/geronimo-servlet_2.5_spec-1.2.xml (original)
+++ qpid/trunk/qpid/java/lib/poms/geronimo-servlet_3.0_spec-1.0.xml Fri Jan 31 15:52:15 2014
@@ -17,6 +17,6 @@
-->
<dep>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>1.2</version>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <version>1.0</version>
</dep>
Copied: qpid/trunk/qpid/java/lib/poms/jetty-continuation-8.1.14.v20131031.xml (from r1563012, qpid/trunk/qpid/java/lib/poms/jetty-continuation-7.6.10.v20130312.xml)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/lib/poms/jetty-continuation-8.1.14.v20131031.xml?p2=qpid/trunk/qpid/java/lib/poms/jetty-continuation-8.1.14.v20131031.xml&p1=qpid/trunk/qpid/java/lib/poms/jetty-continuation-7.6.10.v20130312.xml&r1=1563012&r2=1563153&rev=1563153&view=diff
==============================================================================
--- qpid/trunk/qpid/java/lib/poms/jetty-continuation-7.6.10.v20130312.xml (original)
+++ qpid/trunk/qpid/java/lib/poms/jetty-continuation-8.1.14.v20131031.xml Fri Jan 31 15:52:15 2014
@@ -18,5 +18,5 @@
<dep>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-continuation</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
</dep>
Copied: qpid/trunk/qpid/java/lib/poms/jetty-http-8.1.14.v20131031.xml (from r1563012, qpid/trunk/qpid/java/lib/poms/jetty-http-7.6.10.v20130312.xml)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/lib/poms/jetty-http-8.1.14.v20131031.xml?p2=qpid/trunk/qpid/java/lib/poms/jetty-http-8.1.14.v20131031.xml&p1=qpid/trunk/qpid/java/lib/poms/jetty-http-7.6.10.v20130312.xml&r1=1563012&r2=1563153&rev=1563153&view=diff
==============================================================================
--- qpid/trunk/qpid/java/lib/poms/jetty-http-7.6.10.v20130312.xml (original)
+++ qpid/trunk/qpid/java/lib/poms/jetty-http-8.1.14.v20131031.xml Fri Jan 31 15:52:15 2014
@@ -18,7 +18,7 @@
<dep>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
Copied: qpid/trunk/qpid/java/lib/poms/jetty-io-8.1.14.v20131031.xml (from r1563012, qpid/trunk/qpid/java/lib/poms/jetty-io-7.6.10.v20130312.xml)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/lib/poms/jetty-io-8.1.14.v20131031.xml?p2=qpid/trunk/qpid/java/lib/poms/jetty-io-8.1.14.v20131031.xml&p1=qpid/trunk/qpid/java/lib/poms/jetty-io-7.6.10.v20130312.xml&r1=1563012&r2=1563153&rev=1563153&view=diff
==============================================================================
--- qpid/trunk/qpid/java/lib/poms/jetty-io-7.6.10.v20130312.xml (original)
+++ qpid/trunk/qpid/java/lib/poms/jetty-io-8.1.14.v20131031.xml Fri Jan 31 15:52:15 2014
@@ -18,7 +18,7 @@
<dep>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
Copied: qpid/trunk/qpid/java/lib/poms/jetty-security-8.1.14.v20131031.xml (from r1563012, qpid/trunk/qpid/java/lib/poms/jetty-security-7.6.10.v20130312.xml)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/lib/poms/jetty-security-8.1.14.v20131031.xml?p2=qpid/trunk/qpid/java/lib/poms/jetty-security-8.1.14.v20131031.xml&p1=qpid/trunk/qpid/java/lib/poms/jetty-security-7.6.10.v20130312.xml&r1=1563012&r2=1563153&rev=1563153&view=diff
==============================================================================
--- qpid/trunk/qpid/java/lib/poms/jetty-security-7.6.10.v20130312.xml (original)
+++ qpid/trunk/qpid/java/lib/poms/jetty-security-8.1.14.v20131031.xml Fri Jan 31 15:52:15 2014
@@ -18,7 +18,7 @@
<dep>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
Copied: qpid/trunk/qpid/java/lib/poms/jetty-server-8.1.14.v20131031.xml (from r1563012, qpid/trunk/qpid/java/lib/poms/jetty-server-7.6.10.v20130312.xml)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/lib/poms/jetty-server-8.1.14.v20131031.xml?p2=qpid/trunk/qpid/java/lib/poms/jetty-server-8.1.14.v20131031.xml&p1=qpid/trunk/qpid/java/lib/poms/jetty-server-7.6.10.v20130312.xml&r1=1563012&r2=1563153&rev=1563153&view=diff
==============================================================================
--- qpid/trunk/qpid/java/lib/poms/jetty-server-7.6.10.v20130312.xml (original)
+++ qpid/trunk/qpid/java/lib/poms/jetty-server-8.1.14.v20131031.xml Fri Jan 31 15:52:15 2014
@@ -18,7 +18,7 @@
<dep>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty.orbit</groupId>
Copied: qpid/trunk/qpid/java/lib/poms/jetty-servlet-8.1.14.v20131031.xml (from r1563012, qpid/trunk/qpid/java/lib/poms/jetty-servlet-7.6.10.v20130312.xml)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/lib/poms/jetty-servlet-8.1.14.v20131031.xml?p2=qpid/trunk/qpid/java/lib/poms/jetty-servlet-8.1.14.v20131031.xml&p1=qpid/trunk/qpid/java/lib/poms/jetty-servlet-7.6.10.v20130312.xml&r1=1563012&r2=1563153&rev=1563153&view=diff
==============================================================================
--- qpid/trunk/qpid/java/lib/poms/jetty-servlet-7.6.10.v20130312.xml (original)
+++ qpid/trunk/qpid/java/lib/poms/jetty-servlet-8.1.14.v20131031.xml Fri Jan 31 15:52:15 2014
@@ -18,7 +18,7 @@
<dep>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
Copied: qpid/trunk/qpid/java/lib/poms/jetty-util-8.1.14.v20131031.xml (from r1563012, qpid/trunk/qpid/java/lib/poms/jetty-util-7.6.10.v20130312.xml)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/lib/poms/jetty-util-8.1.14.v20131031.xml?p2=qpid/trunk/qpid/java/lib/poms/jetty-util-8.1.14.v20131031.xml&p1=qpid/trunk/qpid/java/lib/poms/jetty-util-7.6.10.v20130312.xml&r1=1563012&r2=1563153&rev=1563153&view=diff
==============================================================================
--- qpid/trunk/qpid/java/lib/poms/jetty-util-7.6.10.v20130312.xml (original)
+++ qpid/trunk/qpid/java/lib/poms/jetty-util-8.1.14.v20131031.xml Fri Jan 31 15:52:15 2014
@@ -18,5 +18,5 @@
<dep>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
</dep>
Copied: qpid/trunk/qpid/java/lib/poms/jetty-websocket-8.1.14.v20131031.xml (from r1563012, qpid/trunk/qpid/java/lib/poms/jetty-websocket-7.6.10.v20130312.xml)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/lib/poms/jetty-websocket-8.1.14.v20131031.xml?p2=qpid/trunk/qpid/java/lib/poms/jetty-websocket-8.1.14.v20131031.xml&p1=qpid/trunk/qpid/java/lib/poms/jetty-websocket-7.6.10.v20130312.xml&r1=1563012&r2=1563153&rev=1563153&view=diff
==============================================================================
--- qpid/trunk/qpid/java/lib/poms/jetty-websocket-7.6.10.v20130312.xml (original)
+++ qpid/trunk/qpid/java/lib/poms/jetty-websocket-8.1.14.v20131031.xml Fri Jan 31 15:52:15 2014
@@ -18,7 +18,7 @@
<dep>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-websocket</artifactId>
- <version>7.6.10.v20130312</version>
+ <version>8.1.14.v20131031</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org