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

https://issues.apache.org/jira/browse/AMQ-5515 - update to 8.1.15.v20140411

This commit is contained in:
gtully 2015-01-13 11:59:20 +00:00
parent 2a9f8a3632
commit 60f9b020cc
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-fileserver/pom.xml
View File

@ -66,7 +66,7 @@
<!-- web container --> <!-- web container -->
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId> <artifactId>geronimo-servlet_3.0_spec</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

2
activemq-web-console/pom.xml
View File

@ -167,7 +167,7 @@
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId> <artifactId>geronimo-servlet_3.0_spec</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

2
activemq-web/pom.xml
View File

@ -70,7 +70,7 @@
<!-- web container --> <!-- web container -->
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId> <artifactId>geronimo-servlet_3.0_spec</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

2
assembly/pom.xml
View File

@ -274,7 +274,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId> <artifactId>geronimo-servlet_3.0_spec</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>

2
assembly/src/main/descriptors/common-bin.xml
View File

@ -247,7 +247,7 @@
<include>org.springframework:spring-web</include> <include>org.springframework:spring-web</include>
<include>org.springframework:spring-webmvc</include> <include>org.springframework:spring-webmvc</include>
<include>org.eclipse.jetty.aggregate:jetty-all</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 --> <!-- JSP support -->
<include>org.mortbay.jetty:jsp-2.1-glassfish</include> <include>org.mortbay.jetty:jsp-2.1-glassfish</include>

6
pom.xml
View File

@ -74,7 +74,7 @@
<jasypt-version>1.9.2</jasypt-version> <jasypt-version>1.9.2</jasypt-version>
<jaxb-bundle-version>2.2.1.1_2</jaxb-bundle-version> <jaxb-bundle-version>2.2.1.1_2</jaxb-bundle-version>
<jdom-version>1.0</jdom-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> <jmdns-version>3.4.1</jmdns-version>
<jsp-version>2.1.v20100127</jsp-version> <jsp-version>2.1.v20100127</jsp-version>
<jstl-version>1.1.2</jstl-version> <jstl-version>1.1.2</jstl-version>
@ -551,8 +551,8 @@
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId> <artifactId>geronimo-servlet_3.0_spec</artifactId>
<version>1.2</version> <version>1.0</version>
</dependency> </dependency>
<dependency> <dependency>