[jboss-cvs] JBossAS SVN: r104725 - in projects/aop/trunk: aop and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed May 12 10:10:37 EDT 2010
Author: kabir.khan at jboss.com
Date: 2010-05-12 10:10:36 -0400 (Wed, 12 May 2010)
New Revision: 104725
Modified:
projects/aop/trunk/aop/pom.xml
projects/aop/trunk/asintegration-jmx/pom.xml
projects/aop/trunk/maven-jbossaop-plugin/pom.xml
projects/aop/trunk/pom.xml
Log:
[JBAOP-789] Don't use artifacts from deprecated maven repository
Modified: projects/aop/trunk/aop/pom.xml
===================================================================
--- projects/aop/trunk/aop/pom.xml 2010-05-12 13:21:37 UTC (rev 104724)
+++ projects/aop/trunk/aop/pom.xml 2010-05-12 14:10:36 UTC (rev 104725)
@@ -294,7 +294,7 @@
<dependencies>
<dependency>
- <groupId>apache-xerces</groupId>
+ <groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</dependency>
<dependency>
Modified: projects/aop/trunk/asintegration-jmx/pom.xml
===================================================================
--- projects/aop/trunk/asintegration-jmx/pom.xml 2010-05-12 13:21:37 UTC (rev 104724)
+++ projects/aop/trunk/asintegration-jmx/pom.xml 2010-05-12 14:10:36 UTC (rev 104725)
@@ -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>
Modified: projects/aop/trunk/maven-jbossaop-plugin/pom.xml
===================================================================
--- projects/aop/trunk/maven-jbossaop-plugin/pom.xml 2010-05-12 13:21:37 UTC (rev 104724)
+++ projects/aop/trunk/maven-jbossaop-plugin/pom.xml 2010-05-12 14:10:36 UTC (rev 104725)
@@ -1,202 +1,206 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>3</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jbossaop-plugin</artifactId>
- <packaging>maven-plugin</packaging>
- <version>2.1.0-SNAPSHOT</version>
- <name>JBoss AOP Maven Plugin</name>
-
- <distributionManagement>
- <snapshotRepository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshot Repository</name>
- <url>dav:https://snapshots.jboss.org/maven2</url>
- </snapshotRepository>
- </distributionManagement>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>2.0.9</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>2.0.9</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.4.9</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-plugin-testing-harness</artifactId>
- <version>1.0-beta-1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- <version>2.0.0.GA</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>apache-xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <!-- included in jboss-container -->
- <exclusion>
- <groupId>apache-slide</groupId>
- <artifactId>webdavlib</artifactId>
- </exclusion>
- <exclusion>
- <groupId>wutka-dtdparser</groupId>
- <artifactId>dtdparser121</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- </exclusion>
- <exclusion>
- <groupId>apache-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </exclusion>
- <!-- end included in jboss-container -->
- <exclusion>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- </exclusion>
- <!-- this is needed by aopc
- <exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
- </exclusion>
- -->
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>qdox</groupId>
- <artifactId>qdox</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-jdk</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss.profiler.jvmti</groupId>
- <artifactId>jboss-profiler-jvmti</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-test</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Maven Repository</name>
- <url>http://repository.jboss.org/maven2</url>
- </repository>
- </repositories>
-
- <build>
- <sourceDirectory>src/main/java</sourceDirectory>
- <scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
- <testSourceDirectory>src/test/java</testSourceDirectory>
- <outputDirectory>target/classes</outputDirectory>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
- <defaultGoal>install</defaultGoal>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- </testResource>
- </testResources>
- <directory>target</directory>
-
-
- <plugins>
-
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${jdkVersion}</source>
- <target>${jdkVersion}</target>
- <!--
- <projectArtifact implementation="org.apache.maven.plugins.testing.stubs.StubArtifact"/>
- -->
- </configuration>
- </plugin>
-
-<!--
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <compileSourceRoots>
- <compileSourceRoot>${basedir}\target\test-classes\unit\compiler-basic-test\src\main\java</compileSourceRoot>
- </compileSourceRoots>
- <compilerId>javac</compilerId>
- <debug>true</debug>
- <outputDirectory>${basedir}\target\test\unit\compiler-basic-test\target\classes</outputDirectory>
- <buildDirectory>${basedir}\target\test\unit\compiler-basic-test\target</buildDirectory>
- <projectArtifact implementation="org.apache.maven.plugins.testing.stubs.StubArtifact"/>
- </configuration>
- </plugin>
- -->
-
- </plugins>
-
- </build>
-
- <properties>
- <jdkVersion>1.5</jdkVersion>
- </properties>
-
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>3</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jbossaop-plugin</artifactId>
+ <packaging>maven-plugin</packaging>
+ <version>2.1.0-SNAPSHOT</version>
+ <name>JBoss AOP Maven Plugin</name>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/aop/branches/Branch_2_2/maven-jbossaop-plugin/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/aop/branches/Branch_2_2/maven-jbossaop-plugin/</developerConnection>
+ </scm>
+
+ <distributionManagement>
+ <snapshotRepository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshot Repository</name>
+ <url>dav:https://snapshots.jboss.org/maven2</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0.9</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.9</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.4.9</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-plugin-testing-harness</artifactId>
+ <version>1.0-beta-1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <version>2.1.4.GA</version>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <!-- included in jboss-container -->
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>wutka-dtdparser</groupId>
+ <artifactId>dtdparser121</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ <!-- end included in jboss-container -->
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ <!-- this is needed by aopc
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-container</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-logging-spi</artifactId>
+ </exclusion>
+ -->
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-logging-log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>qdox</groupId>
+ <artifactId>qdox</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-logging-jdk</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss.profiler.jvmti</groupId>
+ <artifactId>jboss-profiler-jvmti</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-test</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Maven Repository</name>
+ <url>http://repository.jboss.org/maven2</url>
+ </repository>
+ </repositories>
+
+ <build>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
+ <outputDirectory>target/classes</outputDirectory>
+ <testOutputDirectory>target/test-classes</testOutputDirectory>
+ <defaultGoal>install</defaultGoal>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ </testResources>
+ <directory>target</directory>
+
+
+ <plugins>
+
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>${jdkVersion}</source>
+ <target>${jdkVersion}</target>
+ <!--
+ <projectArtifact implementation="org.apache.maven.plugins.testing.stubs.StubArtifact" />
+ -->
+ </configuration>
+ </plugin>
+
+<!--
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <compileSourceRoots>
+ <compileSourceRoot>${basedir}\target\test-classes\unit\compiler-basic-test\src\main\java</compileSourceRoot>
+ </compileSourceRoots>
+ <compilerId>javac</compilerId>
+ <debug>true</debug>
+ <outputDirectory>${basedir}\target\test\unit\compiler-basic-test\target\classes</outputDirectory>
+ <buildDirectory>${basedir}\target\test\unit\compiler-basic-test\target</buildDirectory>
+ <projectArtifact implementation="org.apache.maven.plugins.testing.stubs.StubArtifact" />
+ </configuration>
+ </plugin>
+ -->
+
+ </plugins>
+
+ </build>
+
+ <properties>
+ <jdkVersion>1.5</jdkVersion>
+ </properties>
+
+</project>
Modified: projects/aop/trunk/pom.xml
===================================================================
--- projects/aop/trunk/pom.xml 2010-05-12 13:21:37 UTC (rev 104724)
+++ projects/aop/trunk/pom.xml 2010-05-12 14:10:36 UTC (rev 104725)
@@ -19,14 +19,14 @@
</scm>
<properties>
- <version.javassist.javassist>3.11.0.GA</version.javassist.javassist>
- <version.org.jboss.classpool>1.0.0.Alpha4</version.org.jboss.classpool>
+ <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>
<version.org.jboss.deployers>2.2.0.Alpha4</version.org.jboss.deployers>
- <version.org.jboss.jboss-reflect>2.2.0.Alpha4</version.org.jboss.jboss-reflect>
+ <version.org.jboss.jboss-reflect>2.2.0.Alpha5</version.org.jboss.jboss-reflect>
<version.org.jboss.jboss-vfs>3.0.0.CR5</version.org.jboss.jboss-vfs>
- <version.org.jboss.kernel>2.2.0.Alpha9</version.org.jboss.kernel>
+ <version.org.jboss.kernel>2.2.0.Alpha10</version.org.jboss.kernel>
<version.org.jboss.logging>2.2.0.CR1</version.org.jboss.logging>
<version.org.jboss.mdr>2.2.0.Alpha2</version.org.jboss.mdr>
<version.jarjar>1.0</version.jarjar>
@@ -97,8 +97,13 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>apache-xerces</groupId>
+ <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>
<dependency>
@@ -229,11 +234,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>
@@ -285,9 +338,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>
@@ -336,7 +426,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