[jboss-svn-commits] JBL Code SVN: r33608 - in labs/jbossrules/trunk: drools-container/drools-spring and 6 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed Jun 23 13:48:13 EDT 2010


Author: baunax
Date: 2010-06-23 13:48:12 -0400 (Wed, 23 Jun 2010)
New Revision: 33608

Modified:
   labs/jbossrules/trunk/drools-container/drools-spring/pom.xml
   labs/jbossrules/trunk/drools-pipeline/drools-camel/pom.xml
   labs/jbossrules/trunk/drools-planner/drools-planner-core/pom.xml
   labs/jbossrules/trunk/drools-planner/drools-planner-examples/pom.xml
   labs/jbossrules/trunk/drools-process/drools-bpmn2/pom.xml
   labs/jbossrules/trunk/drools-repository/pom.xml
   labs/jbossrules/trunk/drools-server/drools-server-app/pom.xml
   labs/jbossrules/trunk/pom.xml
Log:
JBRULES-2555 Update all references to slf4j to version 1.6.0
	- updated poms that references slf4j to use master pom version

Modified: labs/jbossrules/trunk/drools-container/drools-spring/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/pom.xml	2010-06-23 16:06:29 UTC (rev 33607)
+++ labs/jbossrules/trunk/drools-container/drools-spring/pom.xml	2010-06-23 17:48:12 UTC (rev 33608)
@@ -91,7 +91,6 @@
     	 <dependency>
         	<groupId>org.slf4j</groupId>
         	<artifactId>slf4j-log4j12</artifactId>
-        	<version>1.5.2</version>
         	<scope>test</scope>
         </dependency>
     	 <dependency>

Modified: labs/jbossrules/trunk/drools-pipeline/drools-camel/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-pipeline/drools-camel/pom.xml	2010-06-23 16:06:29 UTC (rev 33607)
+++ labs/jbossrules/trunk/drools-pipeline/drools-camel/pom.xml	2010-06-23 17:48:12 UTC (rev 33608)
@@ -85,7 +85,6 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.5.2</version>
 			<scope>test</scope>
 		</dependency>
     </dependencies>

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-core/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-core/pom.xml	2010-06-23 16:06:29 UTC (rev 33607)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-core/pom.xml	2010-06-23 17:48:12 UTC (rev 33608)
@@ -49,14 +49,8 @@
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
     </dependency>
+     <!-- Xstream -->
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>test</scope>
-      <!-- Because of direct use for the namespaced logging config -->
-    </dependency>
-    <!-- Xstream -->
-    <dependency>
       <groupId>com.thoughtworks.xstream</groupId>
       <artifactId>xstream</artifactId>
     </dependency>

Modified: labs/jbossrules/trunk/drools-planner/drools-planner-examples/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-planner/drools-planner-examples/pom.xml	2010-06-23 16:06:29 UTC (rev 33607)
+++ labs/jbossrules/trunk/drools-planner/drools-planner-examples/pom.xml	2010-06-23 17:48:12 UTC (rev 33608)
@@ -67,28 +67,15 @@
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-    </dependency>
     <!-- Logging -->
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.5.10</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.5.3</version>
-      <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>compile</scope>
-      <!-- Because of direct use for the namespaced logging config -->
-    </dependency>
     <!-- Xstream -->
     <dependency>
       <groupId>com.thoughtworks.xstream</groupId>

Modified: labs/jbossrules/trunk/drools-process/drools-bpmn2/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpmn2/pom.xml	2010-06-23 16:06:29 UTC (rev 33607)
+++ labs/jbossrules/trunk/drools-process/drools-bpmn2/pom.xml	2010-06-23 17:48:12 UTC (rev 33608)
@@ -139,7 +139,6 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.5.2</version>
       <scope>test</scope>
     </dependency>    
     <dependency>

Modified: labs/jbossrules/trunk/drools-repository/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-repository/pom.xml	2010-06-23 16:06:29 UTC (rev 33607)
+++ labs/jbossrules/trunk/drools-repository/pom.xml	2010-06-23 17:48:12 UTC (rev 33608)
@@ -57,13 +57,9 @@
       <dependency>
          <groupId>org.slf4j</groupId>
          <artifactId>slf4j-log4j12</artifactId>
-         <scope>runtime</scope>
+         <scope>test</scope>
       </dependency>
       <dependency>
-         <groupId>log4j</groupId>
-         <artifactId>log4j</artifactId>
-      </dependency>
-      <dependency>
          <groupId>org.hsqldb</groupId>
          <artifactId>hsqldb</artifactId>
       </dependency>

Modified: labs/jbossrules/trunk/drools-server/drools-server-app/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-server/drools-server-app/pom.xml	2010-06-23 16:06:29 UTC (rev 33607)
+++ labs/jbossrules/trunk/drools-server/drools-server-app/pom.xml	2010-06-23 17:48:12 UTC (rev 33608)
@@ -127,7 +127,6 @@
 	<dependency>
 	  	<groupId>org.slf4j</groupId>
 	  	<artifactId>slf4j-log4j12</artifactId>
-	  	<version>1.5.2</version>
 	</dependency>
 
 	<!-- web app deps -->

Modified: labs/jbossrules/trunk/pom.xml
===================================================================
--- labs/jbossrules/trunk/pom.xml	2010-06-23 16:06:29 UTC (rev 33607)
+++ labs/jbossrules/trunk/pom.xml	2010-06-23 17:48:12 UTC (rev 33608)
@@ -145,35 +145,35 @@
       <name>JBoss Inc.</name>
       <url>http://www.jboss.org/</url>
    </organization>
-   <repositories>
-        <repository>
-          <id>jboss-public-repository-group</id>
-          <name>JBoss Public Maven Repository Group</name>
-          <url>https://repository.jboss.org/nexus/content/groups/public/</url>
-          <layout>default</layout>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </snapshots>
-        </repository>
-      <repository>
-          <id>jboss-deprecated</id>
-          <name>JBoss Deprecated</name>
-          <url>https://repository.jboss.org/nexus/content/repositories/deprecated/</url>
-          <layout>default</layout>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
+   <repositories>
+        <repository>
+          <id>jboss-public-repository-group</id>
+          <name>JBoss Public Maven Repository Group</name>
+          <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+          <layout>default</layout>
+          <releases>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </snapshots>
         </repository>
       <repository>
+          <id>jboss-deprecated</id>
+          <name>JBoss Deprecated</name>
+          <url>https://repository.jboss.org/nexus/content/repositories/deprecated/</url>
+          <layout>default</layout>
+          <releases>
+            <enabled>true</enabled>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </repository>
+      <repository>
          <!-- used by mvel to publish snapshots -->
          <id>codehaus-snapshot</id>
          <url>http://snapshots.repository.codehaus.org</url>
@@ -614,7 +614,7 @@
                <configuration>
                   <descriptors>
                      <descriptor>src/main/assembly/pre-bin.xml</descriptor>
-                     <descriptor>src/main/assembly/bin.xml</descriptor>
+                     <descriptor>src/main/assembly/bin.xml</descriptor>
                      <descriptor>src/main/assembly/osgi-bundles.xml</descriptor>
                      <descriptor>src/main/assembly/guvnor.xml</descriptor>
                      <descriptor>src/main/assembly/src.xml</descriptor>
@@ -1270,33 +1270,16 @@
          </dependency>
          <!-- Logging for drools-repository and drools-planner -->
             <dependency>
-
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
-                <version>1.5.10</version>
+                <version>1.6.0</version>
             </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-log4j12</artifactId>
 
-                <version>1.5.10</version>
-                <!--<scope>runtime</scope> TODO default me on runtime-->
-            </dependency>
-       <dependency>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
-                <version>1.2.14</version>
-
-                <!--<scope>runtime</scope> TODO default me on runtime-->
-            </dependency>
-			
-
-         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>com.springsource.slf4j.juli</artifactId>
-            <version>1.5.10</version>
-         </dependency>
-
+	      <dependency>
+			 <groupId>org.slf4j</groupId>
+			 <artifactId>slf4j-log4j12</artifactId>
+			 <version>1.6.0</version>
+	      </dependency>
          <!-- drools-repository -->
          <dependency>
             <groupId>org.apache.jackrabbit</groupId>



More information about the jboss-svn-commits mailing list