servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r1076598 - in /servicemix/smx4/nmr/trunk: assembly/pom.xml jbi/itests/pom.xml jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java pom.xml
Date Thu, 03 Mar 2011 12:18:22 GMT
Author: gertv
Date: Thu Mar  3 12:18:21 2011
New Revision: 1076598

URL: http://svn.apache.org/viewvc?rev=1076598&view=rev
Log:
SMX4NMR-256: Use 'import' scope to reduce number of managed dependencies

Modified:
    servicemix/smx4/nmr/trunk/assembly/pom.xml
    servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
    servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java
    servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java
    servicemix/smx4/nmr/trunk/pom.xml

Modified: servicemix/smx4/nmr/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/pom.xml?rev=1076598&r1=1076597&r2=1076598&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/pom.xml Thu Mar  3 12:18:21 2011
@@ -33,18 +33,8 @@
     <name>Apache ServiceMix :: NMR :: Assembly</name>
 
     <dependencies>
-    
-        <!-- Karaf (distribution and feature) -->
-        <dependency>
-            <groupId>org.apache.karaf</groupId>
-            <artifactId>apache-karaf</artifactId>
-            <type>tar.gz</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf</groupId>
-            <artifactId>apache-karaf</artifactId>
-            <type>zip</type>
-        </dependency>
+
+        <!-- Karaf (distribution and features) -->
         <dependency>
             <groupId>org.apache.karaf.assemblies.features</groupId>
             <artifactId>standard</artifactId>
@@ -57,117 +47,7 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        
-        <!-- Aries -->
-        <dependency>
-            <groupId>org.apache.aries.transaction</groupId>
-            <artifactId>org.apache.aries.transaction.manager</artifactId>
-        </dependency>
-        
-        <!-- ServiceMix NMR -->
-        <dependency>
-            <groupId>org.apache.servicemix.nmr</groupId>
-            <artifactId>org.apache.servicemix.nmr.api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.nmr</groupId>
-            <artifactId>org.apache.servicemix.nmr.branding</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.nmr</groupId>
-            <artifactId>org.apache.servicemix.nmr.commands</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.nmr</groupId>
-            <artifactId>org.apache.servicemix.nmr.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.nmr</groupId>
-            <artifactId>org.apache.servicemix.nmr.management</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.nmr</groupId>
-            <artifactId>org.apache.servicemix.nmr.osgi</artifactId>
-        </dependency>
-        
-        <!-- ServiceMix NMR Document -->
-        <dependency>
-            <groupId>org.apache.servicemix.document</groupId>
-            <artifactId>org.apache.servicemix.document</artifactId>
-        </dependency>
-        
-        <!-- ServiceMix NMR JBI -->
-        <dependency>
-            <groupId>org.apache.servicemix.jbi</groupId>
-            <artifactId>org.apache.servicemix.jbi.commands</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.jbi</groupId>
-            <artifactId>org.apache.servicemix.jbi.deployer</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.jbi</groupId>
-            <artifactId>org.apache.servicemix.jbi.osgi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.jbi</groupId>
-            <artifactId>org.apache.servicemix.jbi.runtime</artifactId>
-        </dependency>
-        
-        <!-- ServiceMix NMR Naming -->
-        <dependency>
-            <groupId>org.apache.servicemix.naming</groupId>
-            <artifactId>org.apache.servicemix.naming</artifactId>
-        </dependency>
-        
-        <!-- ServiceMix Specs -->
-        <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
-        </dependency>
-        
-        <!-- ServiceMix Common and Utils -->
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-utils</artifactId>
-        </dependency>
-        
-        <!-- ServiceMix Bundle Feature Dependencies -->
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.ant</artifactId>
-        </dependency>
-        
-        <!-- Other Dependencies -->
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>stax2-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>woodstox-core-asl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.fusesource.commonman</groupId>
-            <artifactId>commons-management</artifactId>    
-        </dependency>
-    
+
     </dependencies>
     
     <build>

Modified: servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/pom.xml?rev=1076598&r1=1076597&r2=1076598&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/pom.xml Thu Mar  3 12:18:21 2011
@@ -265,7 +265,7 @@
             <artifactId>sshd-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix.gogo</groupId>
+            <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.gogo.runtime</artifactId>
         </dependency>
         <dependency>

Modified: servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java?rev=1076598&r1=1076597&r2=1076598&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java
(original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/IntegrationTest.java
Thu Mar  3 12:18:21 2011
@@ -269,7 +269,7 @@ public class IntegrationTest extends Abs
             mavenBundle("org.apache.sshd", "sshd-core"),
             mavenBundle("org.apache.karaf", "org.apache.karaf.management"),
             mavenBundle("org.apache.karaf.jaas", "org.apache.karaf.jaas.config"),
-            mavenBundle("org.apache.felix.gogo", "org.apache.felix.gogo.runtime"),
+            mavenBundle("org.apache.felix", "org.apache.felix.gogo.runtime"),
             mavenBundle("org.apache.karaf.shell", "org.apache.karaf.shell.console"),
             mavenBundle("org.apache.karaf.shell", "org.apache.karaf.shell.osgi"),
             mavenBundle("org.apache.karaf.shell", "org.apache.karaf.shell.log").noStart(),

Modified: servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java?rev=1076598&r1=1076597&r2=1076598&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java
(original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java
Thu Mar  3 12:18:21 2011
@@ -288,7 +288,7 @@ public class ManagementTest extends Abst
             mavenBundle("org.apache.mina", "mina-core"),
             mavenBundle("org.apache.sshd", "sshd-core"),
             mavenBundle("org.apache.karaf.jaas", "org.apache.karaf.jaas.config"),
-            mavenBundle("org.apache.felix.gogo", "org.apache.felix.gogo.runtime"),
+            mavenBundle("org.apache.felix", "org.apache.felix.gogo.runtime"),
             mavenBundle("org.apache.karaf.shell", "org.apache.karaf.shell.console"),
             mavenBundle("org.apache.karaf.shell", "org.apache.karaf.shell.osgi"),
             mavenBundle("org.apache.karaf.shell", "org.apache.karaf.shell.log").noStart(),

Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=1076598&r1=1076597&r2=1076598&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Thu Mar  3 12:18:21 2011
@@ -58,7 +58,7 @@
   </issueManagement>
 
   <prerequisites>
-      <maven>2.2.1</maven>
+      <maven>3.0.0</maven>
   </prerequisites>
 
   <properties>
@@ -66,18 +66,10 @@
       <sonar.skippedModules>examples</sonar.skippedModules>
 
       <!-- OSGi (Felix framework, Aries, Karaf, Equinox) -->
-      <aries.proxy.version>0.3</aries.proxy.version>
-      <aries.util.version>0.3</aries.util.version>
       <aries.transaction.version>0.3</aries.transaction.version>
-      <aries.blueprint.version>0.3</aries.blueprint.version>
-      <felix.configadmin.version>1.2.4</felix.configadmin.version>
-      <felix.framework.version>3.0.2</felix.framework.version>
-      <felix.fileinstall.version>3.0.2</felix.fileinstall.version>
-      <felix.gogo.version>0.4.0</felix.gogo.version>
       <felix.plugin.version>2.1.0</felix.plugin.version>
       <karaf.version>2.2.0</karaf.version>
-      <osgi.core.version>4.2.0</osgi.core.version>
-      
+
       <!-- ActiveMQ -->
       <activemq.version>5.4.2</activemq.version>
       
@@ -162,124 +154,34 @@
 
   <dependencyManagement>
     <dependencies>
-    
-        <!-- Aries -->
-        <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint</artifactId>
-            <version>${aries.blueprint.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries</groupId>
-            <artifactId>org.apache.aries.util</artifactId>
-            <version>${aries.util.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.proxy</groupId>
-            <artifactId>org.apache.aries.proxy</artifactId>
-            <version>${aries.proxy.version}</version>
-        </dependency>
+        <!-- Aries (bits not defined in Karaf pom.xm only) -->
         <dependency>
             <groupId>org.apache.aries.transaction</groupId>
             <artifactId>org.apache.aries.transaction.manager</artifactId>
             <version>${aries.transaction.version}</version>
         </dependency>
-    
+
         <!-- Karaf -->
         <dependency>
             <groupId>org.apache.karaf</groupId>
-            <artifactId>apache-karaf</artifactId>
+            <artifactId>karaf</artifactId>
             <version>${karaf.version}</version>
-            <type>tar.gz</type>
+            <type>pom</type>
+            <scope>import</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.karaf</groupId>
             <artifactId>apache-karaf</artifactId>
             <version>${karaf.version}</version>
-            <type>zip</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.assemblies.features</groupId>
-            <artifactId>standard</artifactId>
-            <version>${karaf.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.assemblies.features</groupId>
-            <artifactId>enterprise</artifactId>
-            <version>${karaf.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf</groupId>
-            <artifactId>org.apache.karaf.main</artifactId>
-            <version>${karaf.version}</version>
+            <type>tar.gz</type>
         </dependency>
         <dependency>
             <groupId>org.apache.karaf</groupId>
-            <artifactId>org.apache.karaf.management</artifactId>
-            <version>${karaf.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.jaas</groupId>
-            <artifactId>org.apache.karaf.jaas.boot</artifactId>
-            <version>${karaf.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.jaas</groupId>
-            <artifactId>org.apache.karaf.jaas.config</artifactId>
-            <version>${karaf.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.console</artifactId>
-            <version>${karaf.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.log</artifactId>
-            <version>${karaf.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.osgi</artifactId>
+            <artifactId>apache-karaf</artifactId>
             <version>${karaf.version}</version>
+            <type>zip</type>
         </dependency>
-        
-        <!-- Felix and OSGi -->
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.configadmin</artifactId>
-            <version>${felix.configadmin.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.fileinstall</artifactId>
-            <version>${felix.fileinstall.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.framework</artifactId>
-            <version>${felix.framework.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix.gogo</groupId>
-            <artifactId>org.apache.felix.gogo.runtime</artifactId>
-            <version>${felix.gogo.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <version>${osgi.core.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-            <version>${osgi.core.version}</version>
-        </dependency>
-        
+
         <!-- ServiceMix Legal -->
         <dependency>
             <groupId>org.apache.servicemix.legal</groupId>



Mime
View raw message