recent change for https://issues.apache.org/jira/browse/AMQ-2502 breaks build as activemq-pool was made optional for activemq-camel

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1327702 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Timothy A. Bish 2012-04-18 22:09:44 +00:00
parent f7a904ab68
commit bda7ccb248
1 changed files with 14 additions and 10 deletions

View File

@ -6,9 +6,9 @@
The ASF licenses this file to You under the Apache License, Version 2.0 The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with (the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -16,7 +16,7 @@
limitations under the License. limitations under the License.
--> -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
@ -29,7 +29,7 @@
<packaging>bundle</packaging> <packaging>bundle</packaging>
<name>ActiveMQ :: Web</name> <name>ActiveMQ :: Web</name>
<description>Web Connector for REST API and Streamlets support</description> <description>Web Connector for REST API and Streamlets support</description>
<properties> <properties>
<activemq.osgi.import.pkg> <activemq.osgi.import.pkg>
org.apache.activemq*;resolution:=optional, org.apache.activemq*;resolution:=optional,
@ -44,7 +44,7 @@
org.apache.activemq.web*;version=${project.version};-noimport:=true, org.apache.activemq.web*;version=${project.version};-noimport:=true,
</activemq.osgi.export> </activemq.osgi.export>
</properties> </properties>
<dependencies> <dependencies>
<!-- activemq --> <!-- activemq -->
<dependency> <dependency>
@ -55,26 +55,30 @@
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>activemq-camel</artifactId> <artifactId>activemq-camel</artifactId>
</dependency> </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>activemq-pool</artifactId>
</dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>activemq-core</artifactId> <artifactId>activemq-core</artifactId>
<scope>test</scope> <scope>test</scope>
<type>test-jar</type> <type>test-jar</type>
</dependency> </dependency>
<!-- 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_2.5_spec</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.aggregate</groupId> <groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all-server</artifactId> <artifactId>jetty-all-server</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-websocket</artifactId> <artifactId>jetty-websocket</artifactId>
@ -86,7 +90,7 @@
<artifactId>jetty-continuation</artifactId> <artifactId>jetty-continuation</artifactId>
<version>${jetty-version}</version> <version>${jetty-version}</version>
</dependency> </dependency>
<!-- Rome RSS Reader --> <!-- Rome RSS Reader -->
<dependency> <dependency>
<groupId>rome</groupId> <groupId>rome</groupId>
@ -132,7 +136,7 @@
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>