From e64f83abcc96c4a0829e891db81fa74f90f8f4bd Mon Sep 17 00:00:00 2001
From: gtully <gary.tully@gmail.com>
Date: Mon, 30 Sep 2013 23:42:18 +0100
Subject: [PATCH] fix mvn warning on duplicate
 dependencies.dependency.\(groupId:artifactId:type:classifier\) must be
 unique: org.osgi:org.osgi.core:jar -> version 4.3.1 vs \(?\) \@ line 195,
 column 17

---
 activemq-spring/pom.xml | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml
index 1f66b61b71..9136c05b5a 100755
--- a/activemq-spring/pom.xml
+++ b/activemq-spring/pom.xml
@@ -103,13 +103,14 @@
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>4.3.1</version>
+      <version>${org.osgi.core-version}</version>
       <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.compendium</artifactId>
-      <version>4.3.1</version>
+      <version>${org.osgi.core-version}</version>
       <scope>provided</scope>
     </dependency>
 
@@ -192,12 +193,6 @@
       <artifactId>activemq-ra</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <scope>provided</scope>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>org.springframework.osgi</groupId>
       <artifactId>spring-osgi-core</artifactId>