You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by dj...@apache.org on 2011/04/17 00:13:30 UTC

svn commit: r1094067 - in /karaf/trunk: admin/management/pom.xml assemblies/features/framework/pom.xml assemblies/features/full/pom.xml diagnostic/management/pom.xml pom.xml

Author: djencks
Date: Sat Apr 16 22:13:29 2011
New Revision: 1094067

URL: http://svn.apache.org/viewvc?rev=1094067&view=rev
Log:
KARAF-510 adjust dependencies so ssh and management feature jars only appear in those features

Modified:
    karaf/trunk/admin/management/pom.xml
    karaf/trunk/assemblies/features/framework/pom.xml
    karaf/trunk/assemblies/features/full/pom.xml
    karaf/trunk/diagnostic/management/pom.xml
    karaf/trunk/pom.xml

Modified: karaf/trunk/admin/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/admin/management/pom.xml?rev=1094067&r1=1094066&r2=1094067&view=diff
==============================================================================
--- karaf/trunk/admin/management/pom.xml (original)
+++ karaf/trunk/admin/management/pom.xml Sat Apr 16 22:13:29 2011
@@ -55,11 +55,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.karaf</groupId>
-            <artifactId>org.apache.karaf.management</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymockclassextension</artifactId>
             <version>${easymock.version}</version>

Modified: karaf/trunk/assemblies/features/framework/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/pom.xml?rev=1094067&r1=1094066&r2=1094067&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/pom.xml (original)
+++ karaf/trunk/assemblies/features/framework/pom.xml Sat Apr 16 22:13:29 2011
@@ -187,26 +187,6 @@
             <artifactId>org.apache.servicemix.bundles.asm</artifactId>
         </dependency>
 
-        <!-- management feature -->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf</groupId>-->
-            <!--<artifactId>org.apache.karaf.management</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.aries.jmx</groupId>-->
-            <!--<artifactId>org.apache.aries.jmx</artifactId>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.aries.jmx</groupId>-->
-            <!--<artifactId>org.apache.aries.jmx.blueprint</artifactId>-->
-        <!--</dependency>-->
-
-        <!-- config feature -->
-        <!--<dependency>-->
-            <!--<groupId>org.apache.karaf.shell</groupId>-->
-            <!--<artifactId>org.apache.karaf.shell.config</artifactId>-->
-        <!--</dependency>-->
-
     </dependencies>
     <build>
         <resources>

Modified: karaf/trunk/assemblies/features/full/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/full/pom.xml?rev=1094067&r1=1094066&r2=1094067&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/full/pom.xml (original)
+++ karaf/trunk/assemblies/features/full/pom.xml Sat Apr 16 22:13:29 2011
@@ -70,10 +70,6 @@
             <groupId>org.apache.karaf.deployer</groupId>
             <artifactId>org.apache.karaf.deployer.wrap</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.ssh</artifactId>
-        </dependency>
     </dependencies>
     <build>
         <resources>

Modified: karaf/trunk/diagnostic/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/diagnostic/management/pom.xml?rev=1094067&r1=1094066&r2=1094067&view=diff
==============================================================================
--- karaf/trunk/diagnostic/management/pom.xml (original)
+++ karaf/trunk/diagnostic/management/pom.xml Sat Apr 16 22:13:29 2011
@@ -51,10 +51,6 @@
             <groupId>org.apache.karaf.diagnostic</groupId>
             <artifactId>org.apache.karaf.diagnostic.core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.karaf</groupId>
-            <artifactId>org.apache.karaf.management</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1094067&r1=1094066&r2=1094067&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Sat Apr 16 22:13:29 2011
@@ -909,11 +909,6 @@
                 <version>${pax.url.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.ops4j.pax.url</groupId>
-                <artifactId>pax-url-aether</artifactId>
-                <version>${pax.url.version}</version>
-            </dependency>
-            <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-servlet_2.5_spec</artifactId>
                 <version>${geronimo.servlet.version}</version>
@@ -1265,6 +1260,11 @@
                     <artifactId>maven-site-plugin</artifactId>
                     <version>3.0-beta-3</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.karaf.tooling</groupId>
+                    <artifactId>karaf-maven-plugin</artifactId>
+                    <version>3.0.0-SNAPSHOT</version>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>