This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push: new f94b2f3 Fix BZ 64522 - package jars in effective dependency order (only order is changed, no other changes) f94b2f3 is described below commit f94b2f3a62e484ba979476bda9d66acf6d517134 Author: Raymond Augé <rotty3...@apache.org> AuthorDate: Sat Jun 13 19:55:07 2020 -0400 Fix BZ 64522 - package jars in effective dependency order (only order is changed, no other changes) Signed-off-by: Raymond Augé <rotty3...@apache.org> --- build.xml | 228 +++++++++++++++++++++++---------------------- webapps/docs/changelog.xml | 4 + 2 files changed, 121 insertions(+), 111 deletions(-) diff --git a/build.xml b/build.xml index b77c03f..05ebace 100644 --- a/build.xml +++ b/build.xml @@ -762,6 +762,12 @@ </target> <target name="package" depends="compile,build-manifests,setup-bnd" > + <!-- + #### ORDER IS IMPORTANT #### + Bnd will use the built jars to resolve import package versions and + JPMS module names. + --> + <!-- Common Annotations JAR File --> <jarIt jarfile="${annotations-api.jar}" filesDir="${tomcat.classes}" @@ -778,13 +784,6 @@ license="${tomcat.manifests}/servlet-api.jar.license" addOSGi="true" /> - <!-- JSP Implementation JAR File --> - <jarIt jarfile="${jsp-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.jsp-api" - manifest="${tomcat.manifests}/jsp-api.jar.manifest" - addOSGi="true" /> - <!-- EL Implementation JAR File --> <jarIt jarfile="${el-api.jar}" filesDir="${tomcat.classes}" @@ -792,6 +791,13 @@ manifest="${tomcat.manifests}/el-api.jar.manifest" addOSGi="true" /> + <!-- JSP Implementation JAR File --> + <jarIt jarfile="${jsp-api.jar}" + filesDir="${tomcat.classes}" + filesId="files.jsp-api" + manifest="${tomcat.manifests}/jsp-api.jar.manifest" + addOSGi="true" /> + <!-- WebSocket API JAR File --> <jarIt jarfile="${websocket-api.jar}" filesDir="${tomcat.classes}" @@ -806,11 +812,10 @@ manifest="${tomcat.manifests}/jaspic-api.jar.manifest" addOSGi="true" /> - <!-- WebSocket implementation JAR File --> - <jarIt jarfile="${tomcat-websocket.jar}" + <!-- Tomcat-juli JAR File --> + <jarIt jarfile="${tomcat-juli.jar}" filesDir="${tomcat.classes}" - filesId="files.tomcat-websocket" - meta-inf="${tomcat.manifests}/tomcat-websocket.jar" + filesId="files.tomcat-juli" addOSGi="true" /> <!-- Bootstrap JAR File --> @@ -819,81 +824,75 @@ filesId="files.bootstrap" manifest="${tomcat.manifests}/bootstrap.jar.manifest" /> - <!-- Tomcat-juli JAR File --> - <jarIt jarfile="${tomcat-juli.jar}" + <!-- Tomcat Util JAR File --> + <jarIt jarfile="${tomcat-util.jar}" filesDir="${tomcat.classes}" - filesId="files.tomcat-juli" + filesId="files.tomcat-util" addOSGi="true" /> - <!-- Catalina Main JAR File --> - <jarIt jarfile="${catalina.jar}" + <!-- Tomcat API JAR File --> + <jarIt jarfile="${tomcat-api.jar}" filesDir="${tomcat.classes}" - filesId="files.catalina" + filesId="files.tomcat-api" addOSGi="true" /> - <!-- Catalina GroupCom/Tribes JAR File --> - <jarIt jarfile="${catalina-tribes.jar}" + <!-- Tomcat Util Scan JAR File --> + <jarIt jarfile="${tomcat-util-scan.jar}" filesDir="${tomcat.classes}" - filesId="files.catalina-tribes" + filesId="files.tomcat-util-scan" addOSGi="true" /> - <!-- Server-Side Includes (SSI) --> - <jarIt jarfile="${catalina-ssi.jar}" + <jarIt jarfile="${tomcat-jni.jar}" filesDir="${tomcat.classes}" - filesId="files.catalina-ssi" + filesId="files.tomcat-jni" addOSGi="true" /> - <!-- Catalina Cluster/HA JAR File --> - <jarIt jarfile="${catalina-ha.jar}" + <!-- Protocol handlers - Coyote --> + <jarIt jarfile="${tomcat-coyote.jar}" filesDir="${tomcat.classes}" - filesId="files.catalina-ha" + filesId="files.tomcat-coyote" addOSGi="true" /> - <!-- Catalina Ant Tasks JAR File --> - <jarIt jarfile="${catalina-ant.jar}" - filesDir="${tomcat.classes}" - filesId="files.catalina-ant" /> - - <!-- Catalina Storeconfig JAR File --> - <jarIt jarfile="${catalina-storeconfig.jar}" + <!-- WebSocket implementation JAR File --> + <jarIt jarfile="${tomcat-websocket.jar}" filesDir="${tomcat.classes}" - filesId="files.catalina-storeconfig" + filesId="files.tomcat-websocket" + meta-inf="${tomcat.manifests}/tomcat-websocket.jar" addOSGi="true" /> - <!-- Tomcat API JAR File --> - <jarIt jarfile="${tomcat-api.jar}" + <!-- Catalina GroupCom/Tribes JAR File --> + <jarIt jarfile="${catalina-tribes.jar}" filesDir="${tomcat.classes}" - filesId="files.tomcat-api" + filesId="files.catalina-tribes" addOSGi="true" /> - <!-- Tomcat Util JAR File --> - <jarIt jarfile="${tomcat-util.jar}" + <!-- Catalina Main JAR File --> + <jarIt jarfile="${catalina.jar}" filesDir="${tomcat.classes}" - filesId="files.tomcat-util" + filesId="files.catalina" addOSGi="true" /> - <!-- Tomcat Util Scan JAR File --> - <jarIt jarfile="${tomcat-util-scan.jar}" + <!-- Catalina Cluster/HA JAR File --> + <jarIt jarfile="${catalina-ha.jar}" filesDir="${tomcat.classes}" - filesId="files.tomcat-util-scan" + filesId="files.catalina-ha" addOSGi="true" /> - <!-- Protocol handlers - Coyote --> - <jarIt jarfile="${tomcat-coyote.jar}" + <!-- Server-Side Includes (SSI) --> + <jarIt jarfile="${catalina-ssi.jar}" filesDir="${tomcat.classes}" - filesId="files.tomcat-coyote" + filesId="files.catalina-ssi" addOSGi="true" /> - <jarIt jarfile="${tomcat-jni.jar}" + <!-- Catalina Ant Tasks JAR File --> + <jarIt jarfile="${catalina-ant.jar}" filesDir="${tomcat.classes}" - filesId="files.tomcat-jni" - addOSGi="true" /> + filesId="files.catalina-ant" /> - <!-- Jasper Implementation JAR File --> - <jarIt jarfile="${jasper.jar}" + <!-- Catalina Storeconfig JAR File --> + <jarIt jarfile="${catalina-storeconfig.jar}" filesDir="${tomcat.classes}" - filesId="files.jasper" - meta-inf="${tomcat.manifests}/jasper.jar" + filesId="files.catalina-storeconfig" addOSGi="true" /> <!-- Jasper EL Implementation JAR File --> @@ -903,6 +902,13 @@ meta-inf="${tomcat.manifests}/jasper-el.jar" addOSGi="true" /> + <!-- Jasper Implementation JAR File --> + <jarIt jarfile="${jasper.jar}" + filesDir="${tomcat.classes}" + filesId="files.jasper" + meta-inf="${tomcat.manifests}/jasper.jar" + addOSGi="true" /> + <!-- Re-packaged Apache Commons DBCP 2--> <jarIt jarfile="${tomcat-dbcp.jar}" filesDir="${tomcat.classes}" @@ -1389,6 +1395,13 @@ addGraal="true" graalPrefix="org.apache.tomcat.embed/tomcat-embed-core" graalFiles="res/graal/tomcat-embed-core/native-image"/> + <jarIt jarfile="${tomcat-embed-el.jar}" + filesDir="${tomcat.classes}" + filesId="files.tomcat-embed-el" + addOSGi="true" + addGraal="true" + graalPrefix="org.apache.tomcat.embed/tomcat-embed-el" + graalFiles="res/graal/tomcat-embed-el/native-image"/> <jarIt jarfile="${tomcat-embed-jasper.jar}" filesDir="${tomcat.classes}" filesId="files.tomcat-embed-jasper" @@ -1397,13 +1410,6 @@ addGraal="true" graalPrefix="org.apache.tomcat.embed/tomcat-embed-jasper" graalFiles="res/graal/tomcat-embed-jasper/native-image"/> - <jarIt jarfile="${tomcat-embed-el.jar}" - filesDir="${tomcat.classes}" - filesId="files.tomcat-embed-el" - addOSGi="true" - addGraal="true" - graalPrefix="org.apache.tomcat.embed/tomcat-embed-el" - graalFiles="res/graal/tomcat-embed-el/native-image"/> <jarIt jarfile="${tomcat-embed-websocket.jar}" filesDir="${tomcat.classes}" filesId="files.tomcat-embed-websocket" @@ -1425,12 +1431,12 @@ filesId="files.tomcat-embed-core" notice="${tomcat.manifests}/servlet-api.jar.notice" license="${tomcat.manifests}/servlet-api.jar.license"/> - <jarIt jarfile="${tomcat-embed-jasper-sources.jar}" - filesDir="java" - filesId="files.tomcat-embed-jasper"/> <jarIt jarfile="${tomcat-embed-el-sources.jar}" filesDir="java" filesId="files.tomcat-embed-el"/> + <jarIt jarfile="${tomcat-embed-jasper-sources.jar}" + filesDir="java" + filesId="files.tomcat-embed-jasper"/> <jarIt jarfile="${tomcat-embed-websocket-sources.jar}" filesDir="java" filesId="files.tomcat-embed-websocket"/> @@ -2612,6 +2618,12 @@ skip.installer property in build.properties" /> notice="${tomcat.manifests}/servlet-api.jar.notice" license="${tomcat.manifests}/servlet-api.jar.license" /> + <!-- JSP EL Implementation JAR File --> + <jarIt jarfile="${el-api-src.jar}" + filesDir="java" + filesId="files.el-api" + manifest="${tomcat.manifests}/el-api.jar.manifest" /> + <!-- JSP Implementation JAR File --> <jarIt jarfile="${jsp-api-src.jar}" filesDir="java" @@ -2620,23 +2632,12 @@ skip.installer property in build.properties" /> notice="${tomcat.manifests}/jsp-api.jar.notice" license="${tomcat.manifests}/jsp-api.jar.license" /> - <!-- JSP EL Implementation JAR File --> - <jarIt jarfile="${el-api-src.jar}" - filesDir="java" - filesId="files.el-api" - manifest="${tomcat.manifests}/el-api.jar.manifest" /> - <!-- WebSocket API JAR File --> <jarIt jarfile="${websocket-api-src.jar}" filesDir="java" filesId="files.websocket-api" manifest="${tomcat.manifests}/websocket-api.jar.manifest" /> - <!-- WebSocket implementation JAR File --> - <jarIt jarfile="${tomcat-websocket-src.jar}" - filesDir="java" - filesId="files.tomcat-websocket" /> - <!-- JASPIC API JAR File --> <jarIt jarfile="${jaspic-api-src.jar}" filesDir="java" @@ -2645,37 +2646,67 @@ skip.installer property in build.properties" /> notice="${tomcat.manifests}/jaspic-api.jar.notice" license="${tomcat.manifests}/jaspic-api.jar.license" /> + <!-- Tomcat-juli JAR File --> + <jarIt jarfile="${tomcat-juli-src.jar}" + filesDir="java" + filesId="files.tomcat-juli" /> + <!-- Bootstrap JAR File --> <jarIt jarfile="${bootstrap-src.jar}" filesDir="java" filesId="files.bootstrap" manifest="${tomcat.manifests}/bootstrap.jar.manifest" /> - <!-- Tomcat-juli JAR File --> - <jarIt jarfile="${tomcat-juli-src.jar}" + <!-- Tomcat Util JAR File --> + <jarIt jarfile="${tomcat-util-src.jar}" filesDir="java" - filesId="files.tomcat-juli" /> + filesId="files.tomcat-util" /> - <!-- Catalina Main JAR File --> - <jarIt jarfile="${catalina-src.jar}" + <!-- Tomcat API JAR File --> + <jarIt jarfile="${tomcat-api-src.jar}" filesDir="java" - filesId="files.catalina" /> + filesId="files.tomcat-api" /> + + <!-- Tomcat Util Scan JAR File --> + <jarIt jarfile="${tomcat-util-scan-src.jar}" + filesDir="java" + filesId="files.tomcat-util-scan" /> + + <!-- JNI --> + <jarIt jarfile="${tomcat-jni-src.jar}" + filesDir="java" + filesId="files.tomcat-jni" /> + + <!-- Protocol handlers - Coyote --> + <jarIt jarfile="${tomcat-coyote-src.jar}" + filesDir="java" + filesId="files.tomcat-coyote" /> + + <!-- WebSocket implementation JAR File --> + <jarIt jarfile="${tomcat-websocket-src.jar}" + filesDir="java" + filesId="files.tomcat-websocket" /> <!-- Catalina GroupCom/Tribes JAR File --> <jarIt jarfile="${catalina-tribes-src.jar}" filesDir="java" filesId="files.catalina-tribes" /> - <!-- Catalina SSI JAR File --> - <jarIt jarfile="${catalina-ssi-src.jar}" + <!-- Catalina Main JAR File --> + <jarIt jarfile="${catalina-src.jar}" filesDir="java" - filesId="files.catalina-ssi" /> + filesId="files.catalina" /> <!-- Catalina Cluster/HA JAR File --> <jarIt jarfile="${catalina-ha-src.jar}" filesDir="java" filesId="files.catalina-ha" /> + <!-- Catalina SSI JAR File --> + <jarIt jarfile="${catalina-ssi-src.jar}" + filesDir="java" + filesId="files.catalina-ssi" /> + <!-- Catalina Ant Tasks JAR File --> <jarIt jarfile="${catalina-ant-src.jar}" filesDir="java" @@ -2686,41 +2717,16 @@ skip.installer property in build.properties" /> filesDir="java" filesId="files.catalina-storeconfig" /> - <!-- Tomcat API JAR File --> - <jarIt jarfile="${tomcat-api-src.jar}" - filesDir="java" - filesId="files.tomcat-api" /> - - <!-- Tomcat Util JAR File --> - <jarIt jarfile="${tomcat-util-src.jar}" - filesDir="java" - filesId="files.tomcat-util" /> - - <!-- Tomcat Util Scan JAR File --> - <jarIt jarfile="${tomcat-util-scan-src.jar}" - filesDir="java" - filesId="files.tomcat-util-scan" /> - - <!-- Protocol handlers - Coyote --> - <jarIt jarfile="${tomcat-coyote-src.jar}" - filesDir="java" - filesId="files.tomcat-coyote" /> - - <!-- JNI --> - <jarIt jarfile="${tomcat-jni-src.jar}" + <!-- Jasper EL Implementation JAR File --> + <jarIt jarfile="${jasper-el-src.jar}" filesDir="java" - filesId="files.tomcat-jni" /> + filesId="files.jasper-el" /> <!-- Jasper Implementation JAR File --> <jarIt jarfile="${jasper-src.jar}" filesDir="java" filesId="files.jasper" /> - <!-- Jasper EL Implementation JAR File --> - <jarIt jarfile="${jasper-el-src.jar}" - filesDir="java" - filesId="files.jasper-el" /> - <!-- Repackaged DBCP 2 --> <jarIt jarfile="${tomcat-dbcp-src.jar}" filesDir="java" diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 0aef8ae..8641b93 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -139,6 +139,10 @@ they are packaged into separate jars. Pull request provided by Raymond Augé. (markt) </fix> + <fix> + <bug>64522</bug>: Package jars in effective dependency order. Pull + request provided by Raymond Augé. (markt) + </fix> </changelog> </subsection> </section> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org