Merge pull request #67 from arjantijms/pages_40

Initial support for Pages 4.0 M1

pom.xml

@@ -25,13 +25,13 @@
     <parent>
         <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
-        <version>1.0.8</version>
+        <version>1.0.9</version>
         <relativePath/>
     </parent>
 
     <groupId>org.glassfish.wasp</groupId>
     <artifactId>wasp</artifactId>
-    <version>3.2.2-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
 
     <name>WaSP</name>
     <description>Eclipse compatible implementation of Jakarta Server Pages</description>
@@ -79,7 +79,7 @@
         <dependency>
             <groupId>jakarta.servlet.jsp</groupId>
             <artifactId>jakarta.servlet.jsp-api</artifactId>
-            <version>3.1.1</version>
+            <version>4.0.0-M1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -91,13 +91,13 @@
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
-            <version>6.0.0</version>
+            <version>6.1.0-M1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>jakarta.el</groupId>
             <artifactId>jakarta.el-api</artifactId>
-            <version>5.0.1</version>
+            <version>6.0.0-M1</version>
             <scope>provided</scope>
         </dependency>
 
@@ -159,13 +159,13 @@
                 </executions>
             </plugin>
 
-            <!-- Restricts the Java version to 11 -->
+            <!-- Restricts the Java version to 17 -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.11.0</version>
                 <configuration>
-                    <release>11</release>
+                    <release>17</release>
                     <compilerArgument>-Xlint:unchecked</compilerArgument>
                 </configuration>
             </plugin>
@@ -178,7 +178,7 @@
                 <configuration>
                     <instructions>
                         <_noimportjava>true</_noimportjava>
-                        <_runee>JavaSE-11</_runee>
+                        <_runee>JavaSE-17</_runee>
                         <Automatic-Module-Name>org.glassfish.wasp</Automatic-Module-Name>
                         <Extension-Name>org.glassfish.wasp.wasp</Extension-Name>
                         <Bundle-SymbolicName>org.glassfish.wasp.wasp</Bundle-SymbolicName>
@@ -321,16 +321,6 @@
                             <goal>jar</goal>
                         </goals>
                         <configuration>
-                            <source>11</source>
-
-                            <additionalparam>-Xdoclint:none</additionalparam>
-							<additionalOptions>
-								<additionalOption>-Xdoclint:none</additionalOption>
-							</additionalOptions>
-							<additionalJOption>-Xdoclint:none</additionalJOption>
-							<additionalJOptions>
-                            	<additionalJOption>-Xdoclint:none</additionalJOption>
-                        	</additionalJOptions>
 							<doclint>none</doclint>
 							<failOnError>false</failOnError>
 							<detectOfflineLinks>false</detectOfflineLinks>

src/main/java/org/glassfish/wasp/runtime/JspContextWrapper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2022 Contributors to the Eclipse Foundation.
+ * Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation.
  * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
@@ -45,8 +45,6 @@
 import jakarta.servlet.jsp.JspContext;
 import jakarta.servlet.jsp.JspWriter;
 import jakarta.servlet.jsp.PageContext;
-import jakarta.servlet.jsp.el.ExpressionEvaluator;
-import jakarta.servlet.jsp.el.VariableResolver;
 import jakarta.servlet.jsp.tagext.BodyContent;
 import jakarta.servlet.jsp.tagext.JspTag;
 
@@ -329,11 +327,6 @@ public void include(String relativeUrlPath, boolean flush) throws ServletExcepti
         invokingJspCtxt.include(relativeUrlPath, flush);
     }
 
-    @Override
-    public VariableResolver getVariableResolver() {
-        return null;
-    }
-
     @Override
     public BodyContent pushBody() {
         return invokingJspCtxt.pushBody();
@@ -349,11 +342,6 @@ public JspWriter popBody() {
         return invokingJspCtxt.popBody();
     }
 
-    @Override
-    public ExpressionEvaluator getExpressionEvaluator() {
-        return invokingJspCtxt.getExpressionEvaluator();
-    }
-
     @Override
     public void handlePageException(Exception ex) throws IOException, ServletException {
         // Should never be called since handleException() called with a

src/main/java/org/glassfish/wasp/runtime/PageContextImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2022 Contributors to the Eclipse Foundation.
+ * Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation.
  * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2004 The Apache Software Foundation
  *
@@ -64,12 +64,10 @@
 import jakarta.servlet.jsp.JspFactory;
 import jakarta.servlet.jsp.JspWriter;
 import jakarta.servlet.jsp.PageContext;
-import jakarta.servlet.jsp.el.ExpressionEvaluator;
 import jakarta.servlet.jsp.el.ImplicitObjectELResolver;
 import jakarta.servlet.jsp.el.ImportELResolver;
 import jakarta.servlet.jsp.el.NotFoundELResolver;
 import jakarta.servlet.jsp.el.ScopedAttributeELResolver;
-import jakarta.servlet.jsp.el.VariableResolver;
 import jakarta.servlet.jsp.tagext.BodyContent;
 
 /**
@@ -642,11 +640,6 @@ public void include(String relativeUrlPath, boolean flush) throws ServletExcepti
         JspRuntimeLibrary.include(request, response, relativeUrlPath, out, flush);
     }
 
-    @Override
-    public VariableResolver getVariableResolver() {
-        return new VariableResolverImpl(this);
-    }
-
     private ELResolver getELResolver() {
 
         if (elResolver == null) {
@@ -788,15 +781,6 @@ public JspWriter popBody() {
         return out;
     }
 
-    /**
-     * Provides programmatic access to the ExpressionEvaluator. The JSP Container must return a valid instance of an
-     * ExpressionEvaluator that can parse EL expressions.
-     */
-    @Override
-    public ExpressionEvaluator getExpressionEvaluator() {
-        return new ExpressionEvaluatorImpl(this);
-    }
-
     @Override
     public void handlePageException(Exception ex) throws IOException, ServletException {
         // Should never be called since handleException() called with a