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

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

Author: mark.proctor at jboss.com
Date: 2010-07-20 07:06:59 -0400 (Tue, 20 Jul 2010)
New Revision: 34061

Modified:
   labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/boot-bundles.properties
   labs/jbossrules/trunk/osgi-bundles/pom.xml
Log:
-more osgi fixes, making sure jars are pulled that the test specifies.

Modified: labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/boot-bundles.properties
===================================================================
--- labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/boot-bundles.properties	2010-07-20 11:02:30 UTC (rev 34060)
+++ labs/jbossrules/trunk/osgi-bundles/org.drools.osgi.test/src/test/resources/boot-bundles.properties	2010-07-20 11:06:59 UTC (rev 34061)
@@ -60,7 +60,8 @@
 org.apache.log4j,com.springsource.org.apache.log4j,1.2.15
 org.apache.commons,com.springsource.org.apache.commons.logging,1.1.1
 org.slf4j,com.springsource.slf4j.api,1.5.10
-org.slf4j,com.springsource.slf4j.log4j,1.5.3
+org.slf4j,com.springsource.slf4j.log4j,1.5.10
+org.slf4j,com.springsource.slf4j.jcl,1.5.10
 org.jboss.logging,com.springsource.org.jboss.logging,2.0.5.GA
 
 org.jboss.util,com.springsource.org.jboss.util,2.2.13.GA

Modified: labs/jbossrules/trunk/osgi-bundles/pom.xml
===================================================================
--- labs/jbossrules/trunk/osgi-bundles/pom.xml	2010-07-20 11:02:30 UTC (rev 34060)
+++ labs/jbossrules/trunk/osgi-bundles/pom.xml	2010-07-20 11:06:59 UTC (rev 34061)
@@ -23,7 +23,7 @@
     </repository>   
   </repositories-->
   	<properties>
-		<slf4j.version>1.6.0</slf4j.version>
+        <slf4j.version>1.5.10</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.1</equinox.ver>		
@@ -343,22 +343,45 @@
 		 <artifactId>com.springsource.org.jvnet.staxex</artifactId>  
 		 <version>1.0.0</version> 
       </dependency>	  
-      <!--dependency>
+	  
+	<dependency>  
+	   <groupId>org.apache.log4j</groupId>  
+	   <artifactId>com.springsource.org.apache.log4j</artifactId>  
+	   <version>1.2.15</version> 
+	</dependency>
+	  
+      <dependency>
          <groupId>org.apache.commons</groupId>
          <artifactId>com.springsource.org.apache.commons.logging</artifactId>
-		 <version>${slf4j.version}</version>
-      </dependency-->	  
+		 <version>1.1.1</version>
+      </dependency>	 
+	  
+	<dependency>  
+	   <groupId>org.slf4j</groupId>  
+	   <artifactId>com.springsource.slf4j.api</artifactId>  
+	   <version>${slf4j.version}</version> 
+	</dependency>
+	  
+	<dependency>  
+	   <groupId>org.slf4j</groupId>  
+	   <artifactId>com.springsource.slf4j.log4j</artifactId>  
+	   <version>${slf4j.version}</version> 
+	</dependency>	
+	
+	<dependency>  
+	   <groupId>org.slf4j</groupId>  
+	   <artifactId>com.springsource.slf4j.jcl</artifactId>  
+	   <version>${slf4j.version}</version> 
+	</dependency>	
+	
       <!--dependency>
          <groupId>org.slf4j</groupId>
          <artifactId>com.springsource.slf4j.juli</artifactId>
          <version>1.5.10</version>
       </dependency-->
-      <dependency>
-         <groupId>org.apache.log4j</groupId>
-         <artifactId>com.springsource.org.apache.log4j</artifactId>
-		 <version>1.2.15</version>
-      </dependency>
-	  
+
+  
+
 	  <!-- Apache Commons -->
       <dependency>
          <groupId>org.apache.commons</groupId>