Author: nico
Date: 2009-06-05 15:20:21 +0200 (Fri, 05 Jun 2009)
New Revision: 35774

Modified:
   mmbase/trunk/maven-base/pom.xml
Log:
Changes in broken maven 2 files
Add resources to jar when multiproject builds

Modified: mmbase/trunk/maven-base/pom.xml
===================================================================
--- mmbase/trunk/maven-base/pom.xml     2009-06-05 13:10:55 UTC (rev 35773)
+++ mmbase/trunk/maven-base/pom.xml     2009-06-05 13:20:21 UTC (rev 35774)
@@ -77,34 +77,33 @@
     <defaultGoal>install</defaultGoal>
                <resources>
                        <resource>
-                               <directory>src/main/java</directory>
+                               <directory>${basedir}/src/main/java</directory>
                                <excludes>
                                        <exclude>**/*.java</exclude>
                                </excludes>
                        </resource>
                        <resource>
-                               <directory>src/main/resources</directory>
+                               
<directory>${basedir}/src/main/resources</directory>
                                <includes>
                                        <include>**/*</include>
                                </includes>
                        </resource>
                        <resource>
-                               
<directory>src/main/resources-filtered</directory>
+                               
<directory>${basedir}/src/main/resources-filtered</directory>
                                <includes>
                                        <include>**</include>
                                </includes>
                                <filtering>true</filtering>
                        </resource>
                        <resource>
+                               
<directory>${basedir}/src/main/config</directory>
                                <targetPath>org/mmbase/config</targetPath>
-                               <directory>src/main/config</directory>
-               <includes>
-                       <include>**/*</include>
-               </includes>
+                               <includes>
+                                       <include>**/*</include>
+                               </includes>
                        </resource>
-
                        <resource>
-                               
<directory>target/generated/src/main/resources</directory>
+                               
<directory>${basedir}/target/generated/src/main/resources</directory>
                                <includes>
                                        <include>**</include>
                                </includes>

_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to