You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sn...@apache.org on 2006/01/28 18:24:12 UTC
svn commit: r373186 - in /maven/maven-1/plugins/trunk/rar: plugin.jelly
xdocs/changes.xml
Author: snicoll
Date: Sat Jan 28 09:24:03 2006
New Revision: 373186
URL: http://svn.apache.org/viewcvs?rev=373186&view=rev
Log:
MPRAR-2: Fixed handling of plugin properties: ra.xml file is now included wherever it is located.
Modified:
maven/maven-1/plugins/trunk/rar/plugin.jelly
maven/maven-1/plugins/trunk/rar/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/rar/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/rar/plugin.jelly?rev=373186&r1=373185&r2=373186&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/rar/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/rar/plugin.jelly Sat Jan 28 09:24:03 2006
@@ -56,7 +56,16 @@
<!-- include files from maven.rar.src if available -->
<util:available file="${maven.rar.src}">
- <fileset dir="${maven.rar.src}" casesensitive="false"/>
+ <fileset dir="${maven.rar.src}" casesensitive="false"
+ excludes="**/META-INF/ra.xml"/>
+ </util:available>
+
+ <!-- include ra.xml -->
+ <util:available file="${maven.rar.raxml}">
+ <util:file name="${maven.rar.raxml}" var="raXmlFile"/>
+ <ant:metainf dir="${raXmlFile.canonicalFile.parent}">
+ <ant:include name="${raXmlFile.canonicalFile.name}"/>
+ </ant:metainf>
</util:available>
<!-- include built jar if available -->
Modified: maven/maven-1/plugins/trunk/rar/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/rar/xdocs/changes.xml?rev=373186&r1=373185&r2=373186&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/rar/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/rar/xdocs/changes.xml Sat Jan 28 09:24:03 2006
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.1-SNAPSHOT" date="in SVN">
+ <action dev="snicoll" type="fix" issue="MPRAR-1">Fixed handling of plugin properties: ra.xml file is now included wherever it is located.</action>
<action dev="snicoll" type="add" issue="MPRAR-2">Added maven.rar.final.name property.</action>
<action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated :
<ul>