You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by pd...@apache.org on 2006/02/25 21:15:31 UTC
svn commit: r380976 -
/incubator/servicemix/trunk/tooling/maven-eclipse-plugin-plugin/project.xml
Author: pdodds
Date: Sat Feb 25 12:15:27 2006
New Revision: 380976
URL: http://svn.apache.org/viewcvs?rev=380976&view=rev
Log:
Updated to refer to the parent project
Modified:
incubator/servicemix/trunk/tooling/maven-eclipse-plugin-plugin/project.xml
Modified: incubator/servicemix/trunk/tooling/maven-eclipse-plugin-plugin/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/tooling/maven-eclipse-plugin-plugin/project.xml?rev=380976&r1=380975&r2=380976&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/maven-eclipse-plugin-plugin/project.xml (original)
+++ incubator/servicemix/trunk/tooling/maven-eclipse-plugin-plugin/project.xml Sat Feb 25 12:15:27 2006
@@ -1,3 +1,47 @@
+<<<<<<< .mine
+<project>
+ <pomVersion>3</pomVersion>
+
+ <extend>${basedir}/../../etc/project.xml</extend>
+
+ <artifactId>maven-eclipse-plugin-plugin</artifactId>
+
+ <name>Eclipse Plugin Generating Plugin</name>
+
+ <shortDescription>
+ Plugin that generates an Eclipse plugin
+ </shortDescription>
+ <description>
+ Plugin that generates an Eclipse plugin
+ </description>
+
+ <developers>
+ <developer>
+ <name>Philip Dodds</name>
+ <id>pdodds</id>
+ <email>philip.dodds@gmail.com</email>
+ <timezone>0</timezone>
+ </developer>
+ </developers>
+ <build>
+ <!-- This section is compulsory -->
+ <resources>
+ <resource>
+ <directory>${basedir}/src/plugin-resources</directory>
+ <targetPath>plugin-resources</targetPath>
+ </resource>
+ <resource>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>plugin.jelly</include>
+ <include>plugin.properties</include>
+ <include>project.properties</include>
+ <include>project.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+=======
<project>
<pomVersion>3</pomVersion>
<artifactId>maven-eclipse-plugin-plugin</artifactId>
@@ -39,4 +83,5 @@
</resource>
</resources>
</build>
+>>>>>>> .r380975
</project>