Author: julien(a)jboss.com Date: 2008-02-24 12:54:00 -0500 (Sun, 24 Feb 2008) New Revision: 10097 Modified: modules/web/trunk/build/pom.xml modules/web/trunk/web/pom.xml Log: - update to use JBoss Unit 1.2 Beta 2 - trim down pom to remove dependencies resolved transitively Modified: modules/web/trunk/build/pom.xml =================================================================== --- modules/web/trunk/build/pom.xml 2008-02-24 17:22:51 UTC (rev 10096) +++ modules/web/trunk/build/pom.xml 2008-02-24 17:54:00 UTC (rev 10097) @@ -25,27 +25,19 @@ <description>JBoss Portal Web Module</description> <properties> - <version.activation>1.0.2</version.activation> <version.concurrent>1.3.4</version.concurrent> <version.sun.servlet>2.4</version.sun.servlet> <version.apache.tomcat>5.5.12</version.apache.tomcat> - <version.jboss-common-core>2.2.1.GA</version.jboss-common-core> <version.jboss-logging>2.0.3.GA</version.jboss-logging> - <version.jboss-vfs>2.0.0.Beta6</version.jboss-vfs> - <version.jboss.aop>2.0.0.CR1</version.jboss.aop> - <version.jbossxb>2.0.0.CR3</version.jbossxb> - <version.javassist>3.6-beta</version.javassist> <version.jboss-remoting>2.2.1.GA</version.jboss-remoting> <version.jboss.portal.common>1.2.0-Beta1</version.jboss.portal.common> - <version.jboss.unit>1.2.0-SNAPSHOT</version.jboss.unit> + <version.jboss.unit>1.2.0.Beta2</version.jboss.unit> <version.log4j>1.2.14</version.log4j> <version.apache.commons-logging>1.1.1</version.apache.commons-logging> <version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient> - <version.trove>2.1.1</version.trove> <version.jboss.microcontainer>2.0.0.Beta9</version.jboss.microcontainer> <version.cargo>0.9-portal</version.cargo> <version.junit>3.8.1</version.junit> - <version.xerces>2.7.1</version.xerces> <version.ant>1.7.0</version.ant> </properties> @@ -98,11 +90,6 @@ <version>${version.jboss.portal.common}</version> </dependency> <dependency> - <groupId>org.jboss</groupId> - <artifactId>javassist</artifactId> - <version>${version.javassist}</version> - </dependency> - <dependency> <groupId>sun-servlet</groupId> <artifactId>servlet-api</artifactId> <version>${version.sun.servlet}</version> @@ -154,22 +141,7 @@ <version>${version.jboss.unit}</version> </dependency> <dependency> - <groupId>trove</groupId> - <artifactId>trove</artifactId> - <version>${version.trove}</version> - </dependency> - <dependency> - <groupId>apache-xerces</groupId> - <artifactId>resolver</artifactId> - <version>${version.xerces}</version> - </dependency> - <dependency> <groupId>jboss</groupId> - <artifactId>jbossxb</artifactId> - <version>${version.jbossxb}</version> - </dependency> - <dependency> - <groupId>jboss</groupId> <artifactId>jboss-logging-jdk</artifactId> <version>${version.jboss-logging}</version> </dependency> @@ -184,11 +156,6 @@ <version>${version.jboss-remoting}</version> </dependency> <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-vfs</artifactId> - <version>${version.jboss-vfs}</version> - </dependency> - <dependency> <groupId>org.jboss.microcontainer</groupId> <artifactId>jboss-aop-mc-int</artifactId> <version>${version.jboss.microcontainer}</version> @@ -269,46 +236,6 @@ <version>${version.jboss.microcontainer}</version> </dependency> <dependency> - <groupId>org.jboss.aop</groupId> - <artifactId>jboss-aop</artifactId> - <version>${version.jboss.aop}</version> - </dependency> - <!--<dependency>--> - <!--<groupId>jboss.aop</groupId>--> - <!--<artifactId>jboss-aop-as4-deployer</artifactId>--> - <!--<version>${version.jboss.aop}</version>--> - <!--</dependency>--> - <!--<dependency>--> - <!--<groupId>jboss.aop</groupId>--> - <!--<artifactId>jboss-aop-deployer-jdk50</artifactId>--> - <!--<version>${version.jboss.aop}</version>--> - <!--</dependency>--> - <!--<dependency>--> - <!--<groupId>jboss.aop</groupId>--> - <!--<artifactId>jboss-aop-jdk50</artifactId>--> - <!--<version>${version.jboss.aop}</version>--> - <!--</dependency>--> - <!--<dependency>--> - <!--<groupId>jboss.aop</groupId>--> - <!--<artifactId>jboss-aop-jdk50-client</artifactId>--> - <!--<version>${version.jboss.aop}</version>--> - <!--</dependency>--> - <!--<dependency>--> - <!--<groupId>jboss.aop</groupId>--> - <!--<artifactId>jboss-standalone-aspect-library-jdk50</artifactId>--> - <!--<version>${version.jboss.aop}</version>--> - <!--</dependency>--> - <!--<dependency>--> - <!--<groupId>jboss.aop</groupId>--> - <!--<artifactId>jrockit-pluggable-instrumentor</artifactId>--> - <!--<version>${version.jboss.aop}</version>--> - <!--</dependency>--> - <!--<dependency>--> - <!--<groupId>jboss.aop</groupId>--> - <!--<artifactId>pluggable-instrumentor</artifactId>--> - <!--<version>${version.jboss.aop}</version>--> - <!--</dependency>--> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>${version.apache.commons-logging}</version> Modified: modules/web/trunk/web/pom.xml =================================================================== --- modules/web/trunk/web/pom.xml 2008-02-24 17:22:51 UTC (rev 10096) +++ modules/web/trunk/web/pom.xml 2008-02-24 17:54:00 UTC (rev 10097) @@ -44,11 +44,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.jboss</groupId> - <artifactId>javassist</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.jboss.unit</groupId> <artifactId>jboss-unit</artifactId> <scope>test</scope> @@ -79,22 +74,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>trove</groupId> - <artifactId>trove</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>apache-xerces</groupId> - <artifactId>resolver</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>jboss</groupId> - <artifactId>jbossxb</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>jboss</groupId> <artifactId>jboss-logging-jdk</artifactId> <scope>test</scope> </dependency> @@ -108,11 +88,6 @@ <artifactId>jboss-remoting</artifactId> </dependency> <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-vfs</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.jboss.microcontainer</groupId> <artifactId>jboss-aop-mc-int</artifactId> <scope>test</scope> @@ -193,46 +168,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.jboss.aop</groupId> - <artifactId>jboss-aop</artifactId> - <scope>test</scope> - </dependency> - <!--<dependency>--> - <!--<groupId>jboss.aop</groupId>--> - <!--<artifactId>jboss-aop-as4-deployer</artifactId>--> - <!--<scope>test</scope>--> - <!--</dependency>--> - <!--<dependency>--> - <!--<groupId>jboss.aop</groupId>--> - <!--<artifactId>jboss-aop-deployer-jdk50</artifactId>--> - <!--<scope>test</scope>--> - <!--</dependency>--> - <!--<dependency>--> - <!--<groupId>jboss.aop</groupId>--> - <!--<artifactId>jboss-aop-jdk50</artifactId>--> - <!--<scope>test</scope>--> - <!--</dependency>--> - <!--<dependency>--> - <!--<groupId>jboss.aop</groupId>--> - <!--<artifactId>jboss-aop-jdk50-client</artifactId>--> - <!--<scope>test</scope>--> - <!--</dependency>--> - <!--<dependency>--> - <!--<groupId>jboss.aop</groupId>--> - <!--<artifactId>jboss-standalone-aspect-library-jdk50</artifactId>--> - <!--<scope>test</scope>--> - <!--</dependency>--> - <!--<dependency>--> - <!--<groupId>jboss.aop</groupId>--> - <!--<artifactId>jrockit-pluggable-instrumentor</artifactId>--> - <!--<scope>test</scope>--> - <!--</dependency>--> - <!--<dependency>--> - <!--<groupId>jboss.aop</groupId>--> - <!--<artifactId>pluggable-instrumentor</artifactId>--> - <!--<scope>test</scope>--> - <!--</dependency>--> - <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <scope>test</scope> @@ -248,16 +183,6 @@ <type>war</type> <scope>test</scope> </dependency> - <!--<dependency>--> - <!--<groupId>org.jboss.unit</groupId>--> - <!--<artifactId>jboss-unit-tooling-ant</artifactId>--> - <!--<scope>test</scope>--> - <!--</dependency>--> - <!--<dependency>--> - <!--<groupId>cargo</groupId>--> - <!--<artifactId>cargo-core-uberjar</artifactId>--> - <!--<scope>test</scope>--> - <!--</dependency>--> </dependencies> <build> @@ -325,19 +250,12 @@ <property name="dependency.jboss-managed.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-managed.jar.path}"/> <property name="dependency.jboss-metatype.jar" value="${maven.dependency.org.jboss.microcontainer.jboss.metatype.jar.path}"/> <property name="dependency.jboss-aop.jar" value="${maven.dependency.org.jboss.aop.jboss-aop.jar.path}"/> - <!--<property name="dependency.jboss-aop-as4-deployer.jar" value="${maven.dependency.jboss.aop.jboss-aop-as4-deployer.jar.path}"/>--> - <!--<property name="dependency.jboss-aop-deployer-jdk50.jar" value="${maven.dependency.jboss.aop.jboss-aop-deployer-jdk50.jar.path}"/>--> - <!--<property name="dependency.jboss-aop-jdk50.jar" value="${maven.dependency.jboss.aop.jboss-aop-jdk50.jar.path}"/>--> - <!--<property name="dependency.jboss-aop-jdk50-client.jar" value="${maven.dependency.jboss.aop.jboss-aop-jdk50-client.jar.path}"/>--> - <!--<property name="dependency.jboss-standalone-aspect-library-jdk50.jar" value="${maven.dependency.jboss.aop.jboss-standalone-aspect-library-jdk50.jar.path}"/>--> - <!--<property name="dependency.jrockit-pluggable-instrumentor.jar" value="${maven.dependency.jboss.aop.jrockit-pluggable-instrumentor.jar.path}"/>--> - <!--<property name="dependency.pluggable-instrumentor.jar" value="${maven.dependency.jboss.aop.pluggable-instrumentor.jar.path}"/>--> <property name="dependency.javassist.jar" value="${maven.dependency.org.jboss.javassist.jar.path}"/> <property name="dependency.jboss-common-core.jar" value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/> <property name="dependency.resolver.jar" value="${maven.dependency.apache-xerces.resolver.jar.path}"/> <property name="dependency.xercesImpl.jar" value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/> <property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/> - <property name="dependency.jbossxb.jar" value="${maven.dependency.jboss.jbossxb.jar.path}"/> + <property name="dependency.jbossxb.jar" value="${maven.dependency.org.jboss.jbossxb.jar.path}"/> <property name="dependency.jboss-remoting.jar" value="${maven.dependency.jboss.jboss-remoting.jar.path}"/> <property name="dependency.portal-common.jar" value="${maven.dependency.org.jboss.portal.common.common-common.jar.path}"/> <property name="dependency.portal-common-mc.jar" value="${maven.dependency.org.jboss.portal.common.common-mc.jar.path}"/>