forked from pool/tomcat
4851db8aac
- Update to Tomcat 9.0.2:
* Major update for tomcat8 from tomcat9
* For full changelog please read upstream changes at:
+ http://tomcat.apache.org/tomcat-9.0-doc/changelog.html
* Rename all tomcat-8.0-* files to tomcat-9.0-*
- Changed patches:
* Deleted: tomcat-8.0-bootstrap-MANIFEST.MF.patch
* Deleted: tomcat-8.0-sle.catalina.policy.patch
* Deleted: tomcat-8.0-tomcat-users-webapp.patch
* Deleted: tomcat-8.0.33-JDTCompiler-java.patch
* Deleted: tomcat-8.0.44-javadoc.patch
* Deleted: tomcat-8.0.9-property-build.windows.patch
* Added: tomcat-9.0-JDTCompiler-java.patch
* Added: tomcat-9.0-bootstrap-MANIFEST.MF.patch
* Added: tomcat-9.0-javadoc.patch
* Added: tomcat-9.0-sle.catalina.policy.patch
* Added: tomcat-9.0-tomcat-users-webapp.patch
- Renamed subpackage tomcat-3_1-api to tomcat-4_0-api
- Commented out JAVA_HOME in /etc/tomcat/tomcat.conf
- Marked /usr/share/java/*.jar symlinks to /etc/alternatives
as %ghost
OBS-URL: https://build.opensuse.org/request/show/547624
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=115
40 lines
2.1 KiB
Diff
40 lines
2.1 KiB
Diff
Index: java/org/apache/jasper/compiler/JDTCompiler.java
|
|
IDEA additional info:
|
|
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
|
<+>UTF-8
|
|
===================================================================
|
|
--- java/org/apache/jasper/compiler/JDTCompiler.java (date 1506521372000)
|
|
+++ java/org/apache/jasper/compiler/JDTCompiler.java (revision )
|
|
@@ -312,10 +312,10 @@
|
|
CompilerOptions.VERSION_1_7);
|
|
} else if(opt.equals("1.8")) {
|
|
settings.put(CompilerOptions.OPTION_Source,
|
|
- CompilerOptions.VERSION_1_8);
|
|
+ "1.8"); // CompilerOptions.VERSION_1_8
|
|
} else if(opt.equals("1.9")) {
|
|
settings.put(CompilerOptions.OPTION_Source,
|
|
- CompilerOptions.VERSION_1_9);
|
|
+ "1.9"); // CompilerOptions.VERSION_1_9
|
|
} else {
|
|
log.warn("Unknown source VM " + opt + " ignored.");
|
|
settings.put(CompilerOptions.OPTION_Source,
|
|
@@ -359,14 +359,14 @@
|
|
CompilerOptions.VERSION_1_7);
|
|
} else if(opt.equals("1.8")) {
|
|
settings.put(CompilerOptions.OPTION_TargetPlatform,
|
|
- CompilerOptions.VERSION_1_8);
|
|
+ "1.8"); // CompilerOptions.VERSION_1_8
|
|
settings.put(CompilerOptions.OPTION_Compliance,
|
|
- CompilerOptions.VERSION_1_8);
|
|
+ "1.8"); // CompilerOptions.VERSION_1_8
|
|
} else if(opt.equals("1.9")) {
|
|
settings.put(CompilerOptions.OPTION_TargetPlatform,
|
|
- CompilerOptions.VERSION_1_9);
|
|
+ "1.9"); // CompilerOptions.VERSION_1_9
|
|
settings.put(CompilerOptions.OPTION_Compliance,
|
|
- CompilerOptions.VERSION_1_9);
|
|
+ "1.9"); // CompilerOptions.VERSION_1_9
|
|
} else {
|
|
log.warn("Unknown target VM " + opt + " ignored.");
|
|
settings.put(CompilerOptions.OPTION_TargetPlatform,
|