From 201414ed90f4ce59e108693c2ecc61cd550bc5905b8b7de4f3b0405a0e2460ff Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 6 Jan 2025 16:37:21 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=326

---
 tomcat-9.0-jdt.patch | 18 +++++++++---------
 tomcat.changes       |  8 +++-----
 tomcat.spec          |  2 +-
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/tomcat-9.0-jdt.patch b/tomcat-9.0-jdt.patch
index be1cdcc..7a817a8 100644
--- a/tomcat-9.0-jdt.patch
+++ b/tomcat-9.0-jdt.patch
@@ -1,22 +1,22 @@
---- apache-tomcat-9.0.75-src/java/org/apache/jasper/compiler/JDTCompiler.java	2023-05-22 18:12:16.915658492 +0200
-+++ apache-tomcat-9.0.75-src/java/org/apache/jasper/compiler/JDTCompiler.java	2023-05-22 19:45:14.491706823 +0200
-@@ -310,7 +310,7 @@
-             } else if(opt.equals("15")) {
+--- apache-tomcat-9.0.98-src/java/org/apache/jasper/compiler/JDTCompiler.java	2025-01-06 17:29:55.096709905 +0100
++++ apache-tomcat-9.0.98-src/java/org/apache/jasper/compiler/JDTCompiler.java	2025-01-06 17:32:39.494486072 +0100
+@@ -298,7 +298,7 @@
+             } else if (opt.equals("15")) {
                  settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_15);
-             } else if(opt.equals("16")) {
+             } else if (opt.equals("16")) {
 -                settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_16);
 +                settings.put(CompilerOptions.OPTION_Source, "16");
-             } else if(opt.equals("17")) {
+             } else if (opt.equals("17")) {
                  // Constant not available in latest ECJ version that runs on
                  // Java 8.
-@@ -392,8 +392,8 @@
+@@ -395,8 +395,8 @@
                  settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_15);
                  settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_15);
-             } else if(opt.equals("16")) {
+             } else if (opt.equals("16")) {
 -                settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_16);
 -                settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_16);
 +                settings.put(CompilerOptions.OPTION_TargetPlatform, "16");
 +                settings.put(CompilerOptions.OPTION_Compliance, "16");
-             } else if(opt.equals("17")) {
+             } else if (opt.equals("17")) {
                  // Constant not available in latest ECJ version that runs on
                  // Java 8.
diff --git a/tomcat.changes b/tomcat.changes
index d8d389c..d02c932 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -66,20 +66,17 @@ Fri Jan  3 16:03:11 UTC 2025 - Ricardo Mestre <ricardo.mestre@suse.com>
       default servlet. It will be removed in Tomcat 12 onwards where it will
       effectively be hard coded to true. (markt)
     + Add: Add DataSource based property storage for the WebdavServlet. (remm)
-
   * Coyote
     + Fix: Align encodedSolidusHandling with the Servlet specification. If the
       pass-through mode is used, any %25 sequences will now also be passed
       through to avoid errors and/or corruption when the application decodes the
       path. (markt)
-
   * Jasper
     + Fix: Further optimise EL evaluation of method parameters. Patch provided
       by Paolo B. (markt)
     + Fix: Follow-up to the fix for 69381. Apply the optimisation for method
       lookup performance in expression language to an additional location.
       (markt)
-
   * Web applications
     + Fix: Documentation. Remove references to the ResourceParams element.
       Support for ResourceParams was removed in Tomcat 5.5.x. (markt)
@@ -100,7 +97,6 @@ Fri Jan  3 16:03:11 UTC 2025 - Ricardo Mestre <ricardo.mestre@suse.com>
     + Add: Examples. Limit the shopping cart example to only allow adding the
       pre-defined items to the cart. (markt)
     + Fix: Examples. Remove JSP calendar example. (markt)
-
   * Other
     + Fix: 69465: Fix warnings during native image compilation using the Tomcat
       embedded JARs. (markt)
@@ -112,7 +108,9 @@ Fri Jan  3 16:03:11 UTC 2025 - Ricardo Mestre <ricardo.mestre@suse.com>
     + Add: Improvements to Korean translations. (markt)
     + Add: Improvements to Chinese translations. (markt)
     + Add: Improvements to Japanese translations by tak7iji. (markt)
-
+- Modified patch:
+  * tomcat-9.0-jdt.patch
+    + rediff
 
 -------------------------------------------------------------------
 Fri Nov 22 19:51:47 UTC 2024 - Michele Bussolotto <michele.bussolotto@suse.com>
diff --git a/tomcat.spec b/tomcat.spec
index 590a7a2..41a7d04 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package tomcat
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 # Copyright (c) 2000-2009, JPackage Project
 #
 # All modifications and additions to the file contributed by third parties