Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter
In directory james.mmbase.org:/tmp/cvs-serv32039/portlets-newsletter
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_Portlets/portlets-newsletter
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_Portlets/portlets-newsletter/pom.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- pom.xml 4 Mar 2009 09:42:49 -0000 1.4
+++ pom.xml 14 Apr 2009 10:20:20 -0000 1.5
@@ -1,84 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?xml version="1.0" encoding="UTF-8"?>
+<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>cmsc-portlets-newsletter</artifactId>
- <packaging>war</packaging>
- <name>Newsletter bundle</name>
+
<parent>
- <groupId>finalist</groupId>
- <artifactId>portlets</artifactId>
+ <groupId>org.cmscontainer.portlets</groupId>
+ <artifactId>cmsc-portlets</artifactId>
<version>1.7-SNAPSHOT</version>
</parent>
+
+ <artifactId>cmsc-portlets-newsletter</artifactId>
+ <packaging>war</packaging>
+ <name>CMS Container Newsletter portlet</name>
+
<dependencies>
- <!--dependency>
- <groupId>finalist</groupId>
- <artifactId>cmsc-contentrepository</artifactId>
- <version>${cmsc.version}</version>
- </dependency>
- <dependency>
- <groupId>finalist</groupId>
- <artifactId>cmsc-sitemanagement</artifactId>
- <version>${cmsc.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- </dependency-->
<dependency>
- <groupId>finalist</groupId>
- <artifactId>cmsc-edit-webapp</artifactId>
- <version>${cmsc.version}</version>
- </dependency>
- <dependency>
- <groupId>finalist</groupId>
+ <groupId>org.cmscontainer.modules</groupId>
<artifactId>cmsc-modules-community</artifactId>
- <version>${cmsc.version}</version>
+ <version>${project.version}</version>
+ <classifier>classes</classifier>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>finalist</groupId>
+ <groupId>org.cmscontainer.modules</groupId>
<artifactId>cmsc-modules-publish-remote</artifactId>
- <version>${cmsc.version}</version>
+ <version>${project.version}</version>
+ <classifier>classes</classifier>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>finalist</groupId>
+ <groupId>org.cmscontainer.portlets</groupId>
<artifactId>cmsc-portlets-login</artifactId>
- <version>${cmsc.version}</version>
- </dependency>
- <!--dependency>
- <groupId>finalist</groupId>
- <artifactId>cmsc-portal</artifactId>
- <version>${cmsc.version}</version>
+ <version>${project.version}</version>
+ <classifier>classes</classifier>
+ <scope>provided</scope>
</dependency>
- <dependency>
- <groupId>finalist</groupId>
- <artifactId>cmsc-portlets</artifactId>
- <version>${cmsc.version}</version>
- </dependency>
- <dependency>
- <groupId>finalist</groupId>
- <artifactId>cmsc-taglib</artifactId>
- <version>${cmsc.version}</version>
- </dependency-->
- <!-- The junit is for
src\java\com\finalist\newsletter\services\HtmlParserTest.java -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
- <!-- The test jar is not used now,because some testCase is not
process,like DateUtilTest-->
- <!--dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.2.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.dbunit</groupId>
- <artifactId>dbunit</artifactId>
- <version>2.2</version>
- <scope>test</scope>
- </dependency-->
+
<dependency>
<groupId>hibernate</groupId>
<artifactId>ejb3-persistence</artifactId>
@@ -145,37 +102,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
- <configuration>
- <dest>${basedir}/target/classes</dest>
- <src>${basedir}/resources</src>
- </configuration>
- <executions>
- <execution>
- <id>native2ascii-utf8</id>
- <goals>
- <goal>native2ascii</goal>
- </goals>
- <configuration>
- <encoding>UTF-8</encoding>
- <includes>**/*.properties</includes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webResources>
- <resource>
- <targetPath>WEB-INF/config</targetPath>
- <directory>${basedir}/config</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- </webResources>
- </configuration>
</plugin>
</plugins>
</build>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
