Notification time stamped 2018-07-31 21:13:25 UTC
From 60e8a419006256a9df2c31c0b56f2307f1f6ed78 Mon Sep 17 00:00:00 2001
From: Coty Sutherland <csutherl(a)redhat.com>
Date: Jul 31 2018 21:13:18 +0000
Subject: Related: Update to 9.0.10 Fix patch files so they apply cleanly
---
diff --git a/tomcat-8.0.36-CompilerOptionsV9.patch
b/tomcat-8.0.36-CompilerOptionsV9.patch
deleted file mode 100644
index 0b44236..0000000
--- a/tomcat-8.0.36-CompilerOptionsV9.patch
+++ /dev/null
@@ -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,
diff --git a/tomcat-9.0.10-RemoveCompilerOptions.patch
b/tomcat-9.0.10-RemoveCompilerOptions.patch
new file mode 100644
index 0000000..4a60efb
--- /dev/null
+++ b/tomcat-9.0.10-RemoveCompilerOptions.patch
@@ -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,
diff --git a/tomcat.spec b/tomcat.spec
index f5e4851..1658bd0 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -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
https://src.fedoraproject.org/rpms/tomcat/c/60e8a419006256a9df2c31c0b56f2...