From dev-return-191349-archive-asf-public=cust-asf.ponee.io@tomcat.apache.org  Fri Jun  8 12:41:08 2018
Return-Path: <dev-return-191349-archive-asf-public=cust-asf.ponee.io@tomcat.apache.org>
X-Original-To: archive-asf-public@cust-asf.ponee.io
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by mx-eu-01.ponee.io (Postfix) with SMTP id 1F9C8180608
	for <archive-asf-public@cust-asf.ponee.io>; Fri,  8 Jun 2018 12:41:07 +0200 (CEST)
Received: (qmail 42070 invoked by uid 500); 8 Jun 2018 10:41:06 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 42059 invoked by uid 99); 8 Jun 2018 10:41:06 -0000
Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Jun 2018 10:41:06 +0000
Received: from svn01-us-west.apache.org (localhost [127.0.0.1])
	by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id E231E3A0100
	for <dev@tomcat.apache.org>; Fri,  8 Jun 2018 10:41:00 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1833161 - /tomcat/trunk/build.xml
Date: Fri, 08 Jun 2018 10:41:00 -0000
To: dev@tomcat.apache.org
From: markt@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20180608104100.E231E3A0100@svn01-us-west.apache.org>

Author: markt
Date: Fri Jun  8 10:41:00 2018
New Revision: 1833161

URL: http://svn.apache.org/viewvc?rev=1833161&view=rev
Log:
Fix bnd failures on Windows

Modified:
    tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1833161&r1=1833160&r2=1833161&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri Jun  8 10:41:00 2018
@@ -3034,10 +3034,11 @@ Read the Building page on the Apache Tom
 
   <target name="add-osgi" if="${addOSGi}" >
     <echo message="add-osgi ${jarfile} ${addOSGi}"></echo>
-    <bndwrap output="${jarfile}" definitions="${tomcat.bnd}" >
+    <bndwrap output="${jarfile}.bnd" definitions="${tomcat.bnd}" >
       <fileset file="${jarfile}"  />
     </bndwrap>
-    <delete file="${jarfile}.bak" />
+    <delete file="${jarfile}" />
+    <move file="${jarfile}.bnd" tofile="${jarfile}" />
   </target>
 
   <!-- Macro, used to create checksum and signature files  -->



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