tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Konstantin Kolinko <knst.koli...@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
Date Thu, 13 Jun 2013 12:57:18 GMT
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


Mime
View raw message