Prepare for 4.0.0 development

Since the new API adds a new interface method to MvcContext, we already need to implement it in this PR. see: #367
eclipse-ee4j · Apr 30, 2023 · 325f95c · 325f95c
1 parent baed73a
commit 325f95c
Show file tree

Hide file tree

Showing 32 changed files with 42 additions and 34 deletions.
diff --git a/archetype/pom.xml b/archetype/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.eclipse.krazo</groupId>
         <artifactId>krazo-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>krazo-jakartaee-archetype</artifactId>

diff --git a/core/pom.xml b/core/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.eclipse.krazo</groupId>
         <artifactId>krazo-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>krazo-core</artifactId>
     <name>Eclipse Krazo Core</name>

diff --git a/core/src/main/java/org/eclipse/krazo/MvcContextImpl.java b/core/src/main/java/org/eclipse/krazo/MvcContextImpl.java
@@ -70,6 +70,9 @@ public class MvcContextImpl implements MvcContext {
     @JaxRsContext
     private UriInfo uriInfo;
 
+    @Inject
+    private KrazoConfig krazoConfig;
+
     private Locale locale;
 
     private String applicationPath;
@@ -100,6 +103,11 @@ public Csrf getCsrf() {
         return csrf;
     }
 
+    @Override
+    public String getHiddenMethodFieldName() {
+        return krazoConfig.getFormMethodOverwriteField();
+    }
+
     @Override
     public Encoders getEncoders() {
         return encoders;

diff --git a/documentation/pom.xml b/documentation/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.eclipse.krazo</groupId>
         <artifactId>krazo-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>krazo-documentation</artifactId>

diff --git a/examples/application-path/pom.xml b/examples/application-path/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.eclipse.krazo.examples</groupId>
         <artifactId>krazo-examples-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>application-path</artifactId>
     <packaging>war</packaging>

diff --git a/examples/book-cdi/pom.xml b/examples/book-cdi/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.eclipse.krazo.examples</groupId>
         <artifactId>krazo-examples-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>book-cdi</artifactId>
     <packaging>war</packaging>

diff --git a/examples/book-models/pom.xml b/examples/book-models/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.eclipse.krazo.examples</groupId>
         <artifactId>krazo-examples-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>book-models</artifactId>
     <packaging>war</packaging>

diff --git a/examples/conversation/pom.xml b/examples/conversation/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.eclipse.krazo.examples</groupId>
         <artifactId>krazo-examples-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>conversation</artifactId>
     <packaging>war</packaging>

diff --git a/examples/csrf-property/pom.xml b/examples/csrf-property/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.eclipse.krazo.examples</groupId>
         <artifactId>krazo-examples-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>csrf-property</artifactId>
     <packaging>war</packaging>

diff --git a/examples/def-ext/pom.xml b/examples/def-ext/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.eclipse.krazo.examples</groupId>
         <artifactId>krazo-examples-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>def-ext</artifactId>
     <packaging>war</packaging>

diff --git a/examples/events/pom.xml b/examples/events/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.eclipse.krazo.examples</groupId>
         <artifactId>krazo-examples-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>events</artifactId>
     <packaging>war</packaging>

diff --git a/examples/exceptions/pom.xml b/examples/exceptions/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.eclipse.krazo.examples</groupId>
         <artifactId>krazo-examples-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>exceptions</artifactId>
     <packaging>war</packaging>

diff --git a/examples/facelets/pom.xml b/examples/facelets/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.eclipse.krazo.examples</groupId>
         <artifactId>krazo-examples-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>facelets</artifactId>
     <packaging>war</packaging>

diff --git a/examples/locale/pom.xml b/examples/locale/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.eclipse.krazo.examples</groupId>
         <artifactId>krazo-examples-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>locale</artifactId>
     <packaging>war</packaging>

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.eclipse.krazo</groupId>
         <artifactId>krazo-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
     <groupId>org.eclipse.krazo.examples</groupId>
     <artifactId>krazo-examples-parent</artifactId>

diff --git a/examples/produces/pom.xml b/examples/produces/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.eclipse.krazo.examples</groupId>
         <artifactId>krazo-examples-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>produces</artifactId>
     <packaging>war</packaging>

diff --git a/examples/redirect/pom.xml b/examples/redirect/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.eclipse.krazo.examples</groupId>
         <artifactId>krazo-examples-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>redirect</artifactId>
     <packaging>war</packaging>

diff --git a/examples/redirectScope/pom.xml b/examples/redirectScope/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.eclipse.krazo.examples</groupId>
         <artifactId>krazo-examples-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>redirectScope</artifactId>
     <packaging>war</packaging>

diff --git a/examples/redirectScope2/pom.xml b/examples/redirectScope2/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.eclipse.krazo.examples</groupId>
         <artifactId>krazo-examples-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>redirectScope2</artifactId>
     <packaging>war</packaging>

diff --git a/examples/redirectScope3/pom.xml b/examples/redirectScope3/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.eclipse.krazo.examples</groupId>
         <artifactId>krazo-examples-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>redirectScope3</artifactId>
     <packaging>war</packaging>

diff --git a/examples/requestDispatcher/pom.xml b/examples/requestDispatcher/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.eclipse.krazo.examples</groupId>
         <artifactId>krazo-examples-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>requestDispatcher</artifactId>
     <packaging>war</packaging>

diff --git a/examples/returns/pom.xml b/examples/returns/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.eclipse.krazo.examples</groupId>
         <artifactId>krazo-examples-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>returns</artifactId>
     <packaging>war</packaging>

diff --git a/examples/uri-builder/pom.xml b/examples/uri-builder/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.eclipse.krazo.examples</groupId>
         <artifactId>krazo-examples-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>uri-builder</artifactId>
     <packaging>war</packaging>

diff --git a/examples/validation-i18n/pom.xml b/examples/validation-i18n/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.eclipse.krazo.examples</groupId>
         <artifactId>krazo-examples-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>validation-i18n</artifactId>
     <packaging>war</packaging>

diff --git a/examples/validation/pom.xml b/examples/validation/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.eclipse.krazo.examples</groupId>
         <artifactId>krazo-examples-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>validation</artifactId>
     <packaging>war</packaging>

diff --git a/examples/view-annotation/pom.xml b/examples/view-annotation/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.eclipse.krazo.examples</groupId>
         <artifactId>krazo-examples-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>view-annotation</artifactId>
     <packaging>war</packaging>

diff --git a/jersey/pom.xml b/jersey/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.eclipse.krazo</groupId>
         <artifactId>krazo-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>krazo-jersey</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -1,4 +1,4 @@
-<!--
+    <!--
 
     Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved.
     Copyright (c) 2018, 2021 Eclipse Krazo committers and contributors
@@ -26,7 +26,7 @@
     <groupId>org.eclipse.krazo</groupId>
     <artifactId>krazo-parent</artifactId>
     <packaging>pom</packaging>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
 
     <name>Eclipse Krazo Parent</name>
     <description>Eclipse Krazo Parent</description>
@@ -44,8 +44,8 @@
         <maven.compiler.release>11</maven.compiler.release>
 
         <!-- DEPENDENCY PROPERTIES -->
-        <spec.version>2.1.0</spec.version>
-        <tck.version>2.1.0</tck.version>
+        <spec.version>3.0.0.M1</spec.version>
+        <tck.version>3.0.0.M1</tck.version>
 
         <jersey.version>3.1.0-M8</jersey.version>
         <arquillian-bom.version>1.7.0.Alpha12</arquillian-bom.version>

diff --git a/resteasy/pom.xml b/resteasy/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.eclipse.krazo</groupId>
         <artifactId>krazo-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>krazo-resteasy</artifactId>

diff --git a/tck/pom.xml b/tck/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.eclipse.krazo</groupId>
         <artifactId>krazo-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>krazo-tck</artifactId>

diff --git a/testsuite/pom.xml b/testsuite/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.eclipse.krazo</groupId>
         <artifactId>krazo-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>krazo-testsuite</artifactId>

diff --git a/testsuite/src/main/resources/forms/views/form.jsp b/testsuite/src/main/resources/forms/views/form.jsp
@@ -6,7 +6,7 @@
 </head>
 <body>
     <form id="form" action="forms" method="post">
-        <input id="hidden-method" name="_method" type="hidden" value="post">
+        <input id="hidden-method" name="${mvc.hiddenMethodFieldName}" type="hidden" value="post">
         <input type="submit" name="submit" value="Click here"/>
     </form>
 </body>