Return-Path: 
 <notifications-return-1207-apmail-ant-notifications-archive=ant.apache.org@ant.apache.org>
Delivered-To: apmail-ant-notifications-archive@locus.apache.org
Received: (qmail 45775 invoked from network); 29 Feb 2008 08:15:54 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 29 Feb 2008 08:15:54 -0000
Received: (qmail 15364 invoked by uid 500); 29 Feb 2008 08:15:49 -0000
Delivered-To: apmail-ant-notifications-archive@ant.apache.org
Received: (qmail 15345 invoked by uid 500); 29 Feb 2008 08:15:49 -0000
Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:notifications-help@ant.apache.org>
List-Unsubscribe: <mailto:notifications-unsubscribe@ant.apache.org>
List-Post: <mailto:notifications@ant.apache.org>
List-Id: <notifications.ant.apache.org>
Reply-To: dev@ant.apache.org
Delivered-To: mailing list notifications@ant.apache.org
Received: (qmail 15336 invoked by uid 99); 29 Feb 2008 08:15:49 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Feb 2008 00:15:49 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Feb 2008 08:14:59 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id E87AB1A9832; Fri, 29 Feb 2008 00:15:19 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r632256 - in /ant/ivy/core/trunk: build-release.xml
 build.xml
Date: Fri, 29 Feb 2008 08:15:19 -0000
To: notifications@ant.apache.org
From: xavier@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080229081519.E87AB1A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: xavier
Date: Fri Feb 29 00:15:18 2008
New Revision: 632256

URL: http://svn.apache.org/viewvc?rev=632256&view=rev
Log:
merge packaging fix from 2.0.0-beta2 branch (r630439)

Modified:
    ant/ivy/core/trunk/build-release.xml
    ant/ivy/core/trunk/build.xml

Modified: ant/ivy/core/trunk/build-release.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/build-release.xml?rev=632256&r1=632255&r2=632256&view=diff
==============================================================================
--- ant/ivy/core/trunk/build-release.xml (original)
+++ ant/ivy/core/trunk/build-release.xml Fri Feb 29 00:15:18 2008
@@ -71,7 +71,7 @@
 			<zipfileset dir="${basedir}/test/triggers" prefix="${snapshot.full.name}/test/triggers" excludes="**/cache/**"/>
 			<zipfileset dir="${basedir}/test/xsl" prefix="${snapshot.full.name}/test/xsl"/>
 			<zipfileset dir="${src.dir}/org/apache/ivy/plugins/parser/xml" includes="ivy.xsd" fullpath="${snapshot.full.name}/ivy.xsd"/>
-			<zipfileset dir="${basedir}" includes="MANIFEST.MF" fullpath="${snapshot.full.name}/MANIFEST.MF"/>
+			<zipfileset dir="${basedir}" includes="META-INF/MANIFEST.MF" fullpath="${snapshot.full.name}/META-INF/MANIFEST.MF"/>
 			<zipfileset dir="${basedir}" includes="NOTICE" fullpath="${snapshot.full.name}/NOTICE"/>
 			<zipfileset dir="${basedir}" includes="README" prefix="${snapshot.full.name}"/>
 			<zipfileset dir="${basedir}" includes="LICENSE*" prefix="${snapshot.full.name}"/>
@@ -163,8 +163,7 @@
 		<copy file="${artifacts.build.dir}/jars/${final.name}" 
 				tofile="${m2.distrib.dir}/ivy-${build.version}.jar" />
 		<!-- jar javadocs -->
-	    <jar destfile="${m2.distrib.dir}/ivy-${build.version}-javadoc.jar"
-	            manifest="${basedir}/MANIFEST.MF">
+	    <jar destfile="${m2.distrib.dir}/ivy-${build.version}-javadoc.jar">
 	        <fileset dir="${javadoc.build.dir}" />
 	    </jar>
 		<!-- copy sources jar -->

Modified: ant/ivy/core/trunk/build.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/build.xml?rev=632256&r1=632255&r2=632256&view=diff
==============================================================================
--- ant/ivy/core/trunk/build.xml (original)
+++ ant/ivy/core/trunk/build.xml Fri Feb 29 00:15:18 2008
@@ -307,7 +307,7 @@
         <!-- package the two ivy jars -->
         <jar destfile="${artifacts.build.dir}/jars/${final.name}"
                 manifest="${artifacts.build.dir}/MANIFEST.MF">
-            <metainf dir="${basedir}" includes="LICENSE,DISCLAIMER,NOTICE" />
+            <metainf dir="${basedir}" includes="LICENSE,NOTICE" />
             <manifest>
                 <attribute name="Specification-Title" value="Apache Ivy with Ant tasks" />
                 <attribute name="Specification-Version" value="${build.version}" />
@@ -325,7 +325,7 @@
             <fileset dir="${optional.classes.build.dir}" />
         </jar>
         <jar destfile="${artifacts.build.dir}/jars/${final.core.name}">
-            <metainf dir="${basedir}" includes="LICENSE,DISCLAIMER,NOTICE" />
+            <metainf dir="${basedir}" includes="LICENSE,NOTICE" />
             <manifest>
                 <attribute name="Specification-Title" value="Apache Ivy Core (without Ant tasks)" />
                 <attribute name="Specification-Version" value="${build.version}" />
@@ -520,13 +520,23 @@
 	
     <target name="sources" depends="default-version" description="Create source archive files">
     	<mkdir dir="${artifacts.build.dir}/sources/"/>
-        <jar destfile="${artifacts.build.dir}/sources/${final.name}"
-                manifest="${basedir}/MANIFEST.MF">
+        <jar destfile="${artifacts.build.dir}/sources/${final.name}">
+            <metainf dir="${basedir}" includes="LICENSE,NOTICE" />
+            <manifest>
+                <attribute name="Specification-Title" value="Apache Ivy Sources" />
+                <attribute name="Specification-Version" value="${build.version}" />
+                <attribute name="Specification-Vendor" value="Apache Software Foundation" />
+            </manifest>
             <fileset dir="${src.dir}" />
         </jar>
     	<!-- TODO : we should restrict sources files to the core only -->
-        <jar destfile="${artifacts.build.dir}/sources/${final.core.name}"
-                manifest="${basedir}/MANIFEST.MF">
+        <jar destfile="${artifacts.build.dir}/sources/${final.core.name}">
+            <metainf dir="${basedir}" includes="LICENSE,NOTICE" />
+            <manifest>
+                <attribute name="Specification-Title" value="Apache Ivy Sources" />
+                <attribute name="Specification-Version" value="${build.version}" />
+                <attribute name="Specification-Vendor" value="Apache Software Foundation" />
+            </manifest>
             <fileset dir="${src.dir}" />
         </jar>
 	</target>