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

This closes #83 on Jetty updates

This commit is contained in:
Clebert Suconic 2015-01-28 15:11:11 -05:00
parent c6a444fe5c f2323b6bc2
commit 8bdad8897e
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-web/pom.xml
View File

@ -45,7 +45,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.aggregate</groupId> <groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all-server</artifactId> <artifactId>jetty-all</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>

2
distribution/activemq/pom.xml
View File

@ -154,7 +154,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.aggregate</groupId> <groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all-server</artifactId> <artifactId>jetty-all</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.geronimo.specs</groupId> <groupId>org.apache.geronimo.specs</groupId>

3
distribution/activemq/src/main/assembly/dep.xml
View File

@ -61,7 +61,8 @@
<include>io.airlift:airline</include> <include>io.airlift:airline</include>
<include>com.google.guava:guava</include> <include>com.google.guava:guava</include>
<include>javax.inject:javax.inject</include> <include>javax.inject:javax.inject</include>
<include>org.eclipse.jetty.aggregate:jetty-all-server</include> <include>org.eclipse.jetty.aggregate:jetty-all</include>
<include>org.apache.geronimo.specs:</include>
<include>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</include> <include>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</include>
</includes> </includes>
<!--excludes> <!--excludes>

4
pom.xml
View File

@ -385,8 +385,8 @@
<!-- ## Jetty web Dependencies ##--> <!-- ## Jetty web Dependencies ##-->
<dependency> <dependency>
<groupId>org.eclipse.jetty.aggregate</groupId> <groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all-server</artifactId> <artifactId>jetty-all</artifactId>
<version>7.6.9.v20130131</version> <version>8.1.16.v20140903</version>
<!-- License: (Joint): Apache 2.0 & EPL 1.0 --> <!-- License: (Joint): Apache 2.0 & EPL 1.0 -->
</dependency> </dependency>
<dependency> <dependency>