glassfish-jsp-port-to-servlet-4.0.patch

@@ -1,35 +0,0 @@
---- javax.servlet.jsp-2.3.4/src/main/java/org/apache/jasper/servlet/JspCServletContext.java	2024-11-11 17:17:23.900839969 +0100
-+++ javax.servlet.jsp-2.3.4/src/main/java/org/apache/jasper/servlet/JspCServletContext.java	2024-11-11 17:20:07.928605001 +0100
-@@ -888,4 +888,32 @@
-     public String getVirtualServerName() {
-         throw new UnsupportedOperationException("Not implemented yet");
-     }
-+
-+    public void setResponseCharacterEncoding(String charset) {
-+        throw new UnsupportedOperationException("Not implemented yet");
-+    }
-+
-+    public String getResponseCharacterEncoding() {
-+        throw new UnsupportedOperationException("Not implemented yet");
-+    }
-+
-+    public void setRequestCharacterEncoding(String charset) {
-+        throw new UnsupportedOperationException("Not implemented yet");
-+    }
-+
-+    public String getRequestCharacterEncoding() {
-+        throw new UnsupportedOperationException("Not implemented yet");
-+    }
-+
-+    public void setSessionTimeout(int sessionTimeout) {
-+        throw new UnsupportedOperationException("Not implemented yet");
-+    }
-+
-+    public int getSessionTimeout() {
-+        throw new UnsupportedOperationException("Not implemented yet");
-+    }
-+
-+    public ServletRegistration.Dynamic addJspFile(String servletName, String jspFile) {
-+        throw new UnsupportedOperationException("Not implemented yet");
-+    }
- }

glassfish-jsp.changes

@@ -1,10 +1,3 @@
--------------------------------------------------------------------
-Mon Nov 11 16:35:49 UTC 2024 - Fridrich Strba <fstrba@suse.com>
-
-- Added patch:
-  * glassfish-jsp-port-to-servlet-4.0.patch
-    + port to javax.servlet-api 4.0
-
 -------------------------------------------------------------------
 Wed Feb 21 10:43:53 UTC 2024 - Gus Kenion <gus.kenion@suse.com>
 

glassfish-jsp.spec

@@ -30,8 +30,7 @@ Source1:        https://raw.githubusercontent.com/javaee/javaee-jsp-api/%{artifa
 Source2:        http://www.apache.org/licenses/LICENSE-2.0
 Patch0:         %{name}-build-eclipse-compilers.patch
 Patch1:         %{name}-port-to-servlet-3.1.patch
-Patch2:         %{name}-port-to-servlet-4.0.patch
+Patch2:         Tag.patch
-Patch3:         Tag.patch
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  maven-local
@@ -68,7 +67,10 @@ Group:          Documentation/HTML
 %{summary}.
 
 %prep
-%autosetup -n %{artifactId}-%{version} -p1
+%setup -q -n %{artifactId}-%{version}
+%patch -P 0 -p1
+%patch -P 1 -p1
+%patch -P 2 -p1
 
 %pom_add_dep org.eclipse.jdt:core::provided
 %pom_add_dep org.apache.ant:ant::provided