Update Java version to 21 in GitHub Actions workflow

Author: wikumChamith

.github/workflows/maven.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         platform: [ ubuntu-latest ]
-        java-version: [ 8 ]
+        java-version: [ 21 ]
 
     runs-on: ${{ matrix.platform }}
     env:

omod/src/main/java/org/springframework/web/servlet/mvc/AbstractWizardFormController.java

@@ -42,6 +42,8 @@
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.util.WebUtils;
 
+import static org.springframework.web.util.WebUtils.SUBMIT_IMAGE_SUFFIXES;
+
 /**
  * Form controller for typical wizard-style workflows.
  * <p>
@@ -659,6 +661,13 @@ protected int getTargetPage(HttpServletRequest request, int currentPage) {
 		while (parameterNames.hasMoreElements()) {
 			String param = parameterNames.nextElement();
 			if (param.startsWith(PARAM_TARGET)) {
+				for (String suffix : SUBMIT_IMAGE_SUFFIXES) {
+					// Remove any image button suffixes (like .x or .y)
+					if (param.endsWith(suffix)) {
+						param = param.substring(0, param.length() - suffix.length());
+						break;
+					}
+				}
 				String pageStr = param.substring(PARAM_TARGET.length());
 				try {
 					return Integer.parseInt(pageStr);