Author: nico
Date: 2009-06-04 16:24:36 +0200 (Thu, 04 Jun 2009)
New Revision: 35733
Modified:
mmbase/trunk/base-webapp/pom.xml
mmbase/trunk/core/pom.xml
mmbase/trunk/maven-base/pom.xml
mmbase/trunk/maven/codestandards/pom.xml
mmbase/trunk/maven/maven-mmbase-plugin/pom.xml
mmbase/trunk/maven/pom.xml
mmbase/trunk/pom.xml
Log:
Changes in broken maven 2 files
Modified: mmbase/trunk/base-webapp/pom.xml
===================================================================
--- mmbase/trunk/base-webapp/pom.xml 2009-06-04 14:12:56 UTC (rev 35732)
+++ mmbase/trunk/base-webapp/pom.xml 2009-06-04 14:24:36 UTC (rev 35733)
@@ -29,6 +29,7 @@
<groupId>org.mmbase</groupId>
<artifactId>mmbase</artifactId>
<version>${mmbase.version}</version>
+ <type>war</type>
</dependency>
<!--
Modified: mmbase/trunk/core/pom.xml
===================================================================
--- mmbase/trunk/core/pom.xml 2009-06-04 14:12:56 UTC (rev 35732)
+++ mmbase/trunk/core/pom.xml 2009-06-04 14:24:36 UTC (rev 35733)
@@ -107,10 +107,12 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: mmbase/trunk/maven/codestandards/pom.xml
===================================================================
--- mmbase/trunk/maven/codestandards/pom.xml 2009-06-04 14:12:56 UTC (rev
35732)
+++ mmbase/trunk/maven/codestandards/pom.xml 2009-06-04 14:24:36 UTC (rev
35733)
@@ -13,6 +13,5 @@
<artifactId>codestandards</artifactId>
<packaging>jar</packaging>
<name>MMBase code standards</name>
- <version>${mmbase.version}</version>
</project>
Modified: mmbase/trunk/maven/maven-mmbase-plugin/pom.xml
===================================================================
--- mmbase/trunk/maven/maven-mmbase-plugin/pom.xml 2009-06-04 14:12:56 UTC
(rev 35732)
+++ mmbase/trunk/maven/maven-mmbase-plugin/pom.xml 2009-06-04 14:24:36 UTC
(rev 35733)
@@ -12,8 +12,19 @@
<artifactId>maven-mmbase-plugin</artifactId>
<name>MMBase Maven Plugin</name>
<packaging>maven-plugin</packaging>
- <version>${mmbase.version}</version>
-
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -43,6 +54,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
+ <version>2.5</version>
</dependency>
</dependencies>
Modified: mmbase/trunk/maven/pom.xml
===================================================================
--- mmbase/trunk/maven/pom.xml 2009-06-04 14:12:56 UTC (rev 35732)
+++ mmbase/trunk/maven/pom.xml 2009-06-04 14:24:36 UTC (rev 35733)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.mmbase</groupId>
- <artifactId>mmbase-parent</artifactId>
+ <artifactId>mmbase-cms</artifactId>
<version>1.9-SNAPSHOT</version>
</parent>
@@ -13,7 +13,6 @@
<artifactId>mmbase-maven</artifactId>
<packaging>pom</packaging>
<name>MMBase Maven Parent</name>
- <version>${mmbase.version}</version>
<modules>
<module>codestandards</module>
Modified: mmbase/trunk/maven-base/pom.xml
===================================================================
--- mmbase/trunk/maven-base/pom.xml 2009-06-04 14:12:56 UTC (rev 35732)
+++ mmbase/trunk/maven-base/pom.xml 2009-06-04 14:24:36 UTC (rev 35733)
@@ -56,10 +56,6 @@
<buildnumber.doCheck>false</buildnumber.doCheck>
- <mmbase.number>1.9</mmbase.number>
- <mmbase.version.postfix>-SNAPSHOT</mmbase.version.postfix>
- <mmbase.version>${mmbase.number}${mmbase.version.postfix}</mmbase.version>
- <!-- Cannot be project.version, because then an extension of this cannot
have it's own version any more -->
<netbeans.hint.deploy.server>gfv3</netbeans.hint.deploy.server>
<netbeans.hint.jdkPlatform>JDK_1.6</netbeans.hint.jdkPlatform>
Modified: mmbase/trunk/pom.xml
===================================================================
--- mmbase/trunk/pom.xml 2009-06-04 14:12:56 UTC (rev 35732)
+++ mmbase/trunk/pom.xml 2009-06-04 14:24:36 UTC (rev 35733)
@@ -67,6 +67,12 @@
<properties>
<compiler.fork>false</compiler.fork>
+
+ <mmbase.number>1.9</mmbase.number>
+ <mmbase.version.postfix>-SNAPSHOT</mmbase.version.postfix>
+
<mmbase.version>${mmbase.number}${mmbase.version.postfix}</mmbase.version>
+ <!-- Cannot be project.version, because then an extension of
this cannot have it's own version any more -->
+
</properties>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
