Update of /var/cvs/all
In directory james.mmbase.org:/tmp/cvs-serv7434
Modified Files:
pom.xml
Log Message:
Improvements for the multiproject build
Kick off a full build inside /maven
See also: http://cvs.mmbase.org/viewcvs/all
Index: pom.xml
===================================================================
RCS file: /var/cvs/all/pom.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- pom.xml 17 Feb 2009 21:13:28 -0000 1.11
+++ pom.xml 8 Mar 2009 18:12:50 -0000 1.12
@@ -1,5 +1,14 @@
<?xml version="1.0"?>
-<project>
+<!--
+This software is OSI Certified Open Source Software.
+OSI Certified is a certification mark of the Open Source Initiative
+
+The license (Mozilla version 1.0) can be read at the MMBase site.
+See http://www.MMBase.org/license
+
+-->
+<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/maven-v4_0_0.xsd";>
<!--
This pom is responsible for building the mmbase jar, and perhaps the
maven site.
@@ -15,34 +24,18 @@
<parent>
<groupId>org.mmbase</groupId>
<artifactId>mmbase-parent</artifactId>
- <version>1.9</version>
- <!--
- <relativePath>maven-base/pom.xml</relativePath>
- -->
+ <version>1.9-SNAPSHOT</version>
</parent>
<groupId>org.mmbase</groupId>
<artifactId>mmbase</artifactId>
<packaging>jar</packaging>
<name>MMBase</name>
- <version>${mmbase.version}</version>
-
- <description>
- MMBase is a Web Content Management System with strong multi media
features. MMBase has a large
- installed base in The Netherlands, and is used by major Dutch
broadcasters, publishers,
- educational institutes, national and local governments. MMBase is written
in Java, it is Open
- Source Software (MPL) and all standards used are as 'open' as possible.
The system can be used
- with all major operating systems, webservers and databases.
- </description>
-
- <url>http://www.mmbase.org</url>
-
- <inceptionYear>2000</inceptionYear>
<build>
<resources>
<resource>
- <directory>${basedir}/src</directory>
+ <directory>src</directory>
<includes>
<include>**/*.xml</include>
<include>**/*.dtd</include>
@@ -53,7 +46,7 @@
<filtering>false</filtering>
</resource>
<resource>
- <directory>${basedir}/html/WEB-INF/classes</directory>
+ <directory>html/WEB-INF/classes</directory>
</resource>
<resource>
<targetPath>META-INF</targetPath>
@@ -85,31 +78,70 @@
</configuration>
-->
</plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javacc-maven-plugin</artifactId>
+ <version>2.5</version>
+ <executions>
+ <execution>
+ <id>javacc</id>
+ <goals>
+ <goal>javacc</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <sourceDirectory>src</sourceDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.mmbase.maven</groupId>
+ <artifactId>maven-mmbase-plugin</artifactId>
+ <version>1.9-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>create-index-files</id>
+ <goals>
+ <goal>create-index-files</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
+
</build>
+
<dependencies>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.13</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.0</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1</version>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
- <version>1.2</version>
+ <scope>compile</scope>
</dependency>
</dependencies>
+
<reporting>
<plugins>
<plugin>
@@ -137,11 +169,4 @@
</plugin>
</plugins>
</reporting>
-
- <repositories>
- <repository>
- <id>mmbase</id>
- <url>http://www.mmbase.org/maven2</url>
- </repository>
- </repositories>
</project>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
