geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r922141 - in /geronimo/server/trunk: framework/configs/karaf-framework/pom.xml framework/pom.xml pom.xml
Date Fri, 12 Mar 2010 05:08:29 GMT
Author: gawor
Date: Fri Mar 12 05:08:29 2010
New Revision: 922141

URL: http://svn.apache.org/viewvc?rev=922141&view=rev
Log:
move shell dependency to root pom

Modified:
    geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
    geronimo/server/trunk/framework/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/pom.xml?rev=922141&r1=922140&r2=922141&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Fri Mar 12 05:08:29 2010
@@ -147,18 +147,6 @@
 
             <dependency>
                 <groupId>org.apache.felix.karaf.shell</groupId>
-                <artifactId>org.apache.felix.karaf.shell.console</artifactId>
-                <version>${felix.karaf.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>jline</groupId>
-                        <artifactId>jline</artifactId>
-                    </exclusion>
-               </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.felix.karaf.shell</groupId>
                 <artifactId>org.apache.felix.karaf.shell.log</artifactId>
                 <version>${felix.karaf.version}</version>
                 <exclusions>

Modified: geronimo/server/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/pom.xml?rev=922141&r1=922140&r2=922141&view=diff
==============================================================================
--- geronimo/server/trunk/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/pom.xml Fri Mar 12 05:08:29 2010
@@ -117,11 +117,6 @@
                 <version>1.5.0-SNAPSHOT</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.felix.karaf.shell</groupId>
-                <artifactId>org.apache.felix.karaf.shell.console</artifactId>
-                <version>1.5.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
                 <groupId>org.ops4j.pax.exam</groupId>
                 <artifactId>pax-exam</artifactId>
                 <version>1.0.0</version>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=922141&r1=922140&r2=922141&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Fri Mar 12 05:08:29 2010
@@ -1908,17 +1908,28 @@ only found in cxf
                 <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.compendium</artifactId>
                 <version>4.2.0</version>
-                <!--<exclusions>-->
-                    <!--<exclusion>-->
-                        <!--<groupId>org.apache.felix</groupId>-->
-                        <!--<artifactId>org.osgi.foundation</artifactId>-->
-                    <!--</exclusion>-->
-                    <!--<exclusion>-->
-                        <!--<groupId>org.apache.felix</groupId>-->
-                        <!--<artifactId>javax.servlet</artifactId>-->
-                    <!--</exclusion>-->
-                <!--</exclusions>-->
             </dependency>
+
+            <dependency>
+                <groupId>org.apache.felix.karaf.shell</groupId>
+                <artifactId>org.apache.felix.karaf.shell.console</artifactId>
+                <version>1.5.0-SNAPSHOT</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>jline</groupId>
+                        <artifactId>jline</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.fusesource.jansi</groupId>
+                        <artifactId>jansi</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.aries.blueprint</groupId>
+                        <artifactId>org.apache.aries.blueprint</artifactId>
+                    </exclusion>
+               </exclusions>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 



Mime
View raw message