Return-Path: 
 <dev-return-139079-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
X-Original-To: apmail-tomcat-dev-archive@www.apache.org
Delivered-To: apmail-tomcat-dev-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 684FB10DDC
	for <apmail-tomcat-dev-archive@www.apache.org>;
 Thu, 13 Jun 2013 12:57:46 +0000 (UTC)
Received: (qmail 28619 invoked by uid 500); 13 Jun 2013 12:57:44 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 28533 invoked by uid 500); 13 Jun 2013 12:57:44 -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 28523 invoked by uid 99); 13 Jun 2013 12:57:43 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Jun 2013 12:57:43 +0000
X-ASF-Spam-Status: No, hits=-0.7 required=5.0
	tests=RCVD_IN_DNSWL_LOW,SPF_PASS
X-Spam-Check-By: apache.org
Received-SPF: pass (athena.apache.org: domain of knst.kolinko@gmail.com
 designates 209.85.219.45 as permitted sender)
Received: from [209.85.219.45] (HELO mail-oa0-f45.google.com) (209.85.219.45)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Jun 2013 12:57:39 +0000
Received: by mail-oa0-f45.google.com with SMTP id j1so4041821oag.18
        for <dev@tomcat.apache.org>; Thu, 13 Jun 2013 05:57:18 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20120113;
        h=mime-version:in-reply-to:references:date:message-id:subject:from:to
         :content-type;
        bh=3cckak1SF62MHovoNO54pW+wLC1a2KPh/ZXuegZT4G0=;
        b=RfcMBtUQemYAIdJ6pxaV6nGe2gGQDzQ9iPerHe2U2syRvYw56xXgFsLHd9EsmkJA4M
         uT+2qGv9yuuBIP630E2IaEbll3e4CMcKdumnA/s9/O2vnijv7r+p+VJbXFepILzsgsBp
         dMo+gqDlOYVwVUaGXckOjP0iNAh1vmTqjV90LnGI30srRO0MZQVS2Y4LSVRpmiMA/8un
         xJHGHpBb2IBgf5W38JTEeq+UN6EeWAnV1vmdZT50o2N8LGmHh9c1di730U/4jKhVBxhS
         rZy3Zt4cjxDzdWHg3CLxMsWQcVRMdJK6QNvwpcE4yLnwfnikQiCQQE6oUxf79zrDNiCg
         iUvQ==
MIME-Version: 1.0
X-Received: by 10.60.43.232 with SMTP id z8mr521148oel.138.1371128238650; Thu,
 13 Jun 2013 05:57:18 -0700 (PDT)
Received: by 10.76.117.165 with HTTP; Thu, 13 Jun 2013 05:57:18 -0700 (PDT)
In-Reply-To: <51B9BACA.6030707@pingtoo.com>
References: <51B9BACA.6030707@pingtoo.com>
Date: Thu, 13 Jun 2013 16:57:18 +0400
Message-ID: 
 <CABzHfVk1M+PB3PS5rk7FzDLkwK3NUXMoPa2RrVrx_w3fcs=eWA@mail.gmail.com>
Subject: Re: svn commit: r1492563 - in /tomcat/tc7.0.x/trunk: ./
 build.properties.default build.xml modules/jdbc-pool/build.properties.default
 modules/jdbc-pool/build.xml webapps/docs/changelog.xml
From: Konstantin Kolinko <knst.kolinko@gmail.com>
To: Tomcat Developers List <dev@tomcat.apache.org>
Content-Type: text/plain; charset=ISO-8859-1
X-Virus-Checked: Checked by ClamAV on apache.org

2013/6/13 Brian Burch <brian@pingtoo.com>:
> Sorry, but I cannot quote the relevant section of the original email because
> I had already deleted my copy.
>
> This commit replaces the dependency on junit 4.8.2 with 4.11. It causes
> collateral damage to the current version of netbeans support. It is on my
> todo list to come up with a less fragile solution, but in the meantime could
> someone please commit the following change on my behalf?
>
> brian@schizo:~/sandboxApache/tomcat8/trunk$ svn diff
> Index: res/ide-support/netbeans/project.xml
> ===================================================================
> --- res/ide-support/netbeans/project.xml        (revision 1492631)
> +++ res/ide-support/netbeans/project.xml        (working copy)
> @@ -189,9 +189,9 @@
>              <compilation-unit>
>                  <package-root>test</package-root>
>                  <unit-tests/>
> -                <classpath
> mode="compile">output/classes:output/testclasses:${base.path}/junit4.8.2/junit-4.8.2.jar</classpath>
> +                <classpath
> mode="compile">output/classes:output/testclasses:${base.path}/junit-4.11/junit-4.11.jar</classpath>
>                  <source-level>1.7</source-level>
>              </compilation-unit>
>          </java-data>
>      </configuration>
> -</project>
> \ No newline at end of file
> +</project>
>

Done.
http://svn.apache.org/r1492647

BTW,  nb-tomcat-project.properties  file contains:
ant.includes= ... ${ant.home}/lib/junit.jar

Does one really need that copy of JUnit jar?
There is no junit.jar file in my copy of Ant 1.9.1.

> BTW.. I don't understand the "no newline" warning - I tried my diff against
> new copies with and without a trailing newline, but got the message in both
> cases.

It is just an information message, as otherwise the textual diff
format cannot show the difference differentiate between missing and
present newline on the last line of a file.

As the message is just after '-' and before '+' it means that the old
file ends with '</project>' character without any trailing newline.
It might be that your text editor adds one.

For XML files the presence of a newline at the end of the file does not matter.

Best regards,
Konstantin Kolinko

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