Author: epugh
Date: Fri Mar 11 12:10:39 2005
New Revision: 157143
URL: http://svn.apache.org/viewcvs?view=rev&rev=157143
Log:
Tweaks to get distributions produced with NOTICE.txt and LICENSE.txt
Modified:
jakarta/commons/proper/email/trunk/maven.xml
jakarta/commons/proper/email/trunk/project.xml
Modified: jakarta/commons/proper/email/trunk/maven.xml
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/email/trunk/maven.xml?view=diff&r1=157142&r2=157143
==============================================================================
--- jakarta/commons/proper/email/trunk/maven.xml (original)
+++ jakarta/commons/proper/email/trunk/maven.xml Fri Mar 11 12:10:39 2005
@@ -1,22 +1,61 @@
+<?xml version="1.0"?>
+
<!--
- Copyright 2001-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.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
-->
-<project
- xmlns:j="jelly:core"
- xmlns:m="maven"
- xmlns:u="jelly:util"
- default="jar:jar">
-</project>
\ No newline at end of file
+<project default="jar:jar">
+
+ <!-- ================================================================== -->
+ <!-- START : C O M M O N S - B U I L D -->
+ <!-- ================================================================== -->
+ <!-- Required: Look and Feel for documentation within distributions -->
+ <!-- ================================================================== -->
+ <postGoal name="xdoc:copy-resources">
+ <copy todir="${basedir}/target/docs/style/" failonerror="false">
+ <fileset dir="${basedir}/../commons-build/xdocs/style">
+ <include name='**/*'/>
+ <exclude name='**/CVS/**'/>
+ </fileset>
+ </copy>
+ </postGoal>
+ <!-- ================================================================== -->
+ <!-- END: C O M M O N S - B U I L D -->
+ <!-- ================================================================== -->
+
+ <!-- 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>
+
+</project>
+
+
Modified: jakarta/commons/proper/email/trunk/project.xml
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/email/trunk/project.xml?view=diff&r1=157142&r2=157143
==============================================================================
--- jakarta/commons/proper/email/trunk/project.xml (original)
+++ jakarta/commons/proper/email/trunk/project.xml Fri Mar 11 12:10:39 2005
@@ -3,8 +3,22 @@
<name>Commons Email</name>
<groupId>commons-email</groupId>
<artifactId>commons-email</artifactId>
- <currentVersion>1.0-rc3</currentVersion>
- <organization/>
+ <currentVersion>1.0-rc4</currentVersion>
+
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://jakarta.apache.org</url>
+ <logo>http://jakarta.apache.org/images/original-jakarta-logo.gif</logo>
+ </organization>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>/LICENSE.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
<inceptionYear>2001</inceptionYear>
<package>org.apache.commons.mail</package>
<logo>/images/email-logo-white.png</logo>
@@ -143,22 +157,23 @@
</dependency>
</dependencies>
<build>
- <nagEmailAddress>commons-dev@jakarta.apache.org</nagEmailAddress>
- <sourceDirectory>src/java</sourceDirectory>
- <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
- <unitTest>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- </unitTest>
- <resources>
- <resource>
- <includes>
- <include>NOTICE.txt</include>
- </includes>
- <filtering>false</filtering>
- </resource>
- </resources>
+ <nagEmailAddress>commons-dev@jakarta.apache.org</nagEmailAddress>
+ <sourceDirectory>src/java</sourceDirectory>
+ <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+ <unitTest>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ </unitTest>
+ <resources>
+ <resource>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>NOTICE.txt</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
</build>
<reports>
<report>maven-changelog-plugin</report>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
