You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by ni...@apache.org on 2007/01/08 16:46:12 UTC
svn commit: r494097 - /jakarta/commons/proper/commons-parent/trunk/pom.xml
Author: niallp
Date: Mon Jan 8 07:46:11 2007
New Revision: 494097
URL: http://svn.apache.org/viewvc?view=rev&rev=494097
Log:
revert revision 493942 - due to http://jira.codehaus.org/browse/MSOURCES-6
Modified:
jakarta/commons/proper/commons-parent/trunk/pom.xml
Modified: jakarta/commons/proper/commons-parent/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/commons-parent/trunk/pom.xml?view=diff&rev=494097&r1=494096&r2=494097
==============================================================================
--- jakarta/commons/proper/commons-parent/trunk/pom.xml (original)
+++ jakarta/commons/proper/commons-parent/trunk/pom.xml Mon Jan 8 07:46:11 2007
@@ -96,21 +96,6 @@
</mailingList>
</mailingLists>
<build>
- <resources>
- <!--
- N.B. If dependant poms specify resources the following entry will
- need to be added as maven only inherits if no resources are
- specified in the dependant pom.
- -->
- <resource>
- <directory>${basedir}</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- </includes>
- </resource>
- </resources>
<plugins>
<!-- TODO: later use toolchain support to do compilation on an external JDK 1.3+ compiler -->
<plugin>
@@ -143,6 +128,35 @@
<configuration>
<jdkLevel>${maven.compile.source}</jdkLevel>
</configuration>
+ </plugin>
+ <plugin>
+ <!-- This should possibly better be done by using a resource
+ definition. However, if we declare a resource with
+ ${basedir} as the base directory, then the
+ maven-source-plugin will add the whole directory to
+ its contents when generating a "sources" jar.
+
+ see http://jira.codehaus.org/browse/MSOURCES-6
+ -->
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <configuration>
+ <tasks>
+ <copy todir="${project.build.outputDirectory}/META-INF">
+ <fileset dir="${basedir}">
+ <include name="LICENSE.txt" />
+ <include name="NOTICE.txt" />
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org