You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2013/04/22 15:08:34 UTC
svn commit: r1470486 - in /qpid/branches/0.22/qpid/java: ./ lib/poms/
Author: orudyy
Date: Mon Apr 22 13:08:33 2013
New Revision: 1470486
URL: http://svn.apache.org/r1470486
Log:
QPID-4761: Upgrade jetty to version 7.6.10.v20130312
merged from trunk r1470439 and r1470457
Added:
qpid/branches/0.22/qpid/java/lib/poms/jetty-continuation-7.6.10.v20130312.xml
- copied unchanged from r1470457, qpid/trunk/qpid/java/lib/poms/jetty-continuation-7.6.10.v20130312.xml
qpid/branches/0.22/qpid/java/lib/poms/jetty-http-7.6.10.v20130312.xml
- copied unchanged from r1470457, qpid/trunk/qpid/java/lib/poms/jetty-http-7.6.10.v20130312.xml
qpid/branches/0.22/qpid/java/lib/poms/jetty-io-7.6.10.v20130312.xml
- copied unchanged from r1470457, qpid/trunk/qpid/java/lib/poms/jetty-io-7.6.10.v20130312.xml
qpid/branches/0.22/qpid/java/lib/poms/jetty-security-7.6.10.v20130312.xml
- copied unchanged from r1470457, qpid/trunk/qpid/java/lib/poms/jetty-security-7.6.10.v20130312.xml
qpid/branches/0.22/qpid/java/lib/poms/jetty-server-7.6.10.v20130312.xml
- copied unchanged from r1470457, qpid/trunk/qpid/java/lib/poms/jetty-server-7.6.10.v20130312.xml
qpid/branches/0.22/qpid/java/lib/poms/jetty-servlet-7.6.10.v20130312.xml
- copied unchanged from r1470457, qpid/trunk/qpid/java/lib/poms/jetty-servlet-7.6.10.v20130312.xml
qpid/branches/0.22/qpid/java/lib/poms/jetty-util-7.6.10.v20130312.xml
- copied unchanged from r1470457, qpid/trunk/qpid/java/lib/poms/jetty-util-7.6.10.v20130312.xml
qpid/branches/0.22/qpid/java/lib/poms/jetty-websocket-7.6.10.v20130312.xml
- copied unchanged from r1470457, qpid/trunk/qpid/java/lib/poms/jetty-websocket-7.6.10.v20130312.xml
Removed:
qpid/branches/0.22/qpid/java/lib/poms/jetty-continuation-7.6.3.v20120416.xml
qpid/branches/0.22/qpid/java/lib/poms/jetty-http-7.6.3.v20120416.xml
qpid/branches/0.22/qpid/java/lib/poms/jetty-io-7.6.3.v20120416.xml
qpid/branches/0.22/qpid/java/lib/poms/jetty-security-7.6.3.v20120416.xml
qpid/branches/0.22/qpid/java/lib/poms/jetty-server-7.6.3.v20120416.xml
qpid/branches/0.22/qpid/java/lib/poms/jetty-servlet-7.6.3.v20120416.xml
qpid/branches/0.22/qpid/java/lib/poms/jetty-util-7.6.3.v20120416.xml
qpid/branches/0.22/qpid/java/lib/poms/jetty-websocket-7.6.3.v20120416.xml
Modified:
qpid/branches/0.22/qpid/java/ (props changed)
qpid/branches/0.22/qpid/java/build.deps
qpid/branches/0.22/qpid/java/ivy.retrieve.xml
Propchange: qpid/branches/0.22/qpid/java/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java:r1470439,1470457
Modified: qpid/branches/0.22/qpid/java/build.deps
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/java/build.deps?rev=1470486&r1=1470485&r2=1470486&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/java/build.deps (original)
+++ qpid/branches/0.22/qpid/java/build.deps Mon Apr 22 13:08:33 2013
@@ -47,14 +47,14 @@ slf4j-log4j=lib/required/slf4j-log4j12-1
xalan=lib/required/xalan-2.7.0.jar
-jetty=lib/required/jetty-server-7.6.3.v20120416.jar
-jetty-continuation=lib/required/jetty-continuation-7.6.3.v20120416.jar
-jetty-security=lib/required/jetty-security-7.6.3.v20120416.jar
-jetty-util=lib/required/jetty-util-7.6.3.v20120416.jar
-jetty-io=lib/required/jetty-io-7.6.3.v20120416.jar
-jetty-http=lib/required/jetty-http-7.6.3.v20120416.jar
-jetty-servlet=lib/required/jetty-servlet-7.6.3.v20120416.jar
-jetty-websocket=lib/required/jetty-websocket-7.6.3.v20120416.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
servlet-api=${geronimo-servlet}
dojo=lib/required/dojo-war-1.7.2.war
Modified: qpid/branches/0.22/qpid/java/ivy.retrieve.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/java/ivy.retrieve.xml?rev=1470486&r1=1470485&r2=1470486&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/java/ivy.retrieve.xml (original)
+++ qpid/branches/0.22/qpid/java/ivy.retrieve.xml Mon Apr 22 13:08:33 2013
@@ -59,14 +59,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.3.v20120416" transitive="false"/>
- <dependency org="org.eclipse.jetty" name="jetty-websocket" rev="7.6.3.v20120416" transitive="false"/>
- <dependency org="org.eclipse.jetty" name="jetty-continuation" rev="7.6.3.v20120416" transitive="false"/>
- <dependency org="org.eclipse.jetty" name="jetty-io" rev="7.6.3.v20120416" transitive="false"/>
- <dependency org="org.eclipse.jetty" name="jetty-http" rev="7.6.3.v20120416" transitive="false"/>
- <dependency org="org.eclipse.jetty" name="jetty-security" rev="7.6.3.v20120416" transitive="false"/>
- <dependency org="org.eclipse.jetty" name="jetty-servlet" rev="7.6.3.v20120416" transitive="false"/>
- <dependency org="org.eclipse.jetty" name="jetty-util" rev="7.6.3.v20120416" 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.dojotoolkit" name="dojo-war" rev="1.7.2" transitive="false"/>
<dependency org="xalan" name="xalan" rev="2.7.0" transitive="false"/>
<dependency org="velocity" name="velocity" rev="1.4" transitive="false"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org