Author: ssmiweve Date: 2009-03-10 12:43:25 +0100 (Tue, 10 Mar 2009) New Revision: 7220
Modified: trunk/ trunk/pom.xml trunk/war/pom.xml Log: Merged revisions 7219 via svnmerge from http://sesat.no/svn/sesat-kernel/branches/2.18 ........ r7219 | ssmiweve | 2009-03-10 12:36:30 +0100 (Tue, 10 Mar 2009) | 1 line http://permalink.gmane.org/gmane.comp.java.sesat.kernel.devel/243 ........ Property changes on: trunk ___________________________________________________________________ Modified: svnmerge-integrated - /branches/2.10:1-4690,4692-4745 /branches/2.11:1-4933 /branches/2.12:1-5051,5053-5106 /branches/2.13:1-5378 /branches/2.14:1-5508 /branches/2.15:1-5995 /branches/2.16:1-6499 /branches/2.17:1-6713,6715-6980 /branches/2.18:1-7217 /branches/2.6:1-3877 /branches/2.7:1-4160 /branches/2.8:1-4446 /branches/2.9:1-4626 /branches/MAP_SEARCHv2:1-4544 + /branches/2.10:1-4690,4692-4745 /branches/2.11:1-4933 /branches/2.12:1-5051,5053-5106 /branches/2.13:1-5378 /branches/2.14:1-5508 /branches/2.15:1-5995 /branches/2.16:1-6499 /branches/2.17:1-6713,6715-6980 /branches/2.18:1-7219 /branches/2.6:1-3877 /branches/2.7:1-4160 /branches/2.8:1-4446 /branches/2.9:1-4626 /branches/MAP_SEARCHv2:1-4544 Modified: svn:mergeinfo - /branches/2.17:6980 /branches/2.18:6964-7152,7154,7156,7158,7160-7217 + /branches/2.17:6980 /branches/2.18:6964-7152,7154,7156,7158,7160-7217,7219 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-03-10 11:36:30 UTC (rev 7219) +++ trunk/pom.xml 2009-03-10 11:43:25 UTC (rev 7220) @@ -867,7 +867,6 @@ <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> <version>1.3</version> - <scope>provided</scope> </dependency> <dependency> <groupId>velocity</groupId> Modified: trunk/war/pom.xml =================================================================== --- trunk/war/pom.xml 2009-03-10 11:36:30 UTC (rev 7219) +++ trunk/war/pom.xml 2009-03-10 11:43:25 UTC (rev 7220) @@ -160,13 +160,10 @@ <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.1</version> </dependency> <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.3</version> - <scope>provided</scope> </dependency> <dependency> <groupId>commons-lang</groupId> _______________________________________________ Kernel-commits mailing list [email protected] http://sesat.no/mailman/listinfo/kernel-commits
