diff options
author | Alex Rudyy <orudyy@apache.org> | 2013-04-22 10:45:53 +0000 |
---|---|---|
committer | Alex Rudyy <orudyy@apache.org> | 2013-04-22 10:45:53 +0000 |
commit | 79d512cb5a0cde119039f0b72459a9b37eaafcaa (patch) | |
tree | 4a39e9d768ea3b9335e687e0ff5566fd6e19c2f4 | |
parent | 270fecfbeca0dc4c3c7ba3f3acd9800eac6f896e (diff) | |
download | qpid-python-79d512cb5a0cde119039f0b72459a9b37eaafcaa.tar.gz |
QPID-4761: Upgrade jetty to version 7.6.10.v20130312
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1470439 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | qpid/java/build.deps | 16 | ||||
-rw-r--r-- | qpid/java/ivy.retrieve.xml | 16 | ||||
-rw-r--r-- | qpid/java/lib/poms/jetty-continuation-7.6.3.v20120416.xml | 2 | ||||
-rw-r--r-- | qpid/java/lib/poms/jetty-http-7.6.3.v20120416.xml | 2 | ||||
-rw-r--r-- | qpid/java/lib/poms/jetty-io-7.6.3.v20120416.xml | 2 | ||||
-rw-r--r-- | qpid/java/lib/poms/jetty-security-7.6.3.v20120416.xml | 2 | ||||
-rw-r--r-- | qpid/java/lib/poms/jetty-server-7.6.3.v20120416.xml | 2 | ||||
-rw-r--r-- | qpid/java/lib/poms/jetty-servlet-7.6.3.v20120416.xml | 2 | ||||
-rw-r--r-- | qpid/java/lib/poms/jetty-util-7.6.3.v20120416.xml | 2 | ||||
-rw-r--r-- | qpid/java/lib/poms/jetty-websocket-7.6.3.v20120416.xml | 2 |
10 files changed, 24 insertions, 24 deletions
diff --git a/qpid/java/build.deps b/qpid/java/build.deps index b53ac55b6d..aca8fda2da 100644 --- a/qpid/java/build.deps +++ b/qpid/java/build.deps @@ -47,14 +47,14 @@ slf4j-log4j=lib/required/slf4j-log4j12-1.6.4.jar 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 diff --git a/qpid/java/ivy.retrieve.xml b/qpid/java/ivy.retrieve.xml index 4c8e935aca..4e416f879a 100644 --- a/qpid/java/ivy.retrieve.xml +++ b/qpid/java/ivy.retrieve.xml @@ -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"/> diff --git a/qpid/java/lib/poms/jetty-continuation-7.6.3.v20120416.xml b/qpid/java/lib/poms/jetty-continuation-7.6.3.v20120416.xml index 6ace17c18a..5beba95d17 100644 --- a/qpid/java/lib/poms/jetty-continuation-7.6.3.v20120416.xml +++ b/qpid/java/lib/poms/jetty-continuation-7.6.3.v20120416.xml @@ -18,5 +18,5 @@ <dep> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-continuation</artifactId> - <version>7.6.3.v20120416</version> + <version>7.6.10.v20130312</version> </dep> diff --git a/qpid/java/lib/poms/jetty-http-7.6.3.v20120416.xml b/qpid/java/lib/poms/jetty-http-7.6.3.v20120416.xml index 02af020cfe..5c840bedd6 100644 --- a/qpid/java/lib/poms/jetty-http-7.6.3.v20120416.xml +++ b/qpid/java/lib/poms/jetty-http-7.6.3.v20120416.xml @@ -18,7 +18,7 @@ <dep> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> - <version>7.6.3.v20120416</version> + <version>7.6.10.v20130312</version> <exclusions> <exclusion> <groupId>org.eclipse.jetty</groupId> diff --git a/qpid/java/lib/poms/jetty-io-7.6.3.v20120416.xml b/qpid/java/lib/poms/jetty-io-7.6.3.v20120416.xml index b6c865f0fb..9cec3998ea 100644 --- a/qpid/java/lib/poms/jetty-io-7.6.3.v20120416.xml +++ b/qpid/java/lib/poms/jetty-io-7.6.3.v20120416.xml @@ -18,7 +18,7 @@ <dep> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> - <version>7.6.3.v20120416</version> + <version>7.6.10.v20130312</version> <exclusions> <exclusion> <groupId>org.eclipse.jetty</groupId> diff --git a/qpid/java/lib/poms/jetty-security-7.6.3.v20120416.xml b/qpid/java/lib/poms/jetty-security-7.6.3.v20120416.xml index ba643ccb97..9501750ba0 100644 --- a/qpid/java/lib/poms/jetty-security-7.6.3.v20120416.xml +++ b/qpid/java/lib/poms/jetty-security-7.6.3.v20120416.xml @@ -18,7 +18,7 @@ <dep> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> - <version>7.6.3.v20120416</version> + <version>7.6.10.v20130312</version> <exclusions> <exclusion> <groupId>org.eclipse.jetty</groupId> diff --git a/qpid/java/lib/poms/jetty-server-7.6.3.v20120416.xml b/qpid/java/lib/poms/jetty-server-7.6.3.v20120416.xml index 1e7ce42623..587860b50f 100644 --- a/qpid/java/lib/poms/jetty-server-7.6.3.v20120416.xml +++ b/qpid/java/lib/poms/jetty-server-7.6.3.v20120416.xml @@ -18,7 +18,7 @@ <dep> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>7.6.3.v20120416</version> + <version>7.6.10.v20130312</version> <exclusions> <exclusion> <groupId>org.eclipse.jetty.orbit</groupId> diff --git a/qpid/java/lib/poms/jetty-servlet-7.6.3.v20120416.xml b/qpid/java/lib/poms/jetty-servlet-7.6.3.v20120416.xml index 001bcce824..4c0ff0a41b 100644 --- a/qpid/java/lib/poms/jetty-servlet-7.6.3.v20120416.xml +++ b/qpid/java/lib/poms/jetty-servlet-7.6.3.v20120416.xml @@ -18,7 +18,7 @@ <dep> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> - <version>7.6.3.v20120416</version> + <version>7.6.10.v20130312</version> <exclusions> <exclusion> <groupId>org.eclipse.jetty</groupId> diff --git a/qpid/java/lib/poms/jetty-util-7.6.3.v20120416.xml b/qpid/java/lib/poms/jetty-util-7.6.3.v20120416.xml index c40d7e5f60..f5c990248f 100644 --- a/qpid/java/lib/poms/jetty-util-7.6.3.v20120416.xml +++ b/qpid/java/lib/poms/jetty-util-7.6.3.v20120416.xml @@ -18,5 +18,5 @@ <dep> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>7.6.3.v20120416</version> + <version>7.6.10.v20130312</version> </dep> diff --git a/qpid/java/lib/poms/jetty-websocket-7.6.3.v20120416.xml b/qpid/java/lib/poms/jetty-websocket-7.6.3.v20120416.xml index bba80d9236..4d3ebd1666 100644 --- a/qpid/java/lib/poms/jetty-websocket-7.6.3.v20120416.xml +++ b/qpid/java/lib/poms/jetty-websocket-7.6.3.v20120416.xml @@ -18,7 +18,7 @@ <dep> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-websocket</artifactId> - <version>7.6.3.v20120416</version> + <version>7.6.10.v20130312</version> <exclusions> <exclusion> <groupId>org.eclipse.jetty</groupId> |