geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r886140 - in /geronimo/server/trunk: framework/configs/gshell-framework/src/main/history/dependencies.xml pom.xml
Date Wed, 02 Dec 2009 13:34:27 GMT
Author: rickmcguire
Date: Wed Dec  2 13:34:26 2009
New Revision: 886140

URL: http://svn.apache.org/viewvc?rev=886140&view=rev
Log:
remove slf4j dependencies from gshell to suppress unresolved constaint errors

Modified:
    geronimo/server/trunk/framework/configs/gshell-framework/src/main/history/dependencies.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/framework/configs/gshell-framework/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/gshell-framework/src/main/history/dependencies.xml?rev=886140&r1=886139&r2=886140&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/gshell-framework/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/gshell-framework/src/main/history/dependencies.xml
Wed Dec  2 13:34:26 2009
@@ -97,11 +97,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>xpp3</groupId>
         <artifactId>xpp3_min</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=886140&r1=886139&r2=886140&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed Dec  2 13:34:26 2009
@@ -677,15 +677,16 @@
             </dependency>
 
             <!-- SLF4J support - used by Server and GShell -->
+
             <dependency>
                 <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
+                <artifactId>slf4j-simple</artifactId>
                 <version>1.5.5</version>
             </dependency>
 
             <dependency>
                 <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-simple</artifactId>
+                <artifactId>slf4j-api</artifactId>
                 <version>1.5.5</version>
             </dependency>
 
@@ -1320,7 +1321,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-concurrent_1.0_spec</artifactId>
-                <version>1.0-EA</version>
+                <version>1.1-EA-SNAPSHOT</version>
             </dependency>
 
             <dependency>
@@ -1678,30 +1679,60 @@
                 <groupId>org.apache.geronimo.gshell</groupId>
                 <artifactId>gshell-bootstrap</artifactId>
                 <version>1.0-alpha-1</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.geronimo.gshell</groupId>
                 <artifactId>gshell-cli</artifactId>
                 <version>1.0-alpha-1</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.geronimo.gshell</groupId>
                 <artifactId>gshell-command-api</artifactId>
                 <version>1.0-alpha-1</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.geronimo.gshell</groupId>
                 <artifactId>gshell-core</artifactId>
                 <version>1.0-alpha-1</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.geronimo.gshell.commands</groupId>
                 <artifactId>gshell-builtins</artifactId>
                 <version>1.0-alpha-1</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.slf4j</groupId>
+                        <artifactId>slf4j-api</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
@@ -2223,7 +2254,7 @@
                 <plugin>
                     <groupId>org.apache.geronimo.buildsupport</groupId>
                     <artifactId>geronimo-osgi-plugin</artifactId>
-                    <configuration> 
+                    <configuration>
                         <failOnError>false</failOnError>
                         <profileName>Geronimo-1.6.profile</profileName>
                     </configuration>
@@ -2275,7 +2306,7 @@
             </releases>
         </repository>
     </repositories>
-    
+
     <pluginRepositories>
         <!-- required for clean build unless you want to bootstrap the car-maven-plugin
-->
         <pluginRepository>



Mime
View raw message