Repository: activemq Updated Branches: refs/heads/trunk 2a9f8a363 -> 60f9b020c
https://issues.apache.org/jira/browse/AMQ-5515 - update to 8.1.15.v20140411 Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/60f9b020 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/60f9b020 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/60f9b020 Branch: refs/heads/trunk Commit: 60f9b020cc61ac010697b27ee5cd82c702cacd24 Parents: 2a9f8a3 Author: gtully <[email protected]> Authored: Tue Jan 13 11:59:20 2015 +0000 Committer: gtully <[email protected]> Committed: Tue Jan 13 12:06:54 2015 +0000 ---------------------------------------------------------------------- activemq-fileserver/pom.xml | 2 +- activemq-web-console/pom.xml | 2 +- activemq-web/pom.xml | 2 +- assembly/pom.xml | 2 +- assembly/src/main/descriptors/common-bin.xml | 2 +- pom.xml | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/60f9b020/activemq-fileserver/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-fileserver/pom.xml b/activemq-fileserver/pom.xml index ae02976..44183b6 100755 --- a/activemq-fileserver/pom.xml +++ b/activemq-fileserver/pom.xml @@ -66,7 +66,7 @@ <!-- web container --> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_2.5_spec</artifactId> + <artifactId>geronimo-servlet_3.0_spec</artifactId> <scope>provided</scope> </dependency> http://git-wip-us.apache.org/repos/asf/activemq/blob/60f9b020/activemq-web-console/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml index 23fdbe6..c14c40f 100755 --- a/activemq-web-console/pom.xml +++ b/activemq-web-console/pom.xml @@ -167,7 +167,7 @@ <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_2.5_spec</artifactId> + <artifactId>geronimo-servlet_3.0_spec</artifactId> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/activemq/blob/60f9b020/activemq-web/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-web/pom.xml b/activemq-web/pom.xml index 7be61f7..4b38f78 100755 --- a/activemq-web/pom.xml +++ b/activemq-web/pom.xml @@ -70,7 +70,7 @@ <!-- web container --> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_2.5_spec</artifactId> + <artifactId>geronimo-servlet_3.0_spec</artifactId> <scope>provided</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/activemq/blob/60f9b020/assembly/pom.xml ---------------------------------------------------------------------- diff --git a/assembly/pom.xml b/assembly/pom.xml index 015e0b7..5edbc35 100755 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -274,7 +274,7 @@ </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_2.5_spec</artifactId> + <artifactId>geronimo-servlet_3.0_spec</artifactId> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> http://git-wip-us.apache.org/repos/asf/activemq/blob/60f9b020/assembly/src/main/descriptors/common-bin.xml ---------------------------------------------------------------------- diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml index ac2bbf1..4ff62a9 100644 --- a/assembly/src/main/descriptors/common-bin.xml +++ b/assembly/src/main/descriptors/common-bin.xml @@ -247,7 +247,7 @@ <include>org.springframework:spring-web</include> <include>org.springframework:spring-webmvc</include> <include>org.eclipse.jetty.aggregate:jetty-all</include> - <include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include> + <include>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</include> <!-- JSP support --> <include>org.mortbay.jetty:jsp-2.1-glassfish</include> http://git-wip-us.apache.org/repos/asf/activemq/blob/60f9b020/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d176cd8..336f3fa 100755 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ <jasypt-version>1.9.2</jasypt-version> <jaxb-bundle-version>2.2.1.1_2</jaxb-bundle-version> <jdom-version>1.0</jdom-version> - <jetty-version>7.6.9.v20130131</jetty-version> + <jetty-version>8.1.15.v20140411</jetty-version> <jmdns-version>3.4.1</jmdns-version> <jsp-version>2.1.v20100127</jsp-version> <jstl-version>1.1.2</jstl-version> @@ -551,8 +551,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> </dependency> <dependency>
