rpms/tomcat
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Related: Update to 9.0.10 Fix patch files so they apply cleanly

Browse Source
This commit is contained in:
Coty Sutherland 2018-07-31 17:13:18 -04:00
parent adee825bc2
commit 60e8a41900
3 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tomcat-8.0.36-CompilerOptionsV9.patch
View File

@ -1,24 +0,0 @@
--- java/org/apache/jasper/compiler/JDTCompiler.java~ 2016-07-01 14:39:19.728255958 -0400
+++ java/org/apache/jasper/compiler/JDTCompiler.java 2016-07-01 14:39:37.191311760 -0400
@@ -312,9 +312,6 @@
} else if(opt.equals("1.8")) {
settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_1_8);
- } else if(opt.equals("1.9")) {
- settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_9);
} else {
log.warn("Unknown source VM " + opt + " ignored.");
settings.put(CompilerOptions.OPTION_Source,
@@ -361,11 +358,6 @@
CompilerOptions.VERSION_1_8);
settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_1_8);
- } else if(opt.equals("1.9")) {
- settings.put(CompilerOptions.OPTION_TargetPlatform,
- CompilerOptions.VERSION_1_9);
- settings.put(CompilerOptions.OPTION_Compliance,
- CompilerOptions.VERSION_1_9);
} else {
log.warn("Unknown target VM " + opt + " ignored.");
settings.put(CompilerOptions.OPTION_TargetPlatform,

36
tomcat-9.0.10-RemoveCompilerOptions.patch Normal file
View File

@ -0,0 +1,36 @@
--- java/org/apache/jasper/compiler/JDTCompiler.java.orig 2018-07-31 17:05:49.639378409 -0400
+++ java/org/apache/jasper/compiler/JDTCompiler.java 2018-07-31 17:06:36.947209122 -0400
@@ -313,14 +313,6 @@ public class JDTCompiler extends org.apa
} else if(opt.equals("1.8")) {
settings.put(CompilerOptions.OPTION_Source,
CompilerOptions.VERSION_1_8);
- // Version format changed from Java 9 onwards.
- // Support old format that was used in EA implementation as well
- } else if(opt.equals("9") || opt.equals("1.9")) {
- settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_9);
- } else if(opt.equals("10")) {
- settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_10);
} else {
log.warn("Unknown source VM " + opt + " ignored.");
settings.put(CompilerOptions.OPTION_Source,
@@ -367,18 +359,6 @@ public class JDTCompiler extends org.apa
CompilerOptions.VERSION_1_8);
settings.put(CompilerOptions.OPTION_Compliance,
CompilerOptions.VERSION_1_8);
- // Version format changed from Java 9 onwards.
- // Support old format that was used in EA implementation as well
- } else if(opt.equals("9") || opt.equals("1.9")) {
- settings.put(CompilerOptions.OPTION_TargetPlatform,
- CompilerOptions.VERSION_9);
- settings.put(CompilerOptions.OPTION_Compliance,
- CompilerOptions.VERSION_9);
- } else if(opt.equals("10")) {
- settings.put(CompilerOptions.OPTION_TargetPlatform,
- CompilerOptions.VERSION_10);
- settings.put(CompilerOptions.OPTION_Compliance,
- CompilerOptions.VERSION_10);
} else {
log.warn("Unknown target VM " + opt + " ignored.");
settings.put(CompilerOptions.OPTION_TargetPlatform,

2
tomcat.spec
View File

@ -92,7 +92,7 @@ Source32: tomcat-named.service
Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch
Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
Patch2: %{name}-8.0.36-CompilerOptionsV9.patch
Patch2: %{name}-9.0.10-RemoveCompilerOptions.patch
Patch3: disableJavadocFailOnWarning.patch
BuildArch: noarch