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 2006/07/10 13:22:38 UTC

svn commit: r420490 - in /jakarta/commons/proper/lang/trunk: maven.xml project.properties project.xml

Author: niallp
Date: Mon Jul 10 04:22:38 2006
New Revision: 420490

URL: http://svn.apache.org/viewvc?rev=420490&view=rev
Log:
Fix for LANG-272 - minor build changes

Modified:
    jakarta/commons/proper/lang/trunk/maven.xml
    jakarta/commons/proper/lang/trunk/project.properties
    jakarta/commons/proper/lang/trunk/project.xml

Modified: jakarta/commons/proper/lang/trunk/maven.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/lang/trunk/maven.xml?rev=420490&r1=420489&r2=420490&view=diff
==============================================================================
--- jakarta/commons/proper/lang/trunk/maven.xml (original)
+++ jakarta/commons/proper/lang/trunk/maven.xml Mon Jul 10 04:22:38 2006
@@ -23,12 +23,13 @@
     <!-- Copy Files -->
     <copy todir="${maven.dist.src.assembly.dir}">
       <fileset dir=".">
-        <include name="RELEASE-NOTES.txt"/>
+        <include name="RELEASE-NOTES*.txt"/>
         <include name="NOTICE.txt"/>
         <include name="PROPOSAL.html"/>
         <include name="STATUS.html"/>
         <include name="default.properties"/>
         <include name="checkstyle.xml"/>
+        <include name="checkstyle.properties"/>
       </fileset>
     </copy>
 
@@ -41,6 +42,16 @@
     <delete dir="${maven.dist.src.assembly.dir}/src/java/org/apache/commons/lang/text"/>
     <delete dir="${maven.dist.src.assembly.dir}/src/test/org/apache/commons/lang/text"/>
     
+  </postGoal>
+
+  <!-- Release process uses ant for Binary build, however for completeness... -->
+  <postGoal name="dist:prepare-bin-filesystem">
+
+    <copy todir="${maven.dist.bin.assembly.dir}">
+      <fileset file="${basedir}/NOTICE.txt"/>
+      <fileset file="${basedir}/RELEASE-NOTES.txt"/>
+    </copy>
+
   </postGoal>
   
 </project>

Modified: jakarta/commons/proper/lang/trunk/project.properties
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/lang/trunk/project.properties?rev=420490&r1=420489&r2=420490&view=diff
==============================================================================
--- jakarta/commons/proper/lang/trunk/project.properties (original)
+++ jakarta/commons/proper/lang/trunk/project.properties Mon Jul 10 04:22:38 2006
@@ -32,6 +32,9 @@
 maven.jar.manifest.attribute.X-Compile-Source-JDK=${maven.compile.source}
 maven.jar.manifest.attribute.X-Compile-Target-JDK=${maven.compile.target}
 
+# Make the source distro unzip to a different directory
+maven.dist.src.assembly.dir=${maven.dist.assembly.dir}/src/${maven.final.name}-src
+
 # The Sun Javadoc for versions prior to 1.3 are off-line.
 maven.javadoc.links=http://java.sun.com/j2se/1.3/docs/api/
 maven.javadoc.source=1.3

Modified: jakarta/commons/proper/lang/trunk/project.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/lang/trunk/project.xml?rev=420490&r1=420489&r2=420490&view=diff
==============================================================================
--- jakarta/commons/proper/lang/trunk/project.xml (original)
+++ jakarta/commons/proper/lang/trunk/project.xml Mon Jul 10 04:22:38 2006
@@ -408,6 +408,15 @@
         <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
         <integrationUnitTestSourceDirectory/>
         <aspectSourceDirectory/>
+        <resources>
+            <resource>
+                <directory>.</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+        </resources>
         <!-- Unit test classes -->
         <unitTest>
             <includes>



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org