[jboss-cvs] JBossAS SVN: r85554 - in branches/Branch_5_x: component-matrix and 3 other directories.

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

Author: david.lloyd at jboss.com
Date: 2009-03-06 12:07:23 -0500 (Fri, 06 Mar 2009)
New Revision: 85554

Modified:
   branches/Branch_5_x/build/build-distr.xml
   branches/Branch_5_x/component-matrix/pom.xml
   branches/Branch_5_x/main/pom.xml
   branches/Branch_5_x/main/src/main/org/jboss/system/server/ServerLoader.java
   branches/Branch_5_x/thirdparty/pom.xml
Log:
Move to jboss-logbridge 1.0.0.CR2, jboss-logging-log4j 2.0.6.GA

Modified: branches/Branch_5_x/build/build-distr.xml
===================================================================
--- branches/Branch_5_x/build/build-distr.xml	2009-03-06 16:54:04 UTC (rev 85553)
+++ branches/Branch_5_x/build/build-distr.xml	2009-03-06 17:07:23 UTC (rev 85554)
@@ -1960,7 +1960,7 @@
         <exclude name="*-sources.jar"/>
       </fileset>
       <fileset dir="${org.jboss.logbridge.lib}">
-        <include name="logbridge.jar"/>
+        <include name="jboss-logbridge.jar"/>
       </fileset>
       <fileset dir="${org.jboss.logmanager.lib}">
         <include name="jboss-logmanager.jar"/>

Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml	2009-03-06 16:54:04 UTC (rev 85553)
+++ branches/Branch_5_x/component-matrix/pom.xml	2009-03-06 17:07:23 UTC (rev 85554)
@@ -71,7 +71,7 @@
     <version.org.jboss.integration>5.1.0.CR1</version.org.jboss.integration>
     <version.org.jboss.jbossxb>2.0.0.GA</version.org.jboss.jbossxb>
     <version.org.jboss.jpa>1.0.0-CR1</version.org.jboss.jpa>
-    <version.org.jboss.logbridge>1.0.0.CR1</version.org.jboss.logbridge>
+    <version.org.jboss.logbridge>1.0.0.CR2</version.org.jboss.logbridge>
     <version.org.jboss.logmanager>1.0.0.CR1</version.org.jboss.logmanager>
     <version.org.jboss.man>2.1.0.CR3</version.org.jboss.man>
     <version.org.jboss.mdr>2.0.1.GA</version.org.jboss.mdr>
@@ -607,7 +607,7 @@
       <dependency>
         <groupId>org.jboss.logging</groupId>
         <artifactId>jboss-logging-log4j</artifactId>
-        <version>2.0.5.GA</version>
+        <version>2.0.6.GA</version>
         <exclusions>
           <exclusion>
             <groupId>apache-log4j</groupId>
@@ -618,7 +618,7 @@
 
       <dependency>
         <groupId>org.jboss.logbridge</groupId>
-        <artifactId>logbridge</artifactId>
+        <artifactId>jboss-logbridge</artifactId>
         <version>${version.org.jboss.logbridge}</version>
         <exclusions>
           <exclusion>

Modified: branches/Branch_5_x/main/pom.xml
===================================================================
--- branches/Branch_5_x/main/pom.xml	2009-03-06 16:54:04 UTC (rev 85553)
+++ branches/Branch_5_x/main/pom.xml	2009-03-06 17:07:23 UTC (rev 85554)
@@ -67,7 +67,7 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.logbridge</groupId>
-      <artifactId>logbridge</artifactId>
+      <artifactId>jboss-logbridge</artifactId>
     </dependency>
   </dependencies>
   

Modified: branches/Branch_5_x/main/src/main/org/jboss/system/server/ServerLoader.java
===================================================================
--- branches/Branch_5_x/main/src/main/org/jboss/system/server/ServerLoader.java	2009-03-06 16:54:04 UTC (rev 85553)
+++ branches/Branch_5_x/main/src/main/org/jboss/system/server/ServerLoader.java	2009-03-06 17:07:23 UTC (rev 85554)
@@ -88,7 +88,7 @@
       "jboss-logging-log4j.jar",
       "jboss-logging-jdk.jar",
       "jboss-logmanager.jar",
-      "logbridge.jar",
+      "jboss-logbridge.jar",
       // Common jars
       "jboss-common-core.jar",
       "jboss-xml-binding.jar",

Modified: branches/Branch_5_x/thirdparty/pom.xml
===================================================================
--- branches/Branch_5_x/thirdparty/pom.xml	2009-03-06 16:54:04 UTC (rev 85553)
+++ branches/Branch_5_x/thirdparty/pom.xml	2009-03-06 17:07:23 UTC (rev 85554)
@@ -1359,7 +1359,7 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.logbridge</groupId>
-      <artifactId>logbridge</artifactId>
+      <artifactId>jboss-logbridge</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jboss.logmanager</groupId>