You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2006/02/27 14:05:56 UTC
svn commit: r381335 -
/incubator/servicemix/trunk/tooling/maven-eclipse-plugin-plugin/project.xml
Author: gnodet
Date: Mon Feb 27 05:05:53 2006
New Revision: 381335
URL: http://svn.apache.org/viewcvs?rev=381335&view=rev
Log:
Fix bad project.xml
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=381335&r1=381334&r2=381335&view=diff
==============================================================================
--- incubator/servicemix/trunk/tooling/maven-eclipse-plugin-plugin/project.xml (original)
+++ incubator/servicemix/trunk/tooling/maven-eclipse-plugin-plugin/project.xml Mon Feb 27 05:05:53 2006
@@ -1,4 +1,3 @@
-<<<<<<< .mine
<project>
<pomVersion>3</pomVersion>
@@ -41,47 +40,4 @@
</resource>
</resources>
</build>
-=======
-<project>
- <pomVersion>3</pomVersion>
- <artifactId>maven-eclipse-plugin-plugin</artifactId>
- <groupId>servicemix</groupId>
- <name>Eclipse Plugin Generating Plugin</name>
- <currentVersion>0.1</currentVersion>
- <inceptionYear>2005</inceptionYear>
-
- <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>
->>>>>>> .r380975
-</project>
\ No newline at end of file
+</project>