You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/06/24 11:06:59 UTC
[tomcat] branch master updated: Fix BZ 64544 - add built libs to
the bnd classpath for introspection
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 18d048b Fix BZ 64544 - add built libs to the bnd classpath for introspection
18d048b is described below
commit 18d048bff51ea23d8dea7c4e98382dfe82fbb935
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Fri Jun 19 12:31:39 2020 -0400
Fix BZ 64544 - add built libs to the bnd classpath for introspection
Signed-off-by: Raymond Augé <ro...@apache.org>
---
build.xml | 17 ++++++++++++-----
webapps/docs/changelog.xml | 4 ++++
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/build.xml b/build.xml
index 2482dcd..b1b4fe6 100644
--- a/build.xml
+++ b/build.xml
@@ -1394,14 +1394,16 @@
addOSGi="true"
addGraal="true"
graalPrefix="org.apache.tomcat.embed/tomcat-embed-core"
- graalFiles="res/graal/tomcat-embed-core/native-image"/>
+ graalFiles="res/graal/tomcat-embed-core/native-image"
+ libs="embed/*.jar"/>
<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"/>
+ graalFiles="res/graal/tomcat-embed-el/native-image"
+ libs="embed/*.jar"/>
<jarIt jarfile="${tomcat-embed-jasper.jar}"
filesDir="${tomcat.classes}"
filesId="files.tomcat-embed-jasper"
@@ -1409,7 +1411,8 @@
addOSGi="true"
addGraal="true"
graalPrefix="org.apache.tomcat.embed/tomcat-embed-jasper"
- graalFiles="res/graal/tomcat-embed-jasper/native-image"/>
+ graalFiles="res/graal/tomcat-embed-jasper/native-image"
+ libs="embed/*.jar"/>
<jarIt jarfile="${tomcat-embed-websocket.jar}"
filesDir="${tomcat.classes}"
filesId="files.tomcat-embed-websocket"
@@ -1417,7 +1420,8 @@
addOSGi="true"
addGraal="true"
graalPrefix="org.apache.tomcat.embed/tomcat-embed-websocket"
- graalFiles="res/graal/tomcat-embed-websocket/native-image"/>
+ graalFiles="res/graal/tomcat-embed-websocket/native-image"
+ libs="embed/*.jar"/>
</target>
<target name="embed-sources"
@@ -3348,6 +3352,8 @@ Read the Building page on the Apache Tomcat documentation site for details on ho
default="" />
<attribute name="graalFiles" description="Graal resource/reflection file location"
default="" />
+ <attribute name="libs" description="libraries to use for bnd classpath analysis relative to ${tomcat.output}"
+ default="build/lib/*.jar,build/bin/tomcat-juli.jar" />
<sequential>
<jar jarfile="@{jarfile}" manifest="@{manifest}">
<fileset dir="@{filesDir}">
@@ -3363,6 +3369,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho
<antcall target="add-osgi" >
<param name="jarfile" value="@{jarfile}" />
<param name="addOSGi" value="@{addOSGi}" />
+ <param name="libs" value="@{libs}" />
</antcall>
<antcall target="add-graal">
<param name="jarfile" value="@{jarfile}" />
@@ -3382,8 +3389,8 @@ Read the Building page on the Apache Tomcat documentation site for details on ho
output="${jarfile}.tmp"
>
<classpath>
- <pathelement location="${jarfile}"/>
<pathelement location="${bnd.jar}"/>
+ <fileset dir="${tomcat.output}" includes="${libs}" />
</classpath>
<bndfiles>
<pathelement location="${tomcat.bnd}/${filename}.tmp.bnd"/>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a7d0320..39b8245 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -165,6 +165,10 @@
a better manifest and make sure the resulting jar contents are correct.
Pull request provided by Raymond Augé. (markt)
</fix>
+ <fix>
+ <bug>64544</bug>: Add built libs to the bnd classpath for introspection.
+ Pull request provided by Raymond Augé. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org