Merge pull request #1234 from markt-asf/issue-1233-partial-fix

Issue 1233 partial fix
jakartaee · Mar 2, 2024 · d151787 · d151787
2 parents da90b3c + 1dff878
commit d151787
Show file tree

Hide file tree

Showing 52 changed files with 18 additions and 1,938 deletions.
diff --git a/jsp/pom.xml b/jsp/pom.xml
@@ -36,11 +36,11 @@
     <properties>
         <arquillian.junit>1.7.0.Alpha14</arquillian.junit>
         <jakarta.annotation-api.version>3.0.0-M1</jakarta.annotation-api.version>
-        <jakarta.el-api.version>6.0.0-M2</jakarta.el-api.version>
+        <jakarta.el-api.version>6.0.0-RC1</jakarta.el-api.version>
         <jakarta.mail-api.version>2.1.2</jakarta.mail-api.version>
-        <jakarta.servlet-api.version>6.1.0-M1</jakarta.servlet-api.version>
+        <jakarta.servlet-api.version>6.1.0-M2</jakarta.servlet-api.version>
         <jms-api.version>3.1.0</jms-api.version>
-        <jsp-api.version>4.0.0-M1</jsp-api.version>
+        <jsp-api.version>4.0.0-M2</jsp-api.version>
         <junit.jupiter.version>5.9.1</junit.jupiter.version>
     </properties>
 
@@ -76,9 +76,9 @@
             <version>${project.parent.version}</version>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>servlet</artifactId>
-            <version>${project.parent.version}</version>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>tck-runtime</artifactId>
+            <version>6.1.0-M1</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/...rc/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginValidator.java b/...rc/main/java/com/sun/ts/tests/jsp/spec/core_syntax/actions/plugin/JspPluginValidator.java