You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by oh...@apache.org on 2005/03/10 20:33:25 UTC
svn commit: r156981 - in jakarta/commons/proper/configuration/trunk:
maven.xml project.xml
Author: oheger
Date: Thu Mar 10 11:33:23 2005
New Revision: 156981
URL: http://svn.apache.org/viewcvs?view=rev&rev=156981
Log:
Updated build scripts to include NOTICE.txt in the distros and the jar
Modified:
jakarta/commons/proper/configuration/trunk/maven.xml
jakarta/commons/proper/configuration/trunk/project.xml
Modified: jakarta/commons/proper/configuration/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/configuration/trunk/maven.xml?view=diff&r1=156980&r2=156981
==============================================================================
--- jakarta/commons/proper/configuration/trunk/maven.xml (original)
+++ jakarta/commons/proper/configuration/trunk/maven.xml Thu Mar 10 11:33:23 2005
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
-Copyright 2002-2004 The Apache Software Foundation.
+Copyright 2002-2005 The Apache Software Foundation.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -35,14 +35,26 @@
<!-- END: C O M M O N S - B U I L D -->
<!-- ================================================================== -->
- <!-- Ensures that the conf directory is included in the source distro. -->
+ <!-- Ensures that the conf directory and NOTICE.txt are included in the
+ source distro.
+ -->
<postGoal name="dist:prepare-src-filesystem">
<mkdir dir="${maven.dist.src.assembly.dir}/conf"/>
<copy todir="${maven.dist.src.assembly.dir}/conf">
<fileset dir="${basedir}/conf">
</fileset>
</copy>
+ <copy todir="${maven.dist.src.assembly.dir}">
+ <fileset file="${basedir}/NOTICE.txt"/>
+ </copy>
</postGoal>
+
+ <!-- Ensures that NOTICE.txt is added to the binary distro -->
+ <preGoal name="dist:build-bin">
+ <copy todir="${maven.dist.bin.assembly.dir}">
+ <fileset file="${basedir}/NOTICE.txt"/>
+ </copy>
+ </preGoal>
<!-- NonStringTestHolder.java contains tests shared by JUnit and Cactus
tests. This ugly hack moves the src from /src/test to /src/test-cactus
Modified: jakarta/commons/proper/configuration/trunk/project.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/configuration/trunk/project.xml?view=diff&r1=156980&r2=156981
==============================================================================
--- jakarta/commons/proper/configuration/trunk/project.xml (original)
+++ jakarta/commons/proper/configuration/trunk/project.xml Thu Mar 10 11:33:23 2005
@@ -408,6 +408,13 @@
<include>properties.dtd</include>
</includes>
</resource>
+ <resource>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
</resources>
</build>
<reports>
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org