Author: nico
Date: 2010-03-31 11:22:02 +0200 (Wed, 31 Mar 2010)
New Revision: 41698

Modified:
   CMSContainer/trunk/CMSContainer/maven-base/pom.xml
   CMSContainer/trunk/CMSContainer_Modules/community/pom.xml
   CMSContainer/trunk/CMSContainer_Portlets/portlets-guestbook/pom.xml
   CMSContainer/trunk/CMSContainer_Portlets/portlets-jforum/pom.xml
Log:
CMSC-1670 exclude dependencies

Modified: CMSContainer/trunk/CMSContainer/maven-base/pom.xml
===================================================================
--- CMSContainer/trunk/CMSContainer/maven-base/pom.xml  2010-03-31 09:11:43 UTC 
(rev 41697)
+++ CMSContainer/trunk/CMSContainer/maven-base/pom.xml  2010-03-31 09:22:02 UTC 
(rev 41698)
@@ -593,7 +593,7 @@
         <dependency>
             <groupId>antlr</groupId>
             <artifactId>antlr</artifactId>
-            <version>2.7.2</version>
+            <version>2.7.6</version>
         </dependency>
         <dependency>
             <groupId>oro</groupId>
@@ -697,7 +697,7 @@
          <name>MMBase Maven2 repository</name>
          <url>http://www.mmbase.org/maven2</url>
       </pluginRepository>
-
+      <!-- 
       <pluginRepository>
          <id>mmbase-snapshots</id>
          <name>MMBase Maven2 snapshots repository</name>
@@ -707,6 +707,7 @@
          </snapshots>
 
       </pluginRepository>
+       -->
   </pluginRepositories>
 
 

Modified: CMSContainer/trunk/CMSContainer_Modules/community/pom.xml
===================================================================
--- CMSContainer/trunk/CMSContainer_Modules/community/pom.xml   2010-03-31 
09:11:43 UTC (rev 41697)
+++ CMSContainer/trunk/CMSContainer_Modules/community/pom.xml   2010-03-31 
09:22:02 UTC (rev 41698)
@@ -25,7 +25,6 @@
     <dependency>
       <groupId>antlr</groupId>
       <artifactId>antlr</artifactId>
-      <version>2.7.6</version>
     </dependency>
     <dependency>
       <groupId>cglib</groupId>
@@ -36,6 +35,12 @@
       <groupId>dom4j</groupId>
       <artifactId>dom4j</artifactId>
       <version>1.6.1</version>
+      <exclusions>
+       <exclusion>
+               <groupId>xml-apis</groupId>
+               <artifactId>xml-apis</artifactId>
+       </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>hibernate</groupId>

Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-guestbook/pom.xml
===================================================================
--- CMSContainer/trunk/CMSContainer_Portlets/portlets-guestbook/pom.xml 
2010-03-31 09:11:43 UTC (rev 41697)
+++ CMSContainer/trunk/CMSContainer_Portlets/portlets-guestbook/pom.xml 
2010-03-31 09:22:02 UTC (rev 41698)
@@ -18,6 +18,44 @@
                        <groupId>com.octo.captcha</groupId>
                        <artifactId>jcaptcha-all</artifactId>
                        <version>1.0-RC6</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>quartz</groupId>
+                                       <artifactId>quartz</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>commons-dbcp</groupId>
+                                       <artifactId>commons-dbcp</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>commons-pool</groupId>
+                                       <artifactId>commons-pool</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>hsqldb</groupId>
+                                       <artifactId>hsqldb</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>net.sf.ehcache</groupId>
+                                       <artifactId>ehcache</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>concurrent</groupId>
+                                       <artifactId>concurrent</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.springframework</groupId>
+                                       <artifactId>spring</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>xerces</groupId>
+                                       <artifactId>xercesImpl</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>xerces</groupId>
+                                       <artifactId>xmlParserAPIs</artifactId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
        </dependencies>
        <build>

Modified: CMSContainer/trunk/CMSContainer_Portlets/portlets-jforum/pom.xml
===================================================================
--- CMSContainer/trunk/CMSContainer_Portlets/portlets-jforum/pom.xml    
2010-03-31 09:11:43 UTC (rev 41697)
+++ CMSContainer/trunk/CMSContainer_Portlets/portlets-jforum/pom.xml    
2010-03-31 09:22:02 UTC (rev 41698)
@@ -38,6 +38,44 @@
                        <groupId>com.octo.captcha</groupId>
                        <artifactId>jcaptcha-all</artifactId>
                        <version>1.0-RC-2.0.1</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>quartz</groupId>
+                                       <artifactId>quartz</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>commons-dbcp</groupId>
+                                       <artifactId>commons-dbcp</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>commons-pool</groupId>
+                                       <artifactId>commons-pool</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>hsqldb</groupId>
+                                       <artifactId>hsqldb</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>net.sf.ehcache</groupId>
+                                       <artifactId>ehcache</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>concurrent</groupId>
+                                       <artifactId>concurrent</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.springframework</groupId>
+                                       <artifactId>spring</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>xerces</groupId>
+                                       <artifactId>xercesImpl</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>xerces</groupId>
+                                       <artifactId>xmlParserAPIs</artifactId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
                <dependency>
                        <groupId>jboss</groupId>

_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to