Update of /var/cvs/contributions/CMSContainer/cmsc
In directory james.mmbase.org:/tmp/cvs-serv1717/cmsc
Modified Files:
pom.xml
Log Message:
CMSC-1330 Upgrade CMSc to use MMBase 1.9
CMSC-215 Upgrade from Maven 1 to Maven 2
Upgrade mmbase-1.8.7-20090402
See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc
See also: http://www.mmbase.org/jira/browse/CMSC-1330
See also: http://www.mmbase.org/jira/browse/CMSC-215
Index: pom.xml
===================================================================
RCS file: /var/cvs/contributions/CMSContainer/cmsc/pom.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- pom.xml 26 Feb 2009 12:19:15 -0000 1.5
+++ pom.xml 14 Apr 2009 10:22:59 -0000 1.6
@@ -2,307 +2,32 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>finalist</groupId>
- <artifactId>maven-base</artifactId>
+
+ <parent>
+ <groupId>org.cmscontainer</groupId>
+ <artifactId>cmsc-project</artifactId>
<version>1.7-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.cmscontainer.core</groupId>
+ <artifactId>cmsc-core</artifactId>
+ <name>CMS Container core</name>
<packaging>pom</packaging>
- <name>maven-base</name>
- <properties>
- <cmsc.version>1.7-SNAPSHOT</cmsc.version>
- <mmbase.version>1.8.7-20090103</mmbase.version>
- <mmbasermmci.version>1.8.2-20061020</mmbasermmci.version>
- <pluto.version>1.0.1</pluto.version>
- </properties>
+
<modules>
<module>utilities</module>
- <module>basicmodel</module>
+ <module>security</module>
+ <module>servicemanagement</module>
+ <module>richtext</module>
<module>contentrepository</module>
- <module>maintenance</module>
+ <module>sitemanagement</module>
<module>portal</module>
<module>portlets</module>
+ <module>taglib</module>
<module>search</module>
<module>edit-webapp</module>
- <module>richtext</module>
- <module>security</module>
- <module>servicemanagement</module>
- <module>sitemanagement</module>
- <module>taglib</module>
+ <module>basicmodel</module>
+ <module>maintenance</module>
</modules>
- <repositories>
- <!-- use finalist cmsc repo-->
- <repository>
- <id>cmsc-reps</id>
- <name>Cmsc maven repository</name>
- <url>http://maven.finalist.hk/content/groups/cmsc/</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
- <dependencies>
- <dependency>
- <groupId>mmbase</groupId>
- <artifactId>mmbase-dove</artifactId>
- <version>${mmbase.version}</version>
- </dependency>
- <dependency>
- <groupId>mmbase</groupId>
- <artifactId>mmbase-rmmci-server</artifactId>
- <version>${mmbasermmci.version}</version>
- </dependency>
-
- <dependency>
- <groupId>mmbase</groupId>
- <artifactId>mmbase-taglib</artifactId>
- <version>${mmbase.version}</version>
- </dependency>
-
- <!-- MMApps.sourceforge.net -->
- <dependency>
- <groupId>mmapps</groupId>
- <artifactId>cloudprovider</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>mmapps</groupId>
- <artifactId>commons-mmbaselogging</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>mmapps</groupId>
- <artifactId>mmcommons</artifactId>
- <version>1.4.3</version>
- </dependency>
-
- <!-- Apache portals - pluto -->
- <dependency>
- <groupId>org.apache.pluto</groupId>
- <artifactId>pluto</artifactId>
- <version>${pluto.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.pluto</groupId>
- <artifactId>pluto-descriptors</artifactId>
- <version>${pluto.version}</version>
- </dependency>
-
- <dependency>
- <groupId>portlet-api</groupId>
- <artifactId>portlet-api</artifactId>
- <version>1.0</version>
- </dependency>
-
- <!-- Struts.apache.org -->
- <dependency>
- <groupId>struts</groupId>
- <artifactId>struts</artifactId>
- <version>1.2.9</version>
- </dependency>
-
- <!-- MMBase third-party dependencies -->
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.8</version>
- </dependency>
- <dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- <version>1.1_01</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>2.0</version>
- </dependency>
- <!-- Source code uses org.apache.xpath.XPathAPI -->
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.6.0</version>
- </dependency>
-
- <!-- Servlet/JSP -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4-20040521</version>
- </dependency>
- <dependency>
- <groupId>jspapi</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0-20040521</version>
- </dependency>
-
- <!-- jsp taglibs, jstl -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.2</version>
- </dependency>
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- <version>1.1.2</version>
- </dependency>
-
- <!-- Pager taglib -->
- <dependency>
- <groupId>jsptags.com</groupId>
- <artifactId>pager-taglib</artifactId>
- <version>2.0.2</version>
- </dependency>
-
- <!-- Jakarta Commons -->
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <groupId>commons-chain</groupId>
- <artifactId>commons-chain</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.6</version>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.0</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.3.1</version>
- </dependency>
- <dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- <version>1.3.1</version>
- </dependency>
-
- <!-- Struts third-party dependencies -->
- <dependency>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- <version>2.7.2</version>
- </dependency>
- <dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <version>2.0.8</version>
- </dependency>
- <!-- EHcache used for cmsc sitemanagement -->
- <dependency>
- <groupId>ehcache</groupId>
- <artifactId>ehcache</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>ehcache</groupId>
- <artifactId>ehcache-constructs</artifactId>
- <version>0.6</version>
- </dependency>
- </dependencies>
- <build>
- <sourceDirectory>src/java</sourceDirectory>
- <!--testSourceDirectory>src/test</testSourceDirectory-->
- <resources>
- <resource>
- <directory>${basedir}/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.1-alpha-2</version>
- <configuration>
-
<warSourceDirectory>${basedir}/src/webapp</warSourceDirectory>
- <archiveClasses>true</archiveClasses>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>make-a-jar</id>
- <phase>compile</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <executions>
- <execution>
- <phase>install</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <packaging>jar</packaging>
- <artifactId>${project.artifactId}</artifactId>
- <groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- <file>
-
${project.build.directory}/${project.artifactId}-${project.version}.jar
- </file>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
\ No newline at end of file
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
