This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 96e1d96e20defbc0825771c6ce7bee32e54d4c8c
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Sep 18 19:55:16 2020 +0100
Fix unwanted JPMS dependency of embed-core on embed-jasper
This wasn't happening with a clean/release build. It was with an
incremental build because the embed-jasper JAR was then present when
embed-core was processed. Moving these classes, which are only used by
Japser, ensures this dependency is not created.
---
build.xml | 2 ++
res/bnd/tomcat-embed-core.jar.tmp.bnd | 1 -
res/bnd/tomcat-embed-jasper.jar.tmp.bnd | 3 ++-
webapps/docs/changelog.xml | 4 ++++
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/build.xml b/build.xml
index ca46710..8c57f68 100644
--- a/build.xml
+++ b/build.xml
@@ -742,11 +742,13 @@
<include name="org/apache/tomcat/jni/**" />
<include name="org/apache/jk/**" />
<include name="org/apache/tomcat/util/**" />
+ <exclude name="org/apache/tomcat/util/descriptor/tld/**" />
</patternset>
<patternset id="files.tomcat-embed-jasper" >
<patternset refid="files.jasper" />
<patternset refid="files.jsp-api" />
+ <include name="org/apache/tomcat/util/descriptor/tld/**" />
</patternset>
<patternset id="files.tomcat-embed-el" >
diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd
b/res/bnd/tomcat-embed-core.jar.tmp.bnd
index a834809..1ae652d 100644
--- a/res/bnd/tomcat-embed-core.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd
@@ -67,7 +67,6 @@ Export-Package: \
org.apache.tomcat.util.compat,\
org.apache.tomcat.util.descriptor,\
org.apache.tomcat.util.descriptor.tagplugin,\
- org.apache.tomcat.util.descriptor.tld,\
org.apache.tomcat.util.descriptor.web,\
org.apache.tomcat.util.digester,\
org.apache.tomcat.util.file,\
diff --git a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
index 5284827..d9cf762 100644
--- a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
@@ -28,7 +28,8 @@ Export-Package: \
org.apache.jasper.servlet,\
org.apache.jasper.tagplugins.jstl,\
org.apache.jasper.tagplugins.jstl.core,\
- org.apache.jasper.util
+ org.apache.jasper.util,\
+ org.apache.tomcat.util.descriptor.tld
-includepackage: \
org.apache.jasper.resources
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3b4d63b..b8da6d8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -74,6 +74,10 @@
<bug>64751</bug>: Correct the JPMS module descriptor so the embedded
JARs may be used with JPMS. (markt)
</fix>
+ <fix>
+ When performing an incremental build, ensure bdn does not create
+ unwanted JPMS dependencies between embedded JARs. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
