parent
f688cab01d
commit
ef6ca5ee00
|
@ -1,16 +1,16 @@
|
|||
diff -up ./build.xml.orig ./build.xml
|
||||
--- ./build.xml.orig 2021-07-08 15:58:39.817466224 -0400
|
||||
+++ ./build.xml 2021-07-08 21:10:00.185752235 -0400
|
||||
@@ -1022,7 +1022,7 @@
|
||||
--- ./build.xml.orig 2021-12-09 13:29:38.000000000 -0500
|
||||
+++ ./build.xml 2022-03-04 08:56:31.987572758 -0500
|
||||
@@ -1032,7 +1032,7 @@
|
||||
filesDir="${tomcat.classes}"
|
||||
filesId="files.annotations-api"
|
||||
manifest="${tomcat.manifests}/annotations-api.jar.manifest"
|
||||
- addOSGi="true" />
|
||||
+ addOSGi="false" />
|
||||
|
||||
<!-- Servlet 4.0 Implementation JAR File -->
|
||||
<!-- Servlet Implementation JAR File -->
|
||||
<jarIt jarfile="${servlet-api.jar}"
|
||||
@@ -1031,41 +1031,41 @@
|
||||
@@ -1041,41 +1041,41 @@
|
||||
manifest="${tomcat.manifests}/servlet-api.jar.manifest"
|
||||
notice="${tomcat.manifests}/servlet-api.jar.notice"
|
||||
license="${tomcat.manifests}/servlet-api.jar.license"
|
||||
|
@ -41,7 +41,7 @@ diff -up ./build.xml.orig ./build.xml
|
|||
- addOSGi="true" />
|
||||
+ addOSGi="false" />
|
||||
|
||||
<!-- JASPIC 1.1 API JAR File -->
|
||||
<!-- JASPIC API JAR File -->
|
||||
<jarIt jarfile="${jaspic-api.jar}"
|
||||
filesDir="${tomcat.classes}"
|
||||
filesId="files.jaspic-api"
|
||||
|
@ -58,7 +58,7 @@ diff -up ./build.xml.orig ./build.xml
|
|||
|
||||
<!-- Bootstrap JAR File -->
|
||||
<jarIt jarfile="${bootstrap.jar}"
|
||||
@@ -1077,61 +1077,61 @@
|
||||
@@ -1087,61 +1087,61 @@
|
||||
<jarIt jarfile="${tomcat-util.jar}"
|
||||
filesDir="${tomcat.classes}"
|
||||
filesId="files.tomcat-util"
|
||||
|
@ -130,7 +130,7 @@ diff -up ./build.xml.orig ./build.xml
|
|||
|
||||
<!-- Catalina Ant Tasks JAR File -->
|
||||
<jarIt jarfile="${catalina-ant.jar}"
|
||||
@@ -1142,27 +1142,27 @@
|
||||
@@ -1152,27 +1152,27 @@
|
||||
<jarIt jarfile="${catalina-storeconfig.jar}"
|
||||
filesDir="${tomcat.classes}"
|
||||
filesId="files.catalina-storeconfig"
|
||||
|
@ -162,7 +162,7 @@ diff -up ./build.xml.orig ./build.xml
|
|||
|
||||
<!-- i18n JARs -->
|
||||
<jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
|
||||
@@ -1624,7 +1624,7 @@
|
||||
@@ -1635,7 +1635,7 @@
|
||||
filesId="files.tomcat-embed-core"
|
||||
notice="${tomcat.manifests}/servlet-api.jar.notice"
|
||||
license="${tomcat.manifests}/servlet-api.jar.license"
|
||||
|
@ -171,7 +171,7 @@ diff -up ./build.xml.orig ./build.xml
|
|||
addGraal="true"
|
||||
graalPrefix="org.apache.tomcat.embed/tomcat-embed-core"
|
||||
graalFiles="res/graal/tomcat-embed-core/native-image"
|
||||
@@ -1632,7 +1632,7 @@
|
||||
@@ -1643,7 +1643,7 @@
|
||||
<jarIt jarfile="${tomcat-embed-el.jar}"
|
||||
filesDir="${tomcat.classes}"
|
||||
filesId="files.tomcat-embed-el"
|
||||
|
@ -180,7 +180,7 @@ diff -up ./build.xml.orig ./build.xml
|
|||
addGraal="true"
|
||||
graalPrefix="org.apache.tomcat.embed/tomcat-embed-el"
|
||||
graalFiles="res/graal/tomcat-embed-el/native-image"
|
||||
@@ -1641,7 +1641,7 @@
|
||||
@@ -1652,7 +1652,7 @@
|
||||
filesDir="${tomcat.classes}"
|
||||
filesId="files.tomcat-embed-jasper"
|
||||
meta-inf="${tomcat.manifests}/jasper.jar"
|
||||
|
@ -189,7 +189,7 @@ diff -up ./build.xml.orig ./build.xml
|
|||
addGraal="true"
|
||||
graalPrefix="org.apache.tomcat.embed/tomcat-embed-jasper"
|
||||
graalFiles="res/graal/tomcat-embed-jasper/native-image"
|
||||
@@ -1650,7 +1650,7 @@
|
||||
@@ -1661,7 +1661,7 @@
|
||||
filesDir="${tomcat.classes}"
|
||||
filesId="files.tomcat-embed-websocket"
|
||||
meta-inf="${tomcat.manifests}/tomcat-websocket.jar"
|
||||
|
@ -198,7 +198,7 @@ diff -up ./build.xml.orig ./build.xml
|
|||
addGraal="true"
|
||||
graalPrefix="org.apache.tomcat.embed/tomcat-embed-websocket"
|
||||
graalFiles="res/graal/tomcat-embed-websocket/native-image"
|
||||
@@ -3595,6 +3595,7 @@ Read the Building page on the Apache Tom
|
||||
@@ -3716,6 +3716,7 @@ Read the Building page on the Apache Tom
|
||||
<!-- Add bnd tasks to project -->
|
||||
<path id="bnd.classpath">
|
||||
<fileset file="${bnd.jar}" />
|
||||
|
|
|
@ -1,8 +1,9 @@
|
|||
--- conf/catalina.policy.orig 2021-06-08 09:27:09.295927384 -0400
|
||||
+++ conf/catalina.policy 2021-06-08 09:26:32.056019150 -0400
|
||||
@@ -50,6 +50,36 @@ grant codeBase "file:${java.home}/lib/ex
|
||||
permission java.security.AllPermission;
|
||||
};
|
||||
diff -up ./conf/catalina.policy.orig ./conf/catalina.policy
|
||||
--- ./conf/catalina.policy.orig 2022-03-04 08:49:08.246538215 -0500
|
||||
+++ ./conf/catalina.policy 2022-03-04 08:50:31.842356329 -0500
|
||||
@@ -56,6 +56,36 @@ grant codeBase "file:${java.home}/lib/ex
|
||||
// permission java.security.AllPermission;
|
||||
//};
|
||||
|
||||
+// This permission is required when using javac to compile JSPs on Java 9
|
||||
+// onwards
|
||||
|
|
Loading…
Reference in New Issue