You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2011/08/23 14:25:22 UTC
svn commit: r1160656 - in /activemq/trunk: activemq-camel/pom.xml
activemq-core/pom.xml pom.xml
Author: dejanb
Date: Tue Aug 23 12:25:22 2011
New Revision: 1160656
URL: http://svn.apache.org/viewvc?rev=1160656&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3463 - osgi and maven metadata
Modified:
activemq/trunk/activemq-camel/pom.xml
activemq/trunk/activemq-core/pom.xml
activemq/trunk/pom.xml
Modified: activemq/trunk/activemq-camel/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-camel/pom.xml?rev=1160656&r1=1160655&r2=1160656&view=diff
==============================================================================
--- activemq/trunk/activemq-camel/pom.xml (original)
+++ activemq/trunk/activemq-camel/pom.xml Tue Aug 23 12:25:22 2011
@@ -32,11 +32,10 @@
<properties>
<activemq.osgi.import.pkg>
- org.apache.activemq.pool;resolution:=optional,
+ javax.annotation*;resolution:=optional,
com.thoughtworks.xstream*;resolution:=optional,
org.apache.activeio*;resolution:=optional,
org.apache.camel*;version="[2,3)";resolution:=optional,
- org.apache.commons.pool*;resolution:=optional,
org.apache.derby*;resolution:=optional,
org.apache.tools.ant*;resolution:=optional,
org.apache.xbean*;resolution:=optional,
Modified: activemq/trunk/activemq-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/pom.xml?rev=1160656&r1=1160655&r2=1160656&view=diff
==============================================================================
--- activemq/trunk/activemq-core/pom.xml (original)
+++ activemq/trunk/activemq-core/pom.xml Tue Aug 23 12:25:22 2011
@@ -34,10 +34,12 @@
<activemq.osgi.import.pkg>
com.thoughtworks.xstream*;resolution:=optional,
javax.xml.stream*;resolution:=optional,
+ javax.annotation*;resolution:=optional,
+ javax.transaction*;resolution:=optional,
+ javax.security*;resolution:=optional,
org.codehaus.jettison*;resolution:=optional,
org.apache.activeio*;resolution:=optional,
org.apache.camel*;resolution:=optional,
- org.apache.commons.pool*;resolution:=optional,
org.apache.commons.net*;resolution:=optional,
org.apache.derby*;resolution:=optional,
org.apache.tools.ant*;resolution:=optional,
@@ -125,11 +127,6 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<optional>true</optional>
Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1160656&r1=1160655&r2=1160656&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Tue Aug 23 12:25:22 2011
@@ -32,6 +32,7 @@
<properties>
<activemq-version>5.6-SNAPSHOT</activemq-version>
+ <activeio-version>3.2-SNAPSHOT</activeio-version>
<siteId>activemq-${activemq-version}</siteId>
<projectName>Apache ActiveMQ</projectName>
<!-- base url for site deployment. See distribution management for full url. Override this in settings.xml for staging -->
@@ -296,12 +297,13 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activeio-core</artifactId>
- <version>3.1.2</version>
+ <version>${activeio-version}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activeio-core</artifactId>
- <version>3.1.2</version>
+ <version>${activeio-version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>