[jboss-cvs] JBossAS SVN: r104760 - in projects/kernel/trunk: aop-mc-int and 2 other directories.

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

Author: kabir.khan at jboss.com
Date: 2010-05-13 06:38:00 -0400 (Thu, 13 May 2010)
New Revision: 104760

Modified:
   projects/kernel/trunk/aop-mc-int/pom.xml
   projects/kernel/trunk/dependency/pom.xml
   projects/kernel/trunk/kernel/pom.xml
   projects/kernel/trunk/pom.xml
Log:
[JBKERNEL-120] Don't use artifacts from deprecated repository

Modified: projects/kernel/trunk/aop-mc-int/pom.xml
===================================================================
--- projects/kernel/trunk/aop-mc-int/pom.xml	2010-05-13 10:11:40 UTC (rev 104759)
+++ projects/kernel/trunk/aop-mc-int/pom.xml	2010-05-13 10:38:00 UTC (rev 104760)
@@ -297,6 +297,7 @@
       <groupId>javassist</groupId>
       <artifactId>javassist</artifactId>
     </dependency>
+    
     <!-- Test dependencies -->
     <dependency>
       <groupId>org.jboss.logging</groupId>

Modified: projects/kernel/trunk/dependency/pom.xml
===================================================================
--- projects/kernel/trunk/dependency/pom.xml	2010-05-13 10:11:40 UTC (rev 104759)
+++ projects/kernel/trunk/dependency/pom.xml	2010-05-13 10:38:00 UTC (rev 104760)
@@ -65,6 +65,7 @@
       <groupId>org.jboss</groupId>
       <artifactId>jboss-common-core</artifactId>
     </dependency>
+    
     <!-- Test dependencies -->
     <dependency>
       <groupId>org.jboss.logging</groupId>

Modified: projects/kernel/trunk/kernel/pom.xml
===================================================================
--- projects/kernel/trunk/kernel/pom.xml	2010-05-13 10:11:40 UTC (rev 104759)
+++ projects/kernel/trunk/kernel/pom.xml	2010-05-13 10:38:00 UTC (rev 104760)
@@ -128,7 +128,23 @@
       <groupId>org.jboss</groupId>
       <artifactId>jbossxb</artifactId>
     </dependency>
+
+    <!--  Dependencies overriding the ones excluded from jbossxb -->
     <dependency>
+      <groupId>com.wutka</groupId>
+      <artifactId>dtdparser</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+    </dependency>
+    <!--  END - Dependencies overriding the ones excluded from jbossxb -->
+    
+    <dependency>
       <groupId>javax.inject</groupId>
       <artifactId>javax.inject</artifactId>
     </dependency>

Modified: projects/kernel/trunk/pom.xml
===================================================================
--- projects/kernel/trunk/pom.xml	2010-05-13 10:11:40 UTC (rev 104759)
+++ projects/kernel/trunk/pom.xml	2010-05-13 10:38:00 UTC (rev 104760)
@@ -48,7 +48,7 @@
     <version.jbossxb>2.0.2.Beta7</version.jbossxb>
     <version.jboss.man>2.1.1.SP1</version.jboss.man>
     <version.javassist>3.12.0.GA</version.javassist>
-    <version.jboss.aop>2.2.0.Final</version.jboss.aop>
+    <version.jboss.aop>2.2.1.Alpha1</version.jboss.aop>
     <version.org.jboss.reflect>2.2.0.Alpha5</version.org.jboss.reflect>
     <version.org.jboss.mdr>2.2.0.Alpha2</version.org.jboss.mdr>
     <version.org.jboss.mx>6.0.0.Beta5</version.org.jboss.mx>
@@ -250,6 +250,30 @@
         <groupId>org.jboss</groupId>
         <artifactId>jbossxb</artifactId>
         <version>${version.jbossxb}</version>
+        <exclusions>
+          <!--  
+             2.0.0.Alpha8 contains references to 
+               wutka-dtdparser:dtdparser121:jar:1.2.1
+               apache-xerces:xml-apis:jar:2.9.1
+               apache-xerces:xercesImpl:jar:2.9.1 
+             which do not exist in the nexus repository they are instead called
+               com.wutka:dtdparser:1.21 
+               xml-apis:xml-apis:1.3.04
+               xerces:xercesImpl:2.9.1
+           -->
+          <exclusion>
+             <groupId>wutka-dtdparser</groupId>
+             <artifactId>dtdparser121</artifactId>
+          </exclusion>
+          <exclusion>
+             <groupId>apache-xerces</groupId>
+             <artifactId>xml-apis</artifactId>
+          </exclusion>
+          <exclusion>
+             <groupId>apache-xerces</groupId>
+             <artifactId>xercesImpl</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.jboss</groupId>
@@ -302,6 +326,25 @@
         <version>${version.javax.faces.jsf-api}</version>
       </dependency>
       
+      <!--  Dependencies overriding the ones excluded from jbossxb -->
+      <dependency>
+        <groupId>com.wutka</groupId>
+        <artifactId>dtdparser</artifactId>
+        <version>1.21</version>
+      </dependency>
+      <dependency>
+        <groupId>xml-apis</groupId>
+        <artifactId>xml-apis</artifactId>
+        <version>1.3.04</version>
+      </dependency>
+      <dependency>
+        <groupId>xerces</groupId>
+        <artifactId>xercesImpl</artifactId>
+        <version>2.9.1</version>
+      </dependency>
+      <!--  END - Dependencies overriding the ones excluded from jbossxb -->
+      
+      
       <!-- test dependencies -->
       <dependency>
         <groupId>org.jboss.test</groupId>