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

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

Author: ALRubinger
Date: 2009-10-06 23:10:34 -0400 (Tue, 06 Oct 2009)
New Revision: 94444

Modified:
   branches/Branch_5_x/build/build-distr.xml
   branches/Branch_5_x/build/pom.xml
   branches/Branch_5_x/component-matrix/pom.xml
   branches/Branch_5_x/thirdparty/pom.xml
Log:
[JBAS-7289] Do not bring anything Embedded into AS itself; remove from the dep chain

Modified: branches/Branch_5_x/build/build-distr.xml
===================================================================
--- branches/Branch_5_x/build/build-distr.xml	2009-10-07 02:34:51 UTC (rev 94443)
+++ branches/Branch_5_x/build/build-distr.xml	2009-10-07 03:10:34 UTC (rev 94444)
@@ -1972,10 +1972,6 @@
         excludes="*-sources.jar, *-javadoc.jar" />
       <fileset dir="${jboss.jboss.bootstrap.impl.mc.lib}" includes="*.jar"
         excludes="*-sources.jar, *-javadoc.jar" />
-      <fileset dir="${jboss.jboss.bootstrap.api.embedded.lib}" includes="*.jar"
-        excludes="*-sources.jar, *-javadoc.jar" />
-      <fileset dir="${jboss.jboss.bootstrap.impl.embedded.lib}" includes="*.jar"
-        excludes="*-sources.jar, *-javadoc.jar" />
       <fileset dir="${jboss.common.core.lib}">
         <exclude name="*-sources.jar"/>
       </fileset>

Modified: branches/Branch_5_x/build/pom.xml
===================================================================
--- branches/Branch_5_x/build/pom.xml	2009-10-07 02:34:51 UTC (rev 94443)
+++ branches/Branch_5_x/build/pom.xml	2009-10-07 03:10:34 UTC (rev 94444)
@@ -22,7 +22,7 @@
     
     <dependency>
       <groupId>org.jboss.bootstrap</groupId>
-      <artifactId>jboss-bootstrap-impl-embedded</artifactId>
+      <artifactId>jboss-bootstrap-impl-as</artifactId>
     </dependency>
     
     <dependency>

Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml	2009-10-07 02:34:51 UTC (rev 94443)
+++ branches/Branch_5_x/component-matrix/pom.xml	2009-10-07 03:10:34 UTC (rev 94444)
@@ -58,11 +58,9 @@
     <version.org.jboss.aspects.security>1.0.1</version.org.jboss.aspects.security>
     <version.org.jboss.bootstrap.api>2.0.0-alpha-2</version.org.jboss.bootstrap.api>
     <version.org.jboss.bootstrap.api.as>2.0.0-alpha-2</version.org.jboss.bootstrap.api.as>
-    <version.org.jboss.bootstrap.api.embedded>2.0.0-alpha-1</version.org.jboss.bootstrap.api.embedded>
     <version.org.jboss.bootstrap.api.mc>2.0.0-alpha-1</version.org.jboss.bootstrap.api.mc>
     <version.org.jboss.bootstrap.impl.as>2.0.0-alpha-4</version.org.jboss.bootstrap.impl.as>
     <version.org.jboss.bootstrap.impl.base>2.0.0-alpha-4</version.org.jboss.bootstrap.impl.base>
-    <version.org.jboss.bootstrap.impl.embedded>2.0.0-alpha-1</version.org.jboss.bootstrap.impl.embedded>
     <version.org.jboss.bootstrap.impl.mc>2.0.0-alpha-3</version.org.jboss.bootstrap.impl.mc>
     <version.org.jboss.bootstrap.spi>2.0.0-alpha-3</version.org.jboss.bootstrap.spi>
     <version.org.jboss.bootstrap.spi.as>2.0.0-alpha-4</version.org.jboss.bootstrap.spi.as>
@@ -604,18 +602,6 @@
       </dependency>
       
       <dependency>
-        <groupId>org.jboss.bootstrap</groupId>
-        <artifactId>jboss-bootstrap-api-embedded</artifactId>
-        <version>${version.org.jboss.bootstrap.api.embedded}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.jboss.bootstrap</groupId>
-        <artifactId>jboss-bootstrap-impl-embedded</artifactId>
-        <version>${version.org.jboss.bootstrap.impl.embedded}</version>
-      </dependency>
-
-      <dependency>
         <groupId>org.jboss.logging</groupId>
         <artifactId>jboss-logging-spi</artifactId>
         <version>2.1.0.GA</version>

Modified: branches/Branch_5_x/thirdparty/pom.xml
===================================================================
--- branches/Branch_5_x/thirdparty/pom.xml	2009-10-07 02:34:51 UTC (rev 94443)
+++ branches/Branch_5_x/thirdparty/pom.xml	2009-10-07 03:10:34 UTC (rev 94444)
@@ -357,20 +357,6 @@
               </mapping>
             </dependency>
             <dependency>
-              <groupId>org.jboss.bootstrap</groupId>
-              <artifactId>jboss-bootstrap-api-embedded</artifactId>
-              <mapping>
-                <componentId>jboss.jboss-bootstrap-api-embedded</componentId>
-              </mapping>
-            </dependency>
-            <dependency>
-              <groupId>org.jboss.bootstrap</groupId>
-              <artifactId>jboss-bootstrap-impl-embedded</artifactId>
-              <mapping>
-                <componentId>jboss.jboss-bootstrap-impl-embedded</componentId>
-              </mapping>
-            </dependency>
-            <dependency>
               <groupId>org.jboss.cache</groupId>
               <artifactId>jbosscache-core</artifactId>
               <mapping>
@@ -1460,14 +1446,6 @@
       <groupId>org.jboss.bootstrap</groupId>
       <artifactId>jboss-bootstrap-spi-mc</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.jboss.bootstrap</groupId>
-      <artifactId>jboss-bootstrap-api-embedded</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.bootstrap</groupId>
-      <artifactId>jboss-bootstrap-impl-embedded</artifactId>
-    </dependency>
  
     <!-- Combined integration jar.  Maybe this can be removed when we just use the 
     -  individual compoennts -->