Author: nico
Date: 2010-03-31 11:02:57 +0200 (Wed, 31 Mar 2010)
New Revision: 41696
Modified:
CMSContainer/branches/b1_7/CMSContainer/maven-base/pom.xml
CMSContainer/branches/b1_7/CMSContainer_Modules/community/pom.xml
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-guestbook/config/builders/guestbook/guestbook.xml
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-guestbook/pom.xml
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-jforum/pom.xml
Log:
CMSC-1670 exclude dependencies
Modified: CMSContainer/branches/b1_7/CMSContainer/maven-base/pom.xml
===================================================================
--- CMSContainer/branches/b1_7/CMSContainer/maven-base/pom.xml 2010-03-31
08:32:41 UTC (rev 41695)
+++ CMSContainer/branches/b1_7/CMSContainer/maven-base/pom.xml 2010-03-31
09:02:57 UTC (rev 41696)
@@ -78,7 +78,7 @@
<junit.version>4.4</junit.version>
<pluto.version>1.0.1</pluto.version>
- <mmbase.version>1.9.2-20091118</mmbase.version>
+ <mmbase.version>1.9-SNAPSHOT</mmbase.version>
</properties>
<developers>
@@ -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>
@@ -665,31 +665,45 @@
<id>mmbase</id>
<name>MMBase Maven2 repository</name>
<url>http://www.mmbase.org/maven2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
+ <!--
<repository>
<id>mmbase-snapshots</id>
<name>MMBase Maven2 snapshots repository</name>
<url>http://www.mmbase.org/snapshots</url>
</repository>
+ -->
<repository>
<id>cmsc</id>
<name>CMS Container repository</name>
<url>http://www.cmscontainer.org/files/maven/</url>
<layout>legacy</layout>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
<repository>
<id>maven2-repository.dev.java.net</id>
<name>Java.net Repository for Maven</name>
<url>http://download.java.net/maven/2/</url>
<layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
- <!-- <repository>-->
- <!-- <id>jboss</id>-->
- <!-- <name>JBoss maven 2 repository</name>-->
- <!-- <url>http://repository.jboss.com/maven2</url>-->
- <!-- </repository>-->
-
</repositories>
<pluginRepositories>
@@ -698,7 +712,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>
@@ -708,6 +722,7 @@
</snapshots>
</pluginRepository>
+ -->
</pluginRepositories>
Modified: CMSContainer/branches/b1_7/CMSContainer_Modules/community/pom.xml
===================================================================
--- CMSContainer/branches/b1_7/CMSContainer_Modules/community/pom.xml
2010-03-31 08:32:41 UTC (rev 41695)
+++ CMSContainer/branches/b1_7/CMSContainer_Modules/community/pom.xml
2010-03-31 09:02:57 UTC (rev 41696)
@@ -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/branches/b1_7/CMSContainer_Portlets/portlets-guestbook/config/builders/guestbook/guestbook.xml
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-guestbook/config/builders/guestbook/guestbook.xml
2010-03-31 08:32:41 UTC (rev 41695)
+++
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-guestbook/config/builders/guestbook/guestbook.xml
2010-03-31 09:02:57 UTC (rev 41696)
@@ -37,7 +37,9 @@
<input>6</input>
</positions>
</editor>
- <datatype base="field"
xmlns="http://www.mmbase.org/xmlns/datatypes"/>
+ <datatype base="line"
xmlns="http://www.mmbase.org/xmlns/datatypes";>
+ <default value="50"/>
+ </datatype>
</field>
</fieldlist>
</builder>
Modified:
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-guestbook/pom.xml
===================================================================
--- CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-guestbook/pom.xml
2010-03-31 08:32:41 UTC (rev 41695)
+++ CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-guestbook/pom.xml
2010-03-31 09:02:57 UTC (rev 41696)
@@ -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/branches/b1_7/CMSContainer_Portlets/portlets-jforum/pom.xml
===================================================================
--- CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-jforum/pom.xml
2010-03-31 08:32:41 UTC (rev 41695)
+++ CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-jforum/pom.xml
2010-03-31 09:02:57 UTC (rev 41696)
@@ -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
