Author: nico
Date: 2009-06-06 21:09:21 +0200 (Sat, 06 Jun 2009)
New Revision: 35806
Modified:
mmbase/trunk/applications/pom.xml
mmbase/trunk/applications/taglib/pom.xml
mmbase/trunk/maven-base/pom.xml
mmbase/trunk/pom.xml
Log:
Run maven fully offline when external dependencies are present in the local
repository
Modified: mmbase/trunk/applications/pom.xml
===================================================================
--- mmbase/trunk/applications/pom.xml 2009-06-06 18:58:03 UTC (rev 35805)
+++ mmbase/trunk/applications/pom.xml 2009-06-06 19:09:21 UTC (rev 35806)
@@ -13,7 +13,7 @@
<artifactId>mmbase-application-parent</artifactId>
<packaging>pom</packaging>
<name>MMBase Applications</name>
- <version>${mmbase.version}</version>
+ <version>1.9-SNAPSHOT</version>
<description>
Applications are war overlays then can plug in some functionality into an
existing MMBase installation.
@@ -29,27 +29,7 @@
<scope>provided</scope>
</dependency>
- <!--
- Such dependencies may help IDE?
- But don't make much sense otherwise, and the build may fail if not
using deploy profile
-
<dependency>
- <groupId>org.mmbase</groupId>
- <artifactId>mmbase</artifactId>
- <version>${mmbase.version}</version>
- <classifier>javadoc</classifier>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.mmbase</groupId>
- <artifactId>mmbase</artifactId>
- <version>${mmbase.version}</version>
- <classifier>sources</classifier>
- <scope>provided</scope>
- </dependency>
- -->
-
- <dependency>
<groupId>${jsp.groupId}</groupId>
<artifactId>jsp-api</artifactId>
<scope>provided</scope>
Modified: mmbase/trunk/applications/taglib/pom.xml
===================================================================
--- mmbase/trunk/applications/taglib/pom.xml 2009-06-06 18:58:03 UTC (rev
35805)
+++ mmbase/trunk/applications/taglib/pom.xml 2009-06-06 19:09:21 UTC (rev
35806)
@@ -24,6 +24,28 @@
</description>
<build>
+ <resources>
+ <resource>
+
<directory>${basedir}/target/generated-resources/xml/xslt</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>**</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/main/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/main/config</directory>
+ <targetPath>org/mmbase/config</targetPath>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: mmbase/trunk/maven-base/pom.xml
===================================================================
--- mmbase/trunk/maven-base/pom.xml 2009-06-06 18:58:03 UTC (rev 35805)
+++ mmbase/trunk/maven-base/pom.xml 2009-06-06 19:09:21 UTC (rev 35806)
@@ -26,6 +26,10 @@
<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 -->
<servlet.version>2.4</servlet.version>
<jsp.version>2.0</jsp.version>
Modified: mmbase/trunk/pom.xml
===================================================================
--- mmbase/trunk/pom.xml 2009-06-06 18:58:03 UTC (rev 35805)
+++ mmbase/trunk/pom.xml 2009-06-06 19:09:21 UTC (rev 35806)
@@ -67,15 +67,8 @@
<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>
-
<mailingLists>
<mailingList>
<name>MMBase User List</name>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
