Author: ssmiweve Date: 2009-01-20 15:47:57 +0100 (Tue, 20 Jan 2009) New Revision: 7155
Modified: trunk/ trunk/pom.xml Log: Merged revisions 7154 via svnmerge from http://sesat.no/svn/sesat-kernel/branches/2.18 ........ r7154 | ssmiweve | 2009-01-20 15:45:32 +0100 (Tue, 20 Jan 2009) | 1 line Exclude jmxri.jar and jms.jar (they require a click through download, and are never used at runtime. ........ 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-7152 /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-7154 /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 + /branches/2.17:6980 /branches/2.18:6964-7152,7154 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-01-20 14:45:32 UTC (rev 7154) +++ trunk/pom.xml 2009-01-20 14:47:57 UTC (rev 7155) @@ -834,6 +834,17 @@ <artifactId>commons-log4j</artifactId> <version>1.5-SNAPSHOT</version> <type>jar</type> + <exclusions> + <!-- The following require a click-through license. And are never used at runtime. --> + <exclusion> + <groupId>com.sun.jmx</groupId> + <artifactId>jmxri</artifactId> + </exclusion> + <exclusion> + <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>sesat</groupId> _______________________________________________ Kernel-commits mailing list [email protected] http://sesat.no/mailman/listinfo/kernel-commits
