activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r1375543 - in /activemq/trunk: activemq-core/pom.xml activemq-spring/pom.xml pom.xml
Date Tue, 21 Aug 2012 13:44:49 GMT
Author: dejanb
Date: Tue Aug 21 13:44:49 2012
New Revision: 1375543

URL: http://svn.apache.org/viewvc?rev=1375543&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3983 - osgi dependency

Modified:
    activemq/trunk/activemq-core/pom.xml
    activemq/trunk/activemq-spring/pom.xml
    activemq/trunk/pom.xml

Modified: activemq/trunk/activemq-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/pom.xml?rev=1375543&r1=1375542&r2=1375543&view=diff
==============================================================================
--- activemq/trunk/activemq-core/pom.xml (original)
+++ activemq/trunk/activemq-core/pom.xml Tue Aug 21 13:44:49 2012
@@ -110,6 +110,8 @@
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.core</artifactId>
+      <scope>provided</scope>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>

Modified: activemq/trunk/activemq-spring/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/pom.xml?rev=1375543&r1=1375542&r2=1375543&view=diff
==============================================================================
--- activemq/trunk/activemq-spring/pom.xml (original)
+++ activemq/trunk/activemq-spring/pom.xml Tue Aug 21 13:44:49 2012
@@ -131,6 +131,12 @@
          <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>
         <exclusions>

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1375543&r1=1375542&r2=1375543&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Tue Aug 21 13:44:49 2012
@@ -98,7 +98,7 @@
     <activemq-protobuf-version>1.1</activemq-protobuf-version>
     <opensymphony-version>2.4.2</opensymphony-version>
     <zookeeper-version>3.0.0</zookeeper-version>
-    <org.osgi.core-version>4.1.0</org.osgi.core-version>
+    <org.osgi.core-version>4.2.0</org.osgi.core-version>
     <woodstox-core-asl-version>4.0.8</woodstox-core-asl-version>
     <stax2-api-version>3.0.2</stax2-api-version>
     <site-repo-url>scpexe://people.apache.org/www/activemq.apache.org/maven/</site-repo-url>



Mime
View raw message