[jboss-svn-commits] JBL Code SVN: r33611 - in labs/jbossrules/trunk/osgi-bundles: org.drools.osgi.test/src/test/resources/org/drools/osgi/integrationtests and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: baunax
Date: 2010-06-23 13:49:52 -0400 (Wed, 23 Jun 2010)
New Revision: 33611

Modified:
   labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/org/drools/osgi/integrationtests/BPMN2-MinimalProcess.xml
   labs/jbossrules/trunk/osgi-bundles/pom.xml
Log:
JBRULES-2555 Update all references to slf4j to version 1.6.0
	- removed slf4j beacuse they are already osgizated in version 1.6
	- updated xml prolog in BPMN2-MinimalProcess.xml

Modified: labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/org/drools/osgi/integrationtests/BPMN2-MinimalProcess.xml
===================================================================
--- labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/org/drools/osgi/integrationtests/BPMN2-MinimalProcess.xml	2010-06-23 17:49:21 UTC (rev 33610)
+++ labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/org/drools/osgi/integrationtests/BPMN2-MinimalProcess.xml	2010-06-23 17:49:52 UTC (rev 33611)
@@ -3,10 +3,10 @@
              targetNamespace="http://www.example.org/MinimalExample"
              typeLanguage="http://www.java.com/javaTypes"
              expressionLanguage="http://www.mvel.org/2.0"
-             xmlns="http://schema.omg.org/spec/BPMN/2.0"
+             xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
              xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
-             xs:schemaLocation="http://schema.omg.org/spec/BPMN/2.0 BPMN20.xsd"
-             xmlns:tns="http://www.jboss.org/drools">
+             xs:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd"
+             xmlns:tns="http://www.example.org/MinimalExample">
 
   <process id="Minimal" name="Minimal Process" processType="executable" tns:packageName="com.sample">
     <startEvent id="_1" name="StartProcess"/>

Modified: labs/jbossrules/trunk/osgi-bundles/pom.xml
===================================================================
--- labs/jbossrules/trunk/osgi-bundles/pom.xml	2010-06-23 17:49:21 UTC (rev 33610)
+++ labs/jbossrules/trunk/osgi-bundles/pom.xml	2010-06-23 17:49:52 UTC (rev 33611)
@@ -23,7 +23,7 @@
     </repository>   
   </repositories-->
   	<properties>
-		<slf4j.version>1.5.10</slf4j.version>
+		<slf4j.version>1.6.0</slf4j.version>
 		<spring.maven.artifact.version>3.0.0.RELEASE</spring.maven.artifact.version>
 		<spring.osgi.version>1.2.1</spring.osgi.version>
 		<equinox.ver>3.5</equinox.ver>		
@@ -34,7 +34,7 @@
       <module>jxls/org.drools.osgi.wrapper.jxls-reader</module>
       <module>org.milyn/org.drools.osgi.wrapper.milyn-smooks-javabean</module>
       <module>org.mvel/org.drools.osgi.wrapper.mvel2</module>
-	  <module>org.drools.osgi.test</module>
+      <module>org.drools.osgi.test</module>
    </modules>
    <build>
       <plugins>
@@ -344,28 +344,11 @@
 		 <artifactId>com.springsource.org.jvnet.staxex</artifactId>  
 		 <version>1.0.0</version> 
       </dependency>	  
-	  
-	  <!-- Logging -->
-	 <dependency>
-		  <groupId>org.slf4j</groupId>
-		  <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
-		  <version>${slf4j.version}</version>
-	 </dependency>	  
-      <dependency>
-         <groupId>org.slf4j</groupId>
-         <artifactId>com.springsource.slf4j.api</artifactId>
-         <version>1.5.10</version>
-      </dependency>
-      <dependency>
-         <groupId>org.slf4j</groupId>
-         <artifactId>com.springsource.slf4j.log4j</artifactId>
-         <version>1.5.3</version>
-      </dependency>
-      <dependency>
+      <!--dependency>
          <groupId>org.apache.commons</groupId>
          <artifactId>com.springsource.org.apache.commons.logging</artifactId>
-         <version>1.1.1</version>
-      </dependency>	  
+		 <version>${slf4j.version}</version>
+      </dependency-->	  
       <!--dependency>
          <groupId>org.slf4j</groupId>
          <artifactId>com.springsource.slf4j.juli</artifactId>
@@ -374,7 +357,7 @@
       <dependency>
          <groupId>org.apache.log4j</groupId>
          <artifactId>com.springsource.org.apache.log4j</artifactId>
-         <version>1.2.15</version>
+		 <version>1.2.15</version>
       </dependency>
 	  
 	  <!-- Apache Commons -->