[jboss-cvs] JBossAS SVN: r102322 - in projects/aop/trunk: aop and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 11 22:53:04 EST 2010
Author: flavia.rainone at jboss.com
Date: 2010-03-11 22:53:04 -0500 (Thu, 11 Mar 2010)
New Revision: 102322
Modified:
projects/aop/trunk/aop/.classpath
projects/aop/trunk/aop/src/main/java/org/jboss/aop/reflectprototype/JavassistAopTypeInfoFactoryImpl.java
projects/aop/trunk/asintegration-jmx/pom.xml
projects/aop/trunk/asintegration-mc/pom.xml
projects/aop/trunk/aspects/.classpath
projects/aop/trunk/aspects/pom.xml
projects/aop/trunk/deployers/pom.xml
projects/aop/trunk/pom.xml
Log:
[JBAOP-775] Dependencies updated.
Modified: projects/aop/trunk/aop/.classpath
===================================================================
--- projects/aop/trunk/aop/.classpath 2010-03-12 03:20:40 UTC (rev 102321)
+++ projects/aop/trunk/aop/.classpath 2010-03-12 03:53:04 UTC (rev 102322)
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry excluding="org/jboss/aop/hook/JRockitClassPreProcessor.java" including="**/*.java" kind="src" path="src/main/java"/>
- <classpathentry excluding="**/*.java" including="jboss-aop_1_0.dtd|jboss-aop_2_0.xsd" kind="src" path="docs"/>
- <classpathentry excluding="**/*.java" including="jbossorg-eula.txt" kind="src" path="src/etc"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+ <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
+ <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
+ <classpathentry kind="src" path="docs" including="jboss-aop_1_0.dtd|jboss-aop_2_0.xsd" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/etc" including="jbossorg-eula.txt" excluding="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+</classpath>
\ No newline at end of file
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/reflectprototype/JavassistAopTypeInfoFactoryImpl.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/reflectprototype/JavassistAopTypeInfoFactoryImpl.java 2010-03-12 03:20:40 UTC (rev 102321)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/reflectprototype/JavassistAopTypeInfoFactoryImpl.java 2010-03-12 03:53:04 UTC (rev 102322)
@@ -129,7 +129,7 @@
* @return the info
*/
@Override
- public Object get(Class clazz)
+ public TypeInfo get(Class clazz)
{
throw new RuntimeException("This method is void!!!");
}
Modified: projects/aop/trunk/asintegration-jmx/pom.xml
===================================================================
--- projects/aop/trunk/asintegration-jmx/pom.xml 2010-03-12 03:20:40 UTC (rev 102321)
+++ projects/aop/trunk/asintegration-jmx/pom.xml 2010-03-12 03:53:04 UTC (rev 102322)
@@ -129,12 +129,12 @@
<artifactId>jboss-common-core</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-jmx</artifactId>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-jmx</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
Modified: projects/aop/trunk/asintegration-mc/pom.xml
===================================================================
--- projects/aop/trunk/asintegration-mc/pom.xml 2010-03-12 03:20:40 UTC (rev 102321)
+++ projects/aop/trunk/asintegration-mc/pom.xml 2010-03-12 03:53:04 UTC (rev 102322)
@@ -178,7 +178,7 @@
<artifactId>jboss-mdr</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-dependency</artifactId>
</dependency>
<dependency>
Modified: projects/aop/trunk/aspects/.classpath
===================================================================
--- projects/aop/trunk/aspects/.classpath 2010-03-12 03:20:40 UTC (rev 102321)
+++ projects/aop/trunk/aspects/.classpath 2010-03-12 03:53:04 UTC (rev 102322)
@@ -1,10 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding="org/jboss/test/asynch/" including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
- <classpathentry including="**/*.java" kind="src" path="src/main/java"/>
- <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+ <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
+ <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
+ <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+</classpath>
\ No newline at end of file
Modified: projects/aop/trunk/aspects/pom.xml
===================================================================
--- projects/aop/trunk/aspects/pom.xml 2010-03-12 03:20:40 UTC (rev 102321)
+++ projects/aop/trunk/aspects/pom.xml 2010-03-12 03:53:04 UTC (rev 102322)
@@ -77,8 +77,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-servlet-api</artifactId>
+ <groupId>jboss.web</groupId>
+ <artifactId>servlet-api</artifactId>
<scope>test</scope>
</dependency>
<!--<dependency>
Modified: projects/aop/trunk/deployers/pom.xml
===================================================================
--- projects/aop/trunk/deployers/pom.xml 2010-03-12 03:20:40 UTC (rev 102321)
+++ projects/aop/trunk/deployers/pom.xml 2010-03-12 03:53:04 UTC (rev 102322)
@@ -49,11 +49,11 @@
<artifactId>jboss-vfs</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-kernel</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-aop-mc-int</artifactId>
</dependency>
</dependencies>
Modified: projects/aop/trunk/pom.xml
===================================================================
--- projects/aop/trunk/pom.xml 2010-03-12 03:20:40 UTC (rev 102321)
+++ projects/aop/trunk/pom.xml 2010-03-12 03:53:04 UTC (rev 102322)
@@ -19,20 +19,22 @@
</scm>
<properties>
- <version.javassist.javassist>3.10.0.GA</version.javassist.javassist>
- <version.org.jboss.jbossas>5.1.0.GA</version.org.jboss.jbossas>
+ <version.javassist.javassist>3.11.0.GA</version.javassist.javassist>
+ <version.jboss.jbossas.core-libs>4.0.4.GA</version.jboss.jbossas.core-libs>
+ <version.org.jboss.jbossas>6.0.0.20100216-M2</version.org.jboss.jbossas>
<version.org.jboss.jboss-common-core>2.2.17.GA</version.org.jboss.jboss-common-core>
<version.org.jboss.cl>2.2.0.Alpha3</version.org.jboss.cl>
- <version.org.jboss.deployers>2.2.0.Alpha2</version.org.jboss.deployers>
- <version.org.jboss.integration>5.1.0.SP1</version.org.jboss.integration>
- <version.org.jboss.jboss-reflect>2.0.2.GA</version.org.jboss.jboss-reflect>
- <version.org.jboss.jboss-vfs>3.0.0.CR1</version.org.jboss.jboss-vfs>
- <version.org.jboss.microcontainer.jboss-kernel>2.0.9.GA</version.org.jboss.microcontainer.jboss-kernel>
+ <version.org.jboss.deployers>2.2.0.Alpha3</version.org.jboss.deployers>
+ <version.org.jboss.integration>6.0.0.Alpha9</version.org.jboss.integration>
+ <version.org.jboss.jboss-reflect>2.2.0.Alpha4</version.org.jboss.jboss-reflect>
+ <version.org.jboss.jboss-vfs>3.0.0.CR3</version.org.jboss.jboss-vfs>
+ <version.org.jboss.kernel>2.2.0.Alpha8</version.org.jboss.kernel>
<version.org.jboss.logging>2.2.0.CR1</version.org.jboss.logging>
- <version.org.jboss.man>2.1.1.GA</version.org.jboss.man>
- <version.org.jboss.mdr>2.2.0.Alpha1</version.org.jboss.mdr>
+ <version.org.jboss.man>2.1.1.SP1</version.org.jboss.man>
+ <version.org.jboss.mdr>2.2.0.Alpha2</version.org.jboss.mdr>
<version.xdoclet>1.2.3</version.xdoclet>
<version.jarjar>1.0</version.jarjar>
+ <version.org.jboss.mx>6.0.0.Beta5</version.org.jboss.mx>
</properties>
<build>
@@ -121,7 +123,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>4.8.1</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -131,12 +133,12 @@
<dependency>
<groupId>net.java.dev.javacc</groupId>
<artifactId>javacc</artifactId>
- <version>4.0</version>
+ <version>5.0</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0</version>
</dependency>
<dependency>
<groupId>javassist</groupId>
@@ -149,8 +151,8 @@
<version>${version.org.jboss.jboss-reflect}</version>
<exclusions>
<exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -160,8 +162,8 @@
<version>${version.org.jboss.mdr}</version>
<exclusions>
<exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -217,7 +219,7 @@
<version>${version.org.jboss.cl}</version>
<exclusions>
<exclusion>
- <groupId>org.jboss</groupId>
+ <groupId>org.jboss.integration</groupId>
<artifactId>jboss-classloading-spi</artifactId>
</exclusion>
</exclusions>
@@ -256,7 +258,7 @@
<version>${version.org.jboss.deployers}</version>
<exclusions>
<exclusion>
- <groupId>org.jboss</groupId>
+ <groupId>javassist</groupId>
<artifactId>javassist</artifactId>
</exclusion>
</exclusions>
@@ -307,39 +309,39 @@
<version>${version.org.jboss.integration}</version>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>${version.org.jboss.microcontainer.jboss-kernel}</version>
+ <version>${version.org.jboss.kernel}</version>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-aop-mc-int</artifactId>
- <version>${version.org.jboss.microcontainer.jboss-kernel}</version>
+ <version>${version.org.jboss.kernel}</version>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-dependency</artifactId>
- <version>${version.org.jboss.microcontainer.jboss-kernel}</version>
+ <version>${version.org.jboss.kernel}</version>
</dependency>
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jca-api</artifactId>
- <version>1.5.0.CR2</version>
+ <version>1.5.0.GA</version>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-servlet-api</artifactId>
- <version>2.5.0.CR2</version>
+ <groupId>jboss.web</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>3.0.0-beta-2</version>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
- <version>${version.org.jboss.jbossas}</version>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
+ <version>${version.org.jboss.mx}</version>
</dependency>
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-jmx</artifactId>
- <version>${version.org.jboss.jbossas}</version>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-jmx</artifactId>
+ <version>${version.org.jboss.mx}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.test</groupId>
@@ -350,7 +352,8 @@
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-system-jmx</artifactId>
- <version>${version.org.jboss.jbossas}</version>
+ <!-- see JBAS-6503 -->
+ <version>6.0.0.M1</version>
<exclusions>
<exclusion>
<groupId>org.jboss.aop</groupId>
@@ -390,11 +393,6 @@
<version>${version.org.jboss.man}</version>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-mdr</artifactId>
- <version>${version.org.jboss.mdr}</version>
- </dependency>
- <dependency>
<groupId>jboss</groupId>
<artifactId>jboss-test</artifactId>
<version>1.0.3.GA</version>
@@ -432,7 +430,7 @@
<dependency>
<groupId>snmptrapappender</groupId>
<artifactId>snmpTrapAppender</artifactId>
- <version>1.2.8</version>
+ <version>1.2.14</version>
</dependency>
<dependency>
<groupId>trove</groupId>
More information about the jboss-cvs-commits
mailing list