Return-Path: 
 <derby-commits-return-544-apmail-db-derby-commits-archive=db.apache.org@db.apache.org>
Delivered-To: apmail-db-derby-commits-archive@www.apache.org
Received: (qmail 5904 invoked from network); 25 Apr 2005 19:27:32 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 25 Apr 2005 19:27:32 -0000
Received: (qmail 88644 invoked by uid 500); 25 Apr 2005 19:28:04 -0000
Delivered-To: apmail-db-derby-commits-archive@db.apache.org
Received: (qmail 88627 invoked by uid 500); 25 Apr 2005 19:28:04 -0000
Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:derby-commits-help@db.apache.org>
list-unsubscribe: <mailto:derby-commits-unsubscribe@db.apache.org>
List-Post: <mailto:derby-commits@db.apache.org>
Reply-To: "Derby Development" <derby-dev@db.apache.org>
Delivered-To: mailing list derby-commits@db.apache.org
Received: (qmail 88614 invoked by uid 500); 25 Apr 2005 19:28:04 -0000
Delivered-To: apmail-incubator-derby-cvs@incubator.apache.org
Received: (qmail 88611 invoked by uid 99); 25 Apr 2005 19:28:04 -0000
X-ASF-Spam-Status: No, hits=0.2 required=10.0
	tests=NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Mon, 25 Apr 2005 12:28:04 -0700
Received: (qmail 5891 invoked by uid 65534); 25 Apr 2005 19:27:30 -0000
Message-ID: <20050425192730.5890.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r164628 - /incubator/derby/code/branches/10.0/build.xml
Date: Mon, 25 Apr 2005 19:27:30 -0000
To: derby-cvs@incubator.apache.org
From: fuzzylogic@apache.org
X-Mailer: svnmailer-1.0.0-dev
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: fuzzylogic
Date: Mon Apr 25 12:27:28 2005
New Revision: 164628

URL: http://svn.apache.org/viewcvs?rev=3D164628&view=3Drev
Log:
Derby-228: Merge revision 164627 to 10.0 branch


Modified:
    incubator/derby/code/branches/10.0/build.xml

Modified: incubator/derby/code/branches/10.0/build.xml
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.0/build=
.xml?rev=3D164628&r1=3D164627&r2=3D164628&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/derby/code/branches/10.0/build.xml (original)
+++ incubator/derby/code/branches/10.0/build.xml Mon Apr 25 12:27:28 2005
@@ -749,7 +749,7 @@
     <manifest file=3D"${derby.jar.dir}/lists/smf.mf">
       <attribute name=3D"Bundle-Vendor" value=3D"Apache Software Foundatio=
n"/>
       <attribute name=3D"Bundle-Name" value=3D"Apache Derby ${major}.${min=
or}"/>
-      <attribute name=3D"Bundle-Version" value=3D"${major}.${minor}.${main=
t}"/>
+      <attribute name=3D"Bundle-Version" value=3D"${major}.${minor}.${main=
t}.${changenumber}"/>
     </manifest>=20
=20
     <jar destfile=3D"${derby.jar.dir}/derby.jar"
@@ -767,8 +767,7 @@
       <attribute name=3D"Bundle-Vendor" value=3D"Apache Software Foundatio=
n"/>
       <attribute name=3D"Bundle-Activator" value=3D"org.apache.derby.osgi.=
EmbeddedActivator"/>
       <attribute name=3D"Bundle-Name" value=3D"Apache Derby ${major}.${min=
or}"/>
-      <attribute name=3D"Bundle-Version" value=3D"${major}.${minor}.${main=
t}"/>
-      <attribute name=3D"Import-Package" value=3D"java.sql"/>
+      <attribute name=3D"Bundle-Version" value=3D"${major}.${minor}.${main=
t}.${changenumber}"/>
       <attribute name=3D"DynamicImport-Package" value=3D"*"/>
       <attribute name=3D"Export-Package" value=3D"org.apache.derby.authent=
ication,org.apache.derby.database,org.apache.derby.io,org.apache.derby.jdbc=
,org.apache.derby.vti"/>=20
     </manifest>=20