geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r915136 - in /geronimo/server/trunk/plugins/activemq: activemq-broker-blueprint/pom.xml activemq-broker-blueprint/src/main/history/dependencies.xml geronimo-activemq-blueprint/pom.xml pom.xml
Date Tue, 23 Feb 2010 02:10:49 GMT
Author: djencks
Date: Tue Feb 23 02:10:48 2010
New Revision: 915136

URL: http://svn.apache.org/viewvc?rev=915136&view=rev
Log:
minor cleanups to try to reduce dependency creep

Modified:
    geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml
    geronimo/server/trunk/plugins/activemq/pom.xml

Modified: geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/pom.xml?rev=915136&r1=915135&r2=915136&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/pom.xml Tue Feb 23 02:10:48
2010
@@ -99,8 +99,8 @@
                     <category>JMS</category>
                     <instance>
                         <plugin-artifact>
-                            <copy-file relative-to="server" dest-dir="var/activemq/conf">activemq.xml</copy-file>
-                            <copy-file relative-to="server" dest-dir="var/activemq/template">activemq-template.xml</copy-file>
+                            <!--<copy-file relative-to="server" dest-dir="var/activemq/conf">activemq.xml</copy-file>-->
+                            <!--<copy-file relative-to="server" dest-dir="var/activemq/template">activemq-template.xml</copy-file>-->
                             <copy-file relative-to="geronimo" dest-dir="etc">etc/blueprint-activemq-placeholder.cfg</copy-file>
                             <!--
                             <config-xml-content>

Modified: geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml?rev=915136&r1=915135&r2=915136&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml
Tue Feb 23 02:10:48 2010
@@ -58,11 +58,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.felix</groupId>
-        <artifactId>org.osgi.compendium</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.felix</groupId>
         <artifactId>org.osgi.core</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml?rev=915136&r1=915135&r2=915136&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml Tue Feb 23
02:10:48 2010
@@ -121,11 +121,13 @@
             <groupId>org.apache.felix</groupId>
             <artifactId>org.osgi.core</artifactId>
             <version>1.4.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <version>1.4.0</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/pom.xml?rev=915136&r1=915135&r2=915136&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/pom.xml Tue Feb 23 02:10:48 2010
@@ -100,6 +100,10 @@
                         <groupId>org.springframework.osgi</groupId>
                         <artifactId>spring-osgi-io</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.osgi</groupId>
+                        <artifactId>osgi.core</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 



Mime
View raw message