Author: violetagg
Date: Tue Mar 22 09:18:12 2016
New Revision: 1736163
URL: http://svn.apache.org/viewvc?rev=1736163&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59211
Merged revision 1736162 from tomcat/trunk:
Add hamcrest to Eclipse classpath. Patch is provided by Huxing Zhang.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/res/ide-support/eclipse/eclipse.classpath
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 22 09:18:12 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162
Modified: tomcat/tc8.5.x/trunk/res/ide-support/eclipse/eclipse.classpath
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/res/ide-support/eclipse/eclipse.classpath?rev=1736163&r1=1736162&r2=1736163&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/res/ide-support/eclipse/eclipse.classpath (original)
+++ tomcat/tc8.5.x/trunk/res/ide-support/eclipse/eclipse.classpath Tue Mar 22
09:18:12 2016
@@ -26,5 +26,6 @@
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/wsdl4j-1.6.2/wsdl4j-1.6.2.jar"/>
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/ecj-4.5.1/ecj-4.5.1.jar"/>
<classpathentry kind="var"
path="TOMCAT_LIBS_BASE/easymock-3.2/easymock-3.2.jar"/>
+ <classpathentry kind="var"
path="TOMCAT_LIBS_BASE/hamcrest-1.3/hamcrest-core-1.3.jar"/>
<classpathentry kind="output" path=".settings/output"/>
</classpath>
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1736163&r1=1736162&r2=1736163&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Tue Mar 22 09:18:12 2016
@@ -68,13 +68,17 @@
<subsection name="Other">
<changelog>
<fix>
- <bug>59209<bug>: Remove <code>honorCipherOrder=false</code> attribute
+ <bug>59209</bug>: Remove <code>honorCipherOrder=false</code> attribute
from the connector example in server.xml. When the block is uncommented
the connector will use the default value for this attribute which is
<code>false</code>. If one needs to enable it, one can add it
explicitly to the connector definition. Use of this feature requires
Java 8 or later. Patch is provided by Huxing Zhang. (violetagg)
</fix>
+ <fix>
+ <bug>59211</bug>: Add hamcrest to Eclipse classpath. Patch is provided
+ by Huxing Zhang. (violetagg)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
