Author: markt
Date: Thu Aug 31 14:42:52 2017
New Revision: 1806801
URL: http://svn.apache.org/viewvc?rev=1806801&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61439
Remove the Java Annotation API classes from tomcat-embed-core.jar and package
them in a separate JAR in the embedded distribution to provide end users with
greater flexibility to handle potential conflicts with the JRE and/or other
JARs.
Modified:
tomcat/trunk/build.xml
tomcat/trunk/res/maven/tomcat-embed-core.pom
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1806801&r1=1806800&r2=1806801&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Aug 31 14:42:52 2017
@@ -445,7 +445,6 @@
<!-- Pattern sets for embedded JARs -->
<!-- Every standard pattern set above should be included in an embedded JAR
-->
<patternset id="files.tomcat-embed-core" >
- <patternset refid="files.annotations-api" />
<patternset refid="files.catalina" />
<patternset refid="files.servlet-api" />
<patternset refid="files.jaspic-api" />
@@ -460,7 +459,6 @@
<include name="org/apache/tomcat/jni/**" />
<include name="org/apache/jk/**" />
<include name="org/apache/tomcat/util/**" />
-
</patternset>
<patternset id="files.tomcat-embed-jasper" >
@@ -484,6 +482,9 @@
<!--<patternset refid="files.catalina-ha" />-->
<!-- Ant tasks not included in embedded -->
<!--<patternset refid="files.catalina-ant" />-->
+ <!-- Annotations API is a separate dependency to avoid JRE 9 issues -->
+ <!-- See BZ 61439 -->
+ <!--<patternset refid="files.annotations-api" />-->
<!-- Pattern sets for extras JARs -->
<patternset id="files.tomcat-extras-ws">
@@ -1228,6 +1229,7 @@
<copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
failonerror="false"/>
<copy file="${jdt.jar}" todir="${tomcat.embed}" />
+ <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
<!-- Note the meta-inf below will work as long as there is only one JAR
that needs to add entries. If there is more than one a more complex
Modified: tomcat/trunk/res/maven/tomcat-embed-core.pom
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-embed-core.pom?rev=1806801&r1=1806800&r2=1806801&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-embed-core.pom (original)
+++ tomcat/trunk/res/maven/tomcat-embed-core.pom Thu Aug 31 14:42:52 2017
@@ -29,4 +29,12 @@
<distribution>repo</distribution>
</license>
</licenses>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-annotations-api</artifactId>
+ <version>@MAVEN.DEPLOY.VERSION@</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
</project>
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1806801&r1=1806800&r2=1806801&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Aug 31 14:42:52 2017
@@ -199,6 +199,12 @@
<code>catalina.bat</code> with the correct <code>rem</code> markup.
(rjung)
</fix>
+ <fix>
+ <bug>61439</bug>: Remove the Java Annotation API classes from
+ tomcat-embed-core.jar and package them in a separate JAR in the
+ embedded distribution to provide end users with greater flexibility to
+ handle potential conflicts with the JRE and/or other JARs. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
