mcconnell 2004/03/31 02:28:58 Modified: fortress/cli project.xml fortress/container-test maven.xml fortress/meta project.xml logger-tests project.xml monitor project.xml xmlutil project.properties Log: Fix fortress deps - and disable xmlutil test failure (temporarily). Revision Changes Path 1.4 +7 -1 avalon-excalibur/fortress/cli/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/avalon-excalibur/fortress/cli/project.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- project.xml 30 Mar 2004 12:15:15 -0000 1.3 +++ project.xml 31 Mar 2004 10:28:58 -0000 1.4 @@ -89,7 +89,13 @@ <version>2.0</version> </dependency> <dependency> - <id>excalibur-lifecycle</id> + <groupId>excalibur-lifecycle</groupId> + <artifactId>excalibur-lifecycle-api</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>excalibur-lifecycle</groupId> + <artifactId>excalibur-lifecycle-impl</artifactId> <version>1.1</version> </dependency> </dependencies> 1.2 +1 -0 avalon-excalibur/fortress/container-test/maven.xml Index: maven.xml =================================================================== RCS file: /home/cvs/avalon-excalibur/fortress/container-test/maven.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- maven.xml 29 Mar 2004 17:04:14 -0000 1.1 +++ maven.xml 31 Mar 2004 10:28:58 -0000 1.2 @@ -39,6 +39,7 @@ </classpath> </taskdef> + <mkdir dir="${maven.build.dir}/test-classes"/> <fortress-collect-meta destdir="${maven.build.dir}/test-classes"> <fileset dir="${maven.src.dir}/test"/> </fortress-collect-meta> 1.3 +7 -1 avalon-excalibur/fortress/meta/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/avalon-excalibur/fortress/meta/project.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- project.xml 30 Mar 2004 12:15:16 -0000 1.2 +++ project.xml 31 Mar 2004 10:28:58 -0000 1.3 @@ -33,7 +33,13 @@ <groupId>excalibur-fortress</groupId> </dependency> <dependency> - <id>avalon-framework</id> + <groupId>avalon-framework</groupId> + <artifactId>avalon-framework-api</artifactId> + <version>4.1.5</version> + </dependency> + <dependency> + <groupId>avalon-framework</groupId> + <artifactId>avalon-framework-impl</artifactId> <version>4.1.5</version> </dependency> <dependency> 1.5 +15 -2 avalon-excalibur/logger-tests/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/avalon-excalibur/logger-tests/project.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- project.xml 30 Mar 2004 12:15:18 -0000 1.4 +++ project.xml 31 Mar 2004 10:28:58 -0000 1.5 @@ -99,8 +99,21 @@ <dependency> <!-- testing only --> - <id>excalibur-pool</id> - <version>1.3</version> + <groupId>excalibur-pool</groupId> + <artifactId>excalibur-pool-api</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <!-- testing only --> + <groupId>excalibur-pool</groupId> + <artifactId>excalibur-pool-impl</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <!-- testing only --> + <groupId>excalibur-pool</groupId> + <artifactId>excalibur-pool-instrumented</artifactId> + <version>2.0</version> </dependency> <dependency> <!-- testing only --> 1.7 +15 -2 avalon-excalibur/monitor/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/avalon-excalibur/monitor/project.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- project.xml 30 Mar 2004 12:15:18 -0000 1.6 +++ project.xml 31 Mar 2004 10:28:58 -0000 1.7 @@ -81,8 +81,21 @@ </dependency> <dependency> <!-- testing only --> - <id>excalibur-pool</id> - <version>1.3</version> + <groupId>excalibur-pool</groupId> + <artifactId>excalibur-pool-api</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <!-- testing only --> + <groupId>excalibur-pool</groupId> + <artifactId>excalibur-pool-impl</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <!-- testing only --> + <groupId>excalibur-pool</groupId> + <artifactId>excalibur-pool-instrumented</artifactId> + <version>2.0</version> </dependency> <dependency> <!-- testing only --> 1.7 +1 -0 avalon-excalibur/xmlutil/project.properties Index: project.properties =================================================================== RCS file: /home/cvs/avalon-excalibur/xmlutil/project.properties,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- project.properties 30 Mar 2004 12:15:21 -0000 1.6 +++ project.properties 31 Mar 2004 10:28:58 -0000 1.7 @@ -20,3 +20,4 @@ # gump integration project.name = excalibur-xmlutil +maven.test.failure = false \ No newline at end of file
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]