From 4b6648eba184a9e3c3bd4cee8809439d3de5af07 Mon Sep 17 00:00:00 2001
From: Bosanac Dejan <dejanb@apache.org>
Date: Tue, 23 Aug 2011 12:25:22 +0000
Subject: [PATCH] https://issues.apache.org/jira/browse/AMQ-3463 - osgi and
 maven metadata

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1160656 13f79535-47bb-0310-9956-ffa450edef68
---
 activemq-camel/pom.xml | 3 +--
 activemq-core/pom.xml  | 9 +++------
 pom.xml                | 6 ++++--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/activemq-camel/pom.xml b/activemq-camel/pom.xml
index f050783275..b5133896b0 100755
--- a/activemq-camel/pom.xml
+++ b/activemq-camel/pom.xml
@@ -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,
diff --git a/activemq-core/pom.xml b/activemq-core/pom.xml
index 2ae5278748..8645546dfd 100755
--- a/activemq-core/pom.xml
+++ b/activemq-core/pom.xml
@@ -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,
@@ -124,11 +126,6 @@
       <artifactId>geronimo-jacc_1.1_spec</artifactId>
       <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>
diff --git a/pom.xml b/pom.xml
index 700a5b7699..4063b5a905 100755
--- a/pom.xml
+++ b/pom.xml
@@ -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>