geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tki...@apache.org
Subject svn commit: r690451 - in /geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly: deployable.xml updatesite.xml
Date Sat, 30 Aug 2008 04:09:29 GMT
Author: tkirby
Date: Fri Aug 29 21:09:29 2008
New Revision: 690451

URL: http://svn.apache.org/viewvc?rev=690451&view=rev
Log:
GERONIMODEVTOOLS-505 PLUGIN_RELEASE-NOTES-2.1.2.txt missing from distribution
${pom.version} does not get expanded by assembly filtering :-(, so use a filtered version
from earlier in the build.


Modified:
    geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml
    geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml

Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml?rev=690451&r1=690450&r2=690451&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml Fri Aug
29 21:09:29 2008
@@ -30,10 +30,19 @@
             <includes>
                 <include>LICENSE.txt</include>
                 <include>NOTICE.txt</include>
-                <include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
             </includes>
         </fileSet>
     </fileSets>
+    <files>
+        <file>
+            <source>../features/org.apache.geronimo.v21.feature/target/classes/about_files/PLUGIN_RELEASE-NOTES-${pom.version}.txt</source>
+            <outputDirectory>eclipse</outputDirectory>
+            <!--  <filtered>true</filtered>
+                 ${pom.version} does not get expanded by this filtering :-(
+                 so I take a filtered version from earlier in the build for GERONIMODEVTOOLS-505
+              -->
+        </file>
+    </files>
     <dependencySets>
 
         <!-- 

Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml?rev=690451&r1=690450&r2=690451&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml Fri Aug
29 21:09:29 2008
@@ -30,10 +30,23 @@
             <includes>
                 <include>LICENSE.txt</include>
                 <include>NOTICE.txt</include>
-                <include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
             </includes>
         </fileSet>
     </fileSets>
+    <files>
+        <file>
+            <source>${basedir}/src/main/assembly/site.xml</source>
+            <outputDirectory>/</outputDirectory>
+        </file>
+        <file>
+            <source>../features/org.apache.geronimo.v21.feature/target/classes/about_files/PLUGIN_RELEASE-NOTES-${pom.version}.txt</source>
+            <outputDirectory></outputDirectory>
+            <!--  <filtered>true</filtered>
+                 ${pom.version} does not get expanded by this filtering :-(
+                 so I take a filtered version from earlier in the build for GERONIMODEVTOOLS-505
+              -->
+        </file>
+    </files>
     <dependencySets>
 
         <!-- 
@@ -74,10 +87,4 @@
         </dependencySet>
 
     </dependencySets>
-    <files>
-        <file>
-            <source>${basedir}/src/main/assembly/site.xml</source>
-            <outputDirectory>/</outputDirectory>
-        </file>
-    </files>
 </assembly>



Mime
View raw message