[jboss-cvs] JBossAS SVN: r104723 - in projects/aop/branches/Branch_2_2: aop and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed May 12 09:19:27 EDT 2010
Author: kabir.khan at jboss.com
Date: 2010-05-12 09:19:27 -0400 (Wed, 12 May 2010)
New Revision: 104723
Modified:
projects/aop/branches/Branch_2_2/aop/pom.xml
projects/aop/branches/Branch_2_2/asintegration-jmx/pom.xml
projects/aop/branches/Branch_2_2/maven-jbossaop-plugin/pom.xml
projects/aop/branches/Branch_2_2/pom.xml
Log:
[JBAOP-789] Don't use artifacts from deprecated maven repository
Modified: projects/aop/branches/Branch_2_2/aop/pom.xml
===================================================================
--- projects/aop/branches/Branch_2_2/aop/pom.xml 2010-05-12 12:57:10 UTC (rev 104722)
+++ projects/aop/branches/Branch_2_2/aop/pom.xml 2010-05-12 13:19:27 UTC (rev 104723)
@@ -294,7 +294,7 @@
<dependencies>
<dependency>
- <groupId>apache-xerces</groupId>
+ <groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</dependency>
<dependency>
Modified: projects/aop/branches/Branch_2_2/asintegration-jmx/pom.xml
===================================================================
--- projects/aop/branches/Branch_2_2/asintegration-jmx/pom.xml 2010-05-12 12:57:10 UTC (rev 104722)
+++ projects/aop/branches/Branch_2_2/asintegration-jmx/pom.xml 2010-05-12 13:19:27 UTC (rev 104723)
@@ -34,7 +34,7 @@
<dependencies>
<!-- dependency>
- <groupId>apache-xerces</groupId>
+ <groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</dependency -->
<dependency>
@@ -77,6 +77,16 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
</dependency>
+
+ <!-- Dependencies overriding the ones excluded from deployers-vfs and jboss-as-system-jmx -->
+ <dependency>
+ <groupId>com.wutka</groupId>
+ <artifactId>dtdparser</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: projects/aop/branches/Branch_2_2/maven-jbossaop-plugin/pom.xml
===================================================================
--- projects/aop/branches/Branch_2_2/maven-jbossaop-plugin/pom.xml 2010-05-12 12:57:10 UTC (rev 104722)
+++ projects/aop/branches/Branch_2_2/maven-jbossaop-plugin/pom.xml 2010-05-12 13:19:27 UTC (rev 104723)
@@ -71,7 +71,7 @@
<artifactId>xercesImpl</artifactId>
</exclusion>
<exclusion>
- <groupId>apache-xerces</groupId>
+ <groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
<!-- included in jboss-container -->
Modified: projects/aop/branches/Branch_2_2/pom.xml
===================================================================
--- projects/aop/branches/Branch_2_2/pom.xml 2010-05-12 12:57:10 UTC (rev 104722)
+++ projects/aop/branches/Branch_2_2/pom.xml 2010-05-12 13:19:27 UTC (rev 104723)
@@ -20,7 +20,7 @@
</scm>
<properties>
- <version.javassist.javassist>3.11.0.GA</version.javassist.javassist>
+ <version.javassist.javassist>3.12.0.GA</version.javassist.javassist>
<version.org.jboss.classpool>1.0.0.Alpha6</version.org.jboss.classpool>
<version.org.jboss.jboss-common-core>2.2.17.GA</version.org.jboss.jboss-common-core>
<version.org.jboss.cl>2.2.0.Alpha4</version.org.jboss.cl>
@@ -88,11 +88,16 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>apache-xerces</groupId>
+ <groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
- <version>2.7.0</version>
+ <version>1.3.04</version>
</dependency>
<dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ </dependency>
+ <dependency>
<groupId>org.beanshell</groupId>
<artifactId>bsh</artifactId>
<version>1.3.0</version>
@@ -220,11 +225,59 @@
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-vfs</artifactId>
<version>${version.org.jboss.deployers}</version>
+ <exclusions>
+ <!--
+ 2.0.0.Alpha4 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.kernel</groupId>
<artifactId>jboss-kernel</artifactId>
<version>${version.org.jboss.kernel}</version>
+ <exclusions>
+ <!--
+ 2.0.0.Alpha10 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.kernel</groupId>
@@ -276,9 +329,46 @@
<groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
</exclusion>
+ <!--
+ 6.0.0.M1 contains references to
+ wutka-dtdparser:dtdparser121:jar:1.2.1
+ apache-xerces:xml-apis: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
+ -->
+ <exclusion>
+ <groupId>wutka-dtdparser</groupId>
+ <artifactId>dtdparser121</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ </exclusion>
</exclusions>
</dependency>
+
+ <!-- Dependencies overriding the ones excluded from deployers-vfs, jboss-kernel and jboss-as-system-jmx -->
<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 deployers-vfs, jboss-kernel and jboss-as-system-jmx -->
+
+ <dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
<version>${version.org.jboss.logging}</version>
@@ -327,7 +417,7 @@
<dependency>
<groupId>trove</groupId>
<artifactId>trove</artifactId>
- <version>2.1.1</version>
+ <version>1.0.2</version>
</dependency>
<dependency>
<groupId>com.google.code</groupId>
More information about the jboss-cvs-commits
mailing list