geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r421774 - in /geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin: pom.xml src/java/ src/main/ src/main/java/ src/main/java/org/ src/main/resources/ src/main/resources/META-INF/ src/resources/
Date Fri, 14 Jul 2006 00:41:24 GMT
Author: jdillon
Date: Thu Jul 13 17:41:23 2006
New Revision: 421774

URL: http://svn.apache.org/viewvc?rev=421774&view=rev
Log:
Use standard m2 layout

Added:
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/
      - copied from r421762, geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/java/
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/java/org/
      - copied from r421773, geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/java/org/
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/resources/
      - copied from r421762, geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/resources/
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/main/resources/META-INF/
      - copied from r421773, geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/resources/META-INF/
Removed:
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/java/
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/src/resources/
Modified:
    geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/pom.xml

Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/pom.xml?rev=421774&r1=421773&r2=421774&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/car-maven-plugin/pom.xml Thu Jul 13 17:41:23
2006
@@ -34,7 +34,7 @@
     
     <dependencies>
         
-    <dependency>
+        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
             <version>${pom.version}</version>
@@ -122,8 +122,16 @@
             <artifactId>xpp3</artifactId>
         </dependency> 
     </dependencies>
-
+    
     <build>
+        <!-- FIXME: Remove when the default is to use the m2 standard layout -->
+        <sourceDirectory>${pom.basedir}/src/main/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+            </resource>
+        </resources>
+        
         <plugins>
             <plugin>
                 <artifactId>maven-plugin-plugin</artifactId>



Mime
View raw message