Author: markt
Date: Tue Jun 14 19:41:31 2016
New Revision: 1748452
URL: http://svn.apache.org/viewvc?rev=1748452&view=rev
Log: (empty)
Modified:
tomcat/trunk/build.xml
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1748452&r1=1748451&r2=1748452&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Jun 14 19:41:31 2016
@@ -152,11 +152,9 @@
<!-- Extras JARs & source JARs -->
<property name="catalina-ws.jar" value="${tomcat.extras}/catalina-ws.jar"/>
<property name="catalina-jmx-remote.jar"
value="${tomcat.extras}/catalina-jmx-remote.jar"/>
- <property name="tomcat-embed-log4j.jar"
value="${tomcat.embed}/tomcat-embed-logging-log4j.jar"/>
<property name="catalina-ws-src.jar"
value="${tomcat.extras.sources}/catalina-ws-src.jar"/>
<property name="catalina-jmx-remote-src.jar"
value="${tomcat.extras.sources}/catalina-jmx-remote-src.jar"/>
- <property name="tomcat-embed-log4j-src.jar"
value="${tomcat.embed.sources}/tomcat-embed-logging-log4j-src.jar"/>
<!-- jdbc-pool JARs & source JARs -->
<property name="tomcat-jdbc.jar" value="${tomcat.pool}/tomcat-jdbc.jar"/>
@@ -441,6 +439,7 @@
<patternset refid="files.servlet-api" />
<patternset refid="files.jaspic-api" />
<patternset refid="files.tomcat-api" />
+ <patternset refid="files.tomcat-juli" />
<!-- These pattern sets conflict so include files directly
<patternset refid="files.tomcat-coyote" />
<patternset refid="files.tomcat-util" />
@@ -468,9 +467,6 @@
<patternset refid="files.tomcat-websocket" />
</patternset>
- <!-- Pattern sets used directly -->
- <!--<patternset refid="files.tomcat-juli" />-->
-
<!-- Pattern sets not included in embedded -->
<!-- Cluster support not included in embedded -->
<!--<patternset refid="files.catalina-tribes" />-->
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1748452&r1=1748451&r2=1748452&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jun 14 19:41:31 2016
@@ -45,6 +45,15 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 9.0.0.M9" rtext="in development">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ Correct a regression in the fix for <bug>58588</bug> that removed the
+ entire <code>org.apache.juli</code> package from the embedded JARs
+ rendering them unusable. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Coyote">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
