activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject git commit: 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
Date Mon, 30 Sep 2013 22:42:45 GMT
Updated Branches:
  refs/heads/trunk 8cf7f660c -> e64f83abc


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


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/e64f83ab
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/e64f83ab
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/e64f83ab

Branch: refs/heads/trunk
Commit: e64f83abcc96c4a0829e891db81fa74f90f8f4bd
Parents: 8cf7f66
Author: gtully <gary.tully@gmail.com>
Authored: Mon Sep 30 23:42:18 2013 +0100
Committer: gtully <gary.tully@gmail.com>
Committed: Mon Sep 30 23:42:18 2013 +0100

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


http://git-wip-us.apache.org/repos/asf/activemq/blob/e64f83ab/activemq-spring/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml
index 1f66b61..9136c05 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>
 
@@ -193,12 +194,6 @@
       <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>
       <scope>provided</scope>


Mime
View raw message