diff --git a/.gitignore b/.gitignore index 5cff6acc97..0834ec3c43 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,5 @@ META-INF .checkstyle chromedriver.log .errai/ -*.versionsBackup \ No newline at end of file +*.versionsBackup +.factorypath diff --git a/codequality/checkstyle.xml b/codequality/checkstyle.xml new file mode 100644 index 0000000000..9bff910fe6 --- /dev/null +++ b/codequality/checkstyle.xml @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/codequality/opensource.java.header b/codequality/opensource.java.header new file mode 100644 index 0000000000..7467547a3e --- /dev/null +++ b/codequality/opensource.java.header @@ -0,0 +1,15 @@ +/\*\*? + \* Copyright \d{4} ArcBees Inc\. + \* + \* Licensed under the Apache License, Version 2\.0 \(the "License"\); you may not + \* use this file except in compliance with the License\. You may obtain a copy of + \* the License at + \* + \* http://www\.apache\.org/licenses/LICENSE-2\.0 + \* + \* Unless required by applicable law or agreed to in writing, software + \* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + \* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\. See the + \* License for the specific language governing permissions and limitations under + \* the License\. + \*/ diff --git a/codequality/suppressions.xml b/codequality/suppressions.xml new file mode 100644 index 0000000000..8e6d283b44 --- /dev/null +++ b/codequality/suppressions.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + diff --git a/gwtp-core/gwtp-all/pom.xml b/gwtp-core/gwtp-all/pom.xml index 59bfda2dc1..ddbbbc4620 100644 --- a/gwtp-core/gwtp-all/pom.xml +++ b/gwtp-core/gwtp-all/pom.xml @@ -15,7 +15,7 @@ true - 2.5.3 + 3.7.1 @@ -240,7 +240,7 @@ - com.google.gwt + org.gwtproject gwt-dev provided @@ -274,7 +274,7 @@ org.apache.maven.plugins maven-dependency-plugin - 2.1 + 3.8.1 unpack-dependencies @@ -299,7 +299,7 @@ org.apache.maven.plugins maven-antrun-plugin - 1.6 + 3.1.0 @@ -317,12 +317,12 @@ All Rights Reserved.]]> - - - - - - + + + + + + @@ -339,7 +339,7 @@ org.codehaus.mojo build-helper-maven-plugin - 1.5 + 3.6.0 attach-artifacts diff --git a/gwtp-core/gwtp-clients-common/pom.xml b/gwtp-core/gwtp-clients-common/pom.xml index d386622bbb..701e8ed8bf 100644 --- a/gwtp-core/gwtp-clients-common/pom.xml +++ b/gwtp-core/gwtp-clients-common/pom.xml @@ -32,20 +32,16 @@ - com.google.gwt + org.gwtproject gwt-user - com.google.gwt + org.gwtproject gwt-dev - com.google.gwt.inject + de.knightsoft-net gin - - com.google.inject - guice - diff --git a/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/CodeSplitBundleProvider.java b/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/CodeSplitBundleProvider.java index e10b370064..1c38a8b9ef 100644 --- a/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/CodeSplitBundleProvider.java +++ b/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/CodeSplitBundleProvider.java @@ -18,7 +18,8 @@ import com.google.gwt.inject.client.AsyncProvider; import com.google.gwt.user.client.rpc.AsyncCallback; -import com.google.inject.Provider; + +import jakarta.inject.Provider; /** * Implements a {@link IndirectProvider} that uses code splitting for a specific diff --git a/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/CommonGinModule.java b/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/CommonGinModule.java index 9c0eda3587..ce739c730b 100644 --- a/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/CommonGinModule.java +++ b/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/CommonGinModule.java @@ -16,11 +16,11 @@ package com.gwtplatform.common.client; -import javax.inject.Singleton; - import com.google.gwt.inject.client.AbstractGinModule; import com.gwtplatform.common.shared.UrlUtils; +import jakarta.inject.Singleton; + /** * Common client bindings. * You can safely install this module multiple times as the bindings will be performed only on the first install. diff --git a/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/ProviderBundle.java b/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/ProviderBundle.java index 7d0e20ecf5..53984f7c5e 100644 --- a/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/ProviderBundle.java +++ b/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/ProviderBundle.java @@ -26,10 +26,10 @@ * the objects were behind their individual split points. * GWTP automatically handles ProviderBundles when used with ApplicationController * and Ginjector generation. - *

- *

+ *

+ *

* Here is an example use of a manual {@link ProviderBundle}: - *

+ *

* 

  * public class MyPresenterBundle extends ProviderBundle {
  *   public final static int ID_Object1 = 0;
@@ -38,8 +38,8 @@
  *
  *   @Inject
  *   MyPresenterBundle(
- *       final Provider object1Provider,
- *       final Provider object2Provider) {
+ *       final Provider<Object1> object1Provider,
+ *       final Provider<Object2> object2Provider) {
  *     super( BUNDLE_SIZE );
  *     providers[ID_Object1] = object1Provider;
  *     providers[ID_Object2] = object2Provider;
@@ -54,7 +54,7 @@ public class ProviderBundle {
      * Constructs a {@link ProviderBundle} containing a given number of providers.
      * After calling this constructor you should set the provider manually like
      * so:
-     * 

+     * 

      * 
      *     providers[0] = object1Provider;
      *     providers[1] = object2Provider;
diff --git a/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/StandardProvider.java b/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/StandardProvider.java
index 8715314f41..1de5d65ed7 100644
--- a/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/StandardProvider.java
+++ b/gwtp-core/gwtp-clients-common/src/main/java/com/gwtplatform/common/client/StandardProvider.java
@@ -16,10 +16,10 @@
 
 package com.gwtplatform.common.client;
 
-import javax.inject.Provider;
-
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
+import jakarta.inject.Provider;
+
 /**
  * An {@link IndirectProvider} that immediately gets the object and invokes the
  * callback, without performing code splitting. This is essentially the same as
diff --git a/gwtp-core/gwtp-clients-common/src/main/resources/com/gwtplatform/common/ClientsCommon.gwt.xml b/gwtp-core/gwtp-clients-common/src/main/resources/com/gwtplatform/common/ClientsCommon.gwt.xml
index 3c6e0afb5e..712e729533 100644
--- a/gwtp-core/gwtp-clients-common/src/main/resources/com/gwtplatform/common/ClientsCommon.gwt.xml
+++ b/gwtp-core/gwtp-clients-common/src/main/resources/com/gwtplatform/common/ClientsCommon.gwt.xml
@@ -1,6 +1,6 @@
 
-
+
 
     
     
@@ -9,9 +9,9 @@
     
     
 
-    
+    
     
-    
+    
 
     
     
diff --git a/gwtp-core/gwtp-crawler/pom.xml b/gwtp-core/gwtp-crawler/pom.xml
index 5633b617cc..3e9bfe875a 100644
--- a/gwtp-core/gwtp-crawler/pom.xml
+++ b/gwtp-core/gwtp-crawler/pom.xml
@@ -32,8 +32,8 @@
 
     
         
-            javax.servlet
-            javax.servlet-api
+            jakarta.servlet
+            jakarta.servlet-api
         
 
         
diff --git a/gwtp-core/gwtp-crawler/src/main/java/com/gwtplatform/crawler/server/CrawlFilter.java b/gwtp-core/gwtp-crawler/src/main/java/com/gwtplatform/crawler/server/CrawlFilter.java
index 306d6709a3..49f6631259 100644
--- a/gwtp-core/gwtp-crawler/src/main/java/com/gwtplatform/crawler/server/CrawlFilter.java
+++ b/gwtp-core/gwtp-crawler/src/main/java/com/gwtplatform/crawler/server/CrawlFilter.java
@@ -28,16 +28,16 @@
 import java.net.URLEncoder;
 import java.util.logging.Logger;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * Servlet that makes this application crawlable.
diff --git a/gwtp-core/gwtp-crawler/src/main/java/com/gwtplatform/crawler/server/ServiceKey.java b/gwtp-core/gwtp-crawler/src/main/java/com/gwtplatform/crawler/server/ServiceKey.java
index 53cdd762a2..f164d76f99 100644
--- a/gwtp-core/gwtp-crawler/src/main/java/com/gwtplatform/crawler/server/ServiceKey.java
+++ b/gwtp-core/gwtp-crawler/src/main/java/com/gwtplatform/crawler/server/ServiceKey.java
@@ -28,7 +28,7 @@
 
 /**
  * Use this annotation to bind the key that should be used when invoking
- * {@link CrawlServiceServlet}. For example:
+ * {@code CrawlServiceServlet}. For example:
  * 
bindConstant().annotatedWith(ServiceKey.class).to("123456");
  * 

  */
diff --git a/gwtp-core/gwtp-dispatch-common-client/pom.xml b/gwtp-core/gwtp-dispatch-common-client/pom.xml
index 80e708da34..3c9c138434 100644
--- a/gwtp-core/gwtp-dispatch-common-client/pom.xml
+++ b/gwtp-core/gwtp-dispatch-common-client/pom.xml
@@ -22,11 +22,11 @@
             gwtp-dispatch-common-shared
         
         
-            com.google.gwt
+            org.gwtproject
             gwt-user
         
         
-            com.google.gwt.inject
+            de.knightsoft-net
             gin
         
     
diff --git a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/DefaultCallbackDispatchRequest.java b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/DefaultCallbackDispatchRequest.java
index 9a65ecafa2..095f9fb6cb 100644
--- a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/DefaultCallbackDispatchRequest.java
+++ b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/DefaultCallbackDispatchRequest.java
@@ -22,9 +22,9 @@
  * An implementation of {@link CallbackDispatchRequest} that should be used by
  * {@link com.gwtplatform.dispatch.client.actionhandler.ClientActionHandler}s that make asynchronous calls that do not
  * return a {@link com.google.gwt.http.client.Request}.
- * 

+ * 

  * {@link #isPending()} will return true until either {@link #onSuccess(Object)} or {@link #onFailure} is called.
- * 

+ * 

  * Calling {@link #cancel()} will prevent the {@link #onSuccess(Object)} and {@link #onFailure(Throwable)} from being
  * forwarded to the code that requested the action handler be executed/undone.
  *
diff --git a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/DefaultSecurityCookieAccessor.java b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/DefaultSecurityCookieAccessor.java
index e41032f7ee..112419bc5a 100644
--- a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/DefaultSecurityCookieAccessor.java
+++ b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/DefaultSecurityCookieAccessor.java
@@ -24,7 +24,7 @@
 /**
  * This class provides access to the session id client side by looking into a cookie on the browser. This will work to
  * prevent XSRF attack.
- * 

+ * 

  * To use this class you have to bind a constant string annotated with {@code @}{@link SecurityCookie} to your desired
  * cookie name.
  */
diff --git a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/DelegatingCallbackDispatchRequest.java b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/DelegatingCallbackDispatchRequest.java
index c715f2ae34..dd7c31aab1 100644
--- a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/DelegatingCallbackDispatchRequest.java
+++ b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/DelegatingCallbackDispatchRequest.java
@@ -23,11 +23,11 @@
  * An implementation of {@link DispatchRequest} that should be used by
  * {@link com.gwtplatform.dispatch.client.interceptor.Interceptor}s that make asynchronous calls that return a
  * {@link com.google.gwt.http.client.Request Request}.
- * 

+ * 

  * This class also takes a {@link DispatchRequest} and delegate work to this {@link DispatchRequest}.
- * 

+ * 

  * This class is used within
- * {@link com.gwtplatform.dispatch.rpc.client.interceptor.caching.AbstractCachingRpcInterceptor} to be able to store
+ * com.gwtplatform.dispatch.rpc.client.interceptor.caching.AbstractCachingRpcInterceptor to be able to store
  * inside an {@link java.util.HashMap HashMap} {@link com.gwtplatform.dispatch.client.DefaultCallbackDispatchRequest}
  * while keeping {@link GwtHttpDispatchRequest} nature.
  *
diff --git a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/DelegatingDispatchRequest.java b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/DelegatingDispatchRequest.java
index 898e758abc..1223a1e170 100644
--- a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/DelegatingDispatchRequest.java
+++ b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/DelegatingDispatchRequest.java
@@ -21,7 +21,7 @@
 /**
  * An implementation of {@link DispatchRequest} that is used in conjunction with {@link
  * com.gwtplatform.dispatch.client.interceptor.Interceptor Interceptor}s.
- * 

+ * 

  * As the interceptor implementation may be provided asynchronously, the {@code DelegatingAsyncCallback} will initially
  * not contain a {@link DispatchRequest}. Once the interceptor is executed, this will be populated with a {@link
  * DispatchRequest} by calling {@link #setDelegate(DispatchRequest)}.
@@ -35,7 +35,7 @@ public DelegatingDispatchRequest() {
 
     /**
      * Populates the {@link DelegatingDispatchRequest} object with a {@link DispatchRequest}.
-     * 

+     * 

      * If the code that requested the command to be executed has already chosen to cancel the {@link DispatchRequest},
      * the {@link DispatchRequest} that has been passed will be immediately cancelled.
      *
diff --git a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/DispatchCall.java b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/DispatchCall.java
index ec4cb3f48e..041f50657c 100644
--- a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/DispatchCall.java
+++ b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/DispatchCall.java
@@ -24,12 +24,12 @@
 import com.gwtplatform.dispatch.shared.TypedAction;
 
 /**
- * An class representing a call made to the server through {@link com.gwtplatform.dispatch.rest.client.RestDispatch
- * RestDispatch} or {@link com.gwtplatform.dispatch.rpc.shared.DispatchAsync DispatchAsync}.
- * 

+ * An class representing a call made to the server through com.gwtplatform.dispatch.rest.client.RestDispatch
+ * or com.gwtplatform.dispatch.rpc.shared.DispatchAsync.
+ * 

  * This class will perform the work shared by all dispatch modules. It will delegate exceptions to the bound {@link
  * ExceptionHandler}. It will provide access to the security cookie through the bound {@link SecurityCookieAccessor}.
- * 

+ * 

  * It also provides a couple extension points for implementations.
  *
  * @param  The type of the {@link TypedAction} wrapped by this {@link DispatchCall}.
diff --git a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/ExceptionHandler.java b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/ExceptionHandler.java
index addc6b4ee9..b9e0d9c36b 100644
--- a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/ExceptionHandler.java
+++ b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/ExceptionHandler.java
@@ -17,7 +17,7 @@
 package com.gwtplatform.dispatch.client;
 
 /**
- * Implementations of this interface can be added to a {@link com.gwtplatform.dispatch.shared.DispatchAsync}
+ * Implementations of this interface can be added to a com.gwtplatform.dispatch.shared.DispatchAsync
  * implementation to intercept exceptions which return from further up the chain.
  */
 public interface ExceptionHandler {
diff --git a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/GwtHttpDispatchRequest.java b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/GwtHttpDispatchRequest.java
index d44a73be78..3fb7202b44 100644
--- a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/GwtHttpDispatchRequest.java
+++ b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/GwtHttpDispatchRequest.java
@@ -21,7 +21,7 @@
 
 /**
  * An implementation of {@link DispatchRequest} that is an adapter for {@link Request}.
- * 

+ * 

  * If the code that requested the command to be executed chooses to cancel the {@link DispatchRequest} and the
  * {@link Request} that has been passed is still pending, it will be cancelled.
  */
diff --git a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/AbstractClientActionHandler.java b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/AbstractClientActionHandler.java
index db37277897..818f353523 100644
--- a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/AbstractClientActionHandler.java
+++ b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/AbstractClientActionHandler.java
@@ -20,7 +20,7 @@
  * Simple abstract super-class for {@link ClientActionHandler} implementations that forces the action class to be passed
  * in as a constructor to the handler.
  *
- * @deprecated Since 1.4. Use {@link com.gwtplatform.dispatch.rpc.client.interceptor.AbstractRpcInterceptor}
+ * @deprecated Since 1.4. Use com.gwtplatform.dispatch.rpc.client.interceptor.AbstractRpcInterceptor
  *
  * @param  The action type.
  * @param  The result type.
diff --git a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/ClientActionHandler.java b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/ClientActionHandler.java
index 7e787e5787..105c6fb769 100644
--- a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/ClientActionHandler.java
+++ b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/ClientActionHandler.java
@@ -21,13 +21,13 @@
 
 /**
  * Instances of this interface will handle specific types of action classes on the client.
- * 

+ * 

  * When a call is executed, the {@link ClientActionHandler} that has been registered with the bound
  * {@link ClientActionHandlerRegistry} is called and
- * {@link com.gwtplatform.dispatch.rpc.shared.DispatchAsync DispatchAsync} or
- * {@link com.gwtplatform.dispatch.rest.shared.RestDispatch RestDispatch} does not automatically send the command over
+ * com.gwtplatform.dispatch.rpc.shared.DispatchAsync or
+ * com.gwtplatform.dispatch.rest.shared.RestDispatch does not automatically send the command over
  * HTTP to the server.
- * 

+ * 

  * Client Action Handlers provide a number of flexible options:
  * 

- * 

- * 

+ * 

+ * 

  * Important! If your action handler makes asynchronous calls, be careful with your use of fields as a second
  * call your handler could be made while it is waiting for the asynchronous call to return.
- * 

- * 
Caching Client Action Handler Example

- * 

+ * 

+ * 
Caching Client Action Handler Example

+ * 

  * 
  * 
  * // Interface of cache singleton
@@ -111,10 +111,10 @@
 public interface ClientActionHandler {
     /**
      * Handles the specified action.
-     * 

+     * 

      * If the handler makes asynchronous calls, it is recommended that you confirm that this request has not been
      * cancelled after returning by calling
-     * {@link com.gwtplatform.dispatch.client.DelegatingDispatchRequest#isCancelled()} against the request parameter.
+     * {@link com.gwtplatform.dispatch.client.DelegatingDispatchRequest#cancel()} against the request parameter.
      *
      * @param action         The action to execute.
      * @param resultCallback The callback to use to communicate the result of the action. Unless the request is
@@ -132,10 +132,10 @@ public interface ClientActionHandler {
 
     /**
      * Undoes the specified action if supported.
-     * 

+     * 

      * If the handler makes asynchronous calls, it is recommended that you confirm that this request has not been
      * cancelled after returning by calling
-     * {@link com.gwtplatform.dispatch.client.DelegatingDispatchRequest#isCancelled()} against the request parameter.
+     * {@link com.gwtplatform.dispatch.client.DelegatingDispatchRequest#cancel()} against the request parameter.
      *
      * @param action      The action to undo.
      * @param result      The result to undo.
diff --git a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/ClientActionHandlerRegistry.java b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/ClientActionHandlerRegistry.java
index 6823bbe596..d3a8aeaf8d 100644
--- a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/ClientActionHandlerRegistry.java
+++ b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/ClientActionHandlerRegistry.java
@@ -20,11 +20,11 @@
 
 /**
  * Implementations of this interface will be used by
- * {@link com.gwtplatform.dispatch.rpc.shared.DispatchAsync DispatchAsync} or
- * {@link com.gwtplatform.dispatch.rest.shared.RestDispatch RestDispatch} implementation to find client-side action
+ * com.gwtplatform.dispatch.rpc.shared.DispatchAsync or
+ * com.gwtplatform.dispatch.rest.shared.RestDispatch implementation to find client-side action
  * handlers.
  *
- * @deprecated Since 1.4. Use {@link com.gwtplatform.dispatch.rpc.client.interceptor.RpcInterceptorRegistry}
+ * @deprecated Since 1.4. Use com.gwtplatform.dispatch.rpc.client.interceptor.RpcInterceptorRegistry
  */
 @Deprecated
 public interface ClientActionHandlerRegistry {
diff --git a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/DefaultClientActionHandlerRegistry.java b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/DefaultClientActionHandlerRegistry.java
index 6ddf4b5f80..faaf0cbb0b 100644
--- a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/DefaultClientActionHandlerRegistry.java
+++ b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/DefaultClientActionHandlerRegistry.java
@@ -29,11 +29,11 @@
 /**
  * The default implementation that {@link ClientActionHandlerRegistry} that if bound will not load any client-side
  * action handlers.
- * 

+ * 

  * To register client-side action handlers, extend this class and call {@link #register} in the constructor.
- * 

- * 
Example

- * 

+ * 

+ * 
Example

+ * 

  * 
  * 
  * public class MyActionHandlerRegistry extends DefaultClientActionHandlerRegistry {
@@ -67,7 +67,7 @@
  * 
  * 

  *
- * @deprecated Since 1.4. Use {@link com.gwtplatform.dispatch.rpc.client.interceptor.DefaultRpcInterceptorRegistry}
+ * @deprecated Since 1.4. Use com.gwtplatform.dispatch.rpc.client.interceptor.DefaultRpcInterceptorRegistry
  */
 @Deprecated
 public class DefaultClientActionHandlerRegistry implements ClientActionHandlerRegistry {
@@ -89,7 +89,7 @@ public void get(AsyncCallback> callback) {
     }
 
     /**
-     * Register a {@link javax.inject.Provider} of a client-side action handler.
+     * Register a {@link jakarta.inject.Provider} of a client-side action handler.
      *
      * @param actionType      The type of action that the client-side action handler supports.
      * @param handlerProvider The {@link com.google.inject.Provider} of the handler.
@@ -126,7 +126,7 @@ public void get(AsyncCallback> callback) {
      * Register a client-side action handler that is part of a {@link com.gwtplatform.common.client.ProviderBundle}.
      *
      * @param actionType     The type of that the client-side action handler supports.
-     * @param bundleProvider The {@link javax.inject.Provider} of the
+     * @param bundleProvider The {@link jakarta.inject.Provider} of the
      *                       {@link com.gwtplatform.common.client.ProviderBundle}.
      * @param providerId     The id of the client-side action handler provider.
      */
diff --git a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/UndoCommand.java b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/UndoCommand.java
index 780ef71620..d04d16dd75 100644
--- a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/UndoCommand.java
+++ b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/UndoCommand.java
@@ -22,7 +22,7 @@
 /**
  * The interface that {@link ClientActionHandler}s use to send the action to undo to the server.
  *
- * @deprecated Since 1.4. Use {@link com.gwtplatform.dispatch.client.interceptor.UndoCommand}
+ * @deprecated Since 1.4. Use com.gwtplatform.dispatch.client.interceptor.UndoCommand
  *
  * @param  The action type.
  * @param  The result type.
diff --git a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/caching/AbstractCachingClientActionHandler.java b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/caching/AbstractCachingClientActionHandler.java
index fc30006ea7..a1b01d70ae 100644
--- a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/caching/AbstractCachingClientActionHandler.java
+++ b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/caching/AbstractCachingClientActionHandler.java
@@ -49,7 +49,7 @@
  * 
  * 
  * @deprecated Since 1.4.
- * Use {@link com.gwtplatform.dispatch.rpc.client.interceptor.caching.AbstractCachingRpcInterceptor}
+ * Use com.gwtplatform.dispatch.rpc.client.interceptor.caching.AbstractCachingRpcInterceptor
  *
  * @param  The type of the action.
  * @param  The type of the result.
@@ -151,7 +151,7 @@ public DispatchRequest undo(A action, R result, AsyncCallback callback,
      * Override this method to perform an action before the call is sent to the server. If the call returns a
      * non-{@code null} result then the action is never executed on the server and the returned value is used. If the
      * call returns {@code null} then the action is executed on the server.
-     * 

+     * 

      * You can use this method to fetch the {@code action} from the cache.
      *
      * @param action The action to be prefetched
@@ -162,7 +162,7 @@ public DispatchRequest undo(A action, R result, AsyncCallback callback,
     /**
      * Override this method to perform an action after the call to the server returns successfully or not. If the call
      * succeeded, the result will be passed, if it failed {@code null} will be passed in the {@code result} parameter.
-     * 

+     * 

      * You can use this method to add the result to cache, if it is {@code null} you should remove the {@code action}
      * from the cache.
      *
diff --git a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/caching/ActionCachingHandler.java b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/caching/ActionCachingHandler.java
index 46a1f2413d..e082a1bba7 100644
--- a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/caching/ActionCachingHandler.java
+++ b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/caching/ActionCachingHandler.java
@@ -19,7 +19,7 @@
 /**
  * Default implementation of {@link AbstractCachingClientActionHandler}. It supports action caching
  *
- * @deprecated Since 1.4. Use {@link com.gwtplatform.dispatch.rpc.client.interceptor.caching.CachingInterceptor}
+ * @deprecated Since 1.4. Use com.gwtplatform.dispatch.rpc.client.interceptor.caching.CachingInterceptor
  *
  * @param  The type of the action.
  * @param  The type of the result.
diff --git a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/caching/Cache.java b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/caching/Cache.java
index 53eb2f1238..fbc37217da 100644
--- a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/caching/Cache.java
+++ b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/caching/Cache.java
@@ -19,7 +19,7 @@
 /**
  * Interface for client side caching.
  *
- * @deprecated Since 1.4. Use {@link com.gwtplatform.dispatch.rpc.client.interceptor.caching.Cache}
+ * @deprecated Since 1.4. Use com.gwtplatform.dispatch.rpc.client.interceptor.caching.Cache
  */
 @Deprecated
 public interface Cache {
diff --git a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/caching/DefaultCacheImpl.java b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/caching/DefaultCacheImpl.java
index 4700e7dbb0..d4c56b0342 100644
--- a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/caching/DefaultCacheImpl.java
+++ b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/actionhandler/caching/DefaultCacheImpl.java
@@ -23,7 +23,7 @@
 /**
  * Default Implementation for {@link Cache}, backed by an {@link java.util.HashMap}.
  *
- * @deprecated Since 1.4. Use {@link com.gwtplatform.dispatch.rpc.client.interceptor.caching.DefaultCacheImpl}
+ * @deprecated Since 1.4. Use com.gwtplatform.dispatch.rpc.client.interceptor.caching.DefaultCacheImpl
  */
 @Deprecated
 public class DefaultCacheImpl implements Cache {
@@ -31,7 +31,7 @@ private static class CacheValue {
         private final Object value;
         private final long lastUpdateTime;
 
-        public CacheValue(Object value) {
+        CacheValue(Object value) {
             this.value = value;
             this.lastUpdateTime = new Date().getTime();
         }
diff --git a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/gin/AbstractDispatchAsyncModule.java b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/gin/AbstractDispatchAsyncModule.java
index e8e522472f..6a531627f0 100644
--- a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/gin/AbstractDispatchAsyncModule.java
+++ b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/gin/AbstractDispatchAsyncModule.java
@@ -30,28 +30,22 @@
  * This gin module provides provides access to the dispatcher singleton, which is used to make calls to the server. This
  * module requires an {@link ExceptionHandler} and a {@link SecurityCookieAccessor}. By default, these will be bound to
  * {@link DefaultExceptionHandler}, {@link DefaultSecurityCookieAccessor} respectively.
- * 

+ * 

  * Install the module in one of your {@link #configure()} methods:
- * 

+ * 

  * 
  * install(new RestDispatchAsyncModule.Builder()
  *                 .exceptionHandler(MyExceptionHandler.class)
  *                 .sessionAccessor(MySessionAccessor.class)
  *                 .build());
  * 

- *
- * @see com.gwtplatform.dispatch.rpc.client.gin.RpcDispatchAsyncModule
- * @see com.gwtplatform.dispatch.rest.client.gin.RestDispatchAsyncModule
  */
 public abstract class AbstractDispatchAsyncModule extends AbstractGinModule {
     /**
      * A {@link AbstractDispatchAsyncModule} builder.
-     * 

+     * 

      * By default, this builder configures the {@link AbstractDispatchAsyncModule} to use {@link
      * DefaultExceptionHandler} and {@link DefaultSecurityCookieAccessor}.
-     *
-     * @see com.gwtplatform.dispatch.rpc.client.gin.RpcDispatchAsyncModule.Builder
-     * @see com.gwtplatform.dispatch.rest.client.gin.RestDispatchAsyncModule.Builder
      */
     public abstract static class Builder> {
         private Class exceptionHandlerType = DefaultExceptionHandler.class;
diff --git a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/interceptor/Interceptor.java b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/interceptor/Interceptor.java
index b8e39b5180..3adbd402cf 100644
--- a/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/interceptor/Interceptor.java
+++ b/gwtp-core/gwtp-dispatch-common-client/src/main/java/com/gwtplatform/dispatch/client/interceptor/Interceptor.java
@@ -29,7 +29,7 @@
 public interface Interceptor {
     /**
      * Handles the specified action.
-     * 

+     * 

      * If the interceptor makes asynchronous calls, it is recommended that you confirm that this request has not been
      * cancelled after returning by calling {@link com.gwtplatform.dispatch.client.DelegatingDispatchRequest#isPending()
      * DelegatingDispatchRequest#isPending()} against the request parameter.
diff --git a/gwtp-core/gwtp-dispatch-common-client/src/main/resources/com/gwtplatform/dispatch/DispatchCommonClient.gwt.xml b/gwtp-core/gwtp-dispatch-common-client/src/main/resources/com/gwtplatform/dispatch/DispatchCommonClient.gwt.xml
index 2a96314cb1..46865bb0b5 100644
--- a/gwtp-core/gwtp-dispatch-common-client/src/main/resources/com/gwtplatform/dispatch/DispatchCommonClient.gwt.xml
+++ b/gwtp-core/gwtp-dispatch-common-client/src/main/resources/com/gwtplatform/dispatch/DispatchCommonClient.gwt.xml
@@ -1,6 +1,6 @@
 
-
+
 
     
     
diff --git a/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/ActionException.java b/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/ActionException.java
index 8075b2a453..eec5d23896 100644
--- a/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/ActionException.java
+++ b/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/ActionException.java
@@ -17,8 +17,8 @@
 package com.gwtplatform.dispatch.shared;
 
 /**
- * These are thrown by {@link com.gwtplatform.dispatch.server.Dispatch#execute(Action)} if there is a problem executing
- * a particular {@link Action}.
+ * These are thrown by com.gwtplatform.dispatch.server.Dispatch#execute(Action) if there is a problem executing
+ * a particular Action.
  */
 public class ActionException extends Exception {
 
diff --git a/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/HasSecured.java b/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/HasSecured.java
index 49c0d16048..e23fee8d43 100644
--- a/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/HasSecured.java
+++ b/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/HasSecured.java
@@ -23,7 +23,7 @@ public interface HasSecured {
     /**
      * Verifies if the action is secured. Secured actions perform a number of extra security checks, such as validating
      * the {@link com.gwtplatform.dispatch.shared.SecurityCookie} to foil XSRF attacks.
-     * 

+     * 

      * Important! Make sure your method returns a value that does not depend on client-side information,
      * otherwise it could be tampered with to turn a secure action into an insecure one. An example of a bad practice
      * would be to store a {@code boolean secured} member and return that. Since this field is serialized, the user
diff --git a/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/SecurityCookie.java b/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/SecurityCookie.java
index 110ac6600b..41fd9be22b 100644
--- a/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/SecurityCookie.java
+++ b/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/SecurityCookie.java
@@ -25,12 +25,12 @@
 
 /**
  * Bind this annotation on the string you want to use as a security cookie:
- * 

+ * 

  * 
  * bindConstant().annotatedWith(SecurityCookie.class).to("MYCOOKIE");
  * 

- * 

- * @see com.gwtplatform.dispatch.client.DefaultSecurityCookieAccessor
+ * 

+ * see com.gwtplatform.dispatch.client.DefaultSecurityCookieAccessor
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.FIELD, ElementType.PARAMETER})
diff --git a/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/SecurityCookieAccessor.java b/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/SecurityCookieAccessor.java
index d84a3c77a5..aca0aa5db8 100644
--- a/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/SecurityCookieAccessor.java
+++ b/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/SecurityCookieAccessor.java
@@ -20,8 +20,8 @@
  * Provides access to the security cookie stored on the client. The goal of this security cookie is to prevent XSRF
  * attack. For more details see 
  *     this document.
- * 

- * Notice that the default implementation is {@link com.gwtplatform.dispatch.client.DefaultSecurityCookieAccessor} which
+ * 

+ * Notice that the default implementation is com.gwtplatform.dispatch.client.DefaultSecurityCookieAccessor which
  * does not prevent XSRF attacks if {@literal @}{@link SecurityCookie} is not bound.
  */
 public interface SecurityCookieAccessor {
diff --git a/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/TypedAction.java b/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/TypedAction.java
index 7d60962290..b894316419 100644
--- a/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/TypedAction.java
+++ b/gwtp-core/gwtp-dispatch-common-shared/src/main/java/com/gwtplatform/dispatch/shared/TypedAction.java
@@ -18,7 +18,7 @@
 
 /**
  * An action with a result.
- * 

+ * 

  * Marker interface used by dispatch projects to associate an action type to a result type.
  *
  * @param  the result type for this action.
diff --git a/gwtp-core/gwtp-dispatch-common-shared/src/main/resources/com/gwtplatform/dispatch/DispatchCommonShared.gwt.xml b/gwtp-core/gwtp-dispatch-common-shared/src/main/resources/com/gwtplatform/dispatch/DispatchCommonShared.gwt.xml
index da6c0c6038..0b292fb545 100644
--- a/gwtp-core/gwtp-dispatch-common-shared/src/main/resources/com/gwtplatform/dispatch/DispatchCommonShared.gwt.xml
+++ b/gwtp-core/gwtp-dispatch-common-shared/src/main/resources/com/gwtplatform/dispatch/DispatchCommonShared.gwt.xml
@@ -1,6 +1,6 @@
 
-
+
 
 
     
diff --git a/gwtp-core/gwtp-dispatch-rest-shared/src/main/java/com/gwtplatform/dispatch/rest/shared/ContentType.java b/gwtp-core/gwtp-dispatch-rest-shared/src/main/java/com/gwtplatform/dispatch/rest/shared/ContentType.java
index 22bff93edd..4c151faadc 100644
--- a/gwtp-core/gwtp-dispatch-rest-shared/src/main/java/com/gwtplatform/dispatch/rest/shared/ContentType.java
+++ b/gwtp-core/gwtp-dispatch-rest-shared/src/main/java/com/gwtplatform/dispatch/rest/shared/ContentType.java
@@ -45,7 +45,7 @@ public ContentType(
 
     /**
      * Parses a content type and return an object representation. Input may look like:
-     * 

+     * 

      * application/json; charset=utf-8; q=0.9
      */
     public static ContentType valueOf(String value) {
diff --git a/gwtp-core/gwtp-dispatch-rest-shared/src/main/java/com/gwtplatform/dispatch/rest/shared/DateFormat.java b/gwtp-core/gwtp-dispatch-rest-shared/src/main/java/com/gwtplatform/dispatch/rest/shared/DateFormat.java
index 4e97c057c3..1f95c668ac 100644
--- a/gwtp-core/gwtp-dispatch-rest-shared/src/main/java/com/gwtplatform/dispatch/rest/shared/DateFormat.java
+++ b/gwtp-core/gwtp-dispatch-rest-shared/src/main/java/com/gwtplatform/dispatch/rest/shared/DateFormat.java
@@ -23,7 +23,7 @@
 
 /**
  * Annotation used to specify a date format pattern.
- * 

+ * 

  * This annotation may be put on {@link java.util.Date Date} parameters annotated with
  * {@link javax.ws.rs.FormParam @FormParam}, {@link javax.ws.rs.QueryParam @QueryParam},
  * {@link javax.ws.rs.PathParam @PathParam} or {@link javax.ws.rs.HeaderParam @HeaderParam}.
@@ -34,7 +34,7 @@
     /**
      * 
      * ISO 8601 date format.
-     * 

+     * 

      * Example: {@code 2014-02-25T10:59:26.046-05:00}
      */
     String DEFAULT = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZ";
@@ -42,7 +42,7 @@
     /**
      * The formatting pattern to use for parsing the date. The pattern must follow the rules defined by
      * {@link com.google.gwt.i18n.shared.DateTimeFormat DateTimeFormat}.
-     * 

+     * 

      * If not specified, {@link #DEFAULT} will be used.
      */
     String value() default DEFAULT;
diff --git a/gwtp-core/gwtp-dispatch-rest-shared/src/main/java/com/gwtplatform/dispatch/rest/shared/HttpMethod.java b/gwtp-core/gwtp-dispatch-rest-shared/src/main/java/com/gwtplatform/dispatch/rest/shared/HttpMethod.java
index d060165c6b..2935a7bc83 100644
--- a/gwtp-core/gwtp-dispatch-rest-shared/src/main/java/com/gwtplatform/dispatch/rest/shared/HttpMethod.java
+++ b/gwtp-core/gwtp-dispatch-rest-shared/src/main/java/com/gwtplatform/dispatch/rest/shared/HttpMethod.java
@@ -17,7 +17,7 @@
 package com.gwtplatform.dispatch.rest.shared;
 
 /**
- * Represents the HTTP methods supported by the {@link com.gwtplatform.dispatch.rest.client.RestDispatch RestDispatch}.
+ * Represents the HTTP methods supported by the {@code com.gwtplatform.dispatch.rest.client.RestDispatch}.
  */
 public enum HttpMethod {
     GET,
diff --git a/gwtp-core/gwtp-dispatch-rest-shared/src/main/java/com/gwtplatform/dispatch/rest/shared/RestAction.java b/gwtp-core/gwtp-dispatch-rest-shared/src/main/java/com/gwtplatform/dispatch/rest/shared/RestAction.java
index 37e7c144a7..6d5b0854a4 100644
--- a/gwtp-core/gwtp-dispatch-rest-shared/src/main/java/com/gwtplatform/dispatch/rest/shared/RestAction.java
+++ b/gwtp-core/gwtp-dispatch-rest-shared/src/main/java/com/gwtplatform/dispatch/rest/shared/RestAction.java
@@ -22,8 +22,8 @@
 import com.gwtplatform.dispatch.shared.TypedAction;
 
 /**
- * An action used by {@link com.gwtplatform.dispatch.rest.client.RestDispatch RestDispatch}.
- * 

+ * An action used by {@code com.gwtplatform.dispatch.rest.client.RestDispatch}.
+ * 

  * You will usually want to let GWTP generate your actions by creating services as explained here.
  *
@@ -31,8 +31,8 @@
  */
 public interface RestAction extends TypedAction, HasSecured {
     /**
-     * Returns the relative path for this action. It should not be prepended by the path annotated with {@link
-     * com.gwtplatform.dispatch.rest.client.RestApplicationPath @RestApplicationPath}.
+     * Returns the relative path for this action. It should not be prepended by the path annotated with {@code
+     * com.gwtplatform.dispatch.rest.client.RestApplicationPath}.
      *
      * @return the relative path for this action.
      */
diff --git a/gwtp-core/gwtp-dispatch-rest-shared/src/main/resources/com/gwtplatform/dispatch/rest/DispatchRestShared.gwt.xml b/gwtp-core/gwtp-dispatch-rest-shared/src/main/resources/com/gwtplatform/dispatch/rest/DispatchRestShared.gwt.xml
index db3b35e0d8..9b7dd502ef 100644
--- a/gwtp-core/gwtp-dispatch-rest-shared/src/main/resources/com/gwtplatform/dispatch/rest/DispatchRestShared.gwt.xml
+++ b/gwtp-core/gwtp-dispatch-rest-shared/src/main/resources/com/gwtplatform/dispatch/rest/DispatchRestShared.gwt.xml
@@ -1,6 +1,6 @@
 
-
+
 
     
     
diff --git a/gwtp-core/gwtp-dispatch-rest/pom.xml b/gwtp-core/gwtp-dispatch-rest/pom.xml
index c7a08f6e0e..8427298d04 100644
--- a/gwtp-core/gwtp-dispatch-rest/pom.xml
+++ b/gwtp-core/gwtp-dispatch-rest/pom.xml
@@ -55,26 +55,18 @@
             gwtp-dispatch-rest-shared
         
         
-            com.google.gwt
+            org.gwtproject
             gwt-user
         
         
-            com.google.gwt
+            org.gwtproject
             gwt-dev
         
 
         
-            com.google.gwt.inject
+            de.knightsoft-net
             gin
         
-        
-            com.google.inject
-            guice
-        
-        
-            com.google.inject.extensions
-            guice-multibindings
-        
 
         
         
@@ -90,7 +82,7 @@
 
         
         
-            org.jukito
+            de.knightsoft-net
             jukito
         
         
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/DispatchRestEntryPoint.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/DispatchRestEntryPoint.java
index f87a55dc93..69115587c8 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/DispatchRestEntryPoint.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/DispatchRestEntryPoint.java
@@ -21,7 +21,7 @@
 /**
  * This interface is used to initiate the generation of services and
  * {@link com.gwtplatform.dispatch.rest.shared.RestAction}s.
- * 

+ * 

  * Making it an {@link EntryPoint} makes sure GWT kicks off the generation as early as possible.
  */
 public interface DispatchRestEntryPoint extends EntryPoint {
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/RestDispatchHooks.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/RestDispatchHooks.java
index 02e8f7c867..383c4caca9 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/RestDispatchHooks.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/RestDispatchHooks.java
@@ -21,7 +21,7 @@
 
 /**
  * Hooks to be executed on every {@link com.gwtplatform.dispatch.client.DispatchCall}.
- * 

+ * 

  * {@link #onExecute(RestAction)} will be called just before any action is attempted.

  * {@link #onSuccess(RestAction, Response, Object)} will be called when any action succeeds.

  * {@link #onFailure(RestAction, Response, Throwable)} will be called when any action fails.
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/CoreModule.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/CoreModule.java
index df0de38065..b5f36429aa 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/CoreModule.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/CoreModule.java
@@ -16,12 +16,12 @@
 
 package com.gwtplatform.dispatch.rest.client.core;
 
-import javax.inject.Singleton;
-
 import com.google.gwt.inject.client.AbstractGinModule;
 import com.gwtplatform.dispatch.rest.client.RestDispatch;
 import com.gwtplatform.dispatch.rest.client.core.parameters.HttpParameterFactory;
 
+import jakarta.inject.Singleton;
+
 public class CoreModule extends AbstractGinModule {
     private final CoreModuleBuilder builder;
 
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultBodyFactory.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultBodyFactory.java
index d6a7a964eb..8c8010ba4d 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultBodyFactory.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultBodyFactory.java
@@ -19,8 +19,6 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
 
@@ -33,6 +31,9 @@
 import com.gwtplatform.dispatch.rest.shared.RestAction;
 import com.gwtplatform.dispatch.shared.ActionException;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+
 public class DefaultBodyFactory implements BodyFactory {
     private final Provider> serializationsProvider;
     private final UriFactory uriFactory;
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultDispatchCallFactory.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultDispatchCallFactory.java
index 546b6ecca3..8c79754606 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultDispatchCallFactory.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultDispatchCallFactory.java
@@ -16,8 +16,6 @@
 
 package com.gwtplatform.dispatch.rest.client.core;
 
-import javax.inject.Inject;
-
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.gwtplatform.dispatch.client.ExceptionHandler;
 import com.gwtplatform.dispatch.rest.client.RestDispatchHooks;
@@ -26,6 +24,8 @@
 import com.gwtplatform.dispatch.rest.shared.RestAction;
 import com.gwtplatform.dispatch.shared.SecurityCookieAccessor;
 
+import jakarta.inject.Inject;
+
 /**
  * The default implementation for {@link DispatchCallFactory}.
  */
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultHeaderFactory.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultHeaderFactory.java
index de8d04661c..56ca030bd8 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultHeaderFactory.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultHeaderFactory.java
@@ -20,7 +20,6 @@
 import java.util.List;
 import java.util.Map.Entry;
 
-import javax.inject.Inject;
 import javax.ws.rs.core.HttpHeaders;
 
 import com.google.gwt.http.client.RequestBuilder;
@@ -34,6 +33,8 @@
 import com.gwtplatform.dispatch.rest.shared.HttpParameter.Type;
 import com.gwtplatform.dispatch.rest.shared.RestAction;
 
+import jakarta.inject.Inject;
+
 import static com.google.gwt.user.client.rpc.RpcRequestBuilder.MODULE_BASE_HEADER;
 
 public class DefaultHeaderFactory implements HeaderFactory {
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultRequestBuilderFactory.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultRequestBuilderFactory.java
index 6ccd7e89ac..a2c4cbfb79 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultRequestBuilderFactory.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultRequestBuilderFactory.java
@@ -19,8 +19,6 @@
 import java.util.EnumMap;
 import java.util.Map;
 
-import javax.inject.Inject;
-
 import com.google.gwt.http.client.RequestBuilder;
 import com.google.gwt.http.client.RequestBuilder.Method;
 import com.gwtplatform.dispatch.rest.client.annotations.RequestTimeout;
@@ -28,6 +26,8 @@
 import com.gwtplatform.dispatch.rest.shared.RestAction;
 import com.gwtplatform.dispatch.shared.ActionException;
 
+import jakarta.inject.Inject;
+
 /**
  * Default implementation for {@link RequestBuilderFactory}.
  */
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultResponseDeserializer.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultResponseDeserializer.java
index abd2abc959..937cd8f240 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultResponseDeserializer.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultResponseDeserializer.java
@@ -18,8 +18,6 @@
 
 import java.util.Set;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
 import javax.ws.rs.core.HttpHeaders;
 
 import com.google.gwt.http.client.Response;
@@ -29,6 +27,9 @@
 import com.gwtplatform.dispatch.rest.shared.RestAction;
 import com.gwtplatform.dispatch.shared.ActionException;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+
 /**
  * Default implementation for {@link ResponseDeserializer}.
  */
@@ -92,7 +93,7 @@ protected  R deserializeValue(Serialization serialization, String resultClass
     private boolean isSuccessStatusCode(Response response) {
         int statusCode = response.getStatusCode();
 
-        return (statusCode >= 200 && statusCode < 300) || statusCode == 304;
+        return statusCode >= 200 && statusCode < 300 || statusCode == 304;
     }
 
     private  R getDeserializedResponse(RestAction action, Response response) throws ActionException {
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultRestDispatch.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultRestDispatch.java
index 9a4c0d41b9..d05f9dd1e0 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultRestDispatch.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultRestDispatch.java
@@ -16,13 +16,13 @@
 
 package com.gwtplatform.dispatch.rest.client.core;
 
-import javax.inject.Inject;
-
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.gwtplatform.dispatch.rest.client.RestDispatch;
 import com.gwtplatform.dispatch.rest.shared.RestAction;
 import com.gwtplatform.dispatch.shared.DispatchRequest;
 
+import jakarta.inject.Inject;
+
 /**
  * The default implementation for {@link com.gwtplatform.dispatch.rest.client.RestDispatch}.
  */
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultUriFactory.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultUriFactory.java
index 46018c33ba..28de912e00 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultUriFactory.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/DefaultUriFactory.java
@@ -20,8 +20,6 @@
 import java.util.List;
 import java.util.Map.Entry;
 
-import javax.inject.Inject;
-
 import com.gwtplatform.dispatch.rest.client.RestApplicationPath;
 import com.gwtplatform.dispatch.rest.client.annotations.GlobalQueryParams;
 import com.gwtplatform.dispatch.rest.client.gin.RestParameterBindings;
@@ -29,6 +27,8 @@
 import com.gwtplatform.dispatch.rest.shared.HttpParameter.Type;
 import com.gwtplatform.dispatch.rest.shared.RestAction;
 
+import jakarta.inject.Inject;
+
 public class DefaultUriFactory implements UriFactory {
     private final RestParameterBindings globalQueryParams;
     private final String applicationPath;
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/RequestBuilderFactory.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/RequestBuilderFactory.java
index de7c7a4826..74d1e3b9f6 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/RequestBuilderFactory.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/RequestBuilderFactory.java
@@ -29,7 +29,7 @@ public interface RequestBuilderFactory {
      *
      * @param action        the {@link RestAction} for which to build the request.
      * @param securityToken the security token to add to the {@link RequestBuilder}. Usually the value bound to
-     *                      {@link @XsrfHeaderName}.
+     *                      {@code XsrfHeaderName}.
      * @param            the action type.
      * @return a {@link RequestBuilder} object.
      * @throws ActionException if an exception occured while creating the {@link RequestBuilder}.
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/StaticParametersFactory.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/StaticParametersFactory.java
index 612dac9199..9f9c923397 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/StaticParametersFactory.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/StaticParametersFactory.java
@@ -16,17 +16,17 @@
 
 package com.gwtplatform.dispatch.rest.client.core;
 
-import javax.inject.Inject;
-
 import com.gwtplatform.dispatch.rest.client.RestDispatch;
 import com.gwtplatform.dispatch.rest.client.annotations.DefaultDateFormat;
 import com.gwtplatform.dispatch.rest.client.core.parameters.HttpParameterFactory;
 
+import jakarta.inject.Inject;
+
 /**
  * Used internally by generated code to access various implementations bound by GIN. Injection could be used in
  * generated code but because of changes introduced to the compiler in GWT 2.7, GIN generators may run before the
  * generated GIN module is created and injection doesn't work in generated code.
- * 

+ * 

  * Don't use this class as it may change without notice.
  */
 public class StaticParametersFactory {
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/parameters/DefaultHttpParameterFactory.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/parameters/DefaultHttpParameterFactory.java
index d973dc0f47..5955d954a1 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/parameters/DefaultHttpParameterFactory.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/core/parameters/DefaultHttpParameterFactory.java
@@ -16,13 +16,13 @@
 
 package com.gwtplatform.dispatch.rest.client.core.parameters;
 
-import javax.inject.Inject;
-
 import com.gwtplatform.common.shared.UrlUtils;
 import com.gwtplatform.dispatch.rest.client.annotations.DefaultDateFormat;
 import com.gwtplatform.dispatch.rest.shared.HttpParameter;
 import com.gwtplatform.dispatch.rest.shared.HttpParameter.Type;
 
+import jakarta.inject.Inject;
+
 public class DefaultHttpParameterFactory implements HttpParameterFactory {
     private final UrlUtils urlUtils;
     private final String defaultDateFormat;
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/gin/BaseRestDispatchModuleBuilder.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/gin/BaseRestDispatchModuleBuilder.java
index ebc797d12f..b68f6e24ce 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/gin/BaseRestDispatchModuleBuilder.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/gin/BaseRestDispatchModuleBuilder.java
@@ -81,7 +81,7 @@ public RestParameterBuilder addGlobalQueryParam(String key) {
     /**
      * Specify the pattern to use to format dates before they are sent to the end-point. The pattern must follow the
      * rules defined by {@link com.google.gwt.i18n.shared.DateTimeFormat DateTimeFormat}.
-     * 

+     * 

      * Default is {@link com.gwtplatform.dispatch.rest.shared.DateFormat#DEFAULT}.
      *
      * @param defaultDateFormat The pattern used to format dates.
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/gin/RestDispatchAsyncModule.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/gin/RestDispatchAsyncModule.java
index ffab890e07..e950e9c8db 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/gin/RestDispatchAsyncModule.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/gin/RestDispatchAsyncModule.java
@@ -16,8 +16,6 @@
 
 package com.gwtplatform.dispatch.rest.client.gin;
 
-import javax.inject.Singleton;
-
 import com.google.inject.Provides;
 import com.gwtplatform.common.client.CommonGinModule;
 import com.gwtplatform.dispatch.client.gin.AbstractDispatchAsyncModule;
@@ -32,12 +30,14 @@
 import com.gwtplatform.dispatch.rest.client.interceptor.RestInterceptorRegistry;
 import com.gwtplatform.dispatch.rest.client.serialization.SerializationModule;
 
+import jakarta.inject.Singleton;
+
 /**
  * An implementation of {@link AbstractDispatchAsyncModule} that binds classes used by a restful dispatch.
- * 

+ * 

  * This gin module provides access to the {@link RestDispatch} singleton, which is used to make calls to the server over
  * HTTP.
- * 

+ * 

  * You must manually bind {@literal @}{@link com.gwtplatform.dispatch.rest.client.RestApplicationPath
  * RestApplicationPath} to point to your server API root path.
  */
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/interceptor/DefaultRestInterceptorRegistry.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/interceptor/DefaultRestInterceptorRegistry.java
index f9b32057c9..324d2f646b 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/interceptor/DefaultRestInterceptorRegistry.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/interceptor/DefaultRestInterceptorRegistry.java
@@ -30,9 +30,9 @@
 /**
  * The rest implementation of {@link com.gwtplatform.dispatch.rest.client.interceptor.RestInterceptorRegistry}
  * that if bound will not load any client-side interceptors.
- * 

+ * 

  * To register client-side interceptors, extend this class and call {@link #register} in the constructor.
- * 
Example

+ * 
Example

  * 
  * 
  * public class MyRestInterceptorRegistry extends RestInterceptorRegistry {
@@ -107,7 +107,7 @@ public void get(AsyncCallback callback) {
     }
 
     /**
-     * Register a {@link javax.inject.Provider} of a client-side interceptor.
+     * Register a {@link jakarta.inject.Provider} of a client-side interceptor.
      *
      * @param context         The {@link InterceptorContext} for the rest interceptor.
      * @param handlerProvider The {@link com.google.inject.Provider} of the handler.
@@ -144,7 +144,7 @@ public void get(AsyncCallback callback) {
      * Register a client-side interceptor that is part of a {@link com.gwtplatform.common.client.ProviderBundle}.
      *
      * @param context        The {@link InterceptorContext} for the rest interceptor.
-     * @param bundleProvider The {@link javax.inject.Provider} of the
+     * @param bundleProvider The {@link jakarta.inject.Provider} of the
      *                       {@link com.gwtplatform.common.client.ProviderBundle}.
      * @param providerId     The id of the client-side interceptor provider.
      */
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/interceptor/InterceptorContext.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/interceptor/InterceptorContext.java
index 089c9f82fa..c49744bc6e 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/interceptor/InterceptorContext.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/interceptor/InterceptorContext.java
@@ -17,6 +17,7 @@
 package com.gwtplatform.dispatch.rest.client.interceptor;
 
 import java.util.List;
+import java.util.Objects;
 
 import com.gwtplatform.dispatch.rest.shared.HttpMethod;
 import com.gwtplatform.dispatch.rest.shared.HttpParameter;
@@ -145,16 +146,27 @@ public InterceptorContext build() {
             return new InterceptorContext(this);
         }
 
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (obj == null) {
+                return false;
+            }
+            if (getClass() != obj.getClass()) {
+                return false;
+            }
+            Builder other = (Builder) obj;
+            return anyHttpMethod == other.anyHttpMethod && anyQueryCount == other.anyQueryCount
+                    && httpMethod == other.httpMethod && Objects.equals(path, other.path)
+                    && queryCount == other.queryCount && Objects.equals(template, other.template)
+                    && transcendent == other.transcendent;
+        }
+
         @Override
         public int hashCode() {
-            int result = template != null ? template.hashCode() : 0;
-            result = 31 * result + (path != null ? path.hashCode() : 0);
-            result = 31 * result + (httpMethod != null ? httpMethod.hashCode() : 0);
-            result = 31 * result + queryCount;
-            result = 31 * result + (transcendent ? 1 : 0);
-            result = 31 * result + (anyHttpMethod ? 1 : 0);
-            result = 31 * result + (anyQueryCount ? 1 : 0);
-            return result;
+            return Objects.hash(anyHttpMethod, anyQueryCount, httpMethod, path, queryCount, template, transcendent);
         }
     }
 
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/interceptor/RestInterceptor.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/interceptor/RestInterceptor.java
index 8017173d67..7dcad64296 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/interceptor/RestInterceptor.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/interceptor/RestInterceptor.java
@@ -23,12 +23,12 @@
 
 /**
  * Instances of this interface will handle specific types of action classes on the client.
- * 

+ * 

  * When a call is executed, the {@link Interceptor} that has been registered with the bound
  * {@link com.gwtplatform.dispatch.client.interceptor.InterceptorRegistry InterceptorRegistry} is called and
- * {@link com.gwtplatform.dispatch.rest.shared.RestDispatch RestDispatch} does not automatically
+ * {@code com.gwtplatform.dispatch.rest.shared.RestDispatch} does not automatically
  * send the command over HTTP to the server.
- * 

+ * 

  * Rest Interceptors provide a number of flexible options:
  * 
    
  * 
  • The action can be modified before sending the action to the server.
    • 
@@ -37,10 +37,10 @@
  * 
  • The {@link Interceptor} can take over and communicate directly with the server, possibly using a
  * different mechanism.
    • 
  * 

- * 

+ * 

  * Important! If your interceptor makes asynchronous calls, be careful with your use of fields as a second
  * call your interceptor could be made while it is waiting for the asynchronous call to return.
- * 

+ * 

  * Example:
  * 
  *   public AddItemInterceptor extends AbstractRestInterceptor {
@@ -50,7 +50,7 @@
  *
  *      {@literal @}Override
  *      public DispatchRequest execute(RestAction action, AsyncCallback{@literal <}Object{@literal >} resultCallback,
- *              ExecuteCommand executeCommand) {
+ *              ExecuteCommand<RestAction, Object> executeCommand) {
  *          // process stuff here!
  *          return executeCommand.execute(action, resultCallback);
  *      }
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/interceptor/RestInterceptorRegistry.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/interceptor/RestInterceptorRegistry.java
index 4268d71685..ae5c80291f 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/interceptor/RestInterceptorRegistry.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/interceptor/RestInterceptorRegistry.java
@@ -21,7 +21,7 @@
 
 /**
  * Implementations of this interface will be used by
- * {@link com.gwtplatform.dispatch.rest.shared.RestDispatch RestDispatch} implementation to find
+ * {@code com.gwtplatform.dispatch.rest.shared.RestDispatch} implementation to find
  * client-side interceptor.
  */
 public interface RestInterceptorRegistry extends InterceptorRegistry {
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/serialization/AbstractJacksonMapperProvider.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/serialization/AbstractJacksonMapperProvider.java
index 98b88d647e..95e1fe8dc6 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/serialization/AbstractJacksonMapperProvider.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/serialization/AbstractJacksonMapperProvider.java
@@ -19,10 +19,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.inject.Provider;
-
 import com.github.nmorel.gwtjackson.client.ObjectMapper;
 
+import jakarta.inject.Provider;
+
 /**
  * Abstract class providing utility methods to reduce the code generation complexity of {@link JacksonMapperProvider}.
  */
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/serialization/JsonSerialization.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/serialization/JsonSerialization.java
index a03de88a41..4e122c075c 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/serialization/JsonSerialization.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/serialization/JsonSerialization.java
@@ -18,7 +18,6 @@
 
 import java.util.List;
 
-import javax.inject.Inject;
 import javax.ws.rs.core.MediaType;
 
 import com.github.nmorel.gwtjackson.client.JsonDeserializationContext;
@@ -27,6 +26,8 @@
 import com.github.nmorel.gwtjackson.client.exception.JsonMappingException;
 import com.gwtplatform.dispatch.rest.shared.ContentType;
 
+import jakarta.inject.Inject;
+
 /**
  * JSON implementation of {@link Serialization}. It acts as a facade to 
  * gwt-jackson.
@@ -57,7 +58,7 @@ public boolean canSerialize(String type, List contentTypes) {
     @Override
     public boolean canDeserialize(String type, ContentType contentType) {
         return VOID.equals(type)
-                || (CONTENT_TYPE.isCompatible(contentType) && jacksonMapperProvider.hasMapper(type));
+                || CONTENT_TYPE.isCompatible(contentType) && jacksonMapperProvider.hasMapper(type);
     }
 
     @Override
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/serialization/SerializationModule.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/serialization/SerializationModule.java
index 57ddfe303b..32abb215f8 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/serialization/SerializationModule.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/client/serialization/SerializationModule.java
@@ -16,13 +16,13 @@
 
 package com.gwtplatform.dispatch.rest.client.serialization;
 
-import javax.inject.Singleton;
-
 import com.google.gwt.inject.client.AbstractGinModule;
 import com.google.gwt.inject.client.binder.GinBinder;
 import com.google.gwt.inject.client.binder.GinLinkedBindingBuilder;
 import com.google.gwt.inject.client.multibindings.GinMultibinder;
 
+import jakarta.inject.Singleton;
+
 public class SerializationModule extends AbstractGinModule {
     public static GinLinkedBindingBuilder registerSerializationBinding(GinBinder binder) {
         return GinMultibinder.newSetBinder(binder, Serialization.class).addBinding();
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/DispatchRestGenerator.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/DispatchRestGenerator.java
index 34c6648dfa..3fc090f5f1 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/DispatchRestGenerator.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/DispatchRestGenerator.java
@@ -21,8 +21,6 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.inject.Inject;
-
 import com.google.gwt.core.ext.GeneratorContext;
 import com.google.gwt.core.ext.UnableToCompleteException;
 import com.google.gwt.core.ext.typeinfo.JClassType;
@@ -37,6 +35,8 @@
 import com.gwtplatform.dispatch.rest.rebind.utils.ClassDefinition;
 import com.gwtplatform.dispatch.rest.rebind.utils.Logger;
 
+import jakarta.inject.Inject;
+
 import static com.gwtplatform.dispatch.rest.rebind.utils.Generators.findGenerator;
 import static com.gwtplatform.dispatch.rest.rebind.utils.Generators.findGeneratorWithoutInput;
 
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/DispatchRestRebindModule.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/DispatchRestRebindModule.java
index def02b1b8d..2edf8503ff 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/DispatchRestRebindModule.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/DispatchRestRebindModule.java
@@ -16,8 +16,6 @@
 
 package com.gwtplatform.dispatch.rest.rebind;
 
-import javax.inject.Singleton;
-
 import org.apache.velocity.app.VelocityEngine;
 
 import com.google.gwt.core.ext.GeneratorContext;
@@ -36,6 +34,8 @@
 import com.gwtplatform.dispatch.rest.rebind.utils.Logger;
 import com.gwtplatform.dispatch.rest.rebind.utils.VelocityProperties;
 
+import jakarta.inject.Singleton;
+
 public class DispatchRestRebindModule extends AbstractModule {
     private final TreeLogger treeLogger;
     private final GeneratorContext context;
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/action/ActionMethodGenerator.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/action/ActionMethodGenerator.java
index f10fc0f8dc..a90ae12b3c 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/action/ActionMethodGenerator.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/action/ActionMethodGenerator.java
@@ -20,8 +20,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.inject.Inject;
-
 import org.apache.velocity.app.VelocityEngine;
 
 import com.google.gwt.core.ext.GeneratorContext;
@@ -37,6 +35,8 @@
 import com.gwtplatform.dispatch.rest.rebind.utils.Logger;
 import com.gwtplatform.dispatch.rest.shared.RestAction;
 
+import jakarta.inject.Inject;
+
 import static com.gwtplatform.dispatch.rest.rebind.utils.Generators.findGenerator;
 import static com.gwtplatform.dispatch.rest.rebind.utils.Generators.getGenerator;
 
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/action/RestActionGenerator.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/action/RestActionGenerator.java
index c1aafa5fa9..e9e24aff6c 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/action/RestActionGenerator.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/action/RestActionGenerator.java
@@ -24,8 +24,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.inject.Inject;
-
 import org.apache.velocity.app.VelocityEngine;
 
 import com.google.gwt.core.ext.GeneratorContext;
@@ -56,6 +54,8 @@
 import com.gwtplatform.dispatch.rest.shared.HttpMethod;
 import com.gwtplatform.dispatch.rest.shared.NoXsrfHeader;
 
+import jakarta.inject.Inject;
+
 import static com.gwtplatform.dispatch.rest.rebind.parameter.HttpParameterType.FORM;
 import static com.gwtplatform.dispatch.rest.rebind.parameter.HttpParameterType.isHttpParameter;
 
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/entrypoint/DefaultEntryPointGenerator.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/entrypoint/DefaultEntryPointGenerator.java
index 41a3d9e86c..8128b08aa4 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/entrypoint/DefaultEntryPointGenerator.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/entrypoint/DefaultEntryPointGenerator.java
@@ -18,8 +18,6 @@
 
 import java.io.PrintWriter;
 
-import javax.inject.Inject;
-
 import com.google.gwt.core.ext.GeneratorContext;
 import com.google.gwt.core.ext.UnableToCompleteException;
 import com.google.gwt.core.ext.typeinfo.JClassType;
@@ -31,6 +29,8 @@
 import com.gwtplatform.dispatch.rest.rebind.utils.ClassDefinition;
 import com.gwtplatform.dispatch.rest.rebind.utils.Logger;
 
+import jakarta.inject.Inject;
+
 public class DefaultEntryPointGenerator extends AbstractGenerator implements EntryPointGenerator {
     private String packageName;
     private String className;
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/gin/DefaultGinModuleGenerator.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/gin/DefaultGinModuleGenerator.java
index b86610b31b..2e77d5c790 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/gin/DefaultGinModuleGenerator.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/gin/DefaultGinModuleGenerator.java
@@ -21,8 +21,6 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.inject.Inject;
-
 import org.apache.velocity.app.VelocityEngine;
 
 import com.google.gwt.core.ext.BadPropertyValueException;
@@ -35,6 +33,8 @@
 import com.gwtplatform.dispatch.rest.rebind.utils.EventBus;
 import com.gwtplatform.dispatch.rest.rebind.utils.Logger;
 
+import jakarta.inject.Inject;
+
 public class DefaultGinModuleGenerator extends AbstractVelocityGenerator implements GinModuleGenerator {
     private static final String TEMPLATE = "com/gwtplatform/dispatch/rest/rebind/gin/GinModule.vm";
     private static final String GIN_MODULE_PROPERTY = "gwtp.dispatch.rest.ginModule";
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/parameter/HttpParameterFactory.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/parameter/HttpParameterFactory.java
index eb12d02278..af3e62efe7 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/parameter/HttpParameterFactory.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/parameter/HttpParameterFactory.java
@@ -19,7 +19,6 @@
 import java.util.Collection;
 import java.util.Date;
 
-import javax.inject.Inject;
 import javax.ws.rs.core.Cookie;
 
 import com.google.gwt.core.ext.GeneratorContext;
@@ -32,6 +31,8 @@
 import com.gwtplatform.dispatch.rest.rebind.utils.Logger;
 import com.gwtplatform.dispatch.rest.shared.DateFormat;
 
+import jakarta.inject.Inject;
+
 // TODO: Ideally, resolvers would handle parameter validation and this class would delegate to them
 public class HttpParameterFactory {
     private static final String MANY_REST_ANNOTATIONS =
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/resource/TopLevelResourceGenerator.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/resource/TopLevelResourceGenerator.java
index c9e42887f4..48958be79b 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/resource/TopLevelResourceGenerator.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/resource/TopLevelResourceGenerator.java
@@ -19,7 +19,6 @@
 import java.io.PrintWriter;
 import java.util.Set;
 
-import javax.inject.Inject;
 import javax.ws.rs.Path;
 
 import org.apache.velocity.app.VelocityEngine;
@@ -35,6 +34,8 @@
 import com.gwtplatform.dispatch.rest.shared.ContentType;
 import com.gwtplatform.dispatch.rest.shared.NoXsrfHeader;
 
+import jakarta.inject.Inject;
+
 public class TopLevelResourceGenerator extends AbstractResourceGenerator {
     private static final String TEMPLATE = "com/gwtplatform/dispatch/rest/rebind/resource/Resource.vm";
 
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/serialization/JacksonMapperGenerator.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/serialization/JacksonMapperGenerator.java
index c43b6636fd..9c01392171 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/serialization/JacksonMapperGenerator.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/serialization/JacksonMapperGenerator.java
@@ -22,7 +22,6 @@
 import java.util.Map;
 import java.util.regex.Pattern;
 
-import javax.inject.Inject;
 import javax.ws.rs.core.MediaType;
 
 import org.apache.velocity.app.VelocityEngine;
@@ -36,6 +35,8 @@
 import com.gwtplatform.dispatch.rest.rebind.utils.Logger;
 import com.gwtplatform.dispatch.rest.shared.ContentType;
 
+import jakarta.inject.Inject;
+
 import static com.gwtplatform.dispatch.rest.rebind.utils.JPrimitives.classTypeOrConvertToBoxed;
 
 public class JacksonMapperGenerator extends AbstractVelocityGenerator implements SerializationGenerator {
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/serialization/JacksonMapperProviderGenerator.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/serialization/JacksonMapperProviderGenerator.java
index 5264519372..35b13861de 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/serialization/JacksonMapperProviderGenerator.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/serialization/JacksonMapperProviderGenerator.java
@@ -22,8 +22,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.inject.Inject;
-
 import org.apache.velocity.app.VelocityEngine;
 
 import com.google.gwt.core.ext.GeneratorContext;
@@ -39,6 +37,8 @@
 import com.gwtplatform.dispatch.rest.rebind.utils.EventBus;
 import com.gwtplatform.dispatch.rest.rebind.utils.Logger;
 
+import jakarta.inject.Inject;
+
 public class JacksonMapperProviderGenerator extends AbstractVelocityGenerator
         implements ExtensionGenerator, JacksonMapperDefinitions {
     private static final String TEMPLATE =
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/serialization/SerializationModule.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/serialization/SerializationModule.java
index 5949c16ab4..1585971845 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/serialization/SerializationModule.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/serialization/SerializationModule.java
@@ -16,13 +16,13 @@
 
 package com.gwtplatform.dispatch.rest.rebind.serialization;
 
-import javax.inject.Singleton;
-
 import com.google.inject.AbstractModule;
 import com.google.inject.Binder;
 import com.google.inject.binder.LinkedBindingBuilder;
 import com.google.inject.multibindings.Multibinder;
 
+import jakarta.inject.Singleton;
+
 import static com.gwtplatform.dispatch.rest.rebind.extension.ExtensionModule.addExtensionGenerator;
 
 public class SerializationModule extends AbstractModule {
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/subresource/SubResourceGenerator.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/subresource/SubResourceGenerator.java
index b311a3c218..584c31ad80 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/subresource/SubResourceGenerator.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/subresource/SubResourceGenerator.java
@@ -20,7 +20,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.inject.Inject;
 import javax.ws.rs.Path;
 
 import org.apache.velocity.app.VelocityEngine;
@@ -41,6 +40,8 @@
 import com.gwtplatform.dispatch.rest.shared.ContentType;
 import com.gwtplatform.dispatch.rest.shared.NoXsrfHeader;
 
+import jakarta.inject.Inject;
+
 public class SubResourceGenerator extends AbstractResourceGenerator {
     private static final String TEMPLATE = "com/gwtplatform/dispatch/rest/rebind/subresource/SubResource.vm";
 
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/subresource/SubResourceMethodGenerator.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/subresource/SubResourceMethodGenerator.java
index 939d39d338..ce62809105 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/subresource/SubResourceMethodGenerator.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/subresource/SubResourceMethodGenerator.java
@@ -22,8 +22,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
 import javax.ws.rs.Path;
 
 import org.apache.velocity.app.VelocityEngine;
@@ -42,6 +40,9 @@
 import com.gwtplatform.dispatch.rest.rebind.utils.Logger;
 import com.gwtplatform.dispatch.rest.shared.RestAction;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+
 import static com.gwtplatform.dispatch.rest.rebind.utils.Generators.findGenerator;
 
 public class SubResourceMethodGenerator extends AbstractMethodGenerator {
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/utils/Arrays.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/utils/Arrays.java
index 6cf7151fa3..34ae01f385 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/utils/Arrays.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/utils/Arrays.java
@@ -23,7 +23,7 @@
 public class Arrays {
     /**
      * Server the same purposes as Java's {@link java.util.Arrays Arrays}, except it is null-safe.
-     * 

+     * 

      * Reason: Some introspection methods used by the generators return null arrays.
      */
     public static  List asList(T... array) {
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/utils/VelocityProperties.java b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/utils/VelocityProperties.java
index a97c3d5d4c..d27d38b060 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/utils/VelocityProperties.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/java/com/gwtplatform/dispatch/rest/rebind/utils/VelocityProperties.java
@@ -21,10 +21,10 @@
 import java.util.MissingResourceException;
 import java.util.Properties;
 
-import javax.inject.Inject;
-
 import com.google.gwt.core.ext.UnableToCompleteException;
 
+import jakarta.inject.Inject;
+
 public class VelocityProperties {
     private static final String VELOCITY_PROPERTIES = "com/gwtplatform/dispatch/rest/rebind/velocity.properties";
 
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/resources/com/gwtplatform/dispatch/rest/DispatchRest.gwt.xml b/gwtp-core/gwtp-dispatch-rest/src/main/resources/com/gwtplatform/dispatch/rest/DispatchRest.gwt.xml
index d9578f75b7..c6b340a025 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/resources/com/gwtplatform/dispatch/rest/DispatchRest.gwt.xml
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/resources/com/gwtplatform/dispatch/rest/DispatchRest.gwt.xml
@@ -1,6 +1,6 @@
 
-
+
 
     
     
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/resources/com/gwtplatform/dispatch/rest/rebind/gin/GinModule.vm b/gwtp-core/gwtp-dispatch-rest/src/main/resources/com/gwtplatform/dispatch/rest/rebind/gin/GinModule.vm
index 7973a6a7fc..685ad793ef 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/resources/com/gwtplatform/dispatch/rest/rebind/gin/GinModule.vm
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/resources/com/gwtplatform/dispatch/rest/rebind/gin/GinModule.vm
@@ -1,6 +1,6 @@
 package $package;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import com.google.gwt.inject.client.AbstractGinModule;
 import com.google.inject.TypeLiteral;
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/resources/com/gwtplatform/dispatch/rest/rebind/serialization/JacksonMapper.vm b/gwtp-core/gwtp-dispatch-rest/src/main/resources/com/gwtplatform/dispatch/rest/rebind/serialization/JacksonMapper.vm
index 25f6ca54e8..e0c63dbe41 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/resources/com/gwtplatform/dispatch/rest/rebind/serialization/JacksonMapper.vm
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/resources/com/gwtplatform/dispatch/rest/rebind/serialization/JacksonMapper.vm
@@ -1,6 +1,6 @@
 package $package;
 
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
 
 import com.github.nmorel.gwtjackson.client.ObjectMapper;
 
diff --git a/gwtp-core/gwtp-dispatch-rest/src/main/resources/com/gwtplatform/dispatch/rest/rebind/serialization/JacksonMapperProvider.vm b/gwtp-core/gwtp-dispatch-rest/src/main/resources/com/gwtplatform/dispatch/rest/rebind/serialization/JacksonMapperProvider.vm
index 6cb527722f..37d386081c 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/main/resources/com/gwtplatform/dispatch/rest/rebind/serialization/JacksonMapperProvider.vm
+++ b/gwtp-core/gwtp-dispatch-rest/src/main/resources/com/gwtplatform/dispatch/rest/rebind/serialization/JacksonMapperProvider.vm
@@ -1,7 +1,7 @@
 package $package;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
 
 import com.github.nmorel.gwtjackson.client.ObjectMapper;
 import com.google.inject.TypeLiteral;
diff --git a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/DefaultRequestBuilderFactoryTest.java b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/DefaultRequestBuilderFactoryTest.java
index cd7d0e55a1..53923e1130 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/DefaultRequestBuilderFactoryTest.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/DefaultRequestBuilderFactoryTest.java
@@ -16,8 +16,6 @@
 
 package com.gwtplatform.dispatch.rest.client;
 
-import javax.inject.Inject;
-
 import org.jukito.JukitoModule;
 import org.jukito.JukitoRunner;
 import org.junit.Test;
@@ -33,11 +31,12 @@
 import com.gwtplatform.dispatch.rest.shared.RestAction;
 import com.gwtplatform.dispatch.shared.ActionException;
 
+import jakarta.inject.Inject;
+
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.BDDMockito.given;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.verify;
-
 import static com.gwtplatform.dispatch.rest.shared.HttpMethod.GET;
 
 @RunWith(JukitoRunner.class)
@@ -70,7 +69,7 @@ protected void configureTest() {
     @Test
     public void requestTimeoutShouldBeTheTimeoutProvided() throws ActionException {
         // Given
-        given(httpRequestBuilderFactory.create(eq(RequestBuilder.GET), anyString())).willReturn(requestBuilder);
+        given(httpRequestBuilderFactory.create(eq(RequestBuilder.GET), isNull())).willReturn(requestBuilder);
 
         RestAction action = new SecuredRestAction(parameterFactory, GET, RELATIVE_PATH);
 
diff --git a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/RestDispatchCallTest.java b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/RestDispatchCallTest.java
index 3e1b270fc3..ad8b29e158 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/RestDispatchCallTest.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/RestDispatchCallTest.java
@@ -16,8 +16,6 @@
 
 package com.gwtplatform.dispatch.rest.client;
 
-import javax.inject.Inject;
-
 import org.jukito.JukitoRunner;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -39,9 +37,11 @@
 import com.gwtplatform.dispatch.shared.ActionException;
 import com.gwtplatform.dispatch.shared.SecurityCookieAccessor;
 
+import jakarta.inject.Inject;
+
+import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.ArgumentMatchers.same;
 import static org.mockito.BDDMockito.given;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.same;
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.mock;
 
@@ -82,7 +82,7 @@ public void someAction_cookieSavedBeforeExecution(AsyncCallback callback)
         RequestBuilder requestBuilder = mock(RequestBuilder.class);
         RestDispatchCall call = createCall(action, callback);
 
-        given(requestBuilderFactory.build(same(action), anyString())).willReturn(requestBuilder);
+        given(requestBuilderFactory.build(same(action), isNull())).willReturn(requestBuilder);
 
         // when
         call.execute();
diff --git a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultBodyFactoryTest.java b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultBodyFactoryTest.java
index 5c2362b6e4..26a18daeb7 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultBodyFactoryTest.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultBodyFactoryTest.java
@@ -18,7 +18,6 @@
 
 import java.util.Date;
 
-import javax.inject.Inject;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
 
@@ -42,16 +41,17 @@
 import com.gwtplatform.dispatch.rest.shared.RestAction;
 import com.gwtplatform.dispatch.shared.ActionException;
 
+import jakarta.inject.Inject;
+
 import static org.mockito.BDDMockito.given;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyListOf;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
-
 import static com.gwtplatform.dispatch.rest.shared.HttpMethod.DELETE;
 import static com.gwtplatform.dispatch.rest.shared.HttpMethod.GET;
 
@@ -128,8 +128,8 @@ public void build_body_requestContainsSerializedString(Serialization serializati
         action.setBodyParam(unserializedObject);
         action.setBodyClass(serializationKey);
 
-        given(serialization.canSerialize(eq(serializationKey), anyListOf(ContentType.class))).willReturn(true);
-        given(serialization.serialize(eq(serializationKey), anyListOf(ContentType.class), eq(unserializedObject)))
+        given(serialization.canSerialize(eq(serializationKey), anyList())).willReturn(true);
+        given(serialization.serialize(eq(serializationKey), anyList(), eq(unserializedObject)))
                 .willReturn(serializedValue);
 
         // When
@@ -150,7 +150,7 @@ public void build_body_noSerializer_throws(Serialization serialization) throws A
         action.setBodyParam(unserializedObject);
         action.setBodyClass(serializationKey);
 
-        given(serialization.canSerialize(eq(serializationKey), anyListOf(ContentType.class))).willReturn(false);
+        given(serialization.canSerialize(eq(serializationKey), anyList())).willReturn(false);
 
         // When
         factory.buildBody(requestBuilder, action);
diff --git a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultHeaderFactoryTest.java b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultHeaderFactoryTest.java
index f9e9a3e50d..70c0e99698 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultHeaderFactoryTest.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultHeaderFactoryTest.java
@@ -16,7 +16,6 @@
 
 package com.gwtplatform.dispatch.rest.client.core;
 
-import javax.inject.Inject;
 import javax.ws.rs.core.HttpHeaders;
 
 import org.jukito.JukitoModule;
@@ -43,12 +42,13 @@
 import com.gwtplatform.dispatch.rest.shared.HttpParameter.Type;
 import com.gwtplatform.dispatch.rest.shared.RestAction;
 
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import jakarta.inject.Inject;
+
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
-
 import static com.gwtplatform.dispatch.rest.shared.HttpMethod.GET;
 import static com.gwtplatform.dispatch.rest.shared.HttpMethod.POST;
 
diff --git a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultResponseDeserializerTest.java b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultResponseDeserializerTest.java
index d228324482..506c5b7bc7 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultResponseDeserializerTest.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultResponseDeserializerTest.java
@@ -15,8 +15,6 @@
  */
 
 package com.gwtplatform.dispatch.rest.client.core;
-
-import javax.inject.Inject;
 import javax.ws.rs.core.HttpHeaders;
 
 import org.jukito.JukitoModule;
@@ -34,6 +32,8 @@
 import com.gwtplatform.dispatch.rest.shared.HttpMethod;
 import com.gwtplatform.dispatch.shared.ActionException;
 
+import jakarta.inject.Inject;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
diff --git a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultUriFactoryTest.java b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultUriFactoryTest.java
index c4eb07226e..01a8b86a13 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultUriFactoryTest.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/DefaultUriFactoryTest.java
@@ -16,8 +16,6 @@
 
 package com.gwtplatform.dispatch.rest.client.core;
 
-import javax.inject.Inject;
-
 import org.jukito.JukitoModule;
 import org.jukito.JukitoRunner;
 import org.jukito.TestSingleton;
@@ -36,8 +34,9 @@
 import com.gwtplatform.dispatch.rest.shared.HttpParameter.Type;
 import com.gwtplatform.dispatch.rest.shared.RestAction;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import jakarta.inject.Inject;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static com.gwtplatform.dispatch.rest.shared.HttpMethod.GET;
 import static com.gwtplatform.dispatch.rest.shared.HttpMethod.POST;
 
diff --git a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/DefaultHttpParameterFactoryTest.java b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/DefaultHttpParameterFactoryTest.java
index ea4ac4f181..4dd7cd5fca 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/DefaultHttpParameterFactoryTest.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/DefaultHttpParameterFactoryTest.java
@@ -16,8 +16,6 @@
 
 package com.gwtplatform.dispatch.rest.client.core.parameters;
 
-import javax.inject.Inject;
-
 import org.jukito.JukitoRunner;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -25,6 +23,8 @@
 import com.gwtplatform.dispatch.rest.shared.HttpParameter;
 import com.gwtplatform.dispatch.rest.shared.HttpParameter.Type;
 
+import jakarta.inject.Inject;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 @RunWith(JukitoRunner.class)
diff --git a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/FormParameterTest.java b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/FormParameterTest.java
index 7ea34fa586..28254e8eed 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/FormParameterTest.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/FormParameterTest.java
@@ -20,8 +20,6 @@
 import java.util.List;
 import java.util.Map.Entry;
 
-import javax.inject.Inject;
-
 import org.jukito.JukitoRunner;
 import org.junit.Before;
 import org.junit.Test;
@@ -31,6 +29,8 @@
 import com.gwtplatform.dispatch.rest.rebind.utils.Arrays;
 import com.gwtplatform.dispatch.rest.shared.HttpParameter.Type;
 
+import jakarta.inject.Inject;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
 import static org.mockito.BDDMockito.given;
diff --git a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/MatrixParameterTest.java b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/MatrixParameterTest.java
index d9473376b1..87e94602d4 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/MatrixParameterTest.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/MatrixParameterTest.java
@@ -20,8 +20,6 @@
 import java.util.List;
 import java.util.Map.Entry;
 
-import javax.inject.Inject;
-
 import org.jukito.JukitoRunner;
 import org.junit.Before;
 import org.junit.Test;
@@ -31,6 +29,8 @@
 import com.gwtplatform.dispatch.rest.rebind.utils.Arrays;
 import com.gwtplatform.dispatch.rest.shared.HttpParameter.Type;
 
+import jakarta.inject.Inject;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
 import static org.mockito.BDDMockito.given;
diff --git a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/PathParameterTest.java b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/PathParameterTest.java
index b7fa1e1b7c..c1a806a63f 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/PathParameterTest.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/PathParameterTest.java
@@ -20,8 +20,6 @@
 import java.util.List;
 import java.util.Map.Entry;
 
-import javax.inject.Inject;
-
 import org.jukito.JukitoRunner;
 import org.junit.Before;
 import org.junit.Test;
@@ -31,10 +29,12 @@
 import com.gwtplatform.dispatch.rest.rebind.utils.Arrays;
 import com.gwtplatform.dispatch.rest.shared.HttpParameter.Type;
 
+import jakarta.inject.Inject;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;
-import static org.mockito.Matchers.anyString;
 
 @RunWith(JukitoRunner.class)
 public class PathParameterTest {
diff --git a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/QueryParameterTest.java b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/QueryParameterTest.java
index 300aec04c4..92cad54815 100644
--- a/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/QueryParameterTest.java
+++ b/gwtp-core/gwtp-dispatch-rest/src/test/java/com/gwtplatform/dispatch/rest/client/core/parameters/QueryParameterTest.java
@@ -20,8 +20,6 @@
 import java.util.List;
 import java.util.Map.Entry;
 
-import javax.inject.Inject;
-
 import org.jukito.JukitoRunner;
 import org.junit.Before;
 import org.junit.Test;
@@ -31,6 +29,8 @@
 import com.gwtplatform.dispatch.rest.rebind.utils.Arrays;
 import com.gwtplatform.dispatch.rest.shared.HttpParameter.Type;
 
+import jakarta.inject.Inject;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.tuple;
 import static org.mockito.BDDMockito.given;
diff --git a/gwtp-core/gwtp-dispatch-rpc-client/pom.xml b/gwtp-core/gwtp-dispatch-rpc-client/pom.xml
index 458e3a58fa..e4910582ee 100644
--- a/gwtp-core/gwtp-dispatch-rpc-client/pom.xml
+++ b/gwtp-core/gwtp-dispatch-rpc-client/pom.xml
@@ -44,20 +44,16 @@
             gwtp-dispatch-rpc-shared
         
         
-            com.google.gwt
+            org.gwtproject
             gwt-user
         
         
-            com.google.gwt
+            org.gwtproject
             gwt-dev
         
         
-            com.google.gwt.inject
+            de.knightsoft-net
             gin
         
-        
-            com.google.inject
-            guice
-        
     
 
diff --git a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/DefaultRpcDispatchCallFactory.java b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/DefaultRpcDispatchCallFactory.java
index 11141c757c..933916b7b1 100644
--- a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/DefaultRpcDispatchCallFactory.java
+++ b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/DefaultRpcDispatchCallFactory.java
@@ -16,8 +16,6 @@
 
 package com.gwtplatform.dispatch.rpc.client;
 
-import javax.inject.Inject;
-
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.gwtplatform.dispatch.client.ExceptionHandler;
 import com.gwtplatform.dispatch.client.actionhandler.ClientActionHandlerRegistry;
@@ -27,6 +25,8 @@
 import com.gwtplatform.dispatch.rpc.shared.Result;
 import com.gwtplatform.dispatch.shared.SecurityCookieAccessor;
 
+import jakarta.inject.Inject;
+
 /**
  * The default implementation for {@link RpcDispatchCallFactory}.
  */
diff --git a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/PhoneGapDispatchAsync.java b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/PhoneGapDispatchAsync.java
index fe4f57318e..2da71f6a7e 100644
--- a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/PhoneGapDispatchAsync.java
+++ b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/PhoneGapDispatchAsync.java
@@ -16,13 +16,13 @@
 
 package com.gwtplatform.dispatch.rpc.client;
 
-import javax.inject.Inject;
-
 import com.google.gwt.http.client.RequestBuilder;
 import com.google.gwt.user.client.rpc.RpcRequestBuilder;
 import com.google.gwt.user.client.rpc.ServiceDefTarget;
 import com.gwtplatform.dispatch.rpc.shared.DispatchServiceAsync;
 
+import jakarta.inject.Inject;
+
 /**
  * This class is an extension of {@link RpcDispatchAsync} and configures the right service entry point and request
  * headers for Phone Gap applications.
diff --git a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/RpcDispatchAsync.java b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/RpcDispatchAsync.java
index d513af0b4b..0843e9de58 100644
--- a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/RpcDispatchAsync.java
+++ b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/RpcDispatchAsync.java
@@ -16,8 +16,6 @@
 
 package com.gwtplatform.dispatch.rpc.client;
 
-import javax.inject.Inject;
-
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwt.user.client.rpc.ServiceDefTarget;
 import com.gwtplatform.dispatch.rpc.shared.Action;
@@ -26,9 +24,11 @@
 import com.gwtplatform.dispatch.rpc.shared.Result;
 import com.gwtplatform.dispatch.shared.DispatchRequest;
 
+import jakarta.inject.Inject;
+
 /**
  * This class is the default implementation of {@link com.gwtplatform.dispatch.rpc.shared.DispatchAsync}, which is
- * essentially the client-side access to the {@link com.gwtplatform.dispatch.rpc.server.Dispatch} class on the
+ * essentially the client-side access to the com.gwtplatform.dispatch.rpc.server.Dispatch class on the
  * server-side.
  */
 public class RpcDispatchAsync implements DispatchAsync {
diff --git a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/gin/RpcDispatchAsyncModule.java b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/gin/RpcDispatchAsyncModule.java
index dd7c9622ea..40e153d3fa 100644
--- a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/gin/RpcDispatchAsyncModule.java
+++ b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/gin/RpcDispatchAsyncModule.java
@@ -16,8 +16,6 @@
 
 package com.gwtplatform.dispatch.rpc.client.gin;
 
-import javax.inject.Singleton;
-
 import com.google.gwt.core.client.GWT;
 import com.google.inject.Provides;
 import com.gwtplatform.dispatch.client.DefaultSecurityCookieAccessor;
@@ -36,12 +34,14 @@
 import com.gwtplatform.dispatch.rpc.shared.DispatchService;
 import com.gwtplatform.dispatch.rpc.shared.DispatchServiceAsync;
 
+import jakarta.inject.Singleton;
+
 /**
  * An implementation of {@link AbstractDispatchAsyncModule} that uses Remote Procedure Calls (RPC).
- * 

+ * 

  * This gin module provides provides access to the {@link DispatchAsync} singleton, which is used to make calls to the
  * server over RPC.
- * 

+ * 

  * If you want to prevent XSRF attack (you use secured {@link com.gwtplatform.dispatch.rpc.shared.Action}s) the empty
  * {@link DefaultSecurityCookieAccessor} could leave your application vulnerable to XSRF attacks.
  *
diff --git a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/DefaultRpcInterceptorRegistry.java b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/DefaultRpcInterceptorRegistry.java
index 97d76ad9ff..8676a768a9 100644
--- a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/DefaultRpcInterceptorRegistry.java
+++ b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/DefaultRpcInterceptorRegistry.java
@@ -28,11 +28,12 @@
 
 /**
  * The default implementation that {@link RpcInterceptorRegistry} that if bound will not load any client-side
- * interceptors. 
 To register client-side interceptors, extend this class and call {@link #register} in the
+ * interceptors.
+ * 
 To register client-side interceptors, extend this class and call {@link #register} in the
  * constructor.
- * 

- * 
Example

- * 

+ * 

+ * 
Example

+ * 

  * 
  * 
  * public class MyRpcInterceptorRegistry extends DefaultClientInterceptorRegistry {
@@ -91,7 +92,7 @@ public void get(AsyncCallback> callback) {
     }
 
     /**
-     * Register a {@link javax.inject.Provider} of a client-side interceptor.
+     * Register a {@link jakarta.inject.Provider} of a client-side interceptor.
      *
      * @param actionType The type of action that the client-side interceptor supports.
      * @param handlerProvider The {@link com.google.inject.Provider} of the handler.
@@ -128,7 +129,7 @@ public void get(AsyncCallback> callback) {
      * Register a client-side interceptor that is part of a {@link com.gwtplatform.common.client.ProviderBundle}.
      *
      * @param actionType The type of that the client-side interceptor supports.
-     * @param bundleProvider The {@link javax.inject.Provider} of the {@link com.gwtplatform.common.client
+     * @param bundleProvider The {@link jakarta.inject.Provider} of the {@link com.gwtplatform.common.client
      * .ProviderBundle}.
      * @param providerId The id of the client-side interceptor provider.
      */
diff --git a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/RpcInterceptor.java b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/RpcInterceptor.java
index 44d82dd56e..f719fc712b 100644
--- a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/RpcInterceptor.java
+++ b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/RpcInterceptor.java
@@ -22,12 +22,12 @@
 
 /**
  * Instances of this interface will handle specific types of action classes on the client.
- * 

+ * 

  * When a call is executed, the {@link RpcInterceptor} that has been registered with the bound
  * {@link RpcInterceptorRegistry} is called and
  * {@link com.gwtplatform.dispatch.rpc.shared.DispatchAsync DispatchAsync} does not automatically
  * send the command over HTTP to the server.
- * 

+ * 

  * Interceptors provide a number of flexible options:
  * 
    
  * 
  • The action can be modified before sending the action to the server.
    • 
@@ -36,12 +36,12 @@
  * 
  • The {@link RpcInterceptor} can take over and communicate directly with the server, possibly using a
  * different mechanism.
    • 
  * 

- * 

+ * 

  * Important! If your interceptor makes asynchronous calls, be careful with your use of fields as
  * a second call your interceptor could be made while it is waiting for the asynchronous call to return.
- * 

- * 
Caching Interceptor Example

- * 

+ * 

+ * 
Caching Interceptor Example

+ * 

  * 
  * 
  * // Interface of cache singleton
@@ -107,7 +107,7 @@
 public interface RpcInterceptor extends Interceptor {
     /**
      * Undoes the specified action if supported.
-     * 

+     * 

      * If the interceptor makes asynchronous calls, it is recommended that you confirm that this request has
      * not been cancelled after returning by calling
      * {@link com.gwtplatform.dispatch.client.DelegatingDispatchRequest#isPending()} against the request parameter.
diff --git a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/caching/AbstractCachingRpcInterceptor.java b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/caching/AbstractCachingRpcInterceptor.java
index 2a30c8a5e7..301862e154 100644
--- a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/caching/AbstractCachingRpcInterceptor.java
+++ b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/caching/AbstractCachingRpcInterceptor.java
@@ -151,7 +151,7 @@ public DispatchRequest undo(A action, R result, AsyncCallback callback,
      * Override this method to perform an action before the call is sent to the server. If the call returns a
      * non-{@code null} result then the action is never executed on the server and the returned value is used. If the
      * call returns {@code null} then the action is executed on the server.
-     * 

+     * 

      * You can use this method to fetch the {@code action} from the cache.
      *
      * @param action The action to be prefetched
@@ -162,7 +162,7 @@ public DispatchRequest undo(A action, R result, AsyncCallback callback,
     /**
      * Override this method to perform an action after the call to the server returns successfully or not. If the call
      * succeeded, the result will be passed, if it failed {@code null} will be passed in the {@code result} parameter.
-     * 

+     * 

      * You can use this method to add the result to cache, if it is {@code null} you should remove the {@code action}
      * from the cache.
      *
diff --git a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/caching/DefaultCacheImpl.java b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/caching/DefaultCacheImpl.java
index 81e4cb5245..ca827c9570 100644
--- a/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/caching/DefaultCacheImpl.java
+++ b/gwtp-core/gwtp-dispatch-rpc-client/src/main/java/com/gwtplatform/dispatch/rpc/client/interceptor/caching/DefaultCacheImpl.java
@@ -28,7 +28,7 @@ private static class CacheValue {
         private final Object value;
         private final long lastUpdateTime;
 
-        public CacheValue(Object value) {
+        CacheValue(Object value) {
             this.value = value;
             this.lastUpdateTime = new Date().getTime();
         }
diff --git a/gwtp-core/gwtp-dispatch-rpc-client/src/main/resources/com/gwtplatform/dispatch/Dispatch.gwt.xml b/gwtp-core/gwtp-dispatch-rpc-client/src/main/resources/com/gwtplatform/dispatch/Dispatch.gwt.xml
index 12c5633080..2702c95943 100644
--- a/gwtp-core/gwtp-dispatch-rpc-client/src/main/resources/com/gwtplatform/dispatch/Dispatch.gwt.xml
+++ b/gwtp-core/gwtp-dispatch-rpc-client/src/main/resources/com/gwtplatform/dispatch/Dispatch.gwt.xml
@@ -1,6 +1,6 @@
 
-
+
 
 
 
diff --git a/gwtp-core/gwtp-dispatch-rpc-client/src/main/resources/com/gwtplatform/dispatch/rpc/DispatchRpc.gwt.xml b/gwtp-core/gwtp-dispatch-rpc-client/src/main/resources/com/gwtplatform/dispatch/rpc/DispatchRpc.gwt.xml
index 897de6294d..3f0ee9c459 100644
--- a/gwtp-core/gwtp-dispatch-rpc-client/src/main/resources/com/gwtplatform/dispatch/rpc/DispatchRpc.gwt.xml
+++ b/gwtp-core/gwtp-dispatch-rpc-client/src/main/resources/com/gwtplatform/dispatch/rpc/DispatchRpc.gwt.xml
@@ -1,6 +1,6 @@
 
-
+
 
     
     
diff --git a/gwtp-core/gwtp-dispatch-rpc-server-guice/pom.xml b/gwtp-core/gwtp-dispatch-rpc-server-guice/pom.xml
index 64c3444dd3..fdfb36fa76 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server-guice/pom.xml
+++ b/gwtp-core/gwtp-dispatch-rpc-server-guice/pom.xml
@@ -21,7 +21,7 @@
             gwtp-dispatch-rpc-shared
         
         
-            com.google.gwt
+            org.gwtproject
             gwt-user
         
         
@@ -36,7 +36,7 @@
             test
         
         
-            org.jukito
+            de.knightsoft-net
             jukito
         
     
diff --git a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/DispatchImpl.java b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/DispatchImpl.java
index 822732aebf..6279e045a0 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/DispatchImpl.java
+++ b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/DispatchImpl.java
@@ -16,12 +16,12 @@
 
 package com.gwtplatform.dispatch.rpc.server.guice;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
 import com.gwtplatform.dispatch.rpc.server.AbstractDispatchImpl;
 import com.gwtplatform.dispatch.rpc.server.actionhandlervalidator.ActionHandlerValidatorRegistry;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+
 @Singleton
 public class DispatchImpl extends AbstractDispatchImpl {
 
diff --git a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/DispatchModule.java b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/DispatchModule.java
index 828226b9fc..16db1b6ff8 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/DispatchModule.java
+++ b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/DispatchModule.java
@@ -31,7 +31,7 @@
  * interfaces. Also every
  * {@link com.gwtplatform.dispatch.rpc.server.actionhandler.ActionHandler ActionHandler} and
  * {@link com.gwtplatform.dispatch.rpc.server.actionvalidator.ActionValidator ActionValidator} will be loaded lazily.
- * 

+ * 

  * If you want to override the defaults ({@link DispatchImpl}, {@link LazyActionHandlerValidatorRegistryImpl} pass
  * the override values into the constructor for this module and ensure it is installed before any
  * {@link HandlerModule} instances.
diff --git a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/DispatchServiceImpl.java b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/DispatchServiceImpl.java
index 6f9144afba..3cd774e15e 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/DispatchServiceImpl.java
+++ b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/DispatchServiceImpl.java
@@ -18,18 +18,18 @@
 
 import java.util.logging.Logger;
 
-import javax.inject.Singleton;
-
 import com.google.inject.Inject;
 import com.gwtplatform.dispatch.rpc.server.AbstractDispatchServiceImpl;
 import com.gwtplatform.dispatch.rpc.server.Dispatch;
 import com.gwtplatform.dispatch.rpc.server.RequestProvider;
 import com.gwtplatform.dispatch.shared.SecurityCookie;
 
+import jakarta.inject.Singleton;
+
 /**
  * This is the server-side implementation of the {@link com.gwtplatform.dispatch.rpc.shared.DispatchService},
  * for which the client-side async service is {@link com.gwtplatform.dispatch.rpc.shared.DispatchServiceAsync}.
- * 

+ * 

  * This class is closely related to {@link DispatchImpl}, in theory the latter wouldn't be needed, but we use it to
  * workaround a GWT limitation described in {@link com.gwtplatform.dispatch.rpc.shared.DispatchAsync}.
  *
diff --git a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/HandlerModule.java b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/HandlerModule.java
index 2bd0d6bd16..3456b1ddbc 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/HandlerModule.java
+++ b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/HandlerModule.java
@@ -62,9 +62,9 @@ protected , R extends Result> void bindHandler(
             Class actionClass, Class> handlerClass) {
         bind(ActionHandlerValidatorMap.class).annotatedWith(
                 UniqueAnnotations.create()).toInstance(
-                new ActionHandlerValidatorMapImpl(actionClass,
-                        new ActionHandlerValidatorClass(handlerClass,
-                                DefaultActionValidator.class)));
+                    new ActionHandlerValidatorMapImpl(actionClass,
+                            new ActionHandlerValidatorClass(handlerClass,
+                                    DefaultActionValidator.class)));
     }
 
     /**
@@ -79,9 +79,9 @@ protected , R extends Result> void bindHandler(
             Class actionValidator) {
         bind(ActionHandlerValidatorMap.class).annotatedWith(
                 UniqueAnnotations.create()).toInstance(
-                new ActionHandlerValidatorMapImpl(
+                    new ActionHandlerValidatorMapImpl(
                         actionClass,
-                        new ActionHandlerValidatorClass(handlerClass, actionValidator)));
+                            new ActionHandlerValidatorClass(handlerClass, actionValidator)));
     }
 
     @Override
diff --git a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/RandomSecurityCookieFilter.java b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/RandomSecurityCookieFilter.java
index 25458abfc9..95068f0de5 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/RandomSecurityCookieFilter.java
+++ b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/RandomSecurityCookieFilter.java
@@ -16,12 +16,12 @@
 
 package com.gwtplatform.dispatch.rpc.server.guice;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
 import com.gwtplatform.dispatch.rpc.server.AbstractRandomSecurityCookieFilter;
 import com.gwtplatform.dispatch.shared.SecurityCookie;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+
 @Singleton
 public class RandomSecurityCookieFilter extends AbstractRandomSecurityCookieFilter {
 
diff --git a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/actionhandlervalidator/ActionHandlerValidatorLinker.java b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/actionhandlervalidator/ActionHandlerValidatorLinker.java
index 7f1d8fb429..3aa0bd81dc 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/actionhandlervalidator/ActionHandlerValidatorLinker.java
+++ b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/actionhandlervalidator/ActionHandlerValidatorLinker.java
@@ -16,13 +16,13 @@
 
 package com.gwtplatform.dispatch.rpc.server.guice.actionhandlervalidator;
 
-import javax.inject.Inject;
-
 import com.google.inject.Injector;
 import com.gwtplatform.dispatch.rpc.server.actionhandlervalidator.ActionHandlerValidatorLinkerHelper;
 import com.gwtplatform.dispatch.rpc.server.actionhandlervalidator.ActionHandlerValidatorRegistry;
 import com.gwtplatform.dispatch.rpc.server.guice.GuiceBeanProvider;
 
+import jakarta.inject.Inject;
+
 /**
  * This class links any registered {@link com.gwtplatform.dispatch.rpc.server.actionhandler.ActionHandler ActionHandler}
  * and {@link com.gwtplatform.dispatch.rpc.server.actionvalidator.ActionValidator ActionValidator}
diff --git a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/actionhandlervalidator/LazyActionHandlerValidatorRegistryImpl.java b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/actionhandlervalidator/LazyActionHandlerValidatorRegistryImpl.java
index 9aeae4ea70..be6fd83468 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/actionhandlervalidator/LazyActionHandlerValidatorRegistryImpl.java
+++ b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/actionhandlervalidator/LazyActionHandlerValidatorRegistryImpl.java
@@ -18,9 +18,6 @@
 
 import java.util.concurrent.ConcurrentHashMap;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
 import com.google.inject.Injector;
 import com.gwtplatform.dispatch.rpc.server.actionhandlervalidator.ActionHandlerValidatorClass;
 import com.gwtplatform.dispatch.rpc.server.actionhandlervalidator.ActionHandlerValidatorInstance;
@@ -29,6 +26,9 @@
 import com.gwtplatform.dispatch.rpc.shared.Action;
 import com.gwtplatform.dispatch.rpc.shared.Result;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+
 /**
  * This is a lazy-loading implementation of the registry. It will only create action handlers and validators when they
  * are first used. All {@link com.gwtplatform.dispatch.rpc.server.actionhandler.ActionHandler} and
diff --git a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/request/DefaultRequestProvider.java b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/request/DefaultRequestProvider.java
index 2f929f082e..8c960e6c6b 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/request/DefaultRequestProvider.java
+++ b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/main/java/com/gwtplatform/dispatch/rpc/server/guice/request/DefaultRequestProvider.java
@@ -16,13 +16,13 @@
 
 package com.gwtplatform.dispatch.rpc.server.guice.request;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
-import javax.servlet.http.HttpServletRequest;
-
 import com.gwtplatform.dispatch.rpc.server.RequestProvider;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
+import jakarta.servlet.http.HttpServletRequest;
+
 @Singleton
 public class DefaultRequestProvider implements RequestProvider {
 
diff --git a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/test/java/com/gwtplatform/dispatch/rpc/server/ActionThrownByHandlerTest.java b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/test/java/com/gwtplatform/dispatch/rpc/server/ActionThrownByHandlerTest.java
index 90f43a57d5..2c898a9fcc 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/test/java/com/gwtplatform/dispatch/rpc/server/ActionThrownByHandlerTest.java
+++ b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/test/java/com/gwtplatform/dispatch/rpc/server/ActionThrownByHandlerTest.java
@@ -16,8 +16,6 @@
 
 package com.gwtplatform.dispatch.rpc.server;
 
-import javax.inject.Inject;
-
 import org.jukito.JukitoModule;
 import org.jukito.JukitoRunner;
 import org.junit.Test;
@@ -28,6 +26,8 @@
 import com.gwtplatform.dispatch.rpc.shared.ServiceException;
 import com.gwtplatform.dispatch.shared.ActionException;
 
+import jakarta.inject.Inject;
+
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
diff --git a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/test/java/com/gwtplatform/dispatch/rpc/server/ActionThrownByValidatorTest.java b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/test/java/com/gwtplatform/dispatch/rpc/server/ActionThrownByValidatorTest.java
index b3fa238d8d..b339de6c4c 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/test/java/com/gwtplatform/dispatch/rpc/server/ActionThrownByValidatorTest.java
+++ b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/test/java/com/gwtplatform/dispatch/rpc/server/ActionThrownByValidatorTest.java
@@ -16,8 +16,6 @@
 
 package com.gwtplatform.dispatch.rpc.server;
 
-import javax.inject.Inject;
-
 import org.jukito.JukitoModule;
 import org.jukito.JukitoRunner;
 import org.junit.Test;
@@ -27,6 +25,8 @@
 import com.gwtplatform.dispatch.rpc.shared.ServiceException;
 import com.gwtplatform.dispatch.shared.ActionException;
 
+import jakarta.inject.Inject;
+
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
diff --git a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/test/java/com/gwtplatform/dispatch/rpc/server/HandlerThatThrowsActionException.java b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/test/java/com/gwtplatform/dispatch/rpc/server/HandlerThatThrowsActionException.java
index 6be9e95b2b..1445727ee6 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server-guice/src/test/java/com/gwtplatform/dispatch/rpc/server/HandlerThatThrowsActionException.java
+++ b/gwtp-core/gwtp-dispatch-rpc-server-guice/src/test/java/com/gwtplatform/dispatch/rpc/server/HandlerThatThrowsActionException.java
@@ -16,12 +16,12 @@
 
 package com.gwtplatform.dispatch.rpc.server;
 
-import javax.inject.Inject;
-
 import com.gwtplatform.dispatch.rpc.server.actionhandler.AbstractActionHandler;
 import com.gwtplatform.dispatch.rpc.shared.NoResult;
 import com.gwtplatform.dispatch.shared.ActionException;
 
+import jakarta.inject.Inject;
+
 public class HandlerThatThrowsActionException extends AbstractActionHandler {
     @Inject
     HandlerThatThrowsActionException() {
diff --git a/gwtp-core/gwtp-dispatch-rpc-server-spring/pom.xml b/gwtp-core/gwtp-dispatch-rpc-server-spring/pom.xml
index 81b236db90..665c73d75e 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server-spring/pom.xml
+++ b/gwtp-core/gwtp-dispatch-rpc-server-spring/pom.xml
@@ -22,7 +22,7 @@
         
 
         
-            com.google.gwt
+            org.gwtproject
             gwt-user
         
 
diff --git a/gwtp-core/gwtp-dispatch-rpc-server-spring/src/main/java/com/gwtplatform/dispatch/rpc/server/spring/DispatchServiceImpl.java b/gwtp-core/gwtp-dispatch-rpc-server-spring/src/main/java/com/gwtplatform/dispatch/rpc/server/spring/DispatchServiceImpl.java
index 431d0e13c1..a4df588693 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server-spring/src/main/java/com/gwtplatform/dispatch/rpc/server/spring/DispatchServiceImpl.java
+++ b/gwtp-core/gwtp-dispatch-rpc-server-spring/src/main/java/com/gwtplatform/dispatch/rpc/server/spring/DispatchServiceImpl.java
@@ -19,11 +19,6 @@
 import java.io.IOException;
 import java.util.logging.Logger;
 
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -34,6 +29,11 @@
 import com.gwtplatform.dispatch.rpc.server.Dispatch;
 import com.gwtplatform.dispatch.rpc.server.RequestProvider;
 
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 /**
  * Dispatch request to the handler.
  */
diff --git a/gwtp-core/gwtp-dispatch-rpc-server-spring/src/main/java/com/gwtplatform/dispatch/rpc/server/spring/SpringBeanProvider.java b/gwtp-core/gwtp-dispatch-rpc-server-spring/src/main/java/com/gwtplatform/dispatch/rpc/server/spring/SpringBeanProvider.java
index 1f32cfdf16..c6ee9a7fd9 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server-spring/src/main/java/com/gwtplatform/dispatch/rpc/server/spring/SpringBeanProvider.java
+++ b/gwtp-core/gwtp-dispatch-rpc-server-spring/src/main/java/com/gwtplatform/dispatch/rpc/server/spring/SpringBeanProvider.java
@@ -26,7 +26,6 @@
 
 import com.gwtplatform.dispatch.rpc.server.actionhandlervalidator.ActionHandlerValidatorLinkerHelper.BeanProvider;
 import com.gwtplatform.dispatch.rpc.server.actionhandlervalidator.ActionHandlerValidatorLinkerHelper.CommonBindingDescriptor;
-
 import com.gwtplatform.dispatch.rpc.server.spring.utils.SpringUtils;
 
 public class SpringBeanProvider implements BeanProvider {
diff --git a/gwtp-core/gwtp-dispatch-rpc-server-spring/src/main/java/com/gwtplatform/dispatch/rpc/server/spring/actionhandlervalidator/LazyActionHandlerValidatorRegistryImpl.java b/gwtp-core/gwtp-dispatch-rpc-server-spring/src/main/java/com/gwtplatform/dispatch/rpc/server/spring/actionhandlervalidator/LazyActionHandlerValidatorRegistryImpl.java
index e2a596cc46..4ccf02c335 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server-spring/src/main/java/com/gwtplatform/dispatch/rpc/server/spring/actionhandlervalidator/LazyActionHandlerValidatorRegistryImpl.java
+++ b/gwtp-core/gwtp-dispatch-rpc-server-spring/src/main/java/com/gwtplatform/dispatch/rpc/server/spring/actionhandlervalidator/LazyActionHandlerValidatorRegistryImpl.java
@@ -1,146 +1,146 @@
-/*
- * Copyright 2011 ArcBees Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.gwtplatform.dispatch.rpc.server.spring.actionhandlervalidator;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-
-import com.gwtplatform.dispatch.rpc.server.actionhandler.ActionHandler;
-import com.gwtplatform.dispatch.rpc.server.actionhandlervalidator.ActionHandlerValidatorClass;
-import com.gwtplatform.dispatch.rpc.server.actionhandlervalidator.ActionHandlerValidatorInstance;
-import com.gwtplatform.dispatch.rpc.server.actionhandlervalidator.LazyActionHandlerValidatorRegistry;
-import com.gwtplatform.dispatch.rpc.server.actionvalidator.ActionValidator;
-import com.gwtplatform.dispatch.rpc.server.spring.utils.SpringUtils;
-import com.gwtplatform.dispatch.rpc.shared.Action;
-import com.gwtplatform.dispatch.rpc.shared.Result;
-
-public class LazyActionHandlerValidatorRegistryImpl implements LazyActionHandlerValidatorRegistry,
-        ApplicationContextAware {
-    private ApplicationContext applicationContext;
-
-    private final Map>, ActionHandlerValidatorClass, ? extends Result>>
-            actionHandlerValidatorClasses;
-    private final Map>, ActionHandlerValidatorInstance> actionHandlerValidatorInstances;
-    private final Map, ActionValidator> validators;
-
-    public LazyActionHandlerValidatorRegistryImpl() {
-        actionHandlerValidatorClasses = new ConcurrentHashMap>,
-                ActionHandlerValidatorClass, ? extends Result>>();
-        actionHandlerValidatorInstances = new ConcurrentHashMap>,
-                ActionHandlerValidatorInstance>();
-        validators = new ConcurrentHashMap, ActionValidator>();
-    }
-
-    @Override
-    public , R extends Result> void addActionHandlerValidatorClass(Class actionClass,
-            ActionHandlerValidatorClass actionHandlerValidatorClass) {
-        actionHandlerValidatorClasses.put(actionClass, actionHandlerValidatorClass);
-    }
-
-    @Override
-    public void clearActionHandlerValidators() {
-        actionHandlerValidatorInstances.clear();
-        validators.clear();
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public , R extends Result> ActionHandlerValidatorInstance findActionHandlerValidator(A action) {
-        ActionHandlerValidatorInstance actionHandlerValidatorInstance =
-                actionHandlerValidatorInstances.get(action.getClass());
-
-        if (actionHandlerValidatorInstance == null) {
-            ActionHandlerValidatorClass, ? extends Result> actionHandlerValidatorClass =
-                    actionHandlerValidatorClasses.get(action.getClass());
-            if (actionHandlerValidatorClass != null) {
-                actionHandlerValidatorInstance = createInstance(actionHandlerValidatorClass);
-                if (actionHandlerValidatorInstance != null) {
-                    actionHandlerValidatorInstances.put((Class>) action.getClass(),
-                            actionHandlerValidatorInstance);
-                }
-            }
-        }
-
-        return actionHandlerValidatorInstance;
-    }
-
-    @Override
-    public ActionValidator findActionValidator(Class actionValidatorClass) {
-        return validators.get(actionValidatorClass);
-    }
-
-    @Override
-    public , R extends Result> void removeActionHandlerValidatorClass(Class actionClass,
-            ActionHandlerValidatorClass actionHandlerValidatorClass) {
-        ActionHandlerValidatorClass oldActionHandlerValidatorClass =
-                actionHandlerValidatorClasses.get(actionClass);
-
-        if (oldActionHandlerValidatorClass == actionHandlerValidatorClass) {
-            actionHandlerValidatorClasses.remove(actionClass);
-            ActionHandlerValidatorInstance instance = actionHandlerValidatorInstances.remove(actionClass);
-
-            if (!containValidator(instance.getActionValidator())) {
-                validators.remove(instance.getActionValidator().getClass());
-            }
-        }
-    }
-
-    private boolean containValidator(ActionValidator actionValidator) {
-        for (ActionHandlerValidatorInstance validator : actionHandlerValidatorInstances.values()) {
-            if (validator.getActionValidator().getClass().equals(actionValidator.getClass())) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private ActionHandlerValidatorInstance createInstance(
-            ActionHandlerValidatorClass, ? extends Result> actionHandlerValidatorClass) {
-        ActionHandlerValidatorInstance actionHandlerValidatorInstance;
-        ActionValidator actionValidator = findActionValidator(actionHandlerValidatorClass.getActionValidatorClass());
-
-        ActionHandler actionHandler = SpringUtils.getInstance(applicationContext,
-                actionHandlerValidatorClass.getActionHandlerClass());
-
-        if (actionValidator == null) {
-            actionValidator = SpringUtils.getInstance(applicationContext,
-                    actionHandlerValidatorClass.getActionValidatorClass());
-            actionHandlerValidatorInstance = new ActionHandlerValidatorInstance(actionValidator, actionHandler);
-
-            validators.put(actionValidator.getClass(), actionValidator);
-        } else {
-            actionHandlerValidatorInstance = new ActionHandlerValidatorInstance(actionValidator, actionHandler);
-        }
-
-        if (actionHandlerValidatorInstance.getActionHandler() == null
-                || actionHandlerValidatorInstance.getActionValidator() == null) {
-            return null;
-        }
-
-        return actionHandlerValidatorInstance;
-    }
-
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        this.applicationContext = applicationContext;
-    }
-}
+/*
+ * Copyright 2011 ArcBees Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.gwtplatform.dispatch.rpc.server.spring.actionhandlervalidator;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+
+import com.gwtplatform.dispatch.rpc.server.actionhandler.ActionHandler;
+import com.gwtplatform.dispatch.rpc.server.actionhandlervalidator.ActionHandlerValidatorClass;
+import com.gwtplatform.dispatch.rpc.server.actionhandlervalidator.ActionHandlerValidatorInstance;
+import com.gwtplatform.dispatch.rpc.server.actionhandlervalidator.LazyActionHandlerValidatorRegistry;
+import com.gwtplatform.dispatch.rpc.server.actionvalidator.ActionValidator;
+import com.gwtplatform.dispatch.rpc.server.spring.utils.SpringUtils;
+import com.gwtplatform.dispatch.rpc.shared.Action;
+import com.gwtplatform.dispatch.rpc.shared.Result;
+
+public class LazyActionHandlerValidatorRegistryImpl implements LazyActionHandlerValidatorRegistry,
+        ApplicationContextAware {
+    private ApplicationContext applicationContext;
+
+    private final Map>, ActionHandlerValidatorClass, ? extends Result>>
+            actionHandlerValidatorClasses;
+    private final Map>, ActionHandlerValidatorInstance> actionHandlerValidatorInstances;
+    private final Map, ActionValidator> validators;
+
+    public LazyActionHandlerValidatorRegistryImpl() {
+        actionHandlerValidatorClasses = new ConcurrentHashMap>,
+                ActionHandlerValidatorClass, ? extends Result>>();
+        actionHandlerValidatorInstances = new ConcurrentHashMap>,
+                ActionHandlerValidatorInstance>();
+        validators = new ConcurrentHashMap, ActionValidator>();
+    }
+
+    @Override
+    public , R extends Result> void addActionHandlerValidatorClass(Class actionClass,
+            ActionHandlerValidatorClass actionHandlerValidatorClass) {
+        actionHandlerValidatorClasses.put(actionClass, actionHandlerValidatorClass);
+    }
+
+    @Override
+    public void clearActionHandlerValidators() {
+        actionHandlerValidatorInstances.clear();
+        validators.clear();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public , R extends Result> ActionHandlerValidatorInstance findActionHandlerValidator(A action) {
+        ActionHandlerValidatorInstance actionHandlerValidatorInstance =
+                actionHandlerValidatorInstances.get(action.getClass());
+
+        if (actionHandlerValidatorInstance == null) {
+            ActionHandlerValidatorClass, ? extends Result> actionHandlerValidatorClass =
+                    actionHandlerValidatorClasses.get(action.getClass());
+            if (actionHandlerValidatorClass != null) {
+                actionHandlerValidatorInstance = createInstance(actionHandlerValidatorClass);
+                if (actionHandlerValidatorInstance != null) {
+                    actionHandlerValidatorInstances.put((Class>) action.getClass(),
+                            actionHandlerValidatorInstance);
+                }
+            }
+        }
+
+        return actionHandlerValidatorInstance;
+    }
+
+    @Override
+    public ActionValidator findActionValidator(Class actionValidatorClass) {
+        return validators.get(actionValidatorClass);
+    }
+
+    @Override
+    public , R extends Result> void removeActionHandlerValidatorClass(Class actionClass,
+            ActionHandlerValidatorClass actionHandlerValidatorClass) {
+        ActionHandlerValidatorClass oldActionHandlerValidatorClass =
+                actionHandlerValidatorClasses.get(actionClass);
+
+        if (oldActionHandlerValidatorClass == actionHandlerValidatorClass) {
+            actionHandlerValidatorClasses.remove(actionClass);
+            ActionHandlerValidatorInstance instance = actionHandlerValidatorInstances.remove(actionClass);
+
+            if (!containValidator(instance.getActionValidator())) {
+                validators.remove(instance.getActionValidator().getClass());
+            }
+        }
+    }
+
+    private boolean containValidator(ActionValidator actionValidator) {
+        for (ActionHandlerValidatorInstance validator : actionHandlerValidatorInstances.values()) {
+            if (validator.getActionValidator().getClass().equals(actionValidator.getClass())) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private ActionHandlerValidatorInstance createInstance(
+            ActionHandlerValidatorClass, ? extends Result> actionHandlerValidatorClass) {
+        ActionHandlerValidatorInstance actionHandlerValidatorInstance;
+        ActionValidator actionValidator = findActionValidator(actionHandlerValidatorClass.getActionValidatorClass());
+
+        ActionHandler actionHandler = SpringUtils.getInstance(applicationContext,
+                actionHandlerValidatorClass.getActionHandlerClass());
+
+        if (actionValidator == null) {
+            actionValidator = SpringUtils.getInstance(applicationContext,
+                    actionHandlerValidatorClass.getActionValidatorClass());
+            actionHandlerValidatorInstance = new ActionHandlerValidatorInstance(actionValidator, actionHandler);
+
+            validators.put(actionValidator.getClass(), actionValidator);
+        } else {
+            actionHandlerValidatorInstance = new ActionHandlerValidatorInstance(actionValidator, actionHandler);
+        }
+
+        if (actionHandlerValidatorInstance.getActionHandler() == null
+                || actionHandlerValidatorInstance.getActionValidator() == null) {
+            return null;
+        }
+
+        return actionHandlerValidatorInstance;
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        this.applicationContext = applicationContext;
+    }
+}
diff --git a/gwtp-core/gwtp-dispatch-rpc-server-spring/src/main/java/com/gwtplatform/dispatch/rpc/server/spring/request/DefaultRequestProvider.java b/gwtp-core/gwtp-dispatch-rpc-server-spring/src/main/java/com/gwtplatform/dispatch/rpc/server/spring/request/DefaultRequestProvider.java
index ea5878375f..e1f807a943 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server-spring/src/main/java/com/gwtplatform/dispatch/rpc/server/spring/request/DefaultRequestProvider.java
+++ b/gwtp-core/gwtp-dispatch-rpc-server-spring/src/main/java/com/gwtplatform/dispatch/rpc/server/spring/request/DefaultRequestProvider.java
@@ -16,13 +16,13 @@
 
 package com.gwtplatform.dispatch.rpc.server.spring.request;
 
-import javax.servlet.http.HttpServletRequest;
-
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import com.gwtplatform.dispatch.rpc.server.RequestProvider;
 
+import jakarta.servlet.http.HttpServletRequest;
+
 /**
  * Request provider.
  */
diff --git a/gwtp-core/gwtp-dispatch-rpc-server/pom.xml b/gwtp-core/gwtp-dispatch-rpc-server/pom.xml
index e411bf7c9f..f12b08bc47 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server/pom.xml
+++ b/gwtp-core/gwtp-dispatch-rpc-server/pom.xml
@@ -21,8 +21,17 @@
             gwtp-dispatch-rpc-shared
         
         
-            com.google.gwt
+            org.gwtproject
             gwt-user
         
+        
+            org.gwtproject
+            gwt-servlet-jakarta
+            ${gwt.version}
+        
+        
+            jakarta.servlet
+            jakarta.servlet-api
+        
     
 
diff --git a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/AbstractDispatchImpl.java b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/AbstractDispatchImpl.java
index 1d89b2959d..31be4caa0d 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/AbstractDispatchImpl.java
+++ b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/AbstractDispatchImpl.java
@@ -32,17 +32,15 @@
 /**
  * This is the server-side implementation of the {@link Dispatch} service with an arbitrary action type, for which the
  * client-side async service is {@link com.gwtplatform.dispatch.rpc.shared.DispatchAsync}.
- * 

- * This class is closely related to {@link com.gwtplatform.dispatch.rpc.server.guice.DispatchServiceImpl}.
+ * 

+ * This class is closely related to {@code com.gwtplatform.dispatch.rpc.server.guice.DispatchServiceImpl}.
  * In fact, this class wouldn't be needed, but we use it to workaround a GWT limitation described in
  * {@link com.gwtplatform.dispatch.rpc.shared.DispatchAsync}.
  *
  * @see com.gwtplatform.dispatch.rpc.shared.DispatchAsync
  * @see Dispatch
- * @see com.gwtplatform.dispatch.rpc.server.guice.DispatchImpl
  * @see com.gwtplatform.dispatch.rpc.shared.DispatchService
  * @see com.gwtplatform.dispatch.rpc.shared.DispatchServiceAsync
- * @see com.gwtplatform.dispatch.rpc.server.guice.DispatchServiceImpl
  */
 public abstract class AbstractDispatchImpl implements Dispatch {
 
diff --git a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/AbstractDispatchServiceImpl.java b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/AbstractDispatchServiceImpl.java
index 4b20371cf9..16b685ed0e 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/AbstractDispatchServiceImpl.java
+++ b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/AbstractDispatchServiceImpl.java
@@ -19,29 +19,27 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-
-import com.google.gwt.user.server.rpc.RemoteServiceServlet;
+import com.google.gwt.user.server.rpc.jakarta.RemoteServiceServlet;
 import com.gwtplatform.dispatch.rpc.shared.Action;
 import com.gwtplatform.dispatch.rpc.shared.DispatchService;
 import com.gwtplatform.dispatch.rpc.shared.Result;
 import com.gwtplatform.dispatch.rpc.shared.ServiceException;
 import com.gwtplatform.dispatch.shared.ActionException;
 
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+
 /**
  * This is the server-side implementation of the {@link DispatchService}, for which the client-side async service is
  * {@link com.gwtplatform.dispatch.rpc.shared.DispatchServiceAsync}.
- * 

+ * 

  * This class is closely related to {@link AbstractDispatchImpl}, in theory the latter wouldn't be needed, but we use it
  * to workaround a GWT limitation described in {@link com.gwtplatform.dispatch.rpc.shared.DispatchAsync}.
  *
  * @see com.gwtplatform.dispatch.rpc.shared.DispatchAsync
  * @see Dispatch
- * @see com.gwtplatform.dispatch.rpc.server.guice.DispatchImpl
  * @see com.gwtplatform.dispatch.rpc.shared.DispatchService
  * @see com.gwtplatform.dispatch.rpc.shared.DispatchServiceAsync
- * @see com.gwtplatform.dispatch.rpc.server.guice.DispatchServiceImpl
  */
 public abstract class AbstractDispatchServiceImpl extends RemoteServiceServlet implements DispatchService {
     private static final long serialVersionUID = -4753225025940949024L;
diff --git a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/AbstractRandomSecurityCookieFilter.java b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/AbstractRandomSecurityCookieFilter.java
index 1b6d60af90..0bbfca0b10 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/AbstractRandomSecurityCookieFilter.java
+++ b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/AbstractRandomSecurityCookieFilter.java
@@ -20,25 +20,25 @@
 import java.math.BigInteger;
 import java.security.SecureRandom;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * This filter will automatically inject a security cookie inside the request the first time the page is loaded. This
  * security cookie is a simple randomly generated number. To setup this filter, add the following line
- * before any other {@code serve} call in your own {@link com.google.inject.servlet.ServletModule#configureServlets}:
- * 

+ * before any other {@code serve} call in your own {@code com.google.inject.servlet.ServletModule#configureServlets}:
+ * 

  * 
  * filter("*.jsp").through(HttpSessionSecurityCookieFilter.class);
  * 

- * 

+ * 

  * You also have to use a {@code .jsp} file instead of a {@code .html} as your main GWT file.
  */
 public abstract class AbstractRandomSecurityCookieFilter implements Filter {
diff --git a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/Dispatch.java b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/Dispatch.java
index 739278e806..429d0cca59 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/Dispatch.java
+++ b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/Dispatch.java
@@ -23,9 +23,9 @@
 
 /**
  * The base class of the synchronous dispatcher service with an arbitrary action type. The server-side implementation is
- * {@link com.gwtplatform.dispatch.rpc.server.guice.DispatchImpl} and the async client-side version is
+ * com.gwtplatform.dispatch.rpc.server.guice.DispatchImpl and the async client-side version is
  * {@link com.gwtplatform.dispatch.rpc.shared.DispatchAsync}.
- * 

+ * 

  * This class is closely related to {@link com.gwtplatform.dispatch.rpc.shared.DispatchService}. In fact, this class
  * wouldn't be needed, but we use it to workaround a GWT limitation described in
  * {@link com.gwtplatform.dispatch.rpc.shared.DispatchAsync}.
diff --git a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/RequestProvider.java b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/RequestProvider.java
index 94a39e43c0..e01c5c9f7f 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/RequestProvider.java
+++ b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/RequestProvider.java
@@ -16,7 +16,7 @@
 
 package com.gwtplatform.dispatch.rpc.server;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 public interface RequestProvider {
     HttpServletRequest getServletRequest();
diff --git a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/Utils.java b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/Utils.java
index f2a5dcab03..7991817baf 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/Utils.java
+++ b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/Utils.java
@@ -29,7 +29,7 @@ public class Utils {
     /**
      * Logs an entire stack trace to the logger, so that it can easily be viewed in the App Engine log. The exception
      * will be logged as a severe error.
-     * 

+     * 

      * See also {@link #logStackTrace(Logger, Level, Throwable)}.
      *
      * @param log The {@link Logger} to use.
diff --git a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/actionhandler/ActionHandler.java b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/actionhandler/ActionHandler.java
index d2644c10b8..6f5d9e48ec 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/actionhandler/ActionHandler.java
+++ b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/actionhandler/ActionHandler.java
@@ -23,7 +23,7 @@
 
 /**
  * Instances of this interface will handle specific types of {@link Action} classes.
- * 

+ * 

  * Important! Your action handlers must be thread safe since they will be bound as singletons. For details,
  * see 
  * http://code.google.com/p/google-guice/wiki/Scopes#Scopes_and_Concurrency.
diff --git a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/actionvalidator/ActionValidator.java b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/actionvalidator/ActionValidator.java
index e26cbd706c..17ffb0d1cf 100644
--- a/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/actionvalidator/ActionValidator.java
+++ b/gwtp-core/gwtp-dispatch-rpc-server/src/main/java/com/gwtplatform/dispatch/rpc/server/actionvalidator/ActionValidator.java
@@ -26,7 +26,7 @@
  * whether or not the action can be executed. Doing so will often require session information, which can be done by
  * injecting a {@code Provider} into the validator and calling {@code httpSessionProvider.get()} within the
  * {@link #isValid} method.
- * 

+ * 

  * You should think of annotating your validators with {@code @RequestScoped} or {@code @Singleton}.
  */
 public interface ActionValidator {
diff --git a/gwtp-core/gwtp-dispatch-rpc-shared/pom.xml b/gwtp-core/gwtp-dispatch-rpc-shared/pom.xml
index b8a821f757..92efc71660 100644
--- a/gwtp-core/gwtp-dispatch-rpc-shared/pom.xml
+++ b/gwtp-core/gwtp-dispatch-rpc-shared/pom.xml
@@ -46,7 +46,7 @@
 
     
         
-            com.google.gwt
+            org.gwtproject
             gwt-user
         
 
diff --git a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/AbstractSimpleResult.java b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/AbstractSimpleResult.java
index 0153b34f73..636ca940cc 100644
--- a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/AbstractSimpleResult.java
+++ b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/AbstractSimpleResult.java
@@ -19,7 +19,7 @@
 /**
  * A common use-case is returning a single value from an action. This provides a simple, type-safe superclass for such
  * results.
- * 

+ * 

  * Note: Subclasses should provide both an empty constructor for serialization and a constructor with a single
  * value for normal use. It is recommended that the empty constructor is private or package-private.
  *
diff --git a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/Action.java b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/Action.java
index 5727601b37..cc125b395d 100644
--- a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/Action.java
+++ b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/Action.java
@@ -21,13 +21,13 @@
 import com.gwtplatform.dispatch.shared.TypedAction;
 
 /**
- * An action represents a command sent to the {@link com.gwtplatform.dispatch.rpc.server.Dispatch}. It has a specific
+ * An action represents a command sent to the com.gwtplatform.dispatch.rpc.server.Dispatch. It has a specific
  * result type which is returned if the action is successful. Your implementation should override
  * {@link #getServiceName} to return a default service url. If you use a
  * {@link com.gwtplatform.dispatch.shared.SecurityCookie} to prevent XSRF attacks and you want this action to be secured
  * against such attacks (i.e. it's not meant to be an anonymous action) then you should override {@link #isSecured()} to
  * return {@code true}.
- * 

+ * 

  * You can usually inherit from {@link ActionImpl} or {@link UnsecuredActionImpl} instead.
  *
  * @param  The {@link Result} type.
diff --git a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/ActionImpl.java b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/ActionImpl.java
index d4d6837e8c..dfd79002e2 100644
--- a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/ActionImpl.java
+++ b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/ActionImpl.java
@@ -18,12 +18,12 @@
 
 /**
  * Default Action using the base path as dispatch/className. The base abstract implementation is {@link Action}.
- * 

+ * 

  * An {@link Action} that uses the standard service name {@code "dispatch"}. Actions inheriting from this are secured
  * against XSRF attacks, but you need to configure a {@link com.gwtplatform.dispatch.shared.SecurityCookie}.
- * 

+ * 

  * Use {@link UnsecuredActionImpl} for secured set to off by default.
- * 

+ * 

  * Visit this page for more documentation.
  *
  * @param  The {@link Result} type.
diff --git a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/BatchResult.java b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/BatchResult.java
index 00565f4e88..f8754c775f 100644
--- a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/BatchResult.java
+++ b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/BatchResult.java
@@ -22,7 +22,7 @@
 /**
  * Contains the list of {@link Result}s from successful actions in the {@link BatchAction}. The order will match the
  * order of the original {@link Action}s listed in the {@link BatchAction}.
- * 

+ * 

  * If the {@link BatchAction} was specified to have an {@link BatchAction.OnException} value
  * of {@link BatchAction.OnException#CONTINUE}, failed actions will have a null value.
  */
diff --git a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/DispatchAsync.java b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/DispatchAsync.java
index dffd5af6a1..cb12d0c3c2 100644
--- a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/DispatchAsync.java
+++ b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/DispatchAsync.java
@@ -21,18 +21,15 @@
 
 /**
  * The asynchronous client-side dispatcher service with an arbitrary action type. The server-side implementation is
- * {@link com.gwtplatform.dispatch.rpc.server.guice.DispatchImpl}.
- * 

+ * com.gwtplatform.dispatch.rpc.server.guice.DispatchImpl.
+ * 

  * This class is closely related to {@link DispatchServiceAsync}. In theory this class wouldn't be needed, but we use it
  * to workaround a GWT limitation. In fact, GWT currently can't correctly handle having generic method templates in
- * method signatures (eg. <A> A create( Class type ))
+ * method signatures (eg. <A> A create( Class<A> type ))
  *
  * @see DispatchAsync
- * @see com.gwtplatform.dispatch.rpc.server.Dispatch
- * @see com.gwtplatform.dispatch.rpc.server.guice.DispatchImpl
  * @see DispatchService
  * @see DispatchServiceAsync
- * @see com.gwtplatform.dispatch.rpc.server.guice.DispatchServiceImpl
  */
 public interface DispatchAsync {
     /**
diff --git a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/DispatchService.java b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/DispatchService.java
index afcbe56346..406414cdfe 100644
--- a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/DispatchService.java
+++ b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/DispatchService.java
@@ -21,19 +21,15 @@
 
 /**
  * The base class of the synchronous dispatcher service. The server-side implementation is
- * {@link com.gwtplatform.dispatch.rpc.server.guice.DispatchServiceImpl} and the async client-side version is
+ * com.gwtplatform.dispatch.rpc.server.guice.DispatchServiceImpl and the async client-side version is
  * {@link DispatchServiceAsync}.
- * 

- * This class is closely related to {@link com.gwtplatform.dispatch.rpc.server.Dispatch}, in theory the latter wouldn't
+ * 

+ * This class is closely related to com.gwtplatform.dispatch.rpc.server.Dispatch, in theory the latter wouldn't
  * be needed, but we use it to workaround a GWT limitation described in
- * {@link com.gwtplatform.dispatch.rpc.client.DispatchAsync}.
+ * com.gwtplatform.dispatch.rpc.client.DispatchAsync.
  *
- * @see com.gwtplatform.dispatch.rpc.client.DispatchAsync
- * @see com.gwtplatform.dispatch.rpc.server.Dispatch
- * @see com.gwtplatform.dispatch.rpc.server.guice.DispatchImpl
  * @see DispatchService
  * @see DispatchServiceAsync
- * @see com.gwtplatform.dispatch.rpc.server.guice.DispatchServiceImpl
  */
 public interface DispatchService extends RemoteService {
     /**
diff --git a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/DispatchServiceAsync.java b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/DispatchServiceAsync.java
index 97b810a0f0..406cd16f7a 100644
--- a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/DispatchServiceAsync.java
+++ b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/DispatchServiceAsync.java
@@ -21,18 +21,14 @@
 
 /**
  * The asynchronous client-side dispatcher service. The server-side implementation is
- * {@link com.gwtplatform.dispatch.rpc.server.guice.DispatchServiceImpl}.
- * 

+ * com.gwtplatform.dispatch.rpc.server.guice.DispatchServiceImpl.
+ * 

  * This class is closely related to {@link com.gwtplatform.dispatch.rpc.shared.DispatchAsync}, in theory the latter
  * wouldn't be needed, but we use it to workaround a GWT limitation described in
- * {@link com.gwtplatform.dispatch.rpc.client.DispatchAsync}.
+ * com.gwtplatform.dispatch.rpc.client.DispatchAsync .
  *
- * @see com.gwtplatform.dispatch.client.DispatchAsync
- * @see com.gwtplatform.dispatch.rpc.server.Dispatch
- * @see com.gwtplatform.dispatch.rpc.server.guice.DispatchImpl
  * @see com.gwtplatform.dispatch.rpc.shared.DispatchService
  * @see DispatchServiceAsync
- * @see com.gwtplatform.dispatch.rpc.server.guice.DispatchServiceImpl
  */
 public interface DispatchServiceAsync {
     /**
diff --git a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/MultipleResult.java b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/MultipleResult.java
index f1693a84f4..701739d2bd 100644
--- a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/MultipleResult.java
+++ b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/MultipleResult.java
@@ -21,7 +21,7 @@
 
 /**
  * A common use-case is returning a list value from an action. This provides a simple, type-safe class for such results.
- * 

+ * 

  * Note: Subclasses should provide both an empty constructor for serialization and a constructor with a single
  * value for normal use. It is recommended that the empty constructor is private or package-private.
  *
diff --git a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/NoResult.java b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/NoResult.java
index e9c3e9ac7c..ce8dd7f847 100644
--- a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/NoResult.java
+++ b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/NoResult.java
@@ -18,8 +18,8 @@
 
 /**
  * A common use-case is returning nothing from an action. This provides a simple, type-safe class for such results.
- * 

- * 

+ * 

+ * 

  * Note: Subclasses should provide both an empty constructor for serialization and a constructor with a single
  * value for normal use. It is recommended that the empty constructor is private or package-private.
  */
diff --git a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/Result.java b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/Result.java
index 18e1d51576..cd92d9698c 100644
--- a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/Result.java
+++ b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/Result.java
@@ -27,10 +27,9 @@
  * the RPC mechanism from generating a serializer for all classes
  * that implement Serializable.
  *
- * @see
- * {@link SimpleResult}

- * {@link MultipleResult}

- * {@link NoResult}

+ * @see SimpleResult
+ * @see MultipleResult
+ * @see NoResult
  *
  */
 public interface Result extends IsSerializable, Serializable {
diff --git a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/SimpleResult.java b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/SimpleResult.java
index 17ffab000c..4732763de1 100644
--- a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/SimpleResult.java
+++ b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/SimpleResult.java
@@ -19,7 +19,7 @@
 /**
  * A common use-case is returning a single value from an action. This provides a simple, type-safe class for such
  * results.
- * 

+ * 

  * Note: Subclasses should provide both an empty constructor for serialization and a constructor with a single
  * value for normal use. It is recommended that the empty constructor is private or package-private.
  *
diff --git a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/UnsecuredActionImpl.java b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/UnsecuredActionImpl.java
index cacd4835a5..827995a2ce 100644
--- a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/UnsecuredActionImpl.java
+++ b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/java/com/gwtplatform/dispatch/rpc/shared/UnsecuredActionImpl.java
@@ -18,11 +18,11 @@
 
 /**
  * Default Action using the base path as dispatch/className. The base abstract implementation is {@link Action}.
- * 

+ * 

  * An {@link Action} that uses the standard service name {@code "dispatch"}. Actions inheriting from this are not
  * secured against XSRF attacks, and they will work even if you do not configure a
  * {@link com.gwtplatform.dispatch.shared.SecurityCookie}.
- * 

+ * 

  * Use {@link ActionImpl} for secured set to on by default.
  *
  * @param  The {@link Result} type.
diff --git a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/resources/com/gwtplatform/dispatch/DispatchShared.gwt.xml b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/resources/com/gwtplatform/dispatch/DispatchShared.gwt.xml
index ee4a1ec207..f7ce147fed 100644
--- a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/resources/com/gwtplatform/dispatch/DispatchShared.gwt.xml
+++ b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/resources/com/gwtplatform/dispatch/DispatchShared.gwt.xml
@@ -1,6 +1,6 @@
 
-
+
 
 
 
diff --git a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/resources/com/gwtplatform/dispatch/rpc/DispatchRpcShared.gwt.xml b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/resources/com/gwtplatform/dispatch/rpc/DispatchRpcShared.gwt.xml
index 87dc68dd07..9be1748769 100644
--- a/gwtp-core/gwtp-dispatch-rpc-shared/src/main/resources/com/gwtplatform/dispatch/rpc/DispatchRpcShared.gwt.xml
+++ b/gwtp-core/gwtp-dispatch-rpc-shared/src/main/resources/com/gwtplatform/dispatch/rpc/DispatchRpcShared.gwt.xml
@@ -1,6 +1,6 @@
 
-
+
 
 
     
diff --git a/gwtp-core/gwtp-dispatch-rpc-test/pom.xml b/gwtp-core/gwtp-dispatch-rpc-test/pom.xml
index c3fd8a9f5a..6c541b9d83 100644
--- a/gwtp-core/gwtp-dispatch-rpc-test/pom.xml
+++ b/gwtp-core/gwtp-dispatch-rpc-test/pom.xml
@@ -22,7 +22,7 @@
             gwtp-dispatch-rpc-shared
         
         
-            com.google.gwt
+            org.gwtproject
             gwt-user
         
         
diff --git a/gwtp-core/gwtp-mvp-client/pom.xml b/gwtp-core/gwtp-mvp-client/pom.xml
index bd4f7b62f5..446388ff5f 100644
--- a/gwtp-core/gwtp-mvp-client/pom.xml
+++ b/gwtp-core/gwtp-mvp-client/pom.xml
@@ -19,7 +19,7 @@
                 
                     
                         
-                            test
+                           test
                         
                     
                 
@@ -70,25 +70,20 @@
             gwtp-mvp-shared
         
         
-            com.google.gwt
+            org.gwtproject
             gwt-user
         
         
-            com.google.gwt
+            org.gwtproject
             gwt-dev
         
         
-            com.google.gwt.inject
+            de.knightsoft-net
             gin
         
         
-            com.google.inject
-            guice
-            provided
-        
-        
-            javax.inject
-            javax.inject
+            jakarta.inject
+            jakarta.inject-api
             provided
         
 
@@ -105,7 +100,7 @@
             test
         
         
-            org.jukito
+            de.knightsoft-net
             jukito
         
         
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/ApplicationController.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/ApplicationController.java
index 5989b3973d..4269d77036 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/ApplicationController.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/ApplicationController.java
@@ -21,35 +21,35 @@
 /**
  * ApplicationController will trigger the generation of your Ginjector. To activate the
  * generation you have to add one line to your module.gwt.xml file:
- * 

+ * 

  * 
{@code
  * 
  * }

  * Multiple modules may be supplied as comma separated list.
- * 

- * 

+ * 

+ * 

  * The final step is to call {@code GWT.create(ApplicationController.class)} inside your entry point and then call
  * {@code applicationController.init()} .
- * 

+ * 

  * You can add extension methods to your Ginjector by specifying additional interfaces. This property also
  * accepts a comma separated list.
- * 

+ * 

  * 
{@code
  * 
  * }

- * 

- * 

+ * 

+ * 

  * In these additional interfaces you may for example add a {@link com.gwtplatform.mvp.client.annotations
  * .DefaultGatekeeper}.
- * 

+ * 

  * 
{@code
  * public interface ClientInjectorAdditional {
  *   @DefaultGatekeeper
  *   MyDefaultGateKeeper getMyDefaultGateKeeper();
- * }

- * 

- * @see https://github.com/ArcBees/GWTP/wiki/Bootstrapping
+ * }}

+ * 

+ * see https://github.com/ArcBees/GWTP/wiki/Bootstrapping
  */
 public interface ApplicationController extends EntryPoint {
     void init();
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/AutobindDisable.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/AutobindDisable.java
index bf4f9d4399..2cc052e4a3 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/AutobindDisable.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/AutobindDisable.java
@@ -16,8 +16,8 @@
 
 package com.gwtplatform.mvp.client;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 /**
  * Bind this class to indicate that you wish to globally disable automatic binding in
@@ -28,7 +28,7 @@
  * 

  * If you do not bind this class then autobinding is controlled on a case-by-case
  * basis using the {@link HandlerContainerImpl}'s constructors.
- * 

+ * 

  * Disabling automatic binding can be useful in unit tests, for example.
  */
 @Singleton
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/Bootstrapper.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/Bootstrapper.java
index bcb1932516..25b9585af5 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/Bootstrapper.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/Bootstrapper.java
@@ -18,10 +18,11 @@
 
 /**
  * When a class implementing the Bootstrapper interface and annotated with
- * {@link com.gwtplatform.mvp.client.annotations.Bootstrap} is found, GWTP will call onBootstrap() of the bootstapper
+ * {@code com.gwtplatform.mvp.client.annotations.Bootstrap} is found, GWTP will call onBootstrap() of the bootstapper
  * instead of revealCurrentPlace. This is particularly useful when you need to do initialisation steps before the first
  * page is shown to the user.
- * @see https://github.com/ArcBees/GWTP/wiki/Bootstrapping
+ *
+ * see https://github.com/ArcBees/GWTP/wiki/Bootstrapping
  */
 public interface Bootstrapper {
     void onBootstrap();
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/DefaultBootstrapper.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/DefaultBootstrapper.java
index 1f79e951b9..8112cab715 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/DefaultBootstrapper.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/DefaultBootstrapper.java
@@ -16,14 +16,15 @@
 
 package com.gwtplatform.mvp.client;
 
-import javax.inject.Inject;
-
 import com.gwtplatform.mvp.client.proxy.PlaceManager;
 
+import jakarta.inject.Inject;
+
 /**
  * The default Bootstrapper that is used by GWTP if no other is specified via
- * {@link com.gwtplatform.mvp.client.annotations.Bootstrap}.
- * @see https://github.com/ArcBees/GWTP/wiki/Bootstrapping
+ * {@code com.gwtplatform.mvp.client.annotations.Bootstrap}.
+ *
+ * see https://github.com/ArcBees/GWTP/wiki/Bootstrapping
  */
 public class DefaultBootstrapper implements Bootstrapper {
     private final PlaceManager placeManager;
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HandlerContainer.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HandlerContainer.java
index 3aa24c8ac2..a5c234e6c1 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HandlerContainer.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HandlerContainer.java
@@ -20,7 +20,7 @@
  * A class that can contain handlers. Handlers can be registered when
  * the object is being bound, or at any time while it is bound. They
  * will be automatically unregistered when the class is unbound.
- * 

+ * 

  * For details on the autobinding mechanism, see {@link HandlerContainerImpl}.
  */
 public interface HandlerContainer {
@@ -30,15 +30,15 @@ public interface HandlerContainer {
      * handlers. You should never call {@link #bind()} from the constructor
      * of a non-leaf class since it is meant to be called after the object has
      * been entirely constructed.
-     * 

+     * 

      * When automatic binding is used (see {@link HandlerContainerImpl}), this will
      * be called immediately after the object is constructed through Guice/GIN dependency
      * injection mechanism.
-     * 

+     * 

      * If you are not using automatic binding, or if you later call
      * {@link #unbind()} on this object, you will have to call {@link #bind()}
      * manually.
-     * 

+     * 

      * Multiple call to bind will not fail, the class will be bound once.
      */
     void bind();
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HandlerContainerImpl.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HandlerContainerImpl.java
index 4452b44a70..925d01def4 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HandlerContainerImpl.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HandlerContainerImpl.java
@@ -18,14 +18,14 @@
 
 import java.util.List;
 
-import javax.inject.Inject;
-
 import com.google.web.bindery.event.shared.HandlerRegistration;
 
+import jakarta.inject.Inject;
+
 /**
  * The implementation of {@link HandlerContainer}. Inherit from this class if
  * you want subclasses that can contain handlers.
- * 

+ * 

  * Classes inheriting from {@link HandlerContainerImpl} and that participate in dependency
  * injection with Guice/GIN can use the automatic binding mechanism. See
  * {@link HandlerContainerImpl#HandlerContainerImpl()} and {@link #HandlerContainerImpl(boolean)}
@@ -52,7 +52,7 @@ private static class BindMonitor {
      * Creates a handler container class with automatic binding, unless
      * {@link AutobindDisable} is used to globally disable automatic
      * binding.
-     * 

+     * 

      * Autobinding requires the class to be instantiated by Guice/GIN.
      * If you are instantiating {@link HandlerContainerImpl} with {@code new},
      * autobinding will not work. It is recommended you document it by
@@ -70,7 +70,7 @@ public HandlerContainerImpl() {
      * injection mechanism, unless {@link AutobindDisable} is used to globally
      * disable automatic binding. Otherwise, the user is responsible for calling
      * {@link #bind()}.
-     * 

+     * 

      * Autobinding requires the class to be instantiated by Guice/GIN.
      * If you are instantiating {@link HandlerContainerImpl} with {@code new},
      * autobinding will not work. It is recommended you document it by
@@ -113,19 +113,19 @@ public void unbind() {
 
     /**
      * Lifecycle method called when binding the object.
-     * 

+     * 

      * Important : Make sure you call your parent class {@link #onBind()}. Also, do
      * not call directly, call {@link #bind()} instead.
-     * 

+     * 

      * Any event handler should be
      * initialised here rather than in the constructor. Also, it is good practice to
      * perform any costly initialisation here.
-     * 

+     * 

      * Handlers registered by calling
      * {@link #registerHandler(HandlerRegistration)} will be removed
      * when unbinding. Any other initialisation that takes place here (or as a
      * side-effect of what is done here) should be taken down in {@link #onUnbind()}.
-     * 

+     * 

      * This method will never be invoked more then once, or if it is, the second
      * time will necessarily be preceded by an invocation of {@link #onUnbind()}.
      */
@@ -134,15 +134,15 @@ protected void onBind() {
 
     /**
      * Lifecycle method called when unbinding the object.
-     * 

+     * 

      * Important : Make sure you call your parent class {@link #onUnbind()}.
      * Also, do not call directly, call {@link #unbind()} instead.
-     * 

+     * 

      * Any handler registration recorded with {@link #registerHandler (HandlerRegistration)}
      * will have
      * already been removed at this point. You should override this method to
      * take down any other initialisation that took place in {@link #onBind()}.
-     * 

+     * 

      * This method will never be invoked more then once, or if it is, the second
      * time will necessarily be preceded by an invocation of {@link #onBind()}.
      */
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HasPopupSlot.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HasPopupSlot.java
index c0a9a89628..68934288c2 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HasPopupSlot.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HasPopupSlot.java
@@ -23,15 +23,15 @@ public interface HasPopupSlot {
      * centers it. The view associated with the {@code content}'s presenter must
      * inherit from {@link PopupView}. The popup will be visible and the
      * corresponding presenter will receive the lifecycle events as needed.
-     * 

-     * Contrary to the {@link #setInSlot} method, no
+     * 

+     * Contrary to the {@code #setInSlot} method, no
      * {@link com.gwtplatform.mvp.client.proxy.ResetPresentersEvent} is fired,
      * so {@link PresenterWidget#onReset()} is not invoked.
-     * 

+     * 

      * @param child The popup child, a {@link PresenterWidget}.
      * @see #addToPopupSlot(PresenterWidget)
      */
-    void addToPopupSlot(final PresenterWidget child);
+    void addToPopupSlot(PresenterWidget child);
 
     /**
      * This method removes popup content within the {@link Presenter}. The view
@@ -41,14 +41,14 @@ public interface HasPopupSlot {
      *              previously been added using {@link #addToPopupSlot(PresenterWidget)}
      *              or {@link #addToPopupSlot(PresenterWidget, boolean)}
      */
-    void removeFromPopupSlot(final PresenterWidget child);
+    void removeFromPopupSlot(PresenterWidget child);
 
     /**
      * This method sets some popup content within the {@link Presenter}. The view
      * associated with the {@code content}'s presenter must inherit from
      * {@link PopupView}. The popup will be visible and the corresponding
      * presenter will receive the lifecycle events as needed.
-     * 

+     * 

      * Contrary to the {@link View#setInSlot(Object, com.google.gwt.user.client.ui.IsWidget)}
      * method, no {@link com.gwtplatform.mvp.client.proxy.ResetPresentersEvent}
      * is fired, so {@link PresenterWidget#onReset()} is not invoked.
@@ -59,5 +59,5 @@ public interface HasPopupSlot {
      * @deprecated - Since 1.4. Use {@link #addToPopupSlot(PresenterWidget)} instead. Center no longer as any affect.
      */
     @Deprecated
-    void addToPopupSlot(final PresenterWidget child, boolean center);
+    void addToPopupSlot(PresenterWidget child, boolean center);
 }
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HasSlots.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HasSlots.java
index 4ae968ba24..c268025c92 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HasSlots.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/HasSlots.java
@@ -29,7 +29,7 @@
 /**
  * Interface of objects containing slots in which {@link PresenterWidget} can
  * be inserted.
- * 

+ * 

  * Slots are opaque objects and can be of any type. For slots meant to hold
  * only {@link PresenterWidget}s, you will usually declare an {@link Object}
  * constant within your presenter class:
@@ -51,11 +51,11 @@ public interface HasSlots {
     * This method adds some content in a specific slot of the {@link Presenter}.
     * The attached {@link View} should manage this slot when its
     * {@link View#addToSlot(Object, com.google.gwt.user.client.ui.Widget)} is called.
-    * 

+    * 

     * Contrary to the {@link #setInSlot} method, no
     * {@link com.gwtplatform.mvp.client.proxy.ResetPresentersEvent} is fired,
     * so {@link PresenterWidget#onReset()} is not invoked.
-    * 

+    * 

     * For more details on slots, see {@link HasSlots}.
     *
     * @param slot An opaque object identifying which slot this content is being
@@ -74,7 +74,7 @@ public interface HasSlots {
     * {@link View#setInSlot(Object, com.google.gwt.user.client.ui.Widget)} is called. It should also clear
     * the slot when the {@link View#setInSlot(Object, com.google.gwt.user.client.ui.Widget)} method is
     * called with {@code null} as a parameter.
-    * 

+    * 

     * For more details on slots, see {@link HasSlots}.
     *
     * @param slot An opaque object identifying which slot to clear.
@@ -89,7 +89,7 @@ public interface HasSlots {
     * {@link com.gwtplatform.mvp.client.proxy.ResetPresentersEvent} is fired.
     * The attached {@link View} should manage this slot when its
     * {@link View#removeFromSlot(Object, com.google.gwt.user.client.ui.Widget)} is called.
-    * 

+    * 

     * For more details on slots, see {@link HasSlots}.
     *
     * @param slot An opaque object identifying which slot this content is being
@@ -106,7 +106,7 @@ public interface HasSlots {
     * A {@link com.gwtplatform.mvp.client.proxy.ResetPresentersEvent} will be fired
     * after the top-most visible presenter is revealed, resulting in a call to
     * {@link PresenterWidget#onReset()}.
-    * 

+    * 

     * For more details on slots, see {@link HasSlots}.
     *
     * @param slot An opaque object identifying which slot this content is being
@@ -124,7 +124,7 @@ public interface HasSlots {
     * {@link View#setInSlot(Object, com.google.gwt.user.client.ui.Widget)} is called. It should also clear the
     * slot when the {@code setInSlot} method is called with {@code null} as a
     * parameter.
-    * 

+    * 

     * For more details on slots, see {@link HasSlots}.
     *
     * @param slot An opaque object identifying which slot this content is being
@@ -144,11 +144,11 @@ public interface HasSlots {
      * This method adds some content in a specific slot of the {@link Presenter}.
      * The attached {@link View} should manage this slot when its
      * {@link View#addToSlot(Object, com.google.gwt.user.client.ui.Widget)} is called.
-     * 

+     * 

      * Contrary to the {@link #setInSlot} method, no
      * {@link com.gwtplatform.mvp.client.proxy.ResetPresentersEvent} is fired,
      * so {@link PresenterWidget#onReset()} is not invoked.
-     * 

+     * 

      * For more details on slots, see {@link HasSlots}.
      *
      * @param slot  The slot into which the content is being added.
@@ -164,7 +164,7 @@ public interface HasSlots {
      * {@link View#setInSlot(Object, com.google.gwt.user.client.ui.Widget)} is called. It should also clear
      * the slot when the {@link View#setInSlot(Object, com.google.gwt.user.client.ui.Widget)} method is
      * called with {@code null} as a parameter.
-     * 

+     * 

      * For more details on slots, see {@link HasSlots}.
      *
      * @param slot The slot to clear.
@@ -177,7 +177,7 @@ public interface HasSlots {
      * {@link com.gwtplatform.mvp.client.proxy.ResetPresentersEvent} is fired.
      * The attached {@link View} should manage this slot when its
      * {@link View#removeFromSlot(Object, com.google.gwt.user.client.ui.Widget)} is called.
-     * 

+     * 

      * For more details on slots, see {@link HasSlots}.
      *
      * @param slot  The slot for which the content is being removed.
@@ -191,7 +191,7 @@ public interface HasSlots {
      * A {@link com.gwtplatform.mvp.client.proxy.ResetPresentersEvent} will be fired
      * after the top-most visible presenter is revealed, resulting in a call to
      * {@link PresenterWidget#onReset()}.
-     * 

+     * 

      * For more details on slots, see {@link HasSlots}.
      *
      * @param slot  The slot for which the content is being set.
@@ -207,7 +207,7 @@ public interface HasSlots {
      * {@link View#setInSlot(Object, com.google.gwt.user.client.ui.Widget)} is called. It should also clear the
      * slot when the {@code setInSlot} method is called with {@code null} as a
      * parameter.
-     * 

+     * 

      * For more details on slots, see {@link HasSlots}.
      *
      * @param slot         The slot for which the content is being set.
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PopupView.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PopupView.java
index c4be5b68e4..f4a5ef777d 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PopupView.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PopupView.java
@@ -55,7 +55,7 @@ public interface PopupView extends View {
      * Important! Do not call this directly, instead use
      * {@link PresenterWidget#addToPopupSlot(PresenterWidget)} passing this
      * view's {@link PresenterWidget}.
-     * 

+     * 

      * Make sure the {@link PopupView} is visible.
      * Will not reposition the popup before showing it.
      */
@@ -70,11 +70,11 @@ public interface PopupView extends View {
 
     /**
      * Set the PopupPositioner which will position this popup when it's presenter is revealed.
-     * @param positioner The {@link PopupPositioner} will automatically position the popup onReveal();
-     * @see
-     * {@link com.gwtplatform.mvp.client.view.CenterPopupPositioner},
-     * {@link com.gwtplatform.mvp.client.view.RelativeToWidgetPopupPositioner},
-     * {@link com.gwtplatform.mvp.client.view.TopLeftPopupPositioner}
+     *
+     * @param popupPositioner The {@link PopupPositioner} will automatically position the popup onReveal();
+     * @see com.gwtplatform.mvp.client.view.CenterPopupPositioner
+     * @see com.gwtplatform.mvp.client.view.RelativeToWidgetPopupPositioner
+     * @see com.gwtplatform.mvp.client.view.TopLeftPopupPositioner
      */
     void setPopupPositioner(PopupPositioner popupPositioner);
 
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PopupViewImpl.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PopupViewImpl.java
index 6f3a8eb411..f068d9cb19 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PopupViewImpl.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PopupViewImpl.java
@@ -34,7 +34,7 @@
 /**
  * A simple implementation of {@link PopupView} that can be used when the widget
  * returned by {@link #asWidget()} inherits from {@link PopupPanel}.
- * 

+ * 

  * Also, this implementation simply disregards every call to
  * {@link #setInSlot(Object, com.google.gwt.user.client.ui.IsWidget)}, {@link #addToSlot(Object,
  * com.google.gwt.user.client.ui.IsWidget)}, and
@@ -51,7 +51,7 @@ public abstract class PopupViewImpl extends ViewImpl implements PopupView {
 
     /**
      * By default the popup will position itself in the center of the window.
-     * To use a different positioner use {@link #PopupViewImpl(EventBus, PopupPosition)} instead.
+     * To use a different positioner use {@link #PopupViewImpl(EventBus, PopupPositioner)} instead.
      * @param eventBus The {@link EventBus}.
      */
     public PopupViewImpl(EventBus eventBus) {
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PopupViewWithUiHandlers.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PopupViewWithUiHandlers.java
index 27a0f57f07..c31c70cc75 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PopupViewWithUiHandlers.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PopupViewWithUiHandlers.java
@@ -23,7 +23,7 @@
  * Base class for a {@link PopupView} that implements the {@link HasUiHandlers}
  * interface. You should always call {@link #setUiHandlers(UiHandlers)} from your
  * presenter 's constructor.
- * 

+ * 

  * Important! Never call {@link #getUiHandlers()} inside your constructor
  * since the {@link UiHandlers} are not yet set.
  *
@@ -59,7 +59,7 @@ protected PopupViewWithUiHandlers(EventBus eventBus, PopupPositioner positioner)
 
     /**
      * Access the {@link UiHandlers} associated with this {@link View}.
-     * 

+     * 

      * Important! Never call {@link #getUiHandlers()} inside your constructor
      * since the {@link UiHandlers} are not yet set.
      *
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PreBootstrapper.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PreBootstrapper.java
index 54088f964c..50ea9ac300 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PreBootstrapper.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PreBootstrapper.java
@@ -18,10 +18,10 @@
 
 /**
  * When a class implementing the PreBootstrapper interface and annotated with
- * {@link com.gwtplatform.mvp.client.annotations.PreBootstrap} is found, the ApplicationController
+ * {@code com.gwtplatform.mvp.client.annotations.PreBootstrap} is found, the ApplicationController
  * will call onPreBootstrap() before GWTP is initialized.
  * Because of this fact, no injection can be provided for this class.
- * @see https://github.com/ArcBees/GWTP/wiki/Bootstrapping
+ * see https://github.com/ArcBees/GWTP/wiki/Bootstrapping
  */
 public interface PreBootstrapper {
     void onPreBootstrap();
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/Presenter.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/Presenter.java
index 254c977be9..99ae17c81d 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/Presenter.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/Presenter.java
@@ -33,9 +33,9 @@
  * model-view-presenter architecture. Each logical page of your application will usually
  * correspond to a singleton {@link Presenter}. If you need to separate logic from view
  * in a simple graphical component, you might consider using a {@link PresenterWidget}.
- * 

+ * 

  * For more details on the hierarchical organization of presenters, see {@link PresenterWidget}.
- * 

+ * 

  * Each presenter is associated to a {@link Proxy} which is responsible for listening to the
  * various events of interest for this presenter. This makes it possible to lazily instantiate
  * the presenter and use GWT code splitting. Proxies are automatically generated for you
@@ -65,7 +65,7 @@
  * {@link com.gwtplatform.mvp.client.annotations.ProxyCodeSplit ProxyCodeSplit} or
  * {@link com.gwtplatform.mvp.client.annotations.ProxyCodeSplitBundle ProxyCodeSplitBundle}
  * must always annotate the {@link Proxy} interface.
- * 

+ * 

  * To reveal a presenter associated to a {@link com.gwtplatform.mvp.client.proxy.ProxyPlace ProxyPlace}
  * you can simply navigate to an hyperlink corresponding to this place's name token. The
  * {@link com.gwtplatform.mvp.client.proxy.PlaceManager PlaceManager} offers a number of method for building
@@ -86,13 +86,13 @@
  * order to enforce loose coupling. This event is then handled by the presenter
  * using the {@link com.gwtplatform.mvp.client.annotations.ProxyEvent ProxyEvent}
  * mechanism.
- * 

+ * 

  * If the presenter is revealed and is not currently visible, then its {@link #revealInParent()} method
  * will be called.
- * 

+ * 

  * To hide a presenter, you can reveal another one in the same slot or you can use
  * one of the methods described in {@link PresenterWidget}.
- * 

+ * 

  * A presenter has a number of lifecycle methods that you can hook on to:
  * 
    
  * 
  • {@link #onBind()}
@@ -109,7 +109,7 @@
  * 
  • The presenter's {@link #revealInParent()} is call and it asks to be set in one of its
  * parent slot by firing a
  * {@link com.gwtplatform.mvp.client.proxy.RevealContentEvent RevealContentEvent}
    • 
- * 
  • If a presenter already occupies this slot it is removed.
    • 
+ * 
  • If a presenter already occupies this slot it is removed.
  * 
    • If the presenter owning the slot is currently visible then
  * {@link #onHide()} is called on the removed presenter and, recursively,
  * on its children (bottom-up: first the children, then the parent)
      • 
@@ -118,7 +118,7 @@
  * too, this continues recursively until a visible presenter is reached, or until a presenter fires
  * {@link com.gwtplatform.mvp.client.proxy.RevealRootContentEvent RevealRootContentEvent}
  * or {@link com.gwtplatform.mvp.client.proxy.RevealRootLayoutContentEvent RevealRootLayoutContentEvent}
- * 
    
+ * 

  * 
  • When the above chain stops, {@link #onReveal} is called on all the presenters
  * that were traversed. (top down: first the parent, then the children);
    • 
  * 
  • Finally {@link #onReset()} is called on all the
@@ -133,7 +133,7 @@
 public abstract class Presenter> extends PresenterWidget {
     /**
      * The RevealType define which event will be fired in the default {@link #revealInParent()}.
-     * 
    
+     * 
    
      * Root will fire a {@link RevealRootContentEvent}.
      * RootLayout will fire a {@link RevealRootLayoutContentEvent}.
      * RootPopup will fire a {@link RevealRootPopupContentEvent}.
@@ -292,7 +292,7 @@ public final Proxy_ getProxy() {
      * to edit client details is unusable until all the data for this user has been
      * received. Fetching this data should be done in the {@link #prepareFromRequest(PlaceRequest)}
      * method.
-     * 
    
+     * 
    
      * In order to use manual reveal, override this method to return {@code true}.
      * Then, in your {@link #prepareFromRequest}, you can either:
      * 
      
@@ -320,10 +320,10 @@ public boolean useManualReveal() {
      * to this {@link Presenter}. You should override the method to extract any
      * parameters you need from the request. Make sure you call your parent's
      * {@link #prepareFromRequest} method.
-     * 
      
+     * 
      
      * If your presenter needs to fetch some information from the server while
      * preparing itself, consider using manual reveal. See {@link #useManualReveal()}.
-     * 
      
+     * 
      
      * If your presenter does not handle any parameter and does not want to fetch
      * extra information, then there is no need to override this method.
      *
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PresenterWidget.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PresenterWidget.java
index 775bedd844..af2e5b8afc 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PresenterWidget.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/PresenterWidget.java
@@ -45,7 +45,7 @@
 /**
  * A presenter that does not have to be a singleton. Pages from your
  * application will usually be singletons and extend the {@link Presenter} class.
- * 
      
+ * 
      
  * Choosing between a {@link Presenter} and {@link PresenterWidget} is a design decision that
  * requires some thought. For example, a {@link PresenterWidget} is useful when
  * you need a custom widget with extensive logic. For example, a chat box that can be instantiated
@@ -54,12 +54,12 @@
  * parent presenter, which increases coupling. Therefore, you should use a {@link Presenter} when
  * the parent is not expected to know its child. Moreover, only {@link Presenter} can be attached
  * to name tokens in order to support browser history.
- * 
      
+ * 
      
  * {@link PresenterWidget}s and {@link Presenter}s are organized in a hierarchy.
  * Internally, parent presenters have links to their currently attached children presenters. A
  * parent {@link Presenter} can contain either {@link Presenter}s or {@link PresenterWidget}s,
  * but a {@link PresenterWidget} can only contain {@link PresenterWidget}s.
- * 
      
+ * 
      
  * To reveal a {@link PresenterWidget} you should insert it within a {@link HasSlots slot} of its
  * containing presenter using one of the following methods:
  * 
        
@@ -70,7 +70,7 @@
  * 
      • {@link #addToPopupSlot(PresenterWidget, boolean)}
  * 
      
  * Revealing a {@link Presenter} is done differently, refer to the class documentation for more details.
- * 
      
+ * 
      
  * To hide a {@link PresenterWidget} or a {@link Presenter} you can use {@link #setInSlot} to place
  * another presenter in the same slot, or you can call one of the following methods:
  * 
        
@@ -79,7 +79,7 @@
  * 
      • {@link PopupView#hide()} if the presenter is a popup or a dialog box.
  * 
      
  * Hide a {@link Presenter} using these methods, but
- * 
      
+ * 
      
  * A presenter has a number of lifecycle methods that you can hook on to:
  * 
        
  * 
      • {@link #onBind()}
@@ -92,7 +92,7 @@
  * these lifecycle methods being called. For an example, here is what happens following
  * a call to {@link #setInSlot(Object, PresenterWidget)}:
  * 
          
- * 
        • If a presenter already occupies this slot it is removed.
          • 
+ * 
        • If a presenter already occupies this slot it is removed.
  * 
          • If the presenter owning the slot is currently visible then
  * {@link #onHide()} is called on the removed presenter and, recursively,
  * on its children (bottom-up: first the children, then the parent)
            • 
@@ -100,7 +100,7 @@
  * set in one of its parent slot by firing a
  * {@link com.gwtplatform.mvp.client.proxy.RevealContentEvent RevealContentEvent}.
  * For more details, see the documentation for {@link Presenter}.
- * 
          
+ * 
        • 
  * 
      • If, at this point, the presenter owning the slot is not visible, then the
  * chain stops. Otherwise, {@link #onReveal()} is called on the {@link PresenterWidget} that
  * was just added.
        • 
@@ -188,11 +188,11 @@ public void addToPopupSlot(PresenterWidget child, boolean c
      * This method adds some content in a specific slot of the {@link Presenter}.
      * The attached {@link View} should manage this slot when its
      * {@link View#addToSlot(Object, com.google.gwt.user.client.ui.Widget)} is called.
-     * 
        
+     * 
        
      * Contrary to the {@link #setInSlot} method, no
      * {@link com.gwtplatform.mvp.client.proxy.ResetPresentersEvent} is fired,
      * so {@link PresenterWidget#onReset()} is not invoked.
-     * 
        
+     * 
        
      * For more details on slots, see {@link HasSlots}.
      *
      * @param slot An opaque object identifying which slot this content is being
@@ -211,11 +211,11 @@ public void addToSlot(Object slot, PresenterWidget content) {
      * This method adds some content in a specific slot of the {@link Presenter}.
      * The attached {@link View} should manage this slot when its
      * {@link View#addToSlot(Object, com.google.gwt.user.client.ui.Widget)} is called.
-     * 
        
+     * 
        
      * Contrary to the {@link #setInSlot(IsSlot, PresenterWidget)} method, no
      * {@link com.gwtplatform.mvp.client.proxy.ResetPresentersEvent} is fired,
      * so {@link PresenterWidget#onReset()} is not invoked.
-     * 
        
+     * 
        
      * For more details on slots, see {@link HasSlots}.
      *
      * @param slot The slot into which the content is being added.
@@ -252,7 +252,7 @@ public Widget asWidget() {
     * {@link View#setInSlot(Object, com.google.gwt.user.client.ui.Widget)} is called. It should also clear
     * the slot when the {@link View#setInSlot(Object, com.google.gwt.user.client.ui.Widget)} method is
     * called with {@code null} as a parameter.
-    * 
        
+    * 
        
     * For more details on slots, see {@link HasSlots}.
     *
     * @param slot An opaque object identifying which slot to clear.
@@ -271,7 +271,7 @@ public void clearSlot(Object slot) {
      * {@link View#setInSlot(Object, com.google.gwt.user.client.ui.Widget)} is called. It should also clear
      * the slot when the {@link View#setInSlot(Object, com.google.gwt.user.client.ui.Widget)} method is
      * called with {@code null} as a parameter.
-     * 
        
+     * 
        
      * For more details on slots, see {@link HasSlots}.
      *
      * @param slot Specific slot to clear.
@@ -369,7 +369,7 @@ public void removeFromPopupSlot(PresenterWidget child) {
     * {@link com.gwtplatform.mvp.client.proxy.ResetPresentersEvent} is fired.
     * The attached {@link View} should manage this slot when its
     * {@link View#removeFromSlot(Object, com.google.gwt.user.client.ui.Widget)} is called.
-    * 
        
+    * 
        
     * For more details on slots, see {@link HasSlots}.
     *
     * @param slot An opaque object identifying which slot this content is being
@@ -390,7 +390,7 @@ public void removeFromSlot(Object slot, PresenterWidget content) {
      * {@link com.gwtplatform.mvp.client.proxy.ResetPresentersEvent} is fired.
      * The attached {@link View} should manage this slot when its
      * {@link View#removeFromSlot(Object, com.google.gwt.user.client.ui.Widget)} is called.
-     * 
        
+     * 
        
      * For more details on slots, see {@link HasSlots}.
      *
      * @param slot  The slot for which the content is being removed.
@@ -419,7 +419,7 @@ private void rawRemoveFromSlot(IsSlot slot, PresenterWidget child) {
     * A {@link com.gwtplatform.mvp.client.proxy.ResetPresentersEvent} will be fired
     * after the top-most visible presenter is revealed, resulting in a call to
     * {@link PresenterWidget#onReset()}.
-    * 
        
+    * 
        
     * For more details on slots, see {@link HasSlots}.
     *
     * @param slot An opaque object identifying which slot this content is being
@@ -440,7 +440,7 @@ public void setInSlot(Object slot, PresenterWidget content) {
     * {@link View#setInSlot(Object, com.google.gwt.user.client.ui.Widget)} is called. It should also clear the
     * slot when the {@code setInSlot} method is called with {@code null} as a
     * parameter.
-    * 
        
+    * 
        
     * For more details on slots, see {@link HasSlots}.
     *
     * @param slot An opaque object identifying which slot this content is being
@@ -465,7 +465,7 @@ public void setInSlot(Object slot, PresenterWidget content, boolean performRe
      * {@link View#setInSlot(Object, com.google.gwt.user.client.ui.Widget)} is called. It should also clear the
      * slot when the {@code setInSlot} method is called with {@code null} as a
      * parameter.
-     * 
        
+     * 
        
      * For more details on slots, see {@link HasSlots}.
      *
      * @param slot  The slot for which the content is being set.
@@ -483,7 +483,7 @@ public > void setInSlot(IsSlot slot, T child) {
      * {@link View#setInSlot(Object, com.google.gwt.user.client.ui.Widget)} is called. It should also clear the
      * slot when the {@code setInSlot} method is called with {@code null} as a
      * parameter.
-     * 
        
+     * 
        
      * For more details on slots, see {@link HasSlots}.
      *
      * @param slot  The slot for which the content is being set.
@@ -615,17 +615,17 @@ protected final EventBus getEventBus() {
     /**
      * Lifecycle method called whenever this presenter is about to be
      * hidden.
-     * 
        
+     * 
        
      * Important: Make sure you call your superclass {@link #onHide()} if
      * you override. Also, do not call directly, see {@link PresenterWidget}
      * for more details on lifecycle methods.
-     * 
        
+     * 
        
      * You should override this method to dispose of any object
      * created directly or indirectly during the call to {@link #onReveal()}.
-     * 
        
+     * 
        
      * This method will not be invoked a multiple times without {@link #onReveal()}
      * being called.
-     * 
        
+     * 
        
      * In a presenter hierarchy, this method is called bottom-up: first on the
      * child presenters, then on the parent.
      */
@@ -635,20 +635,20 @@ protected void onHide() {
     /**
      * Lifecycle method called on all visible presenters whenever a
      * presenter is revealed anywhere in the presenter hierarchy.
-     * 
        
+     * 
        
      * Important: Make sure you call your superclass {@link #onReset()} if
      * you override. Also, do not call directly, fire a {@link ResetPresentersEvent}
      * to perform a reset manually. See {@link PresenterWidget} for more details on
      * lifecycle methods.
-     * 
        
+     * 
        
      * This is one of the most frequently used lifecycle method. This is usually a good
      * place to refresh any information displayed by your presenter.
-     * 
        
+     * 
        
      * Note that {@link #onReset()} is not called only when using
      * {@link #addToSlot(Object, PresenterWidget)}, {@link #addToPopupSlot(PresenterWidget)}
      * or #setInSlot(Object, PresenterWidget, boolean)} with {@code false} as the third
      * parameter.
-     * 
        
+     * 
        
      * In a presenter hierarchy, this method is called top-down: first on the
      * parent presenters, then on the children.
      */
@@ -658,18 +658,18 @@ protected void onReset() {
     /**
      * Lifecycle method called whenever this presenter is about to be
      * revealed.
-     * 
        
+     * 
        
      * Important: Make sure you call your superclass {@link #onReveal()} if
      * you override. Also, do not call directly, see {@link PresenterWidget}
      * for more details on lifecycle methods.
-     * 
        
+     * 
        
      * You should override this method to perform any action or initialisation
      * that needs to be done when the presenter is revealed. Any initialisation
      * you perform here should be taken down in {@link #onHide()}.
-     * 
        
+     * 
        
      * Information that needs to be updated whenever the user navigates should
      * be refreshed in {@link #onReset()}.
-     * 
        
+     * 
        
      * In a presenter hierarchy, this method is called top-down: first on the
      * parent presenters, then on the children.
      */
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/RootPresenter.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/RootPresenter.java
index 6072530678..e152deac17 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/RootPresenter.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/RootPresenter.java
@@ -16,8 +16,6 @@
 
 package com.gwtplatform.mvp.client;
 
-import javax.inject.Inject;
-
 import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.Style;
@@ -40,12 +38,14 @@
 import com.gwtplatform.mvp.client.proxy.RevealRootPopupContentEvent;
 import com.gwtplatform.mvp.client.proxy.RevealRootPopupContentHandler;
 
+import jakarta.inject.Inject;
+
 /**
  * This is the presenter for the top-level of the application. It is derived
  * from presenter widget, but it's just because it doesn't need a proxy has it
  * will be bound as an eager singleton. It sets content within GWT's
  * {@link RootPanel} and {@link RootLayoutPanel}.
- * 
        
+ * 
        
  * Fire a {@link RevealRootContentEvent} or {@link RevealRootLayoutContentEvent}
  * to set your presenter at the top level. The choice depends on whether your
  * presenter works as a {@link com.google.gwt.user.client.ui.Panel} or as a
@@ -132,7 +132,7 @@ public void unlockScreen() {
 
         /**
          * Return the RootPanel on which to add the content.
-         * 
        
+         * 
        
          * It returns the default RootPanel.
          * It can be overriden to return another RootPanel to allow embeding the application.
          * @return the RootPanel on which to add the content
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/TabContainerPresenter.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/TabContainerPresenter.java
index 84957b97c8..beaa80de0f 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/TabContainerPresenter.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/TabContainerPresenter.java
@@ -30,7 +30,7 @@
  * Note that this presenter is only meant to be used when the content are themselves
  * {@link Presenter}, if they are {@link PresenterWidget} then no special mechanism is
  * required and you can rely on a standard widget.
- * 
        
+ * 
        
  * Classes extending {@link TabContainerPresenter} must declare one constant of type
  * {@link com.google.gwt.event.shared.GwtEvent.Type Type<RequestTabsHandler>}
  * and annotate it with {@link com.gwtplatform.mvp.client.annotations.RequestTabs RequestTabs}.
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/View.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/View.java
index a3a2eb4ba3..12986bbe55 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/View.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/View.java
@@ -26,12 +26,12 @@ public interface View extends IsWidget {
 
     /**
      * Requests the view to add content within a specific slot.
-     * 
        
+     * 
        
      * Override the default implementation and manage all the slots of your view
      * into which content can be added. You should also consider overriding
      * {@link #removeFromSlot(Object, IsWidget)}.
      * If the view doesn't know about this slot, it can silently ignore the request.
-     * 
        
+     * 
        
      * Used by {@link PresenterWidget#addToSlot(Object, PresenterWidget)}.
      *
      * @param slot    An opaque object indicating the slot to add into.
@@ -41,12 +41,12 @@ public interface View extends IsWidget {
 
     /**
      * Requests the view to remove content from a specific slot.
-     * 
        
+     * 
        
      * Override the default implementation and manage all the slots of your view
      * into which content can be added and removed. You should also override
      * {@link #addToSlot(Object, IsWidget)}.
      * If the view doesn't know about this slot, it can silently ignore the request.
-     * 
        
+     * 
        
      * Used by {@link PresenterWidget#removeFromSlot(Object, PresenterWidget)}.
      *
      * @param slot    An opaque object indicating the slot to remove from.
@@ -57,12 +57,12 @@ public interface View extends IsWidget {
     /**
      * Requests the view to set content within a specific slot, clearing anything
      * that was already contained there.
-     * 
        
+     * 
        
      * Override the default implementation and manage all the slots of your view
      * into which content can be placed. If the view doesn't know about this slot,
      * it can silently ignore the request. When {@code null} is passed, your
      * implementation should clear the slot.
-     * 
        
+     * 
        
      * Used by {@link PresenterWidget#setInSlot(Object, PresenterWidget)} and
      * {@link PresenterWidget#clearSlot(Object)}.
      *
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/ViewImpl.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/ViewImpl.java
index 45b5455039..9d5406f89a 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/ViewImpl.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/ViewImpl.java
@@ -36,10 +36,10 @@
 /**
  * A simple implementation of {@link View} that simply disregard every call to {@link #setInSlot(Object, IsWidget)},
  * {@link #addToSlot(Object, IsWidget)}, and {@link #removeFromSlot(Object, IsWidget)}.
- * 
        
+ * 
        
  * Feel free not to inherit from this if you need another base class (such as {@link
  * com.google.gwt.user.client.ui.Composite Composite}), but you will have to define the above methods.
- * 
        
+ * 
        
  * * Important call {@link #initWidget(IsWidget)} in your {@link View}'s constructor.
  */
 public abstract class ViewImpl implements View {
@@ -114,7 +114,7 @@ public Widget asWidget() {
      * Link a {@link IsSingleSlot} sub-type to a container. The container must implement either {@link HasOneWidget} or
      * {@link HasWidgets}. Here we accept {@code Object} to prevent the hassle of of casting {@code container} if it
      * implements both interfaces.
-     * 
        
+     * 
        
      * {@link HasOneWidget} has checked first.
      *
      * @param slot the slot
@@ -171,7 +171,7 @@ public void onAttachOrDetach(AttachEvent event) {
 
     /**
      * Method called after the view is attached to the DOM.
-     * 
        
+     * 
        
      * You should override this method to perform any ui related initialization that needs to be done after that the
      * view is attached and that the presenter doesn't have to be aware of (attach event handlers for instance)
      */
@@ -180,7 +180,7 @@ protected void onAttach() {
 
     /**
      * Method called after the view is detached to the DOM.
-     * 
        
+     * 
        
      * You should override this method to release any resources created directly or indirectly during the call to {@link
      * #onAttach()}
      */
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/ViewWithUiHandlers.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/ViewWithUiHandlers.java
index e16400da4d..904cf7db63 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/ViewWithUiHandlers.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/ViewWithUiHandlers.java
@@ -22,7 +22,7 @@
  * Base class for a {@link View} that implements the {@link HasUiHandlers}
  * interface. You should always call {@link #setUiHandlers(UiHandlers)} from your
  * presenter's constructor.
- * 
        
+ * 
        
  * Important! Never call {@link #getUiHandlers()} inside your constructor
  * since the {@link UiHandlers} are not yet set.
  *
@@ -36,7 +36,7 @@ public abstract class ViewWithUiHandlers extends ViewImpl
 
     /**
      * Access the {@link UiHandlers} associated with this {@link View}.
-     * 
        
+     * 
        
      * Important! Never call {@link #getUiHandlers()} inside your constructor
      * since the {@link UiHandlers} are not yet set.
      *
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ContentSlot.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ContentSlot.java
index 9d14e97e5e..70aa825867 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ContentSlot.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ContentSlot.java
@@ -24,7 +24,7 @@
 * this event, a child presenter is inserted in the presenter's view. You should
 * make sure the view handles event of this type in its
 * {@link com.gwtplatform.mvp.client.View#setInSlot(Object, com.google.gwt.user.client.ui.Widget)} method.
-* @deprecated since 1.5. use {@link om.gwtplatform.mvp.client.presenter.slots.NestedSlot} instead.
+* @deprecated since 1.5. use {@link com.gwtplatform.mvp.client.presenter.slots.NestedSlot} instead.
 */
 @Deprecated
 @Target(ElementType.FIELD)
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/CustomProvider.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/CustomProvider.java
index c3aea219b8..2ae9cc9954 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/CustomProvider.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/CustomProvider.java
@@ -25,14 +25,14 @@
  * {@linkplain com.gwtplatform.common.client.IndirectProvider provider} which is used to load the
  * presenter behind the proxy. Using a custom provider enables you to add steps which should happen
  * before the presenter is loaded, instantiated and processed by GIN.
- * 
        
+ * 
        
  * The class implementing {@code IndirectProvider} must provide a constructor which takes the
  * original provider as the single argument. For presenters which use {@code @ProxyStandard}
  * this is {@code com.google.inject.Provider<T>}; for presenters which use {@code @ProxyCodeSplit}
  * or {@code @ProxyCodeSplitBundle} this is {@code com.google.gwt.inject.client.AsyncProvider<T>}
- * 
        
+ * 
        
  * Here is an example use of {@code CustomProvider}:
- * 
        
+ * 
        
  * 
          * @ProxyCodeSplit
  * @CustomProvider(SecurityContextProvider.class)
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/GatekeeperParams.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/GatekeeperParams.java
index c2944335d5..0cc1589f51 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/GatekeeperParams.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/GatekeeperParams.java
@@ -21,10 +21,10 @@
 
 /**
  * This annotation lets you define the parameters for a
- * {@link GatekeeperWithParams} to use for the
+ * {@code GatekeeperWithParams} to use for the
  * {@link com.gwtplatform.mvp.client.proxy.Place} associated
  * with your proxy. Your custom {@code Ginjector} must have a
- * method returning the {@link GatekeeperWithParams} specified
+ * method returning the {@code GatekeeperWithParams} specified
  * in this annotation.
  */
 @Target(ElementType.TYPE)
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ProxyCodeSplit.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ProxyCodeSplit.java
index aa6938a57b..ff297ea071 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ProxyCodeSplit.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ProxyCodeSplit.java
@@ -24,9 +24,9 @@
  * you want the associated {@link com.gwtplatform.mvp.client.Presenter} to sit
  * behind a split point. Thus the javascript code will be compiled into a new
  * javascript file and only be loaded from the webapplication server if needed.
- * 
        
+ * 
        
  * Here is an example use of {@link ProxyCodeSplit}:
- * 
        
+ * 
        
  * 
          * @ProxyCodeSplit
  * public interface MyProxy extends ProxyPlace<MyPresenter> {
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ProxyCodeSplitBundle.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ProxyCodeSplitBundle.java
index f3e999c290..7f8118bbd3 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ProxyCodeSplitBundle.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ProxyCodeSplitBundle.java
@@ -26,27 +26,27 @@
  * {@link com.gwtplatform.mvp.client.proxy.Proxy}s and their associated
  * {@link com.gwtplatform.mvp.client.Presenter}s to sit behind one split point
  * and to be compiled into one javascript file separately from others.
- * 
        
+ * 
        
  * Use this annotation if you already have too much code splitting using
  * {@link ProxyCodeSplit} and it is more efficient to group
  * {@link com.gwtplatform.mvp.client.Presenter}s because they share a bulk of
  * their code. You will also have to set up your own implementation of a
  * {@link ProviderBundle}.
- * 
        
+ * 
        
  * ProviderBundles can be created manually or be generated by GWTP. For the manual approach
  * the {@link ProxyCodeSplitBundle#bundleClass()} and {@link ProxyCodeSplitBundle#id()}
  * need to be defined.
- * 
        
- * 
        
+ * 
        
+ * 
        
  * Here is an example use of {@link ProxyCodeSplitBundle} using manual declaration:
- * 
        
+ * 
        
  * 
          * @ProxyCodeSplitBundle(bundleClass = MyPresenterBundle.class, id = MyPresenterBundle.ID_Object1)
  * public interface MyProxy extends ProxyPlace<Object1> {
  * }
  * 
        
- * 
        
- * 
        
+ * 
        
+ * 
        
  * If you use GWTP's generation of {@link com.gwtplatform.mvp.client.ApplicationController} all bundles
  * will be automatically generated for you, all that you need are string identifiers for each unique bundle.
  * The best way to keep your bundles in order is to create an interface that identifies your bundles.
@@ -54,15 +54,15 @@
  * public interface Bundles {
  *   String MAIN = "Main";
  *   String OTHER = "Other";
- * }
        
- * 
        
- * 
        
+ * }}
        
+ * 
        
+ * 
        
  * Here is an example use of {@link ProxyCodeSplitBundle} when using GWTP's generation feature:
  * 
        {@code
  * @ProxyCodeSplitBundle(Bundles.MAIN)
  * public interface MyProxy extends ProxyPlace<Object1> {
- * }
        
- * 
        
+ * }}
    • 
+ * 
    
  *
  * @see ProviderBundle
  * @see Code Splitting
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ProxyEvent.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ProxyEvent.java
index e355514494..38770660cd 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ProxyEvent.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ProxyEvent.java
@@ -23,10 +23,10 @@
  * Use this to annotate an event-handling method that should be registered in
  * the proxy rather than being registered in the presenter. Handlers annotated
  * in this way should not be registered in the Presenter.
- * 
    
+ * 
    
  * The presenter will be instantiated as soon as the proxy intercepts the event, so
  * the presenter will handle the event even if it was not yet initialized.
- * 
    
+ * 
    
  * Methods annotated by {@code @ProxyEvent} must return {@code void} and accept
  * a single parameter derived from {@link com.google.gwt.event.shared.GwtEvent GwtEvent}.
  * This event class must have a static {@code getType} method returning a type
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ProxyStandard.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ProxyStandard.java
index 34a4ee8dfd..ea1c61083e 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ProxyStandard.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/ProxyStandard.java
@@ -23,9 +23,9 @@
  * Use this annotation with a {@link com.gwtplatform.mvp.client.proxy.Proxy} if
  * you don't want the associated {@link com.gwtplatform.mvp.client.Presenter} to
  * sit behind a split point.
- * 
    
+ * 
    
  * Here is an example use of {@link ProxyStandard}:
- * 
    
+ * 
    
  * 
      * @ProxyStandard
  * public interface MyProxy extends ProxyPlace<MyPresenter> {
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/TabInfo.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/TabInfo.java
index f195516e9d..b97f5199b8 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/TabInfo.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/TabInfo.java
@@ -24,7 +24,7 @@
 /**
  * Annotation used to specify various information on a tab. The {@link #container}
  * parameter is mandatory. This annotation can be used in one of three ways:
- * 
    
+ * 
    
  * 1) Annotating the proxy
    
  * You can directly annotate your proxy with it, in which case the {@link #label}
  * parameter must be specified. For example:
@@ -46,12 +46,12 @@
  *    nameToken = "SETTINGS-USER")
  * public interface MyProxy extends TabContentProxy<SettingsTabStripPresenter> { }
  * 
    
- * 
    
+ * 
    
  * 2) Annotating a static method returning {@code String}
    
  * You can annotate a static method returning a {@code String}, in which case you must
  * not specify the {@link #label}. Again, specify the {@link #nameToken} parameter only
  * if your presenter is not a place.
- * 
    
+ * 
    
  * The method you annotate can optionally accept exactly 1 parameter having the type
  * of your custom {@link com.google.gwt.inject.client.Ginjector}. Here's an example of
  * this usage:
@@ -67,17 +67,17 @@
  *   return gingector.getTranslations().homePageLabel();
  * }
  * 
    
- * 
    
+ * 
    
  * 3) Annotating a static method returning
  * {@code TabData}
    
  * You can annotate a static method returning a {@link com.gwtplatform.mvp.client.TabData},
  * in which case you must not specify either the {@link #label} nor the {@link #priority}.
  * Again, specify the {@link #nameToken} parameter only if your presenter is not a place.
- * 
    
+ * 
    
  * The method you annotate can optionally accept parameters having either the type
  * of your custom {@link com.google.gwt.inject.client.Ginjector} or any type that is provided by
  * the ginjector. Here are two examples of this usage:
- * 
    
+ * 
    
  * 
      * {@code @}ProxyCodeSplit
  * public interface MyProxy extends TabContentProxy<SettingsTabStripPresenter> { }
@@ -90,7 +90,7 @@
  *   return ginjector.getTabDataFactory().createUserTabData();
  * }
  * 
    
- * 
    
+ * 
    
  * 
      * {@code @}TabInfo(container = ApplicationPresenter.class)
  * static TabData getTabData(Messages msgs, IsAdminGateKeeper keeper) {
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/TitleFunction.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/TitleFunction.java
index 7da7677c98..916ce0ce5e 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/TitleFunction.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/annotations/TitleFunction.java
@@ -23,7 +23,7 @@
  * This annotation can be used to specify a function returning the title of a
  * place as a string, given the request. It can work in one of two ways. For
  * simple hard-coded titles see {@link Title}.
- * 
    
+ * 
    
  * 1) You can use it to annotate a static or non-static public method in your
  * presenter that returns a string (the title). This method can optionally
  * accept a {@link com.gwtplatform.mvp.shared.proxy.PlaceRequest} parameter to
@@ -31,7 +31,7 @@
  * optionally accept another parameter corresponding to your custom ginjector.
  * Using a static method is more efficient, as it doesn't force instantiation of
  * the associated presenter and view. Example of use:
- * 
    
+ * 
    
  * 
      * {@code @}TitleFunction
  *  static public String getTranslatedTitle( MyGinjector ginjector ) {
@@ -44,7 +44,7 @@
  *    return "Email #" + getEmailId();
  *  }
  * 
    
- * 
    
+ * 
    
  * 2) You can use it to annotate a static or non-static public method in your
  * presenter that returns {@code void} but accept a parameter of type
  * {@link com.gwtplatform.mvp.client.proxy.SetPlaceTitleHandler}. In this case,
@@ -54,12 +54,12 @@
  * fashion, for example following a call to the server. As above, your method
  * can accept a {@link com.gwtplatform.mvp.shared.proxy.PlaceRequest} parameter
  * and your custom ginjector. Example of use:
- * 
    
+ * 
    
  * 
      * {@code @}TitleFunction
  *  public void getTitle( PlaceRequest placeRequest, final SetPlaceTitleHandler handler ) {
  *    prepareFromRequest( placeRequest );
- *    dispatcher.execute( new GetUserNameAction( getUserId(), new AsyncCallback(){
+ *    dispatcher.execute( new GetUserNameAction( getUserId(), new AsyncCallback<GetUserNameResult>(){
  *      public void onSuccess(GetUserNameResult result) {
  *        handler.onSetPlaceTitle( result.getUserName() );
  *      }
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/gin/AbstractPresenterModule.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/gin/AbstractPresenterModule.java
index c145085145..b5a62e6901 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/gin/AbstractPresenterModule.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/gin/AbstractPresenterModule.java
@@ -32,7 +32,7 @@ public AbstractPresenterModule() {
     /**
      * Convenience method for binding a singleton presenter with its proxy, when
      * using automatically generated proxy classes and non-singleton views.
-     * 
    
+     * 
    
      * Important! This is only be meant to be used by presenters associated
      * with non-singleton views, for example when the same view class is reused
      * with many presenters. As such, you will need to also use the
@@ -80,7 +80,7 @@ public AbstractPresenterModule() {
     /**
      * Convenience method for binding a singleton presenter with its proxy, when
      * using automatically generated proxy classes and non-singleton views.
-     * 
    
+     * 
    
      * Important! This is only be meant to be used by presenters associated
      * with non-singleton views, for example when the same view class is reused
      * with many presenters. As such, you will need to also use the
@@ -125,7 +125,7 @@ public AbstractPresenterModule() {
     /**
      * Convenience method for binding a singleton presenter with its proxy, when
      * using custom-made proxy classes and non-singleton views.
-     * 
    
+     * 
    
      * Important! This is only be meant to be used by presenters associated
      * with non-singleton views, for example when the same view class is reused
      * with many presenters. As such, you will need to also use the
@@ -179,7 +179,7 @@ public AbstractPresenterModule() {
     /**
      * Convenience method for binding a singleton presenter with its proxy, when
      * using custom-made proxy classes and non-singleton views.
-     * 
    
+     * 
    
      * Important! This is only be meant to be used by presenters associated
      * with non-singleton views, for example when the same view class is reused
      * with many presenters. As such, you will need to also use the
@@ -284,7 +284,7 @@ protected  void bindPresenterWidgetFactory(Class
     presenterFactory,
 
     /**
      * Bind a view interface to its implementation in a non-singleton manner.
-     * 
    
+     * 
    
      * Important! This is only be meant to be used for presenter associated
      * with non-singleton views, for example when the same view class is reused
      * with many presenters. As such, you will use this method with
@@ -307,7 +307,7 @@ protected  void bindSharedView(Class view,
     /**
      * Convenience method for binding a singleton {@link PresenterWidget} with its
      * {@link View}.
-     * 
    
+     * 
    
      * Important! If you want to use the same {@link PresenterWidget} in
      * many different places, you should consider making it non-singleton with
      * {@link #bindPresenterWidget}. It is possible to use the same singleton
@@ -335,7 +335,7 @@ protected 
    , V extends View> void bindSingletonPrese
     /**
      * Convenience method for binding a singleton {@link PresenterWidget} with its
      * {@link View}.
-     * 
    
+     * 
    
      * Important! If you want to use the same {@link PresenterWidget} in
      * many different places, you should consider making it non-singleton with
      * {@link #bindPresenterWidget}. It is possible to use the same singleton
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/gin/DefaultModule.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/gin/DefaultModule.java
index 7b182505b2..4be02e8f04 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/gin/DefaultModule.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/gin/DefaultModule.java
@@ -18,8 +18,6 @@
 
 import java.lang.annotation.Annotation;
 
-import javax.inject.Singleton;
-
 import com.google.gwt.inject.client.AbstractGinModule;
 import com.google.web.bindery.event.shared.EventBus;
 import com.google.web.bindery.event.shared.SimpleEventBus;
@@ -35,6 +33,8 @@
 import com.gwtplatform.mvp.shared.proxy.ParameterTokenFormatter;
 import com.gwtplatform.mvp.shared.proxy.TokenFormatter;
 
+import jakarta.inject.Singleton;
+
 /**
  * Module with default GWTP bindings. You can use {@link DefaultModule.Builder} to configure each required bindings.
  */
@@ -133,7 +133,7 @@ String getDefaultPlace() {
      * When instantiating the module this way be sure to read {@link DefaultPlaceManager} and manually bind the required
      * constants. Consider using {@link DefaultModule.Builder} if you need to use a different implementation than the
      * default one for a binding.
-     * 
    
+     * 
    
      * Important! If you use this class, don't forget to bind {@link DefaultPlace}, {@link ErrorPlace} and {@link
      * UnauthorizedPlace} to name tokens associated to a presenter.
    
      */
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/googleanalytics/GoogleAnalytics.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/googleanalytics/GoogleAnalytics.java
index 05cd201fba..8d3d475cff 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/googleanalytics/GoogleAnalytics.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/googleanalytics/GoogleAnalytics.java
@@ -19,7 +19,7 @@
 /**
  * This interface lets you manually register Google Analytics events in
  * your application.
- * 
    
+ * 
    
  * Event Tracking is a method available in the {@code ga.js} tracking code that
  * you can use to record user interaction with website elements. This is
  * accomplished by attaching the method call to the particular UI element you
@@ -29,12 +29,12 @@
  * using the Event Tracking method. Finally, Event Tracking employs an
  * object-oriented model that you can use to collect and classify different
  * types of interaction with your web page objects.
- * 
    
+ * 
    
  * Inject this interface in your presenters when you need to interact with the
  * Google Analytics module, for example to log your custom event. You can
  * also configure automatic registration of navigation event using
  * {@link GoogleAnalyticsNavigationTracker}.
- * 
    
+ * 
    
  * Also, for more information about Event Tracking, please read:
  * Event Tracking Guide
  * @deprecated Since 1.4. Use https://github.com/ArcBees/universal-analytics instead.
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/googleanalytics/GoogleAnalyticsNavigationTracker.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/googleanalytics/GoogleAnalyticsNavigationTracker.java
index 2ef4620371..cb61f8c084 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/googleanalytics/GoogleAnalyticsNavigationTracker.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/googleanalytics/GoogleAnalyticsNavigationTracker.java
@@ -16,8 +16,6 @@
 
 package com.gwtplatform.mvp.client.googleanalytics;
 
-import javax.inject.Inject;
-
 import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.core.client.Scheduler.ScheduledCommand;
 import com.google.web.bindery.event.shared.EventBus;
@@ -26,15 +24,17 @@
 import com.gwtplatform.mvp.client.proxy.NavigationHandler;
 import com.gwtplatform.mvp.client.proxy.PlaceManager;
 
+import jakarta.inject.Inject;
+
 /**
  * This class let's you register every navigation event to a Google Analytics
  * account. To use it, you must bind GoogleAnalytics as eager singleton in your
  * gin module and also bind the annotation {@link GaAccount} to your Google
  * Analytics account number:
- * 
    
+ * 
    
  * bind(GoogleAnalyticsImpl.class).to(GoogleAnalytics.class).asEagerSingleton();
  * bindConstant().annotatedWith(GaAccount.class).to("UA-12345678-1");
- * 
    
+ * 
    
  * If you want to log custom events, see {@link GoogleAnalytics}.
  *
  * @deprecated Since 1.4. Use https://github.com/ArcBees/universal-analytics instead.
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/presenter/slots/NestedSlot.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/presenter/slots/NestedSlot.java
index 30e96b9256..a20b89a6b3 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/presenter/slots/NestedSlot.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/presenter/slots/NestedSlot.java
@@ -23,7 +23,7 @@
  * Use NestedSlot in classes extending {@link com.gwtplatform.mvp.client.Presenter}
  * to automatically display child presenters.
  *
- * @see: https://github.com/ArcBees/GWTP/wiki/Presenter-%22Slots%22
+ * see: https://github.com/ArcBees/GWTP/wiki/Presenter-%22Slots%22
  */
 public class NestedSlot extends GwtEvent.Type>
         implements IsSingleSlot>, RemovableSlot> {
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/AsyncCallFailHandler.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/AsyncCallFailHandler.java
index 0984c38b5c..8fd7539712 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/AsyncCallFailHandler.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/AsyncCallFailHandler.java
@@ -22,5 +22,5 @@
  * Handler for {@link AsyncCallFailEvent}.
  */
 public interface AsyncCallFailHandler extends EventHandler {
-    void onAsyncCallFail(final AsyncCallFailEvent asyncCallFailEvent);
+    void onAsyncCallFail(AsyncCallFailEvent asyncCallFailEvent);
 }
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/AsyncCallStartHandler.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/AsyncCallStartHandler.java
index c2ccd5341d..ef34432b87 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/AsyncCallStartHandler.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/AsyncCallStartHandler.java
@@ -22,5 +22,5 @@
  * Handler for {@link AsyncCallStartEvent}.
  */
 public interface AsyncCallStartHandler extends EventHandler {
-    void onAsyncCallStart(final AsyncCallStartEvent asyncCallStartEvent);
+    void onAsyncCallStart(AsyncCallStartEvent asyncCallStartEvent);
 }
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/AsyncCallSucceedHandler.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/AsyncCallSucceedHandler.java
index 0091194ab0..4111535e95 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/AsyncCallSucceedHandler.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/AsyncCallSucceedHandler.java
@@ -22,5 +22,5 @@
  * Handler for {@link AsyncCallSucceedEvent}.
  */
 public interface AsyncCallSucceedHandler extends EventHandler {
-    void onAsyncCallSucceed(final AsyncCallSucceedEvent asyncCallSucceedEvent);
+    void onAsyncCallSucceed(AsyncCallSucceedEvent asyncCallSucceedEvent);
 }
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/DefaultPlaceManager.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/DefaultPlaceManager.java
index 29c449fe44..96c3fc8c75 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/DefaultPlaceManager.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/DefaultPlaceManager.java
@@ -16,8 +16,6 @@
 
 package com.gwtplatform.mvp.client.proxy;
 
-import javax.inject.Inject;
-
 import com.google.gwt.core.shared.GWT;
 import com.google.gwt.place.shared.PlaceHistoryHandler.Historian;
 import com.google.web.bindery.event.shared.EventBus;
@@ -27,21 +25,23 @@
 import com.gwtplatform.mvp.shared.proxy.PlaceRequest;
 import com.gwtplatform.mvp.shared.proxy.TokenFormatter;
 
+import jakarta.inject.Inject;
+
 /**
  * This is a subtype of {@link com.gwtplatform.mvp.client.proxy.PlaceManagerImpl PlaceManagerImpl} that uses
  * custom name tokens to reveal default, error and unauthorized places.
- * 
    
+ * 
    
  * Important! If you use this class, don't forget to bind
  * {@link com.gwtplatform.mvp.client.annotations.DefaultPlace DefaultPlace},
  * {@link com.gwtplatform.mvp.client.annotations.ErrorPlace ErrorPlace} and
  * {@link com.gwtplatform.mvp.client.annotations.UnauthorizedPlace UnauthorizedPlace} to Presenter name tokens in
  * your Gin module.
- * 
    
+ * 
    
  * Note: The default, error and unauthorized places are revealed without updating the browser's URL (hence
  * the false value passed in {@link #revealPlace(com.gwtplatform.mvp.shared.proxy.PlaceRequest, boolean) revealPlace}).
  * This will avoid stepping into an infinite navigation loop if the user navigates back (using the browser's back
  * button).
- * 
    
+ * 
    
  * Here's an example of infinite navigation loop that we want to avoid:
  * 
      
  * 
    1. An unauthenticated hits #admin (a place reserved to authenticated admins)
      2. 
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/Gatekeeper.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/Gatekeeper.java
index 9e3c56a8fe..ecf36809d4 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/Gatekeeper.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/Gatekeeper.java
@@ -19,7 +19,7 @@
 /**
  * Inherit from this class to define a gatekeeper that locks access to your
  * {@link Place} in specific situation. For example:
- * 
      
+ * 
      
  * 
        * public class AdminGatekeeper implements Gatekeeper {
  *
@@ -37,11 +37,11 @@
  *
  * }
  * 
      
- * 
      
+ * 
      
  * You must also make sure that your custom Ginjector provides a {@code get}
  * method returning this {@link Gatekeeper} if you want to use it with the
  * {@link com.gwtplatform.mvp.client.annotations.UseGatekeeper} annotation.
- * 
      
+ * 
      
  * You should usually bind your {@link Gatekeeper} as a singleton.
  */
 public interface Gatekeeper {
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/GatekeeperWithParams.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/GatekeeperWithParams.java
index 0beb67a617..860c342f6f 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/GatekeeperWithParams.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/GatekeeperWithParams.java
@@ -19,7 +19,7 @@
 /**
  * Specialized {@link Gatekeeper} which needs additional parameters
  * in order to find out if the protected {@link Place} can be revealed.
- * 
    
+ * 
    
  * Example of use:
  * 
      * public class HasAllRolesGatekeeper implements GatekeeperWithParams {
@@ -44,12 +44,12 @@
  * }
  * }
  * 
    
- * 
    
+ * 
    
  * You must also make sure that your custom Ginjector provides a {@code get}
  * method returning this {@link GatekeeperWithParams} if you want to use it
  * with the {@link com.gwtplatform.mvp.client.annotations.GatekeeperParams}
  * annotation.
- * 
    
+ * 
    
  * You should usually bind your {@link GatekeeperWithParams} as a singleton.
  */
 public interface GatekeeperWithParams extends Gatekeeper {
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/GetPlaceTitleEvent.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/GetPlaceTitleEvent.java
index 6f5fbfd31a..5e775a4581 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/GetPlaceTitleEvent.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/GetPlaceTitleEvent.java
@@ -23,7 +23,7 @@
 /**
  * This event is fired whenever the user wants to have access to the title of a
  * place.
- * 
    
+ * 
    
  * Important! You should never fire that event directly. Instead, use
  * {@link PlaceManager#getCurrentTitle(SetPlaceTitleHandler)} or
  * {@link PlaceManager#getTitle(int, SetPlaceTitleHandler)}.
@@ -52,7 +52,7 @@ public GetPlaceTitleEvent(
     /**
      * Fires a {@link GetPlaceTitleEvent}
      * into a source that has access to an {@link com.google.web.bindery.event.shared.EventBus}.
-     * 
    
+     * 
    
      * Important! You should never fire that event directly. See
      * {@link GetPlaceTitleEvent} for details.
      *
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/LockInteractionEvent.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/LockInteractionEvent.java
index 5062c20bd1..f7c37e034c 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/LockInteractionEvent.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/LockInteractionEvent.java
@@ -23,10 +23,10 @@
  * This event is fired whenever interaction should be locked throughout the application,
  * usually because a navigation operation is taking place and interacting could cause
  * unexpected state switches.
- * 
    
+ * 
    
  * This event is typically fired by the {@link PlaceManager} whenever a navigation operation
  * starts or stops. It is handled by the default {@link com.gwtplatform.mvp.client.RootPresenter} implementation.
- * Override {@link com.gwtplatform.mvp.client.RootPresenter#lockInteraction(boolean)} to customize the behaviour.
+ * Override {@code com.gwtplatform.mvp.client.RootPresenter#lockInteraction(boolean)} to customize the behaviour.
  */
 public class LockInteractionEvent extends GwtEvent {
     private static Type TYPE;
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/LockInteractionHandler.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/LockInteractionHandler.java
index 065e1beda4..9c9690a8fb 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/LockInteractionHandler.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/LockInteractionHandler.java
@@ -22,6 +22,5 @@
  * Handler for {@link LockInteractionEvent}.
  */
 public interface LockInteractionHandler extends EventHandler {
-    void onLockInteraction(
-            final LockInteractionEvent lockInteractionEvent);
+    void onLockInteraction(LockInteractionEvent lockInteractionEvent);
 }
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ManualRevealCallback.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ManualRevealCallback.java
index 089a85f4f8..4ee7a701fe 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ManualRevealCallback.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ManualRevealCallback.java
@@ -23,9 +23,9 @@
  * This implementation of {@link AsyncCallback} can be used when fetching data from the server within {@link
  * Presenter#prepareFromRequest(com.gwtplatform.mvp.shared.proxy.PlaceRequest)} for a presenter that uses manual reveal
  * (see {@link Presenter#useManualReveal()}.
- * 
    
+ * 
    
  * Use {@link #create(Presenter, AsyncCallback)} to attach that callback to your own.
- * 
    
+ * 
    
  * For more complex scenarios you can use {@link ProxyPlace#manualReveal(Presenter)}.
  *
  * @param  The type of the return value, see {@link AsyncCallback}.
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/NavigationEvent.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/NavigationEvent.java
index 055f492a79..b2185602ee 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/NavigationEvent.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/NavigationEvent.java
@@ -24,7 +24,7 @@
  * Event fired after navigation has occurred. It will not be fired if navigation is
  * refused through {@link PlaceManager#setOnLeaveConfirmation}, instead
  * {@link NavigationRefusedEvent} will.
- * 
    
+ * 
    
  * Instead of registering your presenter towards this event, consider overriding
  * {@link com.gwtplatform.mvp.client.PresenterWidget#onReset()}. From there
  * you can call {@link PlaceManager#getCurrentPlaceRequest()} to get the
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/NavigationHandler.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/NavigationHandler.java
index 3982878dd6..05284de38a 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/NavigationHandler.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/NavigationHandler.java
@@ -22,5 +22,5 @@
  * Handler for {@link NavigationEvent}.
  */
 public interface NavigationHandler extends EventHandler {
-    void onNavigation(final NavigationEvent navigationEvent);
+    void onNavigation(NavigationEvent navigationEvent);
 }
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/NavigationRefusedHandler.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/NavigationRefusedHandler.java
index ce6e41cb2c..c42c3122af 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/NavigationRefusedHandler.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/NavigationRefusedHandler.java
@@ -22,6 +22,5 @@
  * Handler for {@link NavigationRefusedEvent}.
  */
 public interface NavigationRefusedHandler extends EventHandler {
-    void onNavigationRefused(
-            final NavigationRefusedEvent navigationRefusedEvent);
+    void onNavigationRefused(NavigationRefusedEvent navigationRefusedEvent);
 }
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/NotifyingAsyncCallback.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/NotifyingAsyncCallback.java
index dba3a4444e..5644365489 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/NotifyingAsyncCallback.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/NotifyingAsyncCallback.java
@@ -23,7 +23,7 @@
  * An implementation of {@link AsyncCallback} that sends events on the {@link EventBus} whenever
  * an async call starts, succeeds, or fails. The events fired are {@link AsyncCallStartEvent},
  * {@link AsyncCallSucceedEvent}, {@link AsyncCallFailEvent}.
- * 
    
+ * 
    
  * So the way to use {@link NotifyingAsyncCallback} is the following:
  * 
      *   NotifyingAsyncCallback callback = new NotifyingAsyncCallback(eventBus) { ... };
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/Place.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/Place.java
index 77b0fd6537..cb9094b8f4 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/Place.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/Place.java
@@ -21,7 +21,7 @@
 /**
  * Important: For simplicity, places do not participate in dependency
  * injection and can be created with new.
- * 
    
+ * 
    
  * A place represents a particular 'bookmark' or location inside the
  * application. A place is stateful - it may represent a location with it's
  * current settings, such as a particular ID value, or other unique indicators
@@ -32,7 +32,7 @@ public interface Place {
 
     /**
      * Checks if the associated presenter can be revealed.
-     * 
    
+     * 
    
      * The default implementation of this method always return true,
      * but subclasses should override this and check to make sure the current user
      * has the privileges to see the place. Make sure the places you request in
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/PlaceManager.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/PlaceManager.java
index eeb49c053b..3e264ab4d5 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/PlaceManager.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/PlaceManager.java
@@ -32,7 +32,7 @@ public interface PlaceManager extends HasHandlers {
      * Builds a string corresponding to the history token to reveal the specified
      * {@link com.gwtplatform.mvp.shared.proxy.PlaceRequest}. This can be used with a
      * {@link com.google.gwt.user.client.ui.Hyperlink}.
-     * 
    
+     * 
    
      * Invoking this history token will discard all the place hierarchy, effectively revealing the
      * request as a top-level place. To keep the place hierarchy, see
      * {@link #buildRelativeHistoryToken(com.gwtplatform.mvp.shared.proxy.PlaceRequest)},
@@ -49,7 +49,7 @@ public interface PlaceManager extends HasHandlers {
     /**
      * Builds a string corresponding to the history token to reveal the specified place from the
      * current place hierarchy.
-     * 
    
+     * 
    
      * Examples, suppose the current hierarchy is {@code requestA > requestB > requestC}
      * 
      
      * 
    • Calling {@code revealRelativePlace(-1)} will make a link to
@@ -73,7 +73,7 @@ public interface PlaceManager extends HasHandlers {
      * Builds a string corresponding to the history token to reveal the specified {@link PlaceRequest}
      * as a child of the current place hierarchy. Identical to calling
      * {@link #buildRelativeHistoryToken(PlaceRequest, int)} with a level of {@code 0}.
-     * 
      
+     * 
      
      * To get the history token for revealing as a top-level place, see {@link #buildHistoryToken}. To
      * navigate back to a specific place in the hierarchy, see
      * {@link #buildRelativeHistoryToken(int)}.
@@ -88,11 +88,11 @@ public interface PlaceManager extends HasHandlers {
     /**
      * Builds a string corresponding to the history token to reveal the specified {@link PlaceRequest}
      * relative to the other places in the current place hierarchy.
-     * 
      
+     * 
      
      * To get the history token for revealing as a top-level place, see {@link #buildHistoryToken}. To
      * navigate back to a specific place in the hierarchy, see
      * {@link #buildRelativeHistoryToken(int)}.
-     * 
      
+     * 
      
      * Examples, suppose the current hierarchy is {@code requestA > requestB > requestC}
      * 
        
      * 
      • Calling {@code buildRelativeHistoryToken(requestD, 0)} will make a link to
@@ -138,7 +138,7 @@ public interface PlaceManager extends HasHandlers {
 
     /**
      * Retrieves the title of a specific place within the place hierarchy.
-     * 
        
+     * 
        
      * Instead of returning the title directly, this method accepts a callback and will call
      * {@link SetPlaceTitleHandler#onSetPlaceTitle} as soon as the title is available. This makes it
      * possible for the user to query the title from the server based on the {@link PlaceRequest}
@@ -159,7 +159,7 @@ void getTitle(int index, SetPlaceTitleHandler handler)
      * Retrieves the title of the currently displayed place, or {@code null} if it doesn't have a
      * title. Same as calling {@link #getTitle(int, SetPlaceTitleHandler)} with a {@code level} of
      * {@link #getHierarchyDepth()}-1.
-     * 
        
+     * 
        
      * Instead of returning the title directly, this method accepts a callback and will call
      * {@link SetPlaceTitleHandler#onSetPlaceTitle} as soon as the title is available. This makes it
      * possible for the user to query the title from the server based on the
@@ -186,7 +186,7 @@ void getTitle(int index, SetPlaceTitleHandler handler)
     int getHierarchyDepth();
 
     /**
-     * Calls {@link History#back()}. This may cause the user's browser to leave your application, if
+     * Calls {@code History#back()}. This may cause the user's browser to leave your application, if
      * case you call this method from the first page visited.
      */
     void navigateBack();
@@ -194,10 +194,10 @@ void getTitle(int index, SetPlaceTitleHandler handler)
     /**
      * Updates History without firing a {@link com.google.gwt.event.logical.shared.ValueChangeEvent}.
      * Only the last {@link PlaceRequest} of the place request hierarchy is modified.
-     * 
        
+     * 
        
      * This method will only work if the passed {@link PlaceRequest} has the same name token as the
      * current place request (see {@link #getCurrentPlaceRequest()}.
-     * 
        
+     * 
        
      * If {@code true} is passed as a second parameter, then this method causes a new token to be
      * added to the browser history, affecting the behavior of the browser's back button.
      *
@@ -220,7 +220,7 @@ void getTitle(int index, SetPlaceTitleHandler handler)
      * with it. Consider passing {@code false} as the second parameter of {@code revealPlace},
      * otherwise a new token will be inserted in the browser's history and hitting the browser's
      * back button will not take the user out of the application.
-     * 
        
+     * 
        
      * Important! Make sure you build a valid {@link PlaceRequest} and that the user has access
      * to it, otherwise you might create an infinite loop.
      */
@@ -234,9 +234,9 @@ void getTitle(int index, SetPlaceTitleHandler handler)
      * second parameter of {@code revealPlace}, otherwise a new token will be inserted in the
      * browser's history and hitting the browser's back button will take the user back to the
      * invalid page he initially tried to access.
-     * 
        
+     * 
        
      * The default implementation is simply to call {@link #revealDefaultPlace()}.
-     * 
        
+     * 
        
      * Important! Make sure you build a valid {@link PlaceRequest} and that the user has access
      * to it, otherwise you might create an infinite loop.
      *
@@ -256,9 +256,9 @@ void getTitle(int index, SetPlaceTitleHandler handler)
      * be inserted in the browser's history and hitting the browser's back button will take
      * the user
      * back to the unauthorized page he initially tried to access.
-     * 
        
+     * 
        
      * The default implementation is simply to call {@link #revealErrorPlace(String)}.
-     * 
        
+     * 
        
      * Important! Make sure you build a valid {@link PlaceRequest} and that the user has access
      * to it, otherwise you might create an infinite loop.
      *
@@ -271,10 +271,10 @@ void getTitle(int index, SetPlaceTitleHandler handler)
      * current page. Navigating away can happen either occur by changing the program state (the
      * history token), by entering an external URL or by closing the window. All cases will be
      * handled.
-     * 
        
+     * 
        
      * If the user indicates that he doesn't accept the navigation, then the navigation will be
      * cancelled, {@link NavigationRefusedEvent} will be triggered and the current page will remain.
-     * 
        
+     * 
        
      *
      * @param question The question to display. Pass {@code null} to accept navigation directly,
      *                 without asking a question.
@@ -284,7 +284,7 @@ void getTitle(int index, SetPlaceTitleHandler handler)
     /**
      * Programmatically reveals the specified place, updating the browser URL in the process. If you
      * don't want the browser's URL to be updated see {@link #revealPlace(PlaceRequest, boolean)}.
-     * 
        
+     * 
        
      * This discards the current place hierarchy, effectively revealing the request as a top-level
      * place. To keep the current place hierarchy, see {@link #revealRelativePlace(PlaceRequest)},
      * {@link #revealRelativePlace(PlaceRequest, int)} or {@link #revealRelativePlace(int)}. To reveal
@@ -297,7 +297,7 @@ void getTitle(int index, SetPlaceTitleHandler handler)
 
     /**
      * Programmatically reveals the specified place.
-     * 
        
+     * 
        
      * This discards the current place hierarchy, effectively revealing the request as a top-level
      * place. To keep the current place hierarchy, see {@link #revealRelativePlace(PlaceRequest)},
      * {@link #revealRelativePlace(PlaceRequest, int)} or {@link #revealRelativePlace(int)}. To reveal
@@ -313,7 +313,7 @@ void getTitle(int index, SetPlaceTitleHandler handler)
     /**
      * Programmatically reveals the specified hierarchy of places place, updating the browser URL in
      * the process.
-     * 
        
+     * 
        
      * This discards the current place hierarchy, replacing it with the specified place hierarchy. To
      * keep the current place hierarchy, see {@link #revealRelativePlace(PlaceRequest)},
      * {@link #revealRelativePlace(PlaceRequest, int)} or {@link #revealRelativePlace(int)}. To reveal
@@ -323,7 +323,7 @@ void getTitle(int index, SetPlaceTitleHandler handler)
 
     /**
      * Programmatically reveals the specified place from the current place hierarchy.
-     * 
        
+     * 
        
      * Examples. Suppose the current hierarchy is {@code requestA > requestB > requestC}:
      * 
          
      * 
        • Calling {@code revealRelativePlace(-1)} makes it {@code requestA > requestB}
          • 
@@ -345,7 +345,7 @@ void getTitle(int index, SetPlaceTitleHandler handler)
      * Programmatically reveals the specified place as a child of the current place hierarchy.
      * Identical to calling {@link #revealRelativePlace(PlaceRequest, int)} with a level of {@code 0}.
      * This will result in a {@link PlaceRequestInternalEvent} being fired.
-     * 
          
+     * 
          
      * To reveal as a top-level place, see {@link #revealPlace}. To navigate back to a specific place
      * in the hierarchy, see {@link #revealRelativePlace(int)}.
      *
@@ -357,10 +357,10 @@ void getTitle(int index, SetPlaceTitleHandler handler)
     /**
      * Programmatically reveals the specified place relative to the other places in the current place
      * hierarchy. This will result in a {@link PlaceRequestInternalEvent} being fired.
-     * 
          
+     * 
          
      * To reveal as a top-level place, see {@link #revealPlace}. To navigate back to a specific place
      * in the hierarchy, see {@link #revealRelativePlace(int)}.
-     * 
          
+     * 
          
      * Examples. Suppose the current hierarchy is {@code requestA > requestB > requestC}:
      * 
            
      * 
          • Calling {@code revealRelativePlace(requestD, 0)} makes it
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/PlaceRequestInternalEvent.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/PlaceRequestInternalEvent.java
index b67a7db5a8..d234921a20 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/PlaceRequestInternalEvent.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/PlaceRequestInternalEvent.java
@@ -23,7 +23,7 @@
 /**
  * This event is fired by the {@link PlaceManager} whenever a new place is
  * requested, either by history navigation or directly.
- * 
            
+ * 
            
  * Important! You should never fire that event directly. Instead, build a
  * {@link com.gwtplatform.mvp.shared.proxy.PlaceRequest} and pass it to one of the following methods:
  * 
              
@@ -47,7 +47,7 @@ class PlaceRequestInternalEvent extends GwtEvent {
     private boolean handled;
     private boolean authorized = true;
 
-    public PlaceRequestInternalEvent(
+    PlaceRequestInternalEvent(
             PlaceRequest request,
             boolean updateBrowserHistory) {
         this.request = request;
@@ -57,7 +57,7 @@ public PlaceRequestInternalEvent(
     /**
      * Fires a {@link PlaceRequestInternalEvent}
      * into a source that has access to an {@com.google.web.bindery.event.shared.EventBus}.
-     * 
              
+     * 
              
      * Important! You should not fire that event directly, see
      * {@link PlaceRequestInternalEvent} for more details.
      *
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/Proxy.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/Proxy.java
index 48b356ad9b..0a86923901 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/Proxy.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/Proxy.java
@@ -24,9 +24,9 @@
  * before the full {@link Presenter} is instantiated. This include, among
  * others, the presenter's specific {@link RevealContentEvent} that needs the
  * presenter to reveal itself.
- * 
              
+ * 
              
  * The relationship between a presenter and its proxy is two-way.
- * 
              
+ * 
              
  * {@link Presenter} subclasses will usually define their own interface called
  * MyProxy and be derived from this one.
  *
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyImpl.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyImpl.java
index d19be164ab..3ff441a47d 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyImpl.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyImpl.java
@@ -16,14 +16,14 @@
 
 package com.gwtplatform.mvp.client.proxy;
 
-import javax.inject.Inject;
-
 import com.google.gwt.event.shared.GwtEvent;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.web.bindery.event.shared.EventBus;
 import com.gwtplatform.common.client.IndirectProvider;
 import com.gwtplatform.mvp.client.Presenter;
 
+import jakarta.inject.Inject;
+
 /**
  * @param 
               The presenter's type.
  */
@@ -55,7 +55,7 @@ public void getRawPresenter(NotifyingAsyncCallback> callback) {
 
     /**
      * Injects the various resources and performs other bindings.
-     * 
              
+     * 
              
      * Never call directly, it should only be called by GIN. Method injection is
      * used instead of constructor injection, because the latter doesn't work well
      * with GWT generators.
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyPlace.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyPlace.java
index 4a0a1fd02d..1492413964 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyPlace.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyPlace.java
@@ -31,11 +31,11 @@ public interface ProxyPlace
              > extends Proxy
              , Place {
      * called following one or more asynchronous server calls in
      * {@link Presenter#prepareFromRequest(com.gwtplatform.mvp.shared.proxy.PlaceRequest)}.
      * You should manually reveal your presenter exactly once, when all the data needed to use it is available.
-     * 
              
+     * 
              
      * If you failed to fetch the data or cannot reveal the presenter you must call
      * {@link #manualRevealFailed()} otherwise navigation will be blocked and your application
      * will appear to be frozen.
-     * 
              
+     * 
              
      * Also consider using {@link ManualRevealCallback}, which will automatically call
      * {@link #manualReveal(Presenter)} upon success and {@link #manualRevealFailed()} upon
      * failure.
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyPlaceAbstract.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyPlaceAbstract.java
index cd1a868538..90eeaff8a4 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyPlaceAbstract.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyPlaceAbstract.java
@@ -16,8 +16,6 @@
 
 package com.gwtplatform.mvp.client.proxy;
 
-import javax.inject.Inject;
-
 import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.event.shared.GwtEvent;
 import com.google.gwt.user.client.Command;
@@ -29,10 +27,12 @@
 import com.gwtplatform.mvp.client.Presenter;
 import com.gwtplatform.mvp.shared.proxy.PlaceRequest;
 
+import jakarta.inject.Inject;
+
 /**
  * A useful mixing class to define a {@link Proxy} that is also a {@link Place}.
  * You can usually inherit from the simpler form {@link ProxyPlace}.
- * 
              
+ * 
              
  *
  * @param 
                    The Presenter's type.
  * @param  Type of the associated {@link Proxy}.
@@ -175,7 +175,7 @@ protected void setProxy(Proxy_ proxy) {
 
     /**
      * Injects the various resources and performs other bindings.
-     * 
              
+     * 
              
      * Never call directly, it should only be called by GIN. Method injection is
      * used instead of constructor injection, because the latter doesn't work well
      * with GWT generators.
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyRaw.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyRaw.java
index eb28426606..2a9aea1fed 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyRaw.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ProxyRaw.java
@@ -30,7 +30,7 @@ public interface ProxyRaw extends HasHandlers {
      * Get the associated {@link Presenter}. The presenter can only be obtained in
      * an asynchronous manner to support code splitting when needed. To access the
      * presenter, pass a callback.
-     * 
              
+     * 
              
      * The difference between this method and
      * {@link Proxy#getPresenter}
      * is that the latter one gets the specific parameterised {@link Presenter}
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ResetPresentersEvent.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ResetPresentersEvent.java
index 75d55a86e0..979e68869c 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ResetPresentersEvent.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ResetPresentersEvent.java
@@ -23,7 +23,7 @@
  * This event is fired whenever all visible presenters should
  * be reset. This is fired automatically right after navigating to a
  * new place.
- * 
              
+ * 
              
  * The default implementation or {@link com.gwtplatform.mvp.client.RootPresenter} causes
  * {@link com.gwtplatform.mvp.client.PresenterWidget#onReset()}
  * to be called, starting from the top level presenter and going down.
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ResetPresentersHandler.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ResetPresentersHandler.java
index 697957de32..420ccc600b 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ResetPresentersHandler.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/ResetPresentersHandler.java
@@ -20,6 +20,6 @@
 
 public interface ResetPresentersHandler extends EventHandler {
 
-    void onResetPresenters(final ResetPresentersEvent resetPresentersEvent);
+    void onResetPresenters(ResetPresentersEvent resetPresentersEvent);
 
 }
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/RevealContentEvent.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/RevealContentEvent.java
index 0a4c8ba42e..695474afa0 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/RevealContentEvent.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/RevealContentEvent.java
@@ -26,7 +26,7 @@
  * method. To reveal a presenter at the root of the application, fire either
  * {@link RevealRootContentEvent}, {@link RevealRootLayoutContentEvent} or
  * {@link RevealRootPopupContentEvent} instead.
- * 
              
+ * 
              
  * This event is handled by {@link Proxy} classes. Upon handling this
  * event, the proxy first sets the content appropriately in the
  * presenter, and then reveals the presenter.
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/RevealRootContentEvent.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/RevealRootContentEvent.java
index 83538a8a04..2cb0417c1e 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/RevealRootContentEvent.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/RevealRootContentEvent.java
@@ -24,7 +24,7 @@
  * This event is fired by a {@link Presenter} that desires to reveal itself
  * at the root of the application. It is typically fired in the {@link Presenter#revealInParent()}
  * method.
- * 
              
+ * 
              
  * This type of content is usually meant to use the browser like a regular webpage, adding a vertical
  * scrollbar as the content overflow.
  *
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/RevealRootLayoutContentEvent.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/RevealRootLayoutContentEvent.java
index 8488b42a88..1c28bafcb6 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/RevealRootLayoutContentEvent.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/RevealRootLayoutContentEvent.java
@@ -24,7 +24,7 @@
  * This event is fired by a {@link Presenter} that desires to reveal itself
  * at the root of the application. It is typically fired in the {@link Presenter#revealInParent()}
  * method.
- * 
              
+ * 
              
  * This type of content
  * is constrained to lie within the browser window, and to resize with it. You
  * will be responsible for adding your own scrollbars as content overflow,
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/TabContentProxyPlace.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/TabContentProxyPlace.java
index 2eee93fada..eeddc5cdf8 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/TabContentProxyPlace.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/client/proxy/TabContentProxyPlace.java
@@ -23,7 +23,7 @@
  * a name token and can be displayed within a
  * {@link com.gwtplatform.mvp.client.TabContainerPresenter TabContainerPresenter}'s main area.
  * If the presenter is not associated to a name token use {@link NonLeafTabContentProxy} instead.
- * 
              
+ * 
              
  * Example of use:
  * 
                * {@literal @}ProxyCodeSplit
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/ClassCollection.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/ClassCollection.java
index 12c66f1711..c5cf441904 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/ClassCollection.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/ClassCollection.java
@@ -16,8 +16,6 @@
 
 package com.gwtplatform.mvp.rebind;
 
-import javax.inject.Provider;
-
 import com.google.gwt.core.ext.typeinfo.JClassType;
 import com.google.gwt.core.ext.typeinfo.JGenericType;
 import com.google.gwt.core.ext.typeinfo.TypeOracle;
@@ -47,6 +45,8 @@
 import com.gwtplatform.mvp.client.proxy.TabContentProxyPlaceImpl;
 import com.gwtplatform.mvp.shared.proxy.PlaceRequest;
 
+import jakarta.inject.Provider;
+
 /**
  * Contains all the classes that are useful to various generators.
  * This class contains no getters, fields are accessed directly.
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/GinjectorGenerator.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/GinjectorGenerator.java
index fa29870088..39ebe6847a 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/GinjectorGenerator.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/GinjectorGenerator.java
@@ -24,8 +24,6 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.inject.Provider;
-
 import com.google.gwt.core.ext.GeneratorContext;
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.UnableToCompleteException;
@@ -49,6 +47,8 @@
 import com.gwtplatform.mvp.rebind.velocity.GenerateFormFactorGinjectors;
 import com.gwtplatform.mvp.rebind.velocity.RebindModule;
 
+import jakarta.inject.Provider;
+
 /**
  * Will generate a Ginjector from Ginjector.
  */
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/ProviderBundleGenerator.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/ProviderBundleGenerator.java
index 4bcc3942e7..32e10c20a2 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/ProviderBundleGenerator.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/ProviderBundleGenerator.java
@@ -19,9 +19,6 @@
 import java.io.PrintWriter;
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
 import com.google.gwt.core.ext.GeneratorContext;
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.UnableToCompleteException;
@@ -31,6 +28,9 @@
 import com.google.inject.Provider;
 import com.gwtplatform.common.client.ProviderBundle;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+
 /**
  * Will generate a ProviderBundle.
  */
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/ProxyOutputterBase.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/ProxyOutputterBase.java
index 213ade77a7..29715d044a 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/ProxyOutputterBase.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/ProxyOutputterBase.java
@@ -19,9 +19,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.core.ext.TreeLogger;
@@ -44,6 +41,9 @@
 import com.gwtplatform.mvp.client.proxy.RevealContentEvent;
 import com.gwtplatform.mvp.client.proxy.RevealContentHandler;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+
 /**
  * The base class of any {@link ProxyOutputter} implementation.
  */
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/velocity/AbstractVelocityGenerator.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/velocity/AbstractVelocityGenerator.java
index 60d02bb011..420ae0b61b 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/velocity/AbstractVelocityGenerator.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/velocity/AbstractVelocityGenerator.java
@@ -18,13 +18,13 @@
 
 import java.io.PrintWriter;
 
-import javax.inject.Provider;
-
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
 
 import com.google.gwt.core.ext.UnableToCompleteException;
 
+import jakarta.inject.Provider;
+
 public abstract class AbstractVelocityGenerator {
     protected static final String IMPL_NAME = "implName";
     protected static final String PACKAGE = "com.gwtplatform.mvp.client";
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/velocity/GenerateFormFactorGinjectors.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/velocity/GenerateFormFactorGinjectors.java
index 7c6439a24a..662f6cc752 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/velocity/GenerateFormFactorGinjectors.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/velocity/GenerateFormFactorGinjectors.java
@@ -16,13 +16,13 @@
 
 package com.gwtplatform.mvp.rebind.velocity;
 
-import javax.inject.Inject;
-
 import com.gwtplatform.mvp.rebind.velocity.ginjectors.FormFactorGinjectorFactory;
 import com.gwtplatform.mvp.rebind.velocity.ginjectors.FormFactorGinjectorGenerator;
 import com.gwtplatform.mvp.rebind.velocity.ginjectors.FormFactorGinjectorProviderGenerator;
 import com.gwtplatform.mvp.rebind.velocity.ginjectors.GinjectorProviderGenerator;
 
+import jakarta.inject.Inject;
+
 public class GenerateFormFactorGinjectors {
     private static final String FORMFACTOR_GINJECTOR_TEMPLATE = "com/gwtplatform/mvp/rebind/FormFactorGinjector.vm";
     private static final String FORMFACTOR_GINJECTOR_PROVIDER_TEMPLATE
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/velocity/GeneratorUtil.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/velocity/GeneratorUtil.java
index 381d793331..3fb847d121 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/velocity/GeneratorUtil.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/velocity/GeneratorUtil.java
@@ -18,8 +18,6 @@
 
 import java.io.PrintWriter;
 
-import javax.inject.Inject;
-
 import com.google.gwt.core.ext.BadPropertyValueException;
 import com.google.gwt.core.ext.ConfigurationProperty;
 import com.google.gwt.core.ext.GeneratorContext;
@@ -30,6 +28,8 @@
 import com.google.gwt.core.ext.typeinfo.TypeOracle;
 import com.gwtplatform.common.rebind.Logger;
 
+import jakarta.inject.Inject;
+
 public class GeneratorUtil {
     private static final String CANNOT_FIND_PROPERTY = "Cannot find %s property in your module.gwt.xml file.";
     private static final String CANNOT_FIND_TYPE = "Cannot find %s";
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/velocity/RebindModule.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/velocity/RebindModule.java
index 0fe36a02b7..0ed544d070 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/velocity/RebindModule.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/velocity/RebindModule.java
@@ -19,8 +19,6 @@
 import java.io.InputStream;
 import java.util.Properties;
 
-import javax.inject.Singleton;
-
 import org.apache.velocity.app.VelocityEngine;
 
 import com.google.gwt.core.ext.GeneratorContext;
@@ -33,6 +31,8 @@
 import com.gwtplatform.mvp.rebind.velocity.ginjectors.FormFactorGinjectorFactory;
 import com.gwtplatform.mvp.rebind.velocity.proxy.VelocityPlacetokenGenerator;
 
+import jakarta.inject.Singleton;
+
 public class RebindModule extends AbstractModule {
     private static final String VELOCITY_PROPERTIES = "com/gwtplatform/mvp/rebind/velocity.properties";
 
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/velocity/ginjectors/FormFactorGinjectorGenerator.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/velocity/ginjectors/FormFactorGinjectorGenerator.java
index fd5797407d..09f652bb49 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/velocity/ginjectors/FormFactorGinjectorGenerator.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/velocity/ginjectors/FormFactorGinjectorGenerator.java
@@ -18,9 +18,6 @@
 
 import java.io.PrintWriter;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
 
@@ -30,6 +27,9 @@
 import com.gwtplatform.mvp.rebind.velocity.AbstractVelocityGenerator;
 import com.gwtplatform.mvp.rebind.velocity.GeneratorUtil;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+
 public class FormFactorGinjectorGenerator extends AbstractVelocityGenerator {
     private static final String GIN_MODULE = "ginmodule";
     private static final String GIN_MODULE_CLASS = "%s.class";
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/velocity/ginjectors/FormFactorGinjectorProviderGenerator.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/velocity/ginjectors/FormFactorGinjectorProviderGenerator.java
index cd9092ba94..2a979a6ba1 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/velocity/ginjectors/FormFactorGinjectorProviderGenerator.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/velocity/ginjectors/FormFactorGinjectorProviderGenerator.java
@@ -18,9 +18,6 @@
 
 import java.io.PrintWriter;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
 
@@ -29,6 +26,9 @@
 import com.gwtplatform.mvp.rebind.velocity.AbstractVelocityGenerator;
 import com.gwtplatform.mvp.rebind.velocity.GeneratorUtil;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+
 public class FormFactorGinjectorProviderGenerator extends AbstractVelocityGenerator {
     private static final String SUFFIX = "Provider";
 
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/velocity/ginjectors/GinjectorProviderGenerator.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/velocity/ginjectors/GinjectorProviderGenerator.java
index 43af76f906..40863cd1af 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/velocity/ginjectors/GinjectorProviderGenerator.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/velocity/ginjectors/GinjectorProviderGenerator.java
@@ -18,9 +18,6 @@
 
 import java.io.PrintWriter;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
 
@@ -29,6 +26,9 @@
 import com.gwtplatform.mvp.rebind.velocity.AbstractVelocityGenerator;
 import com.gwtplatform.mvp.rebind.velocity.GeneratorUtil;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+
 public class GinjectorProviderGenerator extends AbstractVelocityGenerator {
     private final String velocityTemplate;
     private final String implName;
diff --git a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/velocity/proxy/VelocityPlacetokenGenerator.java b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/velocity/proxy/VelocityPlacetokenGenerator.java
index fc06259139..6893100470 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/velocity/proxy/VelocityPlacetokenGenerator.java
+++ b/gwtp-core/gwtp-mvp-client/src/main/java/com/gwtplatform/mvp/rebind/velocity/proxy/VelocityPlacetokenGenerator.java
@@ -19,8 +19,6 @@
 import java.io.PrintWriter;
 import java.util.Set;
 
-import javax.inject.Provider;
-
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
 
@@ -31,6 +29,8 @@
 import com.gwtplatform.mvp.rebind.velocity.GeneratorUtil;
 import com.gwtplatform.mvp.shared.proxy.PlaceTokenRegistry;
 
+import jakarta.inject.Provider;
+
 /**
  * Velocity powered generator of an {@link PlaceTokenRegistry}.
  */
diff --git a/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/FormFactor.gwt.xml b/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/FormFactor.gwt.xml
index d83c0e612e..0a1d93998c 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/FormFactor.gwt.xml
+++ b/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/FormFactor.gwt.xml
@@ -1,6 +1,6 @@
 
-
+
 
     
     
diff --git a/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/Mvp.gwt.xml b/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/Mvp.gwt.xml
index 169943d243..336defc16c 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/Mvp.gwt.xml
+++ b/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/Mvp.gwt.xml
@@ -1,6 +1,6 @@
 
-
+
 
     
     
diff --git a/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/MvpWithEntryPoint.gwt.xml b/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/MvpWithEntryPoint.gwt.xml
index ada9657c1a..b498c7b32c 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/MvpWithEntryPoint.gwt.xml
+++ b/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/MvpWithEntryPoint.gwt.xml
@@ -1,6 +1,6 @@
 
-
+
 
     
 
diff --git a/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/MvpWithFormFactor.gwt.xml b/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/MvpWithFormFactor.gwt.xml
index 710040659e..3c8a539fa5 100644
--- a/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/MvpWithFormFactor.gwt.xml
+++ b/gwtp-core/gwtp-mvp-client/src/main/resources/com/gwtplatform/mvp/MvpWithFormFactor.gwt.xml
@@ -1,6 +1,6 @@
 
-
+
 
     
 
diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/HandlerContainerImpl2Test.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/HandlerContainerImpl2Test.java
index 8cfbeb3187..25eb8e92ea 100644
--- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/HandlerContainerImpl2Test.java
+++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/HandlerContainerImpl2Test.java
@@ -16,13 +16,13 @@
 
 package com.gwtplatform.mvp.client;
 
-import javax.inject.Inject;
-
 import org.jukito.JukitoModule;
 import org.jukito.JukitoRunner;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import jakarta.inject.Inject;
+
 import static org.junit.Assert.assertFalse;
 
 /**
diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/HandlerContainerImplTest.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/HandlerContainerImplTest.java
index c134c5412f..c34cd930b4 100644
--- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/HandlerContainerImplTest.java
+++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/HandlerContainerImplTest.java
@@ -16,8 +16,6 @@
 
 package com.gwtplatform.mvp.client;
 
-import javax.inject.Inject;
-
 import org.jukito.JukitoRunner;
 import org.jukito.TestSingleton;
 import org.junit.Test;
@@ -25,6 +23,8 @@
 
 import com.google.web.bindery.event.shared.HandlerRegistration;
 
+import jakarta.inject.Inject;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/PresenterTest.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/PresenterTest.java
index ec09a003ca..1a3c950967 100644
--- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/PresenterTest.java
+++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/PresenterTest.java
@@ -16,8 +16,6 @@
 
 package com.gwtplatform.mvp.client;
 
-import javax.inject.Inject;
-
 import org.jukito.JukitoRunner;
 import org.jukito.TestSingleton;
 import org.junit.Test;
@@ -26,6 +24,8 @@
 import com.google.web.bindery.event.shared.EventBus;
 import com.gwtplatform.mvp.client.proxy.Proxy;
 
+import jakarta.inject.Inject;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/PresenterWidgetTest.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/PresenterWidgetTest.java
index 8f12a4512e..ef8e1b9ec1 100644
--- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/PresenterWidgetTest.java
+++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/PresenterWidgetTest.java
@@ -16,9 +16,6 @@
 
 package com.gwtplatform.mvp.client;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-
 import org.jukito.JukitoModule;
 import org.jukito.JukitoRunner;
 import org.jukito.TestSingleton;
@@ -34,6 +31,9 @@
 import com.google.web.bindery.event.shared.HandlerRegistration;
 import com.gwtplatform.mvp.client.presenter.slots.Slot;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/AdminPresenterTestUtilGwt.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/AdminPresenterTestUtilGwt.java
index 7829e08af0..73c80dc57c 100644
--- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/AdminPresenterTestUtilGwt.java
+++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/AdminPresenterTestUtilGwt.java
@@ -16,8 +16,6 @@
 
 package com.gwtplatform.mvp.client.gwt.mvp;
 
-import javax.inject.Inject;
-
 import com.google.web.bindery.event.shared.EventBus;
 import com.gwtplatform.mvp.client.Presenter;
 import com.gwtplatform.mvp.client.View;
@@ -25,6 +23,8 @@
 import com.gwtplatform.mvp.client.annotations.ProxyStandard;
 import com.gwtplatform.mvp.client.proxy.ProxyPlace;
 
+import jakarta.inject.Inject;
+
 /**
  * A test presenter meant to be run in a GWTTestCase.
  */
diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/ClientModuleTestUtilGwt.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/ClientModuleTestUtilGwt.java
index 74245e4e2e..f178d4cf3c 100644
--- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/ClientModuleTestUtilGwt.java
+++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/ClientModuleTestUtilGwt.java
@@ -16,8 +16,6 @@
 
 package com.gwtplatform.mvp.client.gwt.mvp;
 
-import javax.inject.Singleton;
-
 import com.google.inject.name.Names;
 import com.google.web.bindery.event.shared.EventBus;
 import com.google.web.bindery.event.shared.SimpleEventBus;
@@ -29,6 +27,8 @@
 import com.gwtplatform.mvp.shared.proxy.ParameterTokenFormatter;
 import com.gwtplatform.mvp.shared.proxy.TokenFormatter;
 
+import jakarta.inject.Singleton;
+
 public class ClientModuleTestUtilGwt extends AbstractPresenterModule {
     @Override
     protected void configure() {
diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/InstantiationCounterTestUtilGwt.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/InstantiationCounterTestUtilGwt.java
index 7643beebb8..722d5ed422 100644
--- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/InstantiationCounterTestUtilGwt.java
+++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/InstantiationCounterTestUtilGwt.java
@@ -16,7 +16,7 @@
 
 package com.gwtplatform.mvp.client.gwt.mvp;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /**
  * A class that counts the number of times a Ginjector was created.
diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/MainPresenterTestUtilGwt.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/MainPresenterTestUtilGwt.java
index cdf1e370c1..f42ed87d3b 100644
--- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/MainPresenterTestUtilGwt.java
+++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/MainPresenterTestUtilGwt.java
@@ -16,9 +16,6 @@
 
 package com.gwtplatform.mvp.client.gwt.mvp;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 import com.google.web.bindery.event.shared.EventBus;
 import com.gwtplatform.mvp.client.PopupViewCloseHandler;
 import com.gwtplatform.mvp.client.Presenter;
@@ -27,6 +24,9 @@
 import com.gwtplatform.mvp.client.annotations.ProxyStandard;
 import com.gwtplatform.mvp.client.proxy.ProxyPlace;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+
 /**
  * A test presenter meant to be run in a GWTTestCase.
  */
diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/MainViewTestUtilGwt.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/MainViewTestUtilGwt.java
index 9db561a922..9b80b00d6b 100644
--- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/MainViewTestUtilGwt.java
+++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/MainViewTestUtilGwt.java
@@ -16,14 +16,14 @@
 
 package com.gwtplatform.mvp.client.gwt.mvp;
 
-import javax.inject.Inject;
-
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.ui.HTMLPanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.gwtplatform.mvp.client.ViewImpl;
 
+import jakarta.inject.Inject;
+
 /**
  * A test presenter meant to be run in a GWTTestCase.
  */
diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/PlaceManagerTestUtilGwt.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/PlaceManagerTestUtilGwt.java
index c008420599..8fb430cb9e 100644
--- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/PlaceManagerTestUtilGwt.java
+++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/PlaceManagerTestUtilGwt.java
@@ -16,13 +16,13 @@
 
 package com.gwtplatform.mvp.client.gwt.mvp;
 
-import javax.inject.Inject;
-
 import com.google.web.bindery.event.shared.EventBus;
 import com.gwtplatform.mvp.client.proxy.PlaceManagerImpl;
 import com.gwtplatform.mvp.shared.proxy.PlaceRequest;
 import com.gwtplatform.mvp.shared.proxy.TokenFormatter;
 
+import jakarta.inject.Inject;
+
 public class PlaceManagerTestUtilGwt extends PlaceManagerImpl {
     private final PlaceRequest defaultPlaceRequest;
 
diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/PopupPresenterTestUtilGwt.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/PopupPresenterTestUtilGwt.java
index 52a70efece..4076220c49 100644
--- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/PopupPresenterTestUtilGwt.java
+++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/PopupPresenterTestUtilGwt.java
@@ -16,13 +16,13 @@
 
 package com.gwtplatform.mvp.client.gwt.mvp;
 
-import javax.inject.Inject;
-
 import com.google.web.bindery.event.shared.EventBus;
 import com.gwtplatform.mvp.client.PopupView;
 import com.gwtplatform.mvp.client.PopupViewCloseHandler;
 import com.gwtplatform.mvp.client.PresenterWidget;
 
+import jakarta.inject.Inject;
+
 public class PopupPresenterTestUtilGwt extends PresenterWidget {
     public interface MyView extends PopupView {
     }
diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/PopupViewTestUtilGwt.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/PopupViewTestUtilGwt.java
index d4b98e44a2..d38aeed1e9 100644
--- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/PopupViewTestUtilGwt.java
+++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/gwt/mvp/PopupViewTestUtilGwt.java
@@ -16,8 +16,6 @@
 
 package com.gwtplatform.mvp.client.gwt.mvp;
 
-import javax.inject.Inject;
-
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.ui.DialogBox;
@@ -25,6 +23,8 @@
 import com.google.web.bindery.event.shared.EventBus;
 import com.gwtplatform.mvp.client.PopupViewImpl;
 
+import jakarta.inject.Inject;
+
 public class PopupViewTestUtilGwt extends PopupViewImpl implements PopupPresenterTestUtilGwt.MyView {
     public interface Binder extends UiBinder {
     }
diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/mvp/MainPresenterTestUtil.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/mvp/MainPresenterTestUtil.java
index 637e1c1f6e..ecbca5b106 100644
--- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/mvp/MainPresenterTestUtil.java
+++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/mvp/MainPresenterTestUtil.java
@@ -16,9 +16,6 @@
 
 package com.gwtplatform.mvp.client.mvp;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-
 import com.google.web.bindery.event.shared.EventBus;
 import com.gwtplatform.mvp.client.Presenter;
 import com.gwtplatform.mvp.client.PresenterWidget;
@@ -27,6 +24,9 @@
 import com.gwtplatform.mvp.client.presenter.slots.SingleSlot;
 import com.gwtplatform.mvp.client.proxy.Proxy;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+
 /**
  * This is the test presenter.
  */
diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/mvp/MockInjectionTest.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/mvp/MockInjectionTest.java
index f4cb69fb40..035b2004fc 100644
--- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/mvp/MockInjectionTest.java
+++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/mvp/MockInjectionTest.java
@@ -16,8 +16,6 @@
 
 package com.gwtplatform.mvp.client.mvp;
 
-import javax.inject.Inject;
-
 import org.jukito.JukitoModule;
 import org.jukito.JukitoRunner;
 import org.jukito.TestSingleton;
@@ -30,6 +28,8 @@
 import com.gwtplatform.mvp.client.PresenterWidget;
 import com.gwtplatform.mvp.client.View;
 
+import jakarta.inject.Inject;
+
 /**
  * Test behaviour when a mock {@link PresenterWidget} is injected.
  */
diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/mvp/RealInjectionTest.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/mvp/RealInjectionTest.java
index 5ca63f8729..e541f279f4 100644
--- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/mvp/RealInjectionTest.java
+++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/mvp/RealInjectionTest.java
@@ -16,8 +16,6 @@
 
 package com.gwtplatform.mvp.client.mvp;
 
-import javax.inject.Inject;
-
 import org.jukito.JukitoModule;
 import org.jukito.JukitoRunner;
 import org.jukito.TestSingleton;
@@ -30,6 +28,8 @@
 import com.gwtplatform.mvp.client.PresenterWidget;
 import com.gwtplatform.mvp.client.View;
 
+import jakarta.inject.Inject;
+
 /**
  * Test behaviour when a real {@link com.gwtplatform.mvp.client.PresenterWidget} is injected.
  */
diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/mvp/SubPresenterWidgetTestUtil.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/mvp/SubPresenterWidgetTestUtil.java
index d4dcd5c5b5..5d884a0e48 100644
--- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/mvp/SubPresenterWidgetTestUtil.java
+++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/mvp/SubPresenterWidgetTestUtil.java
@@ -16,12 +16,12 @@
 
 package com.gwtplatform.mvp.client.mvp;
 
-import javax.inject.Inject;
-
 import com.google.web.bindery.event.shared.EventBus;
 import com.gwtplatform.mvp.client.PresenterWidget;
 import com.gwtplatform.mvp.client.View;
 
+import jakarta.inject.Inject;
+
 /**
  * This is the test presenter.
  */
diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/AsyncEventPresenterTestUtil.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/AsyncEventPresenterTestUtil.java
index f14ae158a9..13193072ed 100644
--- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/AsyncEventPresenterTestUtil.java
+++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/AsyncEventPresenterTestUtil.java
@@ -97,7 +97,7 @@ public void onAsyncCallFail(AsyncCallFailEvent asyncCallFailEvent) {
     }
 
     static class MyAction extends ActionImpl {
-        public MyAction() {
+        MyAction() {
         }
     }
 
diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/AsyncEventTest.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/AsyncEventTest.java
index 87b778abb7..5490c231fa 100644
--- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/AsyncEventTest.java
+++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/AsyncEventTest.java
@@ -16,12 +16,10 @@
 
 package com.gwtplatform.mvp.client.proxy;
 
-import javax.inject.Inject;
-
 import org.jukito.JukitoRunner;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Matchers;
+import org.mockito.ArgumentMatchers;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
@@ -35,8 +33,10 @@
 import com.gwtplatform.tester.TestDispatchAsync;
 import com.gwtplatform.tester.TestDispatchService;
 
+import jakarta.inject.Inject;
+
 import static org.mockito.BDDMockito.willAnswer;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 
@@ -65,7 +65,7 @@ public void shouldSetLoadingAndNullOnSuccessfulServerCall() {
         TestDispatchAsync spy = spy(new TestDispatchAsync(service, injector));
         AsyncEventPresenterTestUtil presenter = new AsyncEventPresenterTestUtil(eventBus, view, proxy, spy);
         willAnswer(new GetAsynchronousAnswer()).given(spy).execute(eq(new MyAction()),
-                Matchers.>any());
+                ArgumentMatchers.>any());
 
         // when
         presenter.onBind();
@@ -82,7 +82,7 @@ public void shouldSetLoadingAndFailureOnFailedServerCall() {
         TestDispatchAsync spy = spy(new TestDispatchAsync(service, injector));
         AsyncEventPresenterTestUtil presenter = new AsyncEventPresenterTestUtil(eventBus, view, proxy, spy);
         willAnswer(new GetAsynchronousFailureAnswer()).given(spy).execute(eq(new MyAction()),
-                Matchers.>any());
+                ArgumentMatchers.>any());
 
         // when
         presenter.onBind();
diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/GatekeeperTest.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/GatekeeperTest.java
index b3709f4edc..b5b3815c3c 100644
--- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/GatekeeperTest.java
+++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/GatekeeperTest.java
@@ -18,10 +18,6 @@
 
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
-
 import org.jukito.JukitoModule;
 import org.jukito.JukitoRunner;
 import org.jukito.TestEagerSingleton;
@@ -40,6 +36,10 @@
 import com.gwtplatform.mvp.shared.proxy.PlaceRequest;
 import com.gwtplatform.tester.DeferredCommandManager;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
+
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.verify;
 
@@ -75,7 +75,7 @@ protected void configureTest() {
     abstract static class DummyPresenterWithDenyGatekeeper
             extends Presenter {
         @Inject
-        public DummyPresenterWithDenyGatekeeper(EventBus eventBus, View view,
+        DummyPresenterWithDenyGatekeeper(EventBus eventBus, View view,
                 DummyProxyPlaceWithDenyGatekeeper proxy) {
             super(eventBus, view, proxy);
         }
@@ -89,7 +89,7 @@ public final boolean isVisible() {
     @TestEagerSingleton
     static class DummyProxyWithDenyGatekeeper extends ProxyImpl {
         @Inject
-        public DummyProxyWithDenyGatekeeper(Provider presenter) {
+        DummyProxyWithDenyGatekeeper(Provider presenter) {
             this.presenter = new StandardProvider(presenter);
         }
     }
@@ -98,7 +98,7 @@ public DummyProxyWithDenyGatekeeper(Provider p
     static class DummyProxyPlaceWithDenyGatekeeper
             extends ProxyPlaceBase {
         @Inject
-        public DummyProxyPlaceWithDenyGatekeeper(DummyProxyWithDenyGatekeeper proxy,
+        DummyProxyPlaceWithDenyGatekeeper(DummyProxyWithDenyGatekeeper proxy,
                 DeferredCommandManager deferredCommandManager,
                 @Named("DenyGatekeeper") Gatekeeper gatekeeper) {
             super(new PlaceWithGatekeeper("dummyNameTokenWithDenyGatekeeper", gatekeeper), proxy,
@@ -110,7 +110,7 @@ public DummyProxyPlaceWithDenyGatekeeper(DummyProxyWithDenyGatekeeper proxy,
     abstract static class DummyPresenterWithGrantGatekeeper
             extends Presenter {
         @Inject
-        public DummyPresenterWithGrantGatekeeper(EventBus eventBus, View view,
+        DummyPresenterWithGrantGatekeeper(EventBus eventBus, View view,
                 DummyProxyPlaceWithGrantGatekeeper proxy) {
             super(eventBus, view, proxy);
         }
@@ -124,7 +124,7 @@ public final boolean isVisible() {
     @TestEagerSingleton
     static class DummyProxyWithGrantGatekeeper extends ProxyImpl {
         @Inject
-        public DummyProxyWithGrantGatekeeper(Provider presenter) {
+        DummyProxyWithGrantGatekeeper(Provider presenter) {
             this.presenter = new StandardProvider(presenter);
         }
     }
@@ -133,7 +133,7 @@ public DummyProxyWithGrantGatekeeper(Provider
     static class DummyProxyPlaceWithGrantGatekeeper
             extends ProxyPlaceBase {
         @Inject
-        public DummyProxyPlaceWithGrantGatekeeper(DummyProxyWithGrantGatekeeper proxy,
+        DummyProxyPlaceWithGrantGatekeeper(DummyProxyWithGrantGatekeeper proxy,
                 DeferredCommandManager deferredCommandManager,
                 @Named("GrantGatekeeper") Gatekeeper gatekeeper) {
             super(new PlaceWithGatekeeper("dummyNameTokenWithGrantGatekeeper", gatekeeper), proxy,
@@ -144,7 +144,7 @@ public DummyProxyPlaceWithGrantGatekeeper(DummyProxyWithGrantGatekeeper proxy,
     @TestMockSingleton
     abstract static class DummyPresenterDefault extends Presenter {
         @Inject
-        public DummyPresenterDefault(EventBus eventBus, View view, DummyProxyPlaceDefault proxy) {
+        DummyPresenterDefault(EventBus eventBus, View view, DummyProxyPlaceDefault proxy) {
             super(eventBus, view, proxy);
         }
 
@@ -157,7 +157,7 @@ public final boolean isVisible() {
     @TestEagerSingleton
     static class DummyProxyDefault extends ProxyImpl {
         @Inject
-        public DummyProxyDefault(Provider presenter) {
+        DummyProxyDefault(Provider presenter) {
             this.presenter = new StandardProvider(presenter);
         }
     }
@@ -165,7 +165,7 @@ public DummyProxyDefault(Provider presenter) {
     @TestEagerSingleton
     static class DummyProxyPlaceDefault extends ProxyPlaceBase {
         @Inject
-        public DummyProxyPlaceDefault(DummyProxyDefault proxy,
+        DummyProxyPlaceDefault(DummyProxyDefault proxy,
                 DeferredCommandManager deferredCommandManager) {
             super(new PlaceImpl("defaultPlace"), proxy, deferredCommandManager);
         }
diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/GatekeeperWithParamsTest.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/GatekeeperWithParamsTest.java
index ef13a4c416..02adfa85ae 100644
--- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/GatekeeperWithParamsTest.java
+++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/GatekeeperWithParamsTest.java
@@ -19,9 +19,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 import org.jukito.JukitoModule;
 import org.jukito.JukitoRunner;
 import org.jukito.TestEagerSingleton;
@@ -39,6 +36,9 @@
 import com.gwtplatform.mvp.shared.proxy.PlaceRequest;
 import com.gwtplatform.tester.DeferredCommandManager;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.verify;
 
@@ -71,7 +71,7 @@ protected void configureTest() {
     abstract static class DummyPresenterWithDenyGatekeeperWithParams
             extends Presenter {
         @Inject
-        public DummyPresenterWithDenyGatekeeperWithParams(EventBus eventBus, View view,
+        DummyPresenterWithDenyGatekeeperWithParams(EventBus eventBus, View view,
                 DummyProxyPlaceWithDenyGatekeeperWithParams proxy) {
             super(eventBus, view, proxy);
         }
@@ -86,7 +86,7 @@ public final boolean isVisible() {
     static class DummyProxyWithDenyGatekeeperWithParams
             extends ProxyImpl {
         @Inject
-        public DummyProxyWithDenyGatekeeperWithParams(
+        DummyProxyWithDenyGatekeeperWithParams(
                 Provider presenter) {
             this.presenter = new StandardProvider(presenter);
         }
@@ -96,7 +96,7 @@ public DummyProxyWithDenyGatekeeperWithParams(
     static class DummyProxyPlaceWithDenyGatekeeperWithParams
             extends ProxyPlaceBase {
         @Inject
-        public DummyProxyPlaceWithDenyGatekeeperWithParams(
+        DummyProxyPlaceWithDenyGatekeeperWithParams(
                 DummyProxyWithDenyGatekeeperWithParams proxy,
                 DeferredCommandManager deferredCommandManager,
                 GatekeeperWithParams gatekeeper) {
@@ -109,7 +109,7 @@ public DummyProxyPlaceWithDenyGatekeeperWithParams(
     abstract static class DummyPresenterWithGrantGatekeeperWithParams
             extends Presenter {
         @Inject
-        public DummyPresenterWithGrantGatekeeperWithParams(EventBus eventBus, View view,
+        DummyPresenterWithGrantGatekeeperWithParams(EventBus eventBus, View view,
                 DummyProxyPlaceWithGrantGatekeeperWithParams proxy) {
             super(eventBus, view, proxy);
         }
@@ -124,7 +124,7 @@ public final boolean isVisible() {
     static class DummyProxyWithGrantGatekeeperWithParams
             extends ProxyImpl {
         @Inject
-        public DummyProxyWithGrantGatekeeperWithParams(
+        DummyProxyWithGrantGatekeeperWithParams(
                 Provider presenter) {
             this.presenter = new StandardProvider(presenter);
         }
@@ -134,7 +134,7 @@ public DummyProxyWithGrantGatekeeperWithParams(
     static class DummyProxyPlaceWithGrantGatekeeperWithParams
             extends ProxyPlaceBase {
         @Inject
-        public DummyProxyPlaceWithGrantGatekeeperWithParams(
+        DummyProxyPlaceWithGrantGatekeeperWithParams(
                 DummyProxyWithGrantGatekeeperWithParams proxy,
                 DeferredCommandManager deferredCommandManager,
                 GatekeeperWithParams gatekeeper) {
@@ -146,7 +146,7 @@ public DummyProxyPlaceWithGrantGatekeeperWithParams(
     @TestMockSingleton
     abstract static class DummyPresenterDefault extends Presenter {
         @Inject
-        public DummyPresenterDefault(EventBus eventBus, View view, DummyProxyPlaceDefault proxy) {
+        DummyPresenterDefault(EventBus eventBus, View view, DummyProxyPlaceDefault proxy) {
             super(eventBus, view, proxy);
         }
 
@@ -159,7 +159,7 @@ public final boolean isVisible() {
     @TestEagerSingleton
     static class DummyProxyDefault extends ProxyImpl {
         @Inject
-        public DummyProxyDefault(Provider presenter) {
+        DummyProxyDefault(Provider presenter) {
             this.presenter = new StandardProvider(presenter);
         }
     }
@@ -167,7 +167,7 @@ public DummyProxyDefault(Provider presenter) {
     @TestEagerSingleton
     static class DummyProxyPlaceDefault extends ProxyPlaceBase {
         @Inject
-        public DummyProxyPlaceDefault(DummyProxyDefault proxy,
+        DummyProxyPlaceDefault(DummyProxyDefault proxy,
                 DeferredCommandManager deferredCommandManager) {
             super(new PlaceImpl("defaultPlace"), proxy, deferredCommandManager);
         }
diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/PlaceManagerImpl2Test.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/PlaceManagerImpl2Test.java
index 7686615e32..e75e091689 100644
--- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/PlaceManagerImpl2Test.java
+++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/PlaceManagerImpl2Test.java
@@ -18,8 +18,6 @@
 
 import java.util.Collections;
 
-import javax.inject.Inject;
-
 import org.jukito.JukitoModule;
 import org.jukito.JukitoRunner;
 import org.jukito.TestSingleton;
@@ -34,10 +32,12 @@
 import com.gwtplatform.mvp.shared.proxy.PlaceRequest;
 import com.gwtplatform.tester.DeferredCommandManager;
 
+import jakarta.inject.Inject;
+
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isA;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isA;
+import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.verify;
 
@@ -99,7 +99,7 @@ public void execute() {
         assertEquals(1, placeRequest.getParameterNames().size());
         assertEquals("dummyValue", placeRequest.getParameter("dummyParam", null));
 
-        verify(gwtWindowMethods).setBrowserHistoryToken(any(String.class), eq(false));
+        verify(gwtWindowMethods).setBrowserHistoryToken(isNull(), eq(false));
     }
 
     @Test
@@ -129,7 +129,7 @@ public void execute() {
         assertEquals("defaultPlace", placeRequest.getNameToken());
         assertEquals(0, placeRequest.getParameterNames().size());
 
-        verify(gwtWindowMethods).setBrowserHistoryToken(any(String.class), eq(false));
+        verify(gwtWindowMethods).setBrowserHistoryToken(isNull(), eq(false));
     }
 
     @Test
@@ -159,6 +159,6 @@ public void execute() {
         assertEquals("defaultPlace", placeRequest.getNameToken());
         assertEquals(0, placeRequest.getParameterNames().size());
 
-        verify(gwtWindowMethods).setBrowserHistoryToken(any(String.class), eq(false));
+        verify(gwtWindowMethods).setBrowserHistoryToken(isNull(), eq(false));
     }
 }
diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/PlaceManagerImplTest.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/PlaceManagerImplTest.java
index 4b59c93bfe..448eca7db8 100644
--- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/PlaceManagerImplTest.java
+++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/PlaceManagerImplTest.java
@@ -18,9 +18,6 @@
 
 import java.util.List;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-
 import org.jukito.JukitoModule;
 import org.jukito.JukitoRunner;
 import org.jukito.TestEagerSingleton;
@@ -39,9 +36,12 @@
 import com.gwtplatform.mvp.shared.proxy.PlaceRequest;
 import com.gwtplatform.tester.DeferredCommandManager;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -76,7 +76,7 @@ protected void configureTest() {
     @TestMockSingleton
     abstract static class DummyPresenterBasic extends Presenter {
         @Inject
-        public DummyPresenterBasic(EventBus eventBus, View view, DummyProxyPlaceBasic proxy) {
+        DummyPresenterBasic(EventBus eventBus, View view, DummyProxyPlaceBasic proxy) {
             super(eventBus, view, proxy);
         }
 
@@ -89,7 +89,7 @@ public final boolean isVisible() {
     @TestEagerSingleton
     static class DummyProxyBasic extends ProxyImpl {
         @Inject
-        public DummyProxyBasic(Provider presenter) {
+        DummyProxyBasic(Provider presenter) {
             this.presenter = new StandardProvider(presenter);
         }
     }
@@ -97,7 +97,7 @@ public DummyProxyBasic(Provider presenter) {
     abstract static class ProxyPlaceBase
              > extends ProxyPlaceImpl
               {
         private final DeferredCommandManager deferredCommandManager;
 
-        public ProxyPlaceBase(Place place,
+        ProxyPlaceBase(Place place,
                 Proxy
               proxy,
                 DeferredCommandManager deferredCommandManager) {
             super();
@@ -115,7 +115,7 @@ void addDeferredCommand(Command command) {
     @TestEagerSingleton
     static class DummyProxyPlaceBasic extends ProxyPlaceBase {
         @Inject
-        public DummyProxyPlaceBasic(DummyProxyBasic proxy,
+        DummyProxyPlaceBasic(DummyProxyBasic proxy,
                 DeferredCommandManager deferredCommandManager) {
             super(new PlaceImpl("dummyNameTokenBasic"), proxy, deferredCommandManager);
         }
@@ -133,7 +133,7 @@ static class DummyPresenterRedirect extends Presenter {
         @Inject
-        public DummyProxyRedirect(Provider presenter) {
+        DummyProxyRedirect(Provider presenter) {
             this.presenter = new StandardProvider(presenter);
         }
     }
@@ -164,7 +164,7 @@ public DummyProxyRedirect(Provider presenter) {
     @TestEagerSingleton
     static class DummyProxyPlaceRedirect extends ProxyPlaceBase {
         @Inject
-        public DummyProxyPlaceRedirect(DummyProxyRedirect proxy,
+        DummyProxyPlaceRedirect(DummyProxyRedirect proxy,
                 DeferredCommandManager deferredCommandManager) {
             super(new PlaceImpl("dummyNameTokenRedirect"), proxy, deferredCommandManager);
         }
@@ -177,7 +177,7 @@ static class DummyPresenterRedirectNoHistory extends
         private final PlaceManager placeManager;
 
         @Inject
-        public DummyPresenterRedirectNoHistory(EventBus eventBus,
+        DummyPresenterRedirectNoHistory(EventBus eventBus,
                 DummyProxyPlaceRedirectNoHistory proxy, PlaceManager placeManager) {
             super(eventBus, mock(View.class), proxy);
             this.placeManager = placeManager;
@@ -198,7 +198,7 @@ protected void revealInParent() {
     @TestEagerSingleton
     static class DummyProxyRedirectNoHistory extends ProxyImpl {
         @Inject
-        public DummyProxyRedirectNoHistory(Provider presenter) {
+        DummyProxyRedirectNoHistory(Provider presenter) {
             this.presenter = new StandardProvider(presenter);
         }
     }
@@ -208,7 +208,7 @@ static class DummyProxyPlaceRedirectNoHistory extends
             ProxyPlaceBase {
 
         @Inject
-        public DummyProxyPlaceRedirectNoHistory(DummyProxyRedirectNoHistory proxy,
+        DummyProxyPlaceRedirectNoHistory(DummyProxyRedirectNoHistory proxy,
                 DeferredCommandManager deferredCommandManager) {
             super(new PlaceImpl(DummyPresenterRedirectNoHistory.TOKEN), proxy, deferredCommandManager);
         }
@@ -265,7 +265,7 @@ public void placeManagerRevealPlaceStandard(
         verify(presenter).prepareFromRequest(placeRequest);
         verify(presenter).forceReveal();
 
-        verify(gwtWindowMethods).setBrowserHistoryToken(any(String.class), eq(false));
+        verify(gwtWindowMethods).setBrowserHistoryToken(isNull(), eq(false));
 
         assertEquals(1, navigationHandler.navCount);
         placeRequest = navigationHandler.lastEvent.getRequest();
@@ -289,7 +289,7 @@ public void placeManagerRevealPlaceRedirectInPrepareFromRequestNoHistory() {
 
         // Then
         // assert called only once
-        verify(gwtWindowMethods, times(1)).setBrowserHistoryToken(any(String.class), eq(false));
+        verify(gwtWindowMethods, times(1)).setBrowserHistoryToken(isNull(), eq(false));
 
         PlaceRequest finalPlaceRequest = placeManager.getCurrentPlaceRequest();
         assertEquals("dummyNameTokenBasic", finalPlaceRequest.getNameToken());
diff --git a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/PlaceManagerTestUtil.java b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/PlaceManagerTestUtil.java
index d3b4113011..2cc2a306fb 100644
--- a/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/PlaceManagerTestUtil.java
+++ b/gwtp-core/gwtp-mvp-client/src/test/java/com/gwtplatform/mvp/client/proxy/PlaceManagerTestUtil.java
@@ -16,12 +16,12 @@
 
 package com.gwtplatform.mvp.client.proxy;
 
-import javax.inject.Inject;
-
 import com.google.web.bindery.event.shared.EventBus;
 import com.gwtplatform.mvp.shared.proxy.PlaceRequest;
 import com.gwtplatform.mvp.shared.proxy.TokenFormatter;
 
+import jakarta.inject.Inject;
+
 /**
  * This place manager overrides all the methods that use
  * GWT-dependent classes and can be used for testing without
@@ -33,7 +33,7 @@ class PlaceManagerTestUtil extends PlaceManagerImpl {
     private final PlaceManagerWindowMethodsTestUtil gwtWindowMethods;
 
     @Inject
-    public PlaceManagerTestUtil(EventBus eventBus, TokenFormatter tokenFormatter,
+    PlaceManagerTestUtil(EventBus eventBus, TokenFormatter tokenFormatter,
             PlaceManagerWindowMethodsTestUtil gwtWindowMethods) {
         super(eventBus, tokenFormatter);
         this.gwtWindowMethods = gwtWindowMethods;
diff --git a/gwtp-core/gwtp-mvp-client/src/test/resources/com/gwtplatform/mvp/MvpGwtTest.gwt.xml b/gwtp-core/gwtp-mvp-client/src/test/resources/com/gwtplatform/mvp/MvpGwtTest.gwt.xml
index fccb19ccc9..6c8c3fd6f3 100644
--- a/gwtp-core/gwtp-mvp-client/src/test/resources/com/gwtplatform/mvp/MvpGwtTest.gwt.xml
+++ b/gwtp-core/gwtp-mvp-client/src/test/resources/com/gwtplatform/mvp/MvpGwtTest.gwt.xml
@@ -1,6 +1,6 @@
 
-
+
 
     
     
diff --git a/gwtp-core/gwtp-mvp-shared/pom.xml b/gwtp-core/gwtp-mvp-shared/pom.xml
index e7a1617677..fee20d73de 100644
--- a/gwtp-core/gwtp-mvp-shared/pom.xml
+++ b/gwtp-core/gwtp-mvp-shared/pom.xml
@@ -32,8 +32,8 @@
         
 
         
-            javax.inject
-            javax.inject
+            jakarta.inject
+            jakarta.inject-api
             provided
         
 
@@ -43,7 +43,7 @@
             mockito-core
         
         
-            org.jukito
+            de.knightsoft-net
             jukito
         
         
diff --git a/gwtp-core/gwtp-mvp-shared/src/main/java/com/gwtplatform/mvp/shared/proxy/ParameterTokenFormatter.java b/gwtp-core/gwtp-mvp-shared/src/main/java/com/gwtplatform/mvp/shared/proxy/ParameterTokenFormatter.java
index 7e88c6634b..45ae71efe0 100644
--- a/gwtp-core/gwtp-mvp-shared/src/main/java/com/gwtplatform/mvp/shared/proxy/ParameterTokenFormatter.java
+++ b/gwtp-core/gwtp-mvp-shared/src/main/java/com/gwtplatform/mvp/shared/proxy/ParameterTokenFormatter.java
@@ -20,10 +20,10 @@
 import java.util.List;
 import java.util.Set;
 
-import javax.inject.Inject;
-
 import com.gwtplatform.common.shared.UrlUtils;
 
+import jakarta.inject.Inject;
+
 /**
  * Formats tokens from {@code String} values to {@link PlaceRequest} and {@link PlaceRequest}
  * hierarchies and vice-versa. The default implementation
@@ -39,21 +39,21 @@
  * parameter or a value it is escaped using the {@code '\'} character by replacing {@code '/'} with
  * {@code '\0'}, {@code ';'} with {@code '\1'}, {@code '='} with {@code '\2'} and {@code '\'} with
  * {@code '\3'}.
- * 
              
+ * 
              
  * Before decoding a {@link String} URL fragment into a {@link PlaceRequest} or a
  * {@link PlaceRequest} hierarchy, {@link ParameterTokenFormatter} will first pass the
- * {@link String} through {@link URL#decodeQueryString(String)} so that if the URL was URL-encoded
+ * {@link String} through {@link UrlUtils#decodeQueryString(String)} so that if the URL was URL-encoded
  * by some user agent, like a mail user agent, it is still parsed correctly.
- * 
              
+ * 
              
  * For example, {@link ParameterTokenFormatter} would parse any of the following:
- * 
              
+ * 
              
  * 
                * nameToken1%3Bparam1.1%3Dvalue1.1%3Bparam1.2%3Dvalue1.2%2FnameToken2%2FnameToken3%3Bparam3.1%3Dvalue%03%11
  * nameToken1;param1.1=value1.1;param1.2=value1.2/nameToken2/nameToken3;param3.1=value\03\21
  * 
              
- * 
              
+ * 
              
  * Into the following hierarchy of {@link PlaceRequest}:
- * 
              
+ * 
              
  * 
                * {
  *   { "nameToken1", { {"param1.1", "value1.1"}, {"parame1.2","value1.2"} },
@@ -61,9 +61,9 @@
  *     "nameToken3", { {"param3.1", "value/3=1"} } }
  * }
  * 
              
- * 
              
+ * 
              
  * If you want to use different symbols as separator, use the
- * {@link #ParameterTokenFormatter(String, String, String)} constructor.
+ * {@link #ParameterTokenFormatter(UrlUtils, String, String, String)} constructor.
  */
 public class ParameterTokenFormatter implements TokenFormatter {
 
@@ -94,7 +94,7 @@ public ParameterTokenFormatter(UrlUtils urlUtils) {
     /**
      * This constructor makes it possible to use custom separators in your token formatter. The
      * separators must be 1-letter strings, they must all be different from one another, and they
-     * must be encoded when ran through {@link URL#encodeQueryString(String)}).
+     * must be encoded when ran through {@link UrlUtils#encodeQueryString(String)}).
      *
      * @param hierarchySeparator The symbol used to separate {@link PlaceRequest} in a hierarchy.
      *                           Must be a 1-character string and can't be {@code %}.
@@ -148,7 +148,7 @@ public PlaceRequest toPlaceRequest(String placeToken) throws TokenFormatExceptio
 
     /**
      * Converts an unescaped string to a place request. To unescape the hash fragment you must run it
-     * through {@link URL#decodeQueryString(String)}.
+     * through {@link UrlUtils#decodeQueryString(String)}.
      *
      * @param unescapedPlaceToken The unescaped string to convert to a place request.
      * @return The place request.
@@ -251,7 +251,7 @@ private String placeTokenToUnescapedString(PlaceRequest placeRequest)
     /**
      * Use our custom escaping mechanism to escape the provided string. This should be used on the
      * name token, and the parameter keys and values, before they are attached with the various
-     * separators. The string will also be passed through {@link URL#encodeQueryString}.
+     * separators. The string will also be passed through {@link UrlUtils#encodeQueryString}.
      * Visible for testing.
      *
      * @param string The string to escape.
@@ -287,9 +287,9 @@ String customEscape(String string) {
      * Use our custom escaping mechanism to unescape the provided string. This should be used on the
      * name token, and the parameter keys and values, after they have been split using the various
      * separators. The input string is expected to already be sent through
-     * {@link URL#decodeQueryString}.
+     * {@link UrlUtils#decodeQueryString}.
      *
-     * @param string The string to unescape, must have passed through {@link URL#decodeQueryString}.
+     * @param string The string to unescape, must have passed through {@link UrlUtils#decodeQueryString}.
      * @return The unescaped string.
      * @throws TokenFormatException if there is an error converting.
      */
diff --git a/gwtp-core/gwtp-mvp-shared/src/main/java/com/gwtplatform/mvp/shared/proxy/PlaceRequest.java b/gwtp-core/gwtp-mvp-shared/src/main/java/com/gwtplatform/mvp/shared/proxy/PlaceRequest.java
index e6b38647fb..99369c4d1b 100644
--- a/gwtp-core/gwtp-mvp-shared/src/main/java/com/gwtplatform/mvp/shared/proxy/PlaceRequest.java
+++ b/gwtp-core/gwtp-mvp-shared/src/main/java/com/gwtplatform/mvp/shared/proxy/PlaceRequest.java
@@ -25,16 +25,16 @@
  * This class represents a 'request' for a place location. It includes the 'id'
  * of the place as well as any parameter values. It can convert from and to
  * String tokens for use with the GWT History.
- * 
              
- * 
              
+ * 
              
+ * 
              
  * Place request tokens are formatted like this:
- * 
              
+ * 
              
  * #nameToken(;key=value)*
- * 
              
- * 
              
+ * 
              
+ * 
              
  * There is a mandatory 'nameToken' value, followed by 0 or more key/value
  * pairs, separated by semi-colons (';'). A few examples follow:
- * 
              
+ * 
              
  * 
                
  * 
              •  #users
                • 
  * 
              •  #user;name=j.blogs
                • 
@@ -49,9 +49,9 @@ public class PlaceRequest {
 
     /**
      * Builds a request without any name token and without parameters. You should
-     * typically use {@link #PlaceRequest(String)} and specify the name token.
+     * typically use {@link Builder} and specify the name token.
      * However, this version is acceptable when calling
-     * {@link com.gwtplatform.mvp.client.proxy.Proxy#reveal(PlaceRequest)}.
+     * com.gwtplatform.mvp.client.proxy.PlaceManager#revealPlace(PlaceRequest).
      */
     public PlaceRequest() {
         this.nameToken = null;
@@ -174,7 +174,7 @@ public boolean matchesNameToken(String nameToken) {
 
     /**
      * Class for constructing {@link PlaceRequest}s. This class supports all currently
-     * existing constructors and the {@link PlaceRequest#with(String, String)} method.
+     * existing constructors.
      * It is not checked if any of the builder parameters are set when calling the {@link #build()} method as is
      * currently also possible to construct an empty {@link PlaceRequest}
      * (see {@link PlaceRequest#PlaceRequest()})
diff --git a/gwtp-core/gwtp-mvp-shared/src/main/java/com/gwtplatform/mvp/shared/proxy/RouteTokenFormatter.java b/gwtp-core/gwtp-mvp-shared/src/main/java/com/gwtplatform/mvp/shared/proxy/RouteTokenFormatter.java
index dd6ef17209..e42735fcc5 100644
--- a/gwtp-core/gwtp-mvp-shared/src/main/java/com/gwtplatform/mvp/shared/proxy/RouteTokenFormatter.java
+++ b/gwtp-core/gwtp-mvp-shared/src/main/java/com/gwtplatform/mvp/shared/proxy/RouteTokenFormatter.java
@@ -23,10 +23,10 @@
 import java.util.Map.Entry;
 import java.util.TreeSet;
 
-import javax.inject.Inject;
-
 import com.gwtplatform.common.shared.UrlUtils;
 
+import jakarta.inject.Inject;
+
 /**
  * Implementation of {@link TokenFormatter} with support for route like place names.
  * 
                
@@ -38,7 +38,7 @@
  * 
                
  * 
                
  * Replace the default binding to {@link ParameterTokenFormatter} with {@link RouteTokenFormatter}. In case you use
- * GWTPs {@link com.gwtplatform.mvp.client.gin.DefaultModule DefaultModule}:
+ * GWTPs com.gwtplatform.mvp.client.gin.DefaultModule:
  * 
                
  * 
                  * install(new DefaultModule(DefaultPlaceManager.class, RouteTokenFormatter.class));
@@ -114,7 +114,7 @@ public int compareTo(RouteMatch other) {
     private class RouteMatcher {
         /**
          * All matching routes of the place-token.
-         * 
                
+         * 
                
          * Sorted in ascending order by the number of static matches.
          */
         final TreeSet allMatches;
@@ -223,9 +223,9 @@ public String toPlaceToken(PlaceRequest placeRequest) throws TokenFormatExceptio
 
     @Override
     public String toHistoryToken(List placeRequestHierarchy) throws TokenFormatException {
-        assert placeRequestHierarchy.size() == 1 : "Expected a place hierarchy with exactly one place.";
+        assert !placeRequestHierarchy.isEmpty() : "Expected a place hierarchy with one or more places.";
 
-        return toPlaceToken(placeRequestHierarchy.get(0));
+        return toPlaceToken(placeRequestHierarchy.get(placeRequestHierarchy.size() - 1));
     }
 
     @Override
diff --git a/gwtp-core/gwtp-mvp-shared/src/main/resources/com/gwtplatform/mvp/MvpShared.gwt.xml b/gwtp-core/gwtp-mvp-shared/src/main/resources/com/gwtplatform/mvp/MvpShared.gwt.xml
index c66e0b53e1..9a67c2d6e5 100644
--- a/gwtp-core/gwtp-mvp-shared/src/main/resources/com/gwtplatform/mvp/MvpShared.gwt.xml
+++ b/gwtp-core/gwtp-mvp-shared/src/main/resources/com/gwtplatform/mvp/MvpShared.gwt.xml
@@ -1,6 +1,6 @@
 
-
+
 
     
 
diff --git a/gwtp-core/gwtp-processors/pom.xml b/gwtp-core/gwtp-processors/pom.xml
index 3cb38f6500..929600c71e 100644
--- a/gwtp-core/gwtp-processors/pom.xml
+++ b/gwtp-core/gwtp-processors/pom.xml
@@ -46,7 +46,7 @@
 
     
         
-            com.google.gwt
+            org.gwtproject
             gwt-user
         
         
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/GenDispatch.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/GenDispatch.java
index 737e634d0a..174fa39454 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/GenDispatch.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/GenDispatch.java
@@ -24,15 +24,15 @@
 
 /**
  * Annotation to generate Action and Result classes.
- * 
                
- * 
                
+ * 
                
+ * 
                
  * If you type:
- * 
                
+ * 
                
  * 
                  * 
  * {@literal @}GenDispatch
  * public class RetrieveFoo {
- *   {@literal @}In(1) Key fooKey;
+ *   {@literal @}In(1) Key<Foo> fooKey;
  *   {@literal @}Out(1) Foo foo;
  *   {@literal @}Out(2) boolean bar;
  * }
@@ -40,24 +40,24 @@
  * 
                
  * gwt-platform will generate two classes, RetrieveFooAction and
  * RetrieveFooResult.
- * 
                
+ * 
                
  * @In specifies that fooKey will only be used in the action. The
  * number passed to @In specifies the order of the arguments to the constructor.
- * 
                
+ * 
                
  * @Out specifies that foo and bar will only be used in the result.
  * The number passed to @Out specifies the order of the arguments to the
  * constructor.
- * 
                
+ * 
                
  * RetrieveFooAction will have fields, getters, and a constructor for fooKey,
  * plus equals, hashCode, toString etc, for it to function correctly as an
  * Action.
- * 
                
+ * 
                
  * RetrieveFooResult will have fields, getters, and a constructor that accepts
  * food and good, for bar, plus equals, hashCode, toString etc, for it to
  * function correctly as an Result.
- * 
                
+ * 
                
  * Complex example:
- * 
                
+ * 
                
  * 
                  * public interface HasThing<T> {
  *   T getThing();
@@ -80,30 +80,30 @@
  * 
              • The getServiceName() method will return "dispatch/MyBar".
  * 
              
  * And the UpdateBarResult object will be able to be passed to something that
- * knows how about the HasThing interface, but does not know about
+ * knows how about the HasThing<Foo> interface, but does not know about
  * UpdateBarResult.
- * 
              
+ * 
              
  * Notes:
- * 
              
+ * 
              
  * There is no naming requirement for your class name. It will be appended with
  * Action and Result
- * 
              
- * 
              
- * 
              
+ * 
              
+ * 
              
+ * 
              
  * {@code isSecured} Specifies the value that the generated isSecured() method
  * should return. Defaults to true if not specified. See
- * {@link com.gwtplatform.dispatch.rpc.shared.Action} for more details.
- * 
              
+ * {@code com.gwtplatform.dispatch.rpc.shared.Action} for more details.
+ * 
              
  * {@code serviceName} Specifies the value that the generated getServiceName()
  * method should return. Defaults to Action.DEFAULT_SERVICE_NAME +
  * "YourClassName" if not specified. See
- * {@link com.gwtplatform.dispatch.rpc.shared.Action} for more details.
- * 
              
+ * {@code com.gwtplatform.dispatch.rpc.shared.Action} for more details.
+ * 
              
  * {@code extraActionInterfaces} A comma separated list of fully qualified
  * interfaces that the Action class will implement. Each of the
  * functions defined in the interface must match an function
  * autogenerated using the field definitions.
- * 
              
+ * 
              
  * {@code extraResultInterfaces} A comma separated list of fully qualified
  * interfaces that the Result class will implement. Each of the
  * functions defined in the interface must match an function
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/GenDto.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/GenDto.java
index 9a2d273a83..eeafe6e4fd 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/GenDto.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/GenDto.java
@@ -25,9 +25,9 @@
 /**
  * Annotation to generate simple Data Transfer Object (DTO) classes solely for
  * transferring data between the client and the server.
- * 
              
+ * 
              
  * If you type:
- * 
              
+ * 
              
  * 
                * 
  * {@literal}@GenDto
@@ -37,14 +37,14 @@
  * }
  * 
  * 
              
- * 
              
+ * 
              
  * gwt-platform will generate a {@code LineItemDto} class.
- * 
              
+ * 
              
  * {@code LineItemDto} will have fields, getters, and a constructor that takes
  * {@code productKey} and quantity plus equals, hashCode, toString etc,
- * 
              
+ * 
              
  * {@code LineItemDto} could be used when creating an invoice.
- * 
              
+ * 
              
  * 
                * 
  * {@literal}@GenDispatch
@@ -55,7 +55,7 @@
  * }
  * 
  * 
              
- * 
              
+ * 
              
  * The alternative to using Dto classes would be to construct persistable
  * {@code LineItem} objects on the client and send them as part of the gwt-rpc call.
  * Using Dto classes is a better choice because:
@@ -65,14 +65,14 @@
  * probably have a price field. The server should ignore the price as it may
  * have been tampered with.
  * 
            
- * 
            
- * 
            
+ * 
            
+ * 
            
  * Notes:
- * 
            
+ * 
            
  * There is no naming requirement for your class name. It will be appended with
  * Dto
- * 
            
- * 
            
+ * 
            
+ * 
            
  */
 @Target({ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/GenEvent.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/GenEvent.java
index b4c0778656..213e697391 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/GenEvent.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/GenEvent.java
@@ -24,9 +24,9 @@
 
 /**
  * Annotation to generate Event and Handler classes.
- * 
            
+ * 
            
  * If you type:
- * 
            
+ * 
            
  * 
              * 
  * {@literal @}GenEvent
@@ -36,29 +36,29 @@
  * }
  * 
  * 
            
- * 
            
+ * 
            
  * gwt-platform will generate two classes, {@code FooChangedEvent} and {@code FooChangedHandler}.
- * 
            
+ * 
            
  * {@code FooChangedEvent} will have fields, getters, and a constructor for foo and
  * originator, plus static {@code getType()}, instance dispatch, etc., for it to
  * function correctly as a {@link com.google.gwt.event.shared.GwtEvent}.
- * 
            
+ * 
            
  * {@code FooChangedHandler} will be an interface with a {@code onFooChanged} method that takes
  * a {@code FooChangedEvent} parameter.
- * 
            
+ * 
            
  * Notes:
- * 
            
+ * 
            
  * There is no naming requirement for your class name. It will be appended with
  * Event and Handler.
- * 
            
+ * 
            
  * Using @{@link Order}:
- * 
            
+ * 
            
  * The order the the fields can be optionally specified using the @{@link Order}
  * annotation. If @{@link Order} is not used, then the order of the parameters to the
  * constructor and to fire() is undefined.
- * 
            
+ * 
            
  * If you type:
- * 
            
+ * 
            
  * 
              * 
  * {@literal @}GenEvent
@@ -70,7 +70,7 @@
  * 
  * 
            
  * The following constructor and {@code fire} methods will be generated:
- * 
            
+ * 
            
  * 
              * 
  *  ...
@@ -81,7 +81,7 @@
  * 
  * 
            
  * Omitting the @{@link Order} annotations would yield:
- * 
            
+ * 
            
  * 
              * 
  *  ...
@@ -91,13 +91,13 @@
  *  ...
  * 
  * 
            
- * 
            
- * 
            
+ * 
            
+ * 
            
  * Using @{@link Optional}:
- * 
            
+ * 
            
  * If @{@link Optional} is used together with @{@link GenEvent}, an additional fire method is generated.
  * If you type:
- * 
            
+ * 
            
  * 
              * 
  * {@literal @}GenEvent
@@ -109,7 +109,7 @@
  * 
  * 
            
  * The following constructors and {@code fire} methods will be generated:
- * 
            
+ * 
            
  * 
              * 
  *  ...
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/GenProxy.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/GenProxy.java
index 58b017feae..dec7b388aa 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/GenProxy.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/GenProxy.java
@@ -45,7 +45,7 @@
  * 
            
  * Fields as proxy:
  * 
            You can declare fields as proxy using {@link UseProxy}
- * or {@link @UseProxyName}.
+ * or {@link UseProxyName}.
  * 
            
  * 
            If you type:
            
  * 
            @@ -90,16 +90,16 @@
 public @interface GenProxy {
     /**
      * Defines the output package.
-     * 
            
+     * 
            
      * 
            
      * By default the output is generated to the same source folder.
      * 
            
-     * 
            
+     * 
            
      * 
            
      * If you are not using a custom target package, the processor will
      * automatically replace ".server" in your package name with ".shared".
      * 
            
-     * 
            
+     * 
            
      * 
            
      * 
      * {@code @GenProxy}(targetPackage = "com.example.package.server")
@@ -137,7 +137,7 @@
     boolean isEmbeddedType() default false;
 
     /**
-     * @see ProxyFor#locator()
+     * see ProxyFor#locator()
      */
     @SuppressWarnings("rawtypes") Class locator() default Locator.class;
 }
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/In.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/In.java
index 012b3a9311..6c3fdf717b 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/In.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/In.java
@@ -24,9 +24,9 @@
 
 /**
  * Use the @In(value) annotation on fields in an @GenDispatch class.
- * 
            
+ * 
            
  * See {@link GenDispatch} for an example.
- * 
            
+ * 
            
  * {@code value} Defines the order that fields should be specified in the
  * constructor of the generated action class.
  */
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/Optional.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/Optional.java
index 8b0b0511d5..bc2cfd6cb3 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/Optional.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/Optional.java
@@ -24,7 +24,7 @@
 
 /**
  * Use the @{@link Optional} annotation to specify optional fields.
- * 
            
+ * 
            
  * 
            
  * If one or more fields are declared optional, the system generates an
  * additional pair of constructor and {@code fire} method that can be called
@@ -34,7 +34,7 @@
  * The omitted fields are not initialized and will contain
  * their default value (i.e. objects will be initialized to {@code null}).
  * 
            
- * 
            
+ * 
            
  * 
            
  * You can use this annotation with:
  * 
            
@@ -43,7 +43,7 @@
  * 
          • @{@link GenDto}
            • 
  * 
          • @{@link GenDispatch}
            • 
  * 
          
- * 
          
+ * 
          
  * 
          
  * See the above annotations for specific behaviors with optional fields.
  * 
          
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/Order.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/Order.java
index d0097518ff..01e2295a54 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/Order.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/Order.java
@@ -25,10 +25,10 @@
 /**
  * Use with @GenEvent or @GenDto to specify the order
  * of the fields in the constructor parameter list.
- * 
          
+ * 
          
  * Fields with an @Order will be first, sorted numerically, and then fields
  * without an @Order will be afterwards in an undefined order.
- * 
          
+ * 
          
  * See {@link GenEvent} or {@link GenDto} for an example.
  */
 @Target({ElementType.FIELD})
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/Out.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/Out.java
index 1862265ada..ea422ba75d 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/Out.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/Out.java
@@ -24,9 +24,9 @@
 
 /**
  * Use the @Out(value) annotation on fields in an @GenDispatch class.
- * 
          
+ * 
          
  * See {@link GenDispatch} for an example.
- * 
          
+ * 
          
  * {@code value} Defines the order that fields should be specified in the
  * constructor of the generated result class.
  */
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/UseProxy.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/UseProxy.java
index 240d411b36..dff39045ac 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/UseProxy.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/UseProxy.java
@@ -27,7 +27,7 @@
 /**
  * Annotation on domain (server-side) object fields specifying an EntityProxy
  * or ValueProxy class for the generation process.
- * @see {@link GenProxy}
+ * @see GenProxy
  */
 @Target({ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/UseProxyName.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/UseProxyName.java
index f00705452a..f76af4c91c 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/UseProxyName.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/UseProxyName.java
@@ -26,7 +26,7 @@
  * Annotation on domain (server-side) object fields specifying an EntityProxy
  * or ValueProxy class for the generation process.
  *
- * @see {@link GenProxy}
+ * @see GenProxy
  */
 @Target({ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/BuilderGenerationHelper.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/BuilderGenerationHelper.java
index 92d40f6a87..1d8001e821 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/BuilderGenerationHelper.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/BuilderGenerationHelper.java
@@ -28,7 +28,7 @@
  * 
          You should consider to use a builder when you are faced with many constructor
  * parameters. Specially mandatory and optional parameters. Here comes the
  * {@link BuilderGenerationHelper} into play.
          
- * 
          
+ * 
          
  * Instead of making the desired object directly, the client calls a constructor
  * (or static factory) with all of the required parameters and gets a builder
  * object. Then the client calls setter-like methods on the builder object to
@@ -36,13 +36,13 @@
  * parameterless build method to generate the object, which is immutable. The
  * builder is a static member class of the class it builds. This class offers a
  * method to generate a builder like this.
- * 
          
+ * 
          
  * Rules:
  * No optional fields - no Builder.
  * Has required fields and optional fields - Constructor for required fields + Builder.
  * Has optional fields - only Builder.
  *
- * @see http://my.safaribooksonline.com/9780137150021/ch02lev1sec2
+ * see http://my.safaribooksonline.com/9780137150021/ch02lev1sec2
  */
 public class BuilderGenerationHelper extends ClassGenerationHelper {
 
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/ClassGenerationHelper.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/ClassGenerationHelper.java
index 39b2f95bc1..7f17b48ab0 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/ClassGenerationHelper.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/ClassGenerationHelper.java
@@ -37,11 +37,11 @@ public ClassGenerationHelper(Writer sourceWriter) {
 
     /**
      * Generates a class header. Pass null to skip the parent class.
-     * 
          
+     * 
          
      * 
          
      * Usage:
      * 
          
-     * 
          
+     * 
          
      * 
                * 
      *  generateClassHeader(Foo.class.getSimpleName(),
@@ -53,7 +53,7 @@ public ClassGenerationHelper(Writer sourceWriter) {
      * 
          
      * Generated example:
      * 
          
-     * 
          
+     * 
          
      * 
                * public class MyFoo extends Foo implements HasName, MyGenericInterface{@literal } {
          
      *
@@ -157,13 +157,13 @@ public void generateFieldAccessors(Collection fieldElements) {
 
     /**
      * Creates a default field assignment.
-     * 
          
+     * 
          
      * 
          
      * generateFieldAssignment(myNameIsTest, null)
      * 
          
-     * 
          
+     * 
          
      * Generates:
-     * 
          
+     * 
          
      * 
          
      *     this.test = null;
      * 
          
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/GenerationHelper.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/GenerationHelper.java
index 3115937fdb..5e6171920c 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/GenerationHelper.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/GenerationHelper.java
@@ -70,7 +70,7 @@ public static String implode(Object[] segments, String delimiter) {
     /**
      * Replaces each placeholder of this string that matches a parameter index.
      * 
          Placeholder format: {int}
          
-     * 
          
+     * 
          
      * 
          Usage:
          
      * 
          replaceParameters("{0} int myField = {1};", "private", 20);
          
      *
@@ -166,11 +166,11 @@ public void generateFieldDeclarations(Collection collection) {
 
     /**
      * Generates a list of Fields.
-     * 
          
+     * 
          
      * 
          
      * Usage:
      * 
          
-     * 
          
+     * 
          
      * 
                * generateFieldList(myList, true, false)
          
      *
@@ -204,14 +204,14 @@ public void generateFooter() {
 
     /**
      * Use null as import to separate import groups.
-     * 
          
+     * 
          
      * 
          
      * Usage:
      * 
          
-     * 
          
+     * 
          
      * 
          -     * generateImports({@link EventHandler}.class, {@link GwtEvent}.class, null,
-     * {@link GenEventProcessor}.class)
          
+     * generateImports(EventHandler.class, GwtEvent.class, null,
+     * GenEventProcessor.class)
          
      *
      * Generated example:
      *
@@ -262,7 +262,7 @@ public String generateModifierList(Modifier... modifiers) {
 
     /**
      * Generates a package declaration.
-     * 
          
+     * 
          
      * 
          
      * Generated example:
      * 
          
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/InterfaceGenerationHelper.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/InterfaceGenerationHelper.java
index 0fcf669dce..62ce0eb554 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/InterfaceGenerationHelper.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/InterfaceGenerationHelper.java
@@ -33,17 +33,17 @@ public InterfaceGenerationHelper(Writer sourceWriter) {
 
     /**
      * Generates an empty method body.
-     * 
          
+     * 
          
      * If you type:
-     * 
          
+     * 
          
      * 
                * 
      *    writer.generateEmptyMethodBody("MyEntity", "stableId");
      * 
      * 
          
-     * 
          
+     * 
          
      * The following method body will be generated:
-     * 
          
+     * 
          
      * 
                * 
      *     MyEntity stableId();
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/ReflectionHelper.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/ReflectionHelper.java
index b891aa5550..95cfc21d7b 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/ReflectionHelper.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/helper/ReflectionHelper.java
@@ -139,7 +139,7 @@ public TypeElement getClassRepresenter() {
     }
 
     /**
-     * Returns all fields ordered that are {@link Modifier.FINAL} or {@link Modifier.STATIC}.
+     * Returns all fields ordered that are {@link Modifier#FINAL} or {@link Modifier#STATIC}.
      */
     public Collection getConstantFields() {
         return getModifierFields(Modifier.FINAL, Modifier.STATIC);
@@ -158,7 +158,7 @@ public Collection getFields() {
     }
 
     /**
-     * Returns all fields which contains {@link Modifier.FINAL}.
+     * Returns all fields which contains {@link Modifier#FINAL}.
      */
     public Collection getFinalFields() {
         return filterFields(getOrderedFields(), Modifier.FINAL);
@@ -186,8 +186,8 @@ public Collection getModifierFields(Modifier... modifiers) {
     }
 
     /**
-     * Returns all fields that are not {@link Modifier.FINAL} or
-     * {@link Modifier.STATIC}. Sorted based on the @ {@link Order} annotation.
+     * Returns all fields that are not {@link Modifier#FINAL} or
+     * {@link Modifier#STATIC}. Sorted based on the @ {@link Order} annotation.
      */
     public Collection getNonConstantFields() {
         return filterFields(getOrderedFields(), Modifier.FINAL, Modifier.STATIC);
@@ -246,7 +246,6 @@ public ProcessingEnvironment getProcessingEnvironment() {
      * 
        • Non {@link Modifier#STATIC} fields
          • 
      * 
        • Non {@link Modifier#FINAL} fields
          • 
      * 
        
-     * 
        
      */
     public Collection getRequiredFields() {
         Collection fields = getFields();
@@ -260,7 +259,7 @@ public String getSimpleClassName() {
     }
 
     /**
-     * Returns all fields which contains {@link Modifier.STATIC}.
+     * Returns all fields which contains {@link Modifier#STATIC}.
      */
     public Collection getStaticFields() {
         return filterFields(getOrderedFields(), Modifier.STATIC);
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenDispatchProcessor.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenDispatchProcessor.java
index 2f28d279c9..2719cdff67 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenDispatchProcessor.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenDispatchProcessor.java
@@ -36,7 +36,7 @@
 
 /**
  * Processes {@link GenDispatch} annotations.
- * 
        
+ * 
        
  * {@link GenDispatchProcessor} should only ever be called by tool infrastructure. See
  * {@link javax.annotation.processing.Processor} for more details.
  */
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenDtoProcessor.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenDtoProcessor.java
index ba96194ce3..1999533ab9 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenDtoProcessor.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenDtoProcessor.java
@@ -30,8 +30,8 @@
 import com.gwtplatform.dispatch.annotation.helper.ReflectionHelper;
 
 /**
- * Processes {@link GenDto} annotations.
- * 
        
+ * Processes {@code GenDto} annotations.
+ * 
        
  * {@link GenDtoProcessor} should only ever be called by tool infrastructure.
  * See {@link javax.annotation.processing.Processor} for more details.
  */
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenEventProcessor.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenEventProcessor.java
index fa5ea18e6b..38cd38351f 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenEventProcessor.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenEventProcessor.java
@@ -31,8 +31,8 @@
 import com.gwtplatform.dispatch.annotation.helper.ReflectionHelper;
 
 /**
- * Processes {@link GenEvent} annotations.
- * 
        
+ * Processes {@code GenEvent} annotations.
+ * 
        
  * {@link GenEventProcessor} should only ever be called by tool infrastructure.
  * See {@link javax.annotation.processing.Processor} for more details.
  */
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenProcessor.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenProcessor.java
index 78c5c3b86c..47020f76d6 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenProcessor.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenProcessor.java
@@ -31,8 +31,8 @@
  * 
        
  * Abstract processor class for all {@code @GenX} annotations.
  * 
        
- * 
        
- * Annotate your processor with @{@link SupportedAnnotationTypes} or override
+ * 
        
+ * Annotate your processor with {@code @SupportedAnnotationTypes} or override
  * {@link #getSupportedAnnotationTypes()} to receive elements, that are
  * annotated in the current environment with one of the given annotations. You
  * can get access these elements using the method
diff --git a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenProxyProcessor.java b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenProxyProcessor.java
index 978d989c13..a698e5396f 100644
--- a/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenProxyProcessor.java
+++ b/gwtp-core/gwtp-processors/src/main/java/com/gwtplatform/dispatch/annotation/processor/GenProxyProcessor.java
@@ -38,7 +38,7 @@
 
 /**
  * Processes {@link GenProxy} annotations.
- * 
        
+ * 
        
  * {@link GenProxyProcessor} should only ever be called by tool infrastructure.
  * See {@link javax.annotation.processing.Processor} for more details.
  */
diff --git a/gwtp-core/gwtp-processors/src/test/java/com/gwtplatform/dispatch/annotation/DispatchAnnotationProcessingTest.java b/gwtp-core/gwtp-processors/src/test/java/com/gwtplatform/dispatch/annotation/DispatchAnnotationProcessingTest.java
index a831c90998..b6f7cbbfcc 100644
--- a/gwtp-core/gwtp-processors/src/test/java/com/gwtplatform/dispatch/annotation/DispatchAnnotationProcessingTest.java
+++ b/gwtp-core/gwtp-processors/src/test/java/com/gwtplatform/dispatch/annotation/DispatchAnnotationProcessingTest.java
@@ -24,7 +24,7 @@
 
 /**
  * This test is being run by ant, but is not run in eclipse.
- * 
        
+ * 
        
  * TODO: Make a test suite with a couple of permutations (with/without Order, Optional, both...).
  */
 public class DispatchAnnotationProcessingTest {
diff --git a/gwtp-core/gwtp-processors/src/test/java/com/gwtplatform/dispatch/annotation/DtoAnnotationProcessingTest.java b/gwtp-core/gwtp-processors/src/test/java/com/gwtplatform/dispatch/annotation/DtoAnnotationProcessingTest.java
index 0e5c488e76..2967476812 100644
--- a/gwtp-core/gwtp-processors/src/test/java/com/gwtplatform/dispatch/annotation/DtoAnnotationProcessingTest.java
+++ b/gwtp-core/gwtp-processors/src/test/java/com/gwtplatform/dispatch/annotation/DtoAnnotationProcessingTest.java
@@ -23,7 +23,7 @@
 
 /**
  * This test is being run by ant, but is not run in eclipse.
- * 
        
+ * 
        
  * TODO: Make a test suite with a couple of permutations (with/without Order, Optional, both...).
  */
 public class DtoAnnotationProcessingTest {
diff --git a/gwtp-core/gwtp-processors/src/test/java/com/gwtplatform/dispatch/annotation/EventAnnotationProcessingTest.java b/gwtp-core/gwtp-processors/src/test/java/com/gwtplatform/dispatch/annotation/EventAnnotationProcessingTest.java
index 3ef9c14380..1061168bf8 100644
--- a/gwtp-core/gwtp-processors/src/test/java/com/gwtplatform/dispatch/annotation/EventAnnotationProcessingTest.java
+++ b/gwtp-core/gwtp-processors/src/test/java/com/gwtplatform/dispatch/annotation/EventAnnotationProcessingTest.java
@@ -18,15 +18,15 @@
 
 import org.junit.Test;
 
+import com.google.gwt.event.shared.HasHandlers;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-import com.google.gwt.event.shared.HasHandlers;
-
 /**
  * This test is being run by ant, but is not run in eclipse.
- * 
        
+ * 
        
  * TODO: Make a test suite with a couple of permutations (with/without Order, Optional, both...).
  */
 public class EventAnnotationProcessingTest {
diff --git a/gwtp-core/gwtp-processors/src/test/java/com/gwtplatform/dispatch/annotation/ProxyAnnotationProcessingTest.java b/gwtp-core/gwtp-processors/src/test/java/com/gwtplatform/dispatch/annotation/ProxyAnnotationProcessingTest.java
index 93a4574b8d..f815e28a45 100644
--- a/gwtp-core/gwtp-processors/src/test/java/com/gwtplatform/dispatch/annotation/ProxyAnnotationProcessingTest.java
+++ b/gwtp-core/gwtp-processors/src/test/java/com/gwtplatform/dispatch/annotation/ProxyAnnotationProcessingTest.java
@@ -22,21 +22,21 @@
 
 import org.junit.Test;
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
 import com.google.web.bindery.requestfactory.shared.EntityProxy;
 import com.google.web.bindery.requestfactory.shared.ProxyFor;
 import com.google.web.bindery.requestfactory.shared.ValueProxy;
 import com.gwtplatform.dispatch.annotation.proxy.AddressProxy;
 import com.gwtplatform.dispatch.annotation.proxy.EmployeeProxy;
 
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
 /**
  * This test is being run by ant, but is not run in eclipse.
- * 
        
+ * 
        
  */
 public class ProxyAnnotationProcessingTest {
 
diff --git a/gwtp-core/gwtp-tester/pom.xml b/gwtp-core/gwtp-tester/pom.xml
index c5d93de948..b101726cea 100644
--- a/gwtp-core/gwtp-tester/pom.xml
+++ b/gwtp-core/gwtp-tester/pom.xml
@@ -30,21 +30,17 @@
             gwtp-dispatch-rpc-server
         
         
-            com.google.gwt
+            org.gwtproject
             gwt-user
         
         
-            com.google.inject
-            guice
-        
-        
-            com.google.gwt.inject
+            de.knightsoft-net
             gin
         
 
         
         
-            org.jukito
+            de.knightsoft-net
             jukito
             test
         
@@ -54,7 +50,7 @@
             test
         
         
-            com.google.gwt
+            org.gwtproject
             gwt-dev
             test
         
diff --git a/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/AsyncMockProvider.java b/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/AsyncMockProvider.java
index 69c292b822..1ee4878d16 100644
--- a/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/AsyncMockProvider.java
+++ b/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/AsyncMockProvider.java
@@ -22,11 +22,11 @@
 /**
  * For use in test cases where an {@link AsyncProvider} is required to provide
  * an object and the test case needs to provide a mock of the object.
- * 
        
+ * 
        
  * Note that the same mock will be returned for every invocation of of {@link #get(AsyncCallback)}
  * (it behaves as a singleton) which may impact your tests, for example
  * if you rely on {@code ==}. If you're using mockito, consider using the
- * {@link com.gwtplatform.tester.mockito.AsyncMockProvider AsyncMockProvider} instead.
+ * {@code com.gwtplatform.tester.mockito.AsyncMockProvider} instead.
  *
  * @param  The type of mock object provided
  */
diff --git a/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/DeferredCommandManager.java b/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/DeferredCommandManager.java
index 454ed6c2fc..8dba16dcd8 100644
--- a/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/DeferredCommandManager.java
+++ b/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/DeferredCommandManager.java
@@ -25,7 +25,7 @@
  * This class mimicks GWT's {@link com.google.gwt.user.client.DeferredCommand}
  * but it can be used in test cases without having to rely on a
  * {@link com.google.gwt.junit.client.GWTTestCase}.
- * 
        
+ * 
        
  * Use {@link #addCommand(Command)} to add deferred commands, then call
  * {@link #pump()} to process all the deferred commands.
  */
diff --git a/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/MockClientActionHandlerMap.java b/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/MockClientActionHandlerMap.java
index 9e2092752b..2ab8d5d393 100644
--- a/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/MockClientActionHandlerMap.java
+++ b/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/MockClientActionHandlerMap.java
@@ -19,13 +19,13 @@
 import com.gwtplatform.dispatch.client.actionhandler.ClientActionHandler;
 
 /**
- * This is the interface that define the map of {@link com.gwtplatform.dispatch.shared.Action} to
+ * This is the interface that define the map of {@code com.gwtplatform.dispatch.shared.Action} to
  * {@link ClientActionHandler} for unit testing.
  */
 public interface MockClientActionHandlerMap {
 
     /**
-     * @return the {@link com.gwtplatform.dispatch.shared.Action} class associated
+     * @return the {@code com.gwtplatform.dispatch.shared.Action} class associated
      */
     Class getActionClass();
 
diff --git a/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/MockFactory.java b/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/MockFactory.java
index 25eb526c46..e5fcc5df63 100644
--- a/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/MockFactory.java
+++ b/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/MockFactory.java
@@ -20,10 +20,10 @@
  * Mocking factory that transfer the work of creating a mock object to any
  * Mocking framework. User should create an implementation to inject in their
  * {@link MockingBinder} implementation.
- * 
        
+ * 
        
  * 
          * public class MockitoMockFactory implements MockFactory {
- *   public  T mock(Class classToMock) {
+ *   public <T> T mock(Class<T> classToMock) {
  *     return Mockito.mock(classToMock);
  *   }
  * }
diff --git a/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/MockHandlerModule.java b/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/MockHandlerModule.java
index 3cd663b38f..548f194053 100644
--- a/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/MockHandlerModule.java
+++ b/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/MockHandlerModule.java
@@ -27,10 +27,10 @@
 /**
  * Module for use in test cases when creating a guice injector that needs to
  * provide mock handlers.
- * 
        
- * Your injector must also have an class that subclasses {@link com.gwtplatform.dispatch.server.guice.HandlerModule}
+ * 
        
+ * Your injector must also have an class that subclasses {@code com.gwtplatform.dispatch.server.guice.HandlerModule}
  * to bind Actions to ActionHandlers and ActionValidators.
- * 
        
+ * 
        
  * You should subclass this module and use the {@link #configureMockHandlers()}
  * method to:
  * 
          
@@ -39,9 +39,9 @@
  * 
        • register mock client-side action handlers with
  * {@link #bindMockClientActionHandler(Class, AbstractClientActionHandler)}.
          • 
  * 
        
- * 
        
- * 
        Unit Testing Example
        
- * 
        
+ * 
        
+ * 
        Unit Testing Example
        
+ * 
        
  * 
          *  // create mock handlers
  *  CreateFooActionHandler mockCreateFooActionHandler =
@@ -70,7 +70,7 @@
  *
  *  // create mock result
  *  final CreateFooResult result =
- *      new CreateFooResult(new Key(Foo.class, 1));
+ *      new CreateFooResult(new Key<Foo>(Foo.class, 1));
  *
  *  // configure mockito to return mock result on specific action
  *  when(
@@ -105,7 +105,7 @@ private static class MockClientActionHandlerMapImpl, R exten
         private final Class actionClass;
         private final ClientActionHandler clientActionHandler;
 
-        public MockClientActionHandlerMapImpl(final Class actionClass,
+        MockClientActionHandlerMapImpl(final Class actionClass,
                 final ClientActionHandler clientActionHandler) {
             this.actionClass = actionClass;
             this.clientActionHandler = clientActionHandler;
@@ -134,12 +134,10 @@ protected void configure() {
 
     /**
      * Registers a mock server-side action handlers.
-     * 
        
+     * 
        
      * This mock server-side action handler will be executed when the class under
-     * test calls {@link com.gwtplatform.dispatch.shared.DispatchAsync#execute
-     * DispatchAsync#execute()} or
-     * {@link com.gwtplatform.dispatch.shared.DispatchAsync#undo
-     * DispatchAsync#undo()}.
+     * test calls {@code com.gwtplatform.dispatch.shared.DispatchAsync#execute()} or
+     * {@code com.gwtplatform.dispatch.shared.DispatchAsync#undo()}.
      *
      * @param           Type of {@link Action} that will be executed by mock handler
      * @param           Type of {@link Result} that will be returned by mock handler
@@ -156,21 +154,17 @@ protected , R extends Result, H extends ActionHandler>
 
     /**
      * Registers a mock client-side action handlers.
-     * 
        
+     * 
        
      * This mock client-side action handler will be executed when the class under
-     * test calls {@link com.gwtplatform.dispatch.shared.DispatchAsync#execute
-     * DispatchAsync#execute()} or
-     * {@link com.gwtplatform.dispatch.shared.DispatchAsync#undo
-     * DispatchAsync#undo()}.
-     * 
        
-     * 
        
+     * test calls {@code com.gwtplatform.dispatch.shared.DispatchAsync#execute()} or
+     * {@code com.gwtplatform.dispatch.shared.DispatchAsync#undo()}.
+     * 
        
+     * 
        
      * If both mock client and mock server action handlers have been registered,
      * the server side action handler will only be called if the mock client side
      * action handler calls
-     * {@link com.gwtplatform.dispatch.client.actionhandler.ExecuteCommand#execute
-     * ExecuteCommand#execute()} or
-     * {@link com.gwtplatform.dispatch.client.actionhandler.UndoCommand#undo
-     * UndoCommand#undo()}
+     * {@code com.gwtplatform.dispatch.client.actionhandler.ExecuteCommand#execute()} or
+     * {@code com.gwtplatform.dispatch.client.actionhandler.UndoCommand#undo()}
      *
      * @param          Type of {@link Action}
      * @param          Type of {@link Result}
@@ -185,6 +179,6 @@ R>> void bindMockClientActionHandler(
             Class actionClass, H mockHandler) {
         bind(MockClientActionHandlerMap.class).annotatedWith(
                 UniqueAnnotations.create()).toInstance(
-                new MockClientActionHandlerMapImpl(actionClass, mockHandler));
+                    new MockClientActionHandlerMapImpl(actionClass, mockHandler));
     }
 }
diff --git a/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/MockProvider.java b/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/MockProvider.java
index 22948babdc..53453c967b 100644
--- a/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/MockProvider.java
+++ b/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/MockProvider.java
@@ -21,11 +21,11 @@
 /**
  * For use in test cases where an {@link Provider} is required to provide an
  * object and the test case needs to provide a mock of the object.
- * 
        
+ * 
        
  * Note that the same mock will be returned for every invocation of {{@link #get()}
  * (it behaves as a singleton) which may impact your tests, for example
  * if you rely on {@code ==}. If you're using mockito, consider using the
- * {@link com.gwtplatform.tester.mockito.MockProvider MockProvider} instead.
+ * {@code com.gwtplatform.tester.mockito.MockProvider} instead.
  *
  * @param  The type of mock object provided
  */
diff --git a/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/MockingBinder.java b/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/MockingBinder.java
index 78686599b3..0698ee92d2 100644
--- a/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/MockingBinder.java
+++ b/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/MockingBinder.java
@@ -24,13 +24,13 @@
 /**
  * {@link MockingBinder} makes testing view even easier by mocking every
  * {@link UiField} and returning a mocked object upon creation.
- * 
        
+ * 
        
  * To use it, you should build a small class that extends MockingBinder and bind
  * that class inside your Guice test module. You will have to provide a
  * {@link MockFactory} to let MockingBinder mock everything.
- * 
        
+ * 
        
  * Ex:
- * 
        
+ * 
        
  * 
          * public static class Module extends JukitoModule {
  *  static class MyTestBinder extends MockingBinder<Widget, BlogView> implements
@@ -47,7 +47,7 @@
  *  }
  * }
  * 
        
- * 
        
+ * 
        
  * Disarming GWT is important to unit test views.
  *
  * @param  Mock type returned by {@link UiBinder#createAndBindUi(Object)}.
diff --git a/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/TestDispatchAsync.java b/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/TestDispatchAsync.java
index 346143f669..85975223b8 100644
--- a/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/TestDispatchAsync.java
+++ b/gwtp-core/gwtp-tester/src/main/java/com/gwtplatform/tester/TestDispatchAsync.java
@@ -46,7 +46,7 @@ public class TestDispatchAsync implements DispatchAsync {
 
     class TestingDispatchRequest implements DispatchRequest {
 
-        public TestingDispatchRequest() {
+        TestingDispatchRequest() {
         }
 
         @Override
diff --git a/gwtp-core/gwtp-tester/src/test/java/com/gwtplatform/tester/MockingBinderTest.java b/gwtp-core/gwtp-tester/src/test/java/com/gwtplatform/tester/MockingBinderTest.java
index 62b71ab125..6300b3b580 100644
--- a/gwtp-core/gwtp-tester/src/test/java/com/gwtplatform/tester/MockingBinderTest.java
+++ b/gwtp-core/gwtp-tester/src/test/java/com/gwtplatform/tester/MockingBinderTest.java
@@ -41,7 +41,7 @@ public static class Module extends JukitoModule {
          */
         static class MyTestBinder extends MockingBinder implements Binder {
             @Inject
-            public MyTestBinder(MockitoMockFactory mockitoMockFactory) {
+            MyTestBinder(MockitoMockFactory mockitoMockFactory) {
                 super(Widget.class, mockitoMockFactory);
             }
         }
diff --git a/gwtp-core/pom.xml b/gwtp-core/pom.xml
index e84746a306..73f9589c16 100644
--- a/gwtp-core/pom.xml
+++ b/gwtp-core/pom.xml
@@ -47,9 +47,11 @@
                 gwt-maven-plugin
                 ${gwt-maven-plugin.version}
                 
-                    -Xss1024k -Xmx512M
+                    -Xss1024k -Xmx512M --add-opens=java.base/java.lang=ALL-UNNAMED
                     **/*GwtTest.java,**/*GwtTestSuite.java
                     htmlunit
+                    true
+                    FF
                     180
                     auto
                 
@@ -63,18 +65,18 @@
 
                 
                     
-                        com.google.gwt
+                        org.gwtproject
                         gwt-user
                         ${gwt.version}
                     
                     
-                        com.google.gwt
+                        org.gwtproject
                         gwt-dev
                         ${gwt.version}
                     
                     
-                        com.google.gwt
-                        gwt-servlet
+                        org.gwtproject
+                        gwt-servlet-jakarta
                         ${gwt.version}
                     
                 
@@ -194,12 +196,12 @@
 
             
             
-                com.google.gwt
+                org.gwtproject
                 gwt-user
                 ${gwt.version}
             
             
-                com.google.gwt
+                org.gwtproject
                 gwt-dev
                 ${gwt.version}
             
@@ -221,21 +223,21 @@
                 ${guice.version}
             
             
-                com.google.gwt.inject
+                de.knightsoft-net
                 gin
                 ${gin.version}
             
 
             
             
-                javax.servlet
-                javax.servlet-api
+                jakarta.servlet
+                jakarta.servlet-api
                 ${servlet-api.version}
             
             
-                javax.inject
-                javax.inject
-                ${javax.inject.version}
+                jakarta.inject
+                jakarta.inject-api
+                ${jakarta.inject.version}
             
             
                 javax.ws.rs
@@ -266,7 +268,7 @@
 
             
             
-                org.jukito
+                de.knightsoft-net
                 jukito
                 ${jukito.version}
                 test
diff --git a/gwtp-crawler-service/.factorypath b/gwtp-crawler-service/.factorypath
index 9606e6c7f2..391a3b594b 100644
--- a/gwtp-crawler-service/.factorypath
+++ b/gwtp-crawler-service/.factorypath
@@ -1,37 +1,96 @@
 
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
+    
 
diff --git a/gwtp-crawler-service/pom.xml b/gwtp-crawler-service/pom.xml
index 220ea80fb7..eade3f25ce 100644
--- a/gwtp-crawler-service/pom.xml
+++ b/gwtp-crawler-service/pom.xml
@@ -43,6 +43,8 @@
                     -Xss1024k -Xmx512M
                     **/*GwtTest.java,**/*GwtTestSuite.java
                     htmlunit
+                    true
+                    FF
                     180
                 
                 
@@ -55,18 +57,18 @@
 
                 
                     
-                        com.google.gwt
+                        org.gwtproject
                         gwt-user
                         ${gwt.version}
                     
                     
-                        com.google.gwt
+                        org.gwtproject
                         gwt-dev
                         ${gwt.version}
                     
                     
-                        com.google.gwt
-                        gwt-servlet
+                        org.gwtproject
+                        gwt-servlet-jakarta
                         ${gwt.version}
                     
                 
@@ -81,14 +83,14 @@
 
     
         
-            javax.servlet
-            javax.servlet-api
+            jakarta.servlet
+            jakarta.servlet-api
             ${servlet-api.version}
         
         
-            javax.inject
-            javax.inject
-            ${javax.inject.version}
+            jakarta.inject
+            jakarta.inject-api
+            ${jakarta.inject.version}
         
 
         
diff --git a/gwtp-crawler-service/src/main/java/com/gwtplatform/crawlerservice/server/CrawlServiceServlet.java b/gwtp-crawler-service/src/main/java/com/gwtplatform/crawlerservice/server/CrawlServiceServlet.java
index a45b95a9b7..47ec7fa9cf 100644
--- a/gwtp-crawler-service/src/main/java/com/gwtplatform/crawlerservice/server/CrawlServiceServlet.java
+++ b/gwtp-crawler-service/src/main/java/com/gwtplatform/crawlerservice/server/CrawlServiceServlet.java
@@ -26,12 +26,6 @@
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
 
-import javax.inject.Provider;
-import javax.inject.Singleton;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.gargoylesoftware.htmlunit.NicelyResynchronizingAjaxController;
 import com.gargoylesoftware.htmlunit.SilentCssErrorHandler;
 import com.gargoylesoftware.htmlunit.WebClient;
@@ -43,6 +37,12 @@
 import com.gwtplatform.crawlerservice.server.domain.CachedPage;
 import com.gwtplatform.crawlerservice.server.service.CachedPageDao;
 
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 /**
  * Servlet that makes it possible to fetch an external page, renders it using HTMLUnit and returns the HTML page.
  */
@@ -216,9 +216,9 @@ private String renderPage(String url) throws IOException {
         webClient.setAjaxController(new SyncAllAjaxController());
         webClient.setCssErrorHandler(new SilentCssErrorHandler());
 
-        WebRequest webRequest = new WebRequest(new URL(url), "text/html");
+        WebRequest webRequest = new WebRequest(new URL(url), "text/html", null);
         HtmlPage page = webClient.getPage(webRequest);
-        webClient.getJavaScriptEngine().pumpEventLoop(timeoutMillis);
+        webClient.getJavaScriptEngine().setJavaScriptTimeout(timeoutMillis);
 
         int waitForBackgroundJavaScript = webClient.waitForBackgroundJavaScript(jsTimeoutMillis);
         int loopCount = 0;
@@ -242,7 +242,7 @@ private String renderPage(String url) throws IOException {
             }
         }
 
-        webClient.closeAllWindows();
+        webClient.close();
 
         return Pattern.compile("", Pattern.DOTALL)
                 .matcher(page.asXml().replace("", ""))
diff --git a/gwtp-crawler-service/src/main/java/com/gwtplatform/crawlerservice/server/guice/CrawlServiceModule.java b/gwtp-crawler-service/src/main/java/com/gwtplatform/crawlerservice/server/guice/CrawlServiceModule.java
index 8e6af02750..dd157eb60c 100644
--- a/gwtp-crawler-service/src/main/java/com/gwtplatform/crawlerservice/server/guice/CrawlServiceModule.java
+++ b/gwtp-crawler-service/src/main/java/com/gwtplatform/crawlerservice/server/guice/CrawlServiceModule.java
@@ -16,14 +16,14 @@
 
 package com.gwtplatform.crawlerservice.server.guice;
 
-import javax.inject.Singleton;
-
 import com.gargoylesoftware.htmlunit.BrowserVersion;
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.google.inject.Provides;
 import com.google.inject.servlet.ServletModule;
 import com.gwtplatform.crawlerservice.server.CrawlServiceServlet;
 
+import jakarta.inject.Singleton;
+
 public class CrawlServiceModule extends ServletModule {
 
     @Override
@@ -34,6 +34,6 @@ public void configureServlets() {
     @Singleton
     @Provides
     WebClient getWebClient() {
-        return new WebClient(BrowserVersion.FIREFOX_38);
+        return new WebClient(BrowserVersion.FIREFOX_ESR);
     }
 }
diff --git a/gwttest/com/gwtplatform/mvp/client/PresenterProxyIntegrationTest.java b/gwttest/com/gwtplatform/mvp/client/PresenterProxyIntegrationTest.java
index e8f895379a..16945053bf 100644
--- a/gwttest/com/gwtplatform/mvp/client/PresenterProxyIntegrationTest.java
+++ b/gwttest/com/gwtplatform/mvp/client/PresenterProxyIntegrationTest.java
@@ -27,7 +27,7 @@
 /**
  * Integration test for {@link PresenterImpl} and automatically-generated
  * {@link Proxy} classes.
- * 
        
+ * 
        
  * TODO: This doesn't work yet. See
  * http://code.google.com/p/gwt-platform/issues/detail?id=38
  */
diff --git a/pom.xml b/pom.xml
index eccf5dadb3..069ce4220b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -224,59 +224,59 @@
     
 
     
-        1.7
+        11
         UTF-8
         UTF-8
         OBF
         false
 
         
-        2.8.0
-        2.15
-        6.4.1
-        1.2
-        3.2
-        2.8.2
-        2.10.2
-        2.2.4
-        2.4
-        2.17
-        2.8
-        2.10
-        3.4
-        1.3.1.5
-        2.1
-        2.5.1
+        2.10.0
+        3.6.0
+        10.21.1
+        3.13.0
+        3.1.3
+        3.11.2
+        5.1
+        3.3.1
+        3.5.2
+        3.8.0
+        3.8.1
+        3.21.0
+        3.0-beta-02
+        5.9.2
+        2.18.0
+        3.1.1
 
         
-        2.8.0
+        2.12.1
         
-        2.1.2
-        0.14.1
+        4.0.0
+        0.15.4
 
         
         1.1.1
-        2.2
-        1.9.48
-        3.0
-        1
-        19.0
-        5.0.2
+        3.3.0
+        2.0.3
+        7.0.0
+        2.0.1
+        33.3.1-jre
+        6.1.2
         1.0
-        3.1.0
-        4.0.5.RELEASE
+        6.1.0
+        6.2.2
         1.7
-        2.19
+        2.70.0
 
         
-        1.4.1
-        4.11
-        1.9.5
-        1.1.4
-        1.6.1
+        1.6
+        4.13.2
+        4.11.0
+        1.1.9
+        3.26.3
 
         
-        0.11
+        0.12
 
         
         SetAsParam
@@ -330,8 +330,8 @@
                     maven-checkstyle-plugin
                     ${maven-checkstyle-plugin.version}
                     
-                        /checkstyle.xml
-                        /suppressions.xml
+                        /codequality/checkstyle.xml
+                        /codequality/suppressions.xml
                         basedir=${basedir}
                         true
                         true
@@ -345,11 +345,6 @@
                             checkstyle
                             ${checkstyle.version}
                         
-                        
-                            com.arcbees
-                            checkstyle
-                            ${arcbees-checkstyle.version}
-                        
                     
 
                     
@@ -397,6 +392,14 @@
                     com.github.searls
                     jasmine-maven-plugin
                     ${jasmine-maven-plugin.version}
+
+                    
+                        
+                            io.github.bonigarcia
+                            webdrivermanager
+                            ${webdrivermanager.version}
+                        
+                    
                 
             
         
@@ -439,6 +442,7 @@
                     
                         **/*GwtTest.java
                     
+                    --add-opens java.base/java.lang=ALL-UNNAMED
                 
             
 
@@ -493,13 +497,13 @@
                     ${project.build.directory}/staging
 
                     
-                        http://download.oracle.com/javase/6/docs/api/
-                        http://google-web-toolkit.googlecode.com/svn/javadoc/latest/
-                        http://static.springsource.org/spring/docs/3.0.x/javadoc-api/
-                        http://google-gin.googlecode.com/svn/trunk/javadoc/
-                        http://google-guice.googlecode.com/svn/trunk/javadoc/
-                        http://aopalliance.sourceforge.net/doc/
-                        https://developers.google.com/appengine/docs/java/javadoc/
+                        https://docs.oracle.com/en/java/javase/11/docs/api/
+                        https://www.gwtproject.org/javadoc/latest/
+                        https://docs.spring.io/spring-framework/docs/current/javadoc-api/
+                        https://gwtplus.github.io/google-gin/latest/javadoc/
+                        https://javadoc.io/doc/com.google.inject/guice/latest/index.html
+                        https://aopalliance.sourceforge.net/doc/
+                        https://cloud.google.com/appengine/docs/legacy/standard/java/javadoc/
                     
 
                     
diff --git a/src/site/site.xml b/src/site/site.xml
index 61bf677b09..62b47285b8 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -1,10 +1,10 @@
-
+
     
         org.apache.maven.skins
         maven-fluido-skin
-        1.3.1
+        2.0.0
     
 
     
@@ -33,4 +33,4 @@
         
        
         
     
-
+