|
|
ab2b12 |
diff -up ./build.xml.orig ./build.xml
|
|
|
47c79e |
--- ./build.xml.orig 2021-12-09 13:29:38.000000000 -0500
|
|
|
47c79e |
+++ ./build.xml 2022-03-04 08:56:31.987572758 -0500
|
|
|
47c79e |
@@ -1032,7 +1032,7 @@
|
|
|
ab2b12 |
filesDir="${tomcat.classes}"
|
|
|
ab2b12 |
filesId="files.annotations-api"
|
|
|
ab2b12 |
manifest="${tomcat.manifests}/annotations-api.jar.manifest"
|
|
|
ab2b12 |
- addOSGi="true" />
|
|
|
ab2b12 |
+ addOSGi="false" />
|
|
|
ab2b12 |
|
|
|
47c79e |
|
|
|
ab2b12 |
|
|
|
47c79e |
@@ -1041,41 +1041,41 @@
|
|
|
ab2b12 |
manifest="${tomcat.manifests}/servlet-api.jar.manifest"
|
|
|
ab2b12 |
notice="${tomcat.manifests}/servlet-api.jar.notice"
|
|
|
ab2b12 |
license="${tomcat.manifests}/servlet-api.jar.license"
|
|
|
ab2b12 |
- addOSGi="true" />
|
|
|
ab2b12 |
+ addOSGi="false" />
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
filesDir="${tomcat.classes}"
|
|
|
ab2b12 |
filesId="files.el-api"
|
|
|
ab2b12 |
manifest="${tomcat.manifests}/el-api.jar.manifest"
|
|
|
ab2b12 |
- addOSGi="true" />
|
|
|
ab2b12 |
+ addOSGi="false" />
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
filesDir="${tomcat.classes}"
|
|
|
ab2b12 |
filesId="files.jsp-api"
|
|
|
ab2b12 |
manifest="${tomcat.manifests}/jsp-api.jar.manifest"
|
|
|
ab2b12 |
- addOSGi="true" />
|
|
|
ab2b12 |
+ addOSGi="false" />
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
filesDir="${tomcat.classes}"
|
|
|
ab2b12 |
filesId="files.websocket-api"
|
|
|
ab2b12 |
manifest="${tomcat.manifests}/websocket-api.jar.manifest"
|
|
|
ab2b12 |
- addOSGi="true" />
|
|
|
ab2b12 |
+ addOSGi="false" />
|
|
|
ab2b12 |
|
|
|
47c79e |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
filesDir="${tomcat.classes}"
|
|
|
ab2b12 |
filesId="files.jaspic-api"
|
|
|
ab2b12 |
manifest="${tomcat.manifests}/jaspic-api.jar.manifest"
|
|
|
ab2b12 |
- addOSGi="true" />
|
|
|
ab2b12 |
+ addOSGi="false" />
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
filesDir="${tomcat.classes}"
|
|
|
ab2b12 |
filesId="files.tomcat-juli"
|
|
|
ab2b12 |
- addOSGi="true" />
|
|
|
ab2b12 |
+ addOSGi="false" />
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
47c79e |
@@ -1087,61 +1087,61 @@
|
|
|
ab2b12 |
|
|
|
ab2b12 |
filesDir="${tomcat.classes}"
|
|
|
ab2b12 |
filesId="files.tomcat-util"
|
|
|
ab2b12 |
- addOSGi="true" />
|
|
|
ab2b12 |
+ addOSGi="false" />
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
filesDir="${tomcat.classes}"
|
|
|
ab2b12 |
filesId="files.tomcat-api"
|
|
|
ab2b12 |
- addOSGi="true" />
|
|
|
ab2b12 |
+ addOSGi="false" />
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
filesDir="${tomcat.classes}"
|
|
|
ab2b12 |
filesId="files.tomcat-util-scan"
|
|
|
ab2b12 |
- addOSGi="true" />
|
|
|
ab2b12 |
+ addOSGi="false" />
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
filesDir="${tomcat.classes}"
|
|
|
ab2b12 |
filesId="files.tomcat-jni"
|
|
|
ab2b12 |
- addOSGi="true" />
|
|
|
ab2b12 |
+ addOSGi="false" />
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
filesDir="${tomcat.classes}"
|
|
|
ab2b12 |
filesId="files.tomcat-coyote"
|
|
|
ab2b12 |
- addOSGi="true" />
|
|
|
ab2b12 |
+ addOSGi="false" />
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
filesDir="${tomcat.classes}"
|
|
|
ab2b12 |
filesId="files.tomcat-websocket"
|
|
|
ab2b12 |
meta-inf="${tomcat.manifests}/tomcat-websocket.jar"
|
|
|
ab2b12 |
- addOSGi="true" />
|
|
|
ab2b12 |
+ addOSGi="false" />
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
filesDir="${tomcat.classes}"
|
|
|
ab2b12 |
filesId="files.catalina-tribes"
|
|
|
ab2b12 |
- addOSGi="true" />
|
|
|
ab2b12 |
+ addOSGi="false" />
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
filesDir="${tomcat.classes}"
|
|
|
ab2b12 |
filesId="files.catalina"
|
|
|
ab2b12 |
- addOSGi="true" />
|
|
|
ab2b12 |
+ addOSGi="false" />
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
filesDir="${tomcat.classes}"
|
|
|
ab2b12 |
filesId="files.catalina-ha"
|
|
|
ab2b12 |
- addOSGi="true" />
|
|
|
ab2b12 |
+ addOSGi="false" />
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
filesDir="${tomcat.classes}"
|
|
|
ab2b12 |
filesId="files.catalina-ssi"
|
|
|
ab2b12 |
- addOSGi="true" />
|
|
|
ab2b12 |
+ addOSGi="false" />
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
47c79e |
@@ -1152,27 +1152,27 @@
|
|
|
ab2b12 |
|
|
|
ab2b12 |
filesDir="${tomcat.classes}"
|
|
|
ab2b12 |
filesId="files.catalina-storeconfig"
|
|
|
ab2b12 |
- addOSGi="true" />
|
|
|
ab2b12 |
+ addOSGi="false" />
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
filesDir="${tomcat.classes}"
|
|
|
ab2b12 |
filesId="files.jasper-el"
|
|
|
ab2b12 |
meta-inf="${tomcat.manifests}/jasper-el.jar"
|
|
|
ab2b12 |
- addOSGi="true" />
|
|
|
ab2b12 |
+ addOSGi="false" />
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
filesDir="${tomcat.classes}"
|
|
|
ab2b12 |
filesId="files.jasper"
|
|
|
ab2b12 |
meta-inf="${tomcat.manifests}/jasper.jar"
|
|
|
ab2b12 |
- addOSGi="true" />
|
|
|
ab2b12 |
+ addOSGi="false" />
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
filesDir="${tomcat.classes}"
|
|
|
ab2b12 |
filesId="files.tomcat-dbcp"
|
|
|
ab2b12 |
- addOSGi="true" />
|
|
|
ab2b12 |
+ addOSGi="false" />
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
ab2b12 |
|
|
|
47c79e |
@@ -1635,7 +1635,7 @@
|
|
|
ab2b12 |
filesId="files.tomcat-embed-core"
|
|
|
ab2b12 |
notice="${tomcat.manifests}/servlet-api.jar.notice"
|
|
|
ab2b12 |
license="${tomcat.manifests}/servlet-api.jar.license"
|
|
|
ab2b12 |
- addOSGi="true"
|
|
|
ab2b12 |
+ addOSGi="false"
|
|
|
ab2b12 |
addGraal="true"
|
|
|
ab2b12 |
graalPrefix="org.apache.tomcat.embed/tomcat-embed-core"
|
|
|
ab2b12 |
graalFiles="res/graal/tomcat-embed-core/native-image"
|
|
|
47c79e |
@@ -1643,7 +1643,7 @@
|
|
|
ab2b12 |
|
|
|
ab2b12 |
filesDir="${tomcat.classes}"
|
|
|
ab2b12 |
filesId="files.tomcat-embed-el"
|
|
|
ab2b12 |
- addOSGi="true"
|
|
|
ab2b12 |
+ addOSGi="false"
|
|
|
ab2b12 |
addGraal="true"
|
|
|
ab2b12 |
graalPrefix="org.apache.tomcat.embed/tomcat-embed-el"
|
|
|
ab2b12 |
graalFiles="res/graal/tomcat-embed-el/native-image"
|
|
|
47c79e |
@@ -1652,7 +1652,7 @@
|
|
|
ab2b12 |
filesDir="${tomcat.classes}"
|
|
|
ab2b12 |
filesId="files.tomcat-embed-jasper"
|
|
|
ab2b12 |
meta-inf="${tomcat.manifests}/jasper.jar"
|
|
|
ab2b12 |
- addOSGi="true"
|
|
|
ab2b12 |
+ addOSGi="false"
|
|
|
ab2b12 |
addGraal="true"
|
|
|
ab2b12 |
graalPrefix="org.apache.tomcat.embed/tomcat-embed-jasper"
|
|
|
ab2b12 |
graalFiles="res/graal/tomcat-embed-jasper/native-image"
|
|
|
47c79e |
@@ -1661,7 +1661,7 @@
|
|
|
ab2b12 |
filesDir="${tomcat.classes}"
|
|
|
ab2b12 |
filesId="files.tomcat-embed-websocket"
|
|
|
ab2b12 |
meta-inf="${tomcat.manifests}/tomcat-websocket.jar"
|
|
|
ab2b12 |
- addOSGi="true"
|
|
|
ab2b12 |
+ addOSGi="false"
|
|
|
ab2b12 |
addGraal="true"
|
|
|
ab2b12 |
graalPrefix="org.apache.tomcat.embed/tomcat-embed-websocket"
|
|
|
ab2b12 |
graalFiles="res/graal/tomcat-embed-websocket/native-image"
|
|
|
47c79e |
@@ -3716,6 +3716,7 @@ Read the Building page on the Apache Tom
|
|
|
ab2b12 |
|
|
|
ab2b12 |
<path id="bnd.classpath">
|
|
|
ab2b12 |
<fileset file="${bnd.jar}" />
|
|
|
ab2b12 |
+ <fileset file="${bndannotation.jar}" />
|
|
|
ab2b12 |
</path>
|
|
|
ab2b12 |
|
|
|
ab2b12 |
<taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bnd.classpath" />
|