Skip to content
Permalink
Browse files
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.
  • Loading branch information
markt-asf committed Sep 18, 2020
1 parent 5746337 commit 3815b4951eb3acd30a0b77aafa75fbdb928d5782
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 2 deletions.
@@ -745,11 +745,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" >
@@ -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,\
@@ -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
@@ -75,6 +75,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">

0 comments on commit 3815b49

Please sign in to comment.