diff --git a/docs/asciidoc/modules/openapi.adoc b/docs/asciidoc/modules/openapi.adoc
index 9ef9746cf9..8aa72cc96b 100644
--- a/docs/asciidoc/modules/openapi.adoc
+++ b/docs/asciidoc/modules/openapi.adoc
@@ -108,21 +108,25 @@ To avoid this behaviour you can specify maven build phase which suits your needs
 | `${project.dir}`
 |Set base directory used it for loading openAPI template file name.
 
+|`excludes`
+|
+|Regular expression used to excludes route. Example: `/web`.
+
 |`includes`
 | 
 |Regular expression used to includes/keep route. Example: `/api/.*`.
 
-|`excludes`
-|
-|Regular expression used to excludes route. Example: `/web`.
+|`javadoc`
+|`on/true`
+|Turn on/off javadoc generation from Java source files. Set to `off` or `false` to turn it off.
 
 |`specVersion`
 |`3.0`
-|Set the desired spec output
+|Set the desired spec output. Possible values: `3.0` or `3.1`
 
 |`templateName`
 |`openapi.yaml`
-|Set openAPI template file name.
+|Set openAPI template file path.
 
 |===
 
@@ -191,7 +195,7 @@ You will find the files in the output build directory. If your application is `b
 This is the main difference with previous version. We moved from runtime to build time generation. This way we:
 
 - Are able to get our OpenAPI files at build time (of course)
-- At runtime we don't waste resources (CPU, memory) while analyze and build the OpenAPI model
+- At runtime, we don't waste resources (CPU, memory) while analyze and build the OpenAPI model
 - We keep bootstrap as fast as possible
 ====
 
@@ -254,7 +258,7 @@ Full/complete example available https://github.com/jooby-project/library-demo[he
 
 ==== JavaDoc comments
 
-JavaDoc comments are supported on Java in script and MVC routes.
+JavaDoc comments are supported for script and MVC routes on Java code base. They are enable by default, to turn them off set `javadoc: off` or `javadoc: false` in your maven/gradle plugin.
 
 .Script routes
 [source,java, role="primary"]
diff --git a/docs/src/main/java/io/jooby/adoc/DocGenerator.java b/docs/src/main/java/io/jooby/adoc/DocGenerator.java
index 882fda0a2a..258374a70b 100644
--- a/docs/src/main/java/io/jooby/adoc/DocGenerator.java
+++ b/docs/src/main/java/io/jooby/adoc/DocGenerator.java
@@ -46,7 +46,7 @@ public static void generate(Path basedir, boolean publish, boolean v1, boolean d
     String version = version();
     // 2.x/3.x/main
     var branch = new Git("jooby-project", "jooby", Paths.get(System.getProperty("user.dir"))).currentBranch();
-    var uiVersion = branch.equals("main") ? "" : "/v" + branch.replace(".x", "");
+    var uiVersion = branch.endsWith(".x") ? "/v" + branch.replace(".x", "") : "";
 
     Path asciidoc = basedir.resolve("asciidoc");
 
diff --git a/jooby/pom.xml b/jooby/pom.xml
index b2896d3333..d3fb5db11e 100644
--- a/jooby/pom.xml
+++ b/jooby/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>jooby-project</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby</artifactId>
   <name>jooby</name>
diff --git a/modules/jooby-apt/pom.xml b/modules/jooby-apt/pom.xml
index f375110a09..b94e7f7603 100644
--- a/modules/jooby-apt/pom.xml
+++ b/modules/jooby-apt/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-apt</artifactId>
   <name>jooby-apt</name>
diff --git a/modules/jooby-avaje-inject/pom.xml b/modules/jooby-avaje-inject/pom.xml
index 9b94aad3d3..0b7dc1190d 100644
--- a/modules/jooby-avaje-inject/pom.xml
+++ b/modules/jooby-avaje-inject/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-avaje-inject</artifactId>
   <name>jooby-avaje-inject</name>
diff --git a/modules/jooby-avaje-jsonb/pom.xml b/modules/jooby-avaje-jsonb/pom.xml
index ecbbfce46d..7dff5e6c75 100644
--- a/modules/jooby-avaje-jsonb/pom.xml
+++ b/modules/jooby-avaje-jsonb/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-avaje-jsonb</artifactId>
   <name>jooby-avaje-jsonb</name>
diff --git a/modules/jooby-avaje-validator/pom.xml b/modules/jooby-avaje-validator/pom.xml
index bff54fbe32..c74d132ca8 100644
--- a/modules/jooby-avaje-validator/pom.xml
+++ b/modules/jooby-avaje-validator/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-avaje-validator</artifactId>
   <name>jooby-avaje-validator</name>
diff --git a/modules/jooby-awssdk-v1/pom.xml b/modules/jooby-awssdk-v1/pom.xml
index 04f4975f6c..d509fcec98 100644
--- a/modules/jooby-awssdk-v1/pom.xml
+++ b/modules/jooby-awssdk-v1/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-awssdk-v1</artifactId>
   <name>jooby-awssdk-v1</name>
diff --git a/modules/jooby-awssdk-v2/pom.xml b/modules/jooby-awssdk-v2/pom.xml
index 3dbf62ab03..1c8713978d 100644
--- a/modules/jooby-awssdk-v2/pom.xml
+++ b/modules/jooby-awssdk-v2/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-awssdk-v2</artifactId>
   <name>jooby-awssdk-v2</name>
diff --git a/modules/jooby-bom/pom.xml b/modules/jooby-bom/pom.xml
index a9e714934c..4190e6e211 100644
--- a/modules/jooby-bom/pom.xml
+++ b/modules/jooby-bom/pom.xml
@@ -7,14 +7,14 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
 
   <groupId>io.jooby</groupId>
   <artifactId>jooby-bom</artifactId>
   <name>jooby-bom</name>
   <packaging>pom</packaging>
-  <version>4.0.14</version>
+  <version>4.0.15</version>
   <description>Jooby (Bill of Materials)</description>
   <url>https://jooby.io</url>
 
diff --git a/modules/jooby-caffeine/pom.xml b/modules/jooby-caffeine/pom.xml
index 0807a6f25c..80b4e273a0 100644
--- a/modules/jooby-caffeine/pom.xml
+++ b/modules/jooby-caffeine/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-caffeine</artifactId>
   <name>jooby-caffeine</name>
diff --git a/modules/jooby-camel/pom.xml b/modules/jooby-camel/pom.xml
index 21d8deb8b8..616051e905 100644
--- a/modules/jooby-camel/pom.xml
+++ b/modules/jooby-camel/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-camel</artifactId>
   <name>jooby-camel</name>
diff --git a/modules/jooby-cli/pom.xml b/modules/jooby-cli/pom.xml
index 25f9d64932..487960e9d2 100644
--- a/modules/jooby-cli/pom.xml
+++ b/modules/jooby-cli/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-cli</artifactId>
   <name>jooby-cli</name>
diff --git a/modules/jooby-commons-email/pom.xml b/modules/jooby-commons-email/pom.xml
index 6c1ee5426f..d8d8e91dd9 100644
--- a/modules/jooby-commons-email/pom.xml
+++ b/modules/jooby-commons-email/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-commons-email</artifactId>
   <name>jooby-commons-email</name>
diff --git a/modules/jooby-conscrypt/pom.xml b/modules/jooby-conscrypt/pom.xml
index 1f6691f60b..7e71c02e00 100644
--- a/modules/jooby-conscrypt/pom.xml
+++ b/modules/jooby-conscrypt/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-conscrypt</artifactId>
   <name>jooby-conscrypt</name>
diff --git a/modules/jooby-db-scheduler/pom.xml b/modules/jooby-db-scheduler/pom.xml
index dc37f529f9..bf3fd6f4c3 100644
--- a/modules/jooby-db-scheduler/pom.xml
+++ b/modules/jooby-db-scheduler/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-db-scheduler</artifactId>
   <name>jooby-db-scheduler</name>
diff --git a/modules/jooby-distribution/pom.xml b/modules/jooby-distribution/pom.xml
index c976ced484..c7530daa65 100644
--- a/modules/jooby-distribution/pom.xml
+++ b/modules/jooby-distribution/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-distribution</artifactId>
   <name>jooby-distribution</name>
diff --git a/modules/jooby-ebean/pom.xml b/modules/jooby-ebean/pom.xml
index c9868aa0a4..20c0244eda 100644
--- a/modules/jooby-ebean/pom.xml
+++ b/modules/jooby-ebean/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-ebean</artifactId>
   <name>jooby-ebean</name>
diff --git a/modules/jooby-flyway/pom.xml b/modules/jooby-flyway/pom.xml
index d2b1980648..d6f81599a9 100644
--- a/modules/jooby-flyway/pom.xml
+++ b/modules/jooby-flyway/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-flyway</artifactId>
   <name>jooby-flyway</name>
diff --git a/modules/jooby-freemarker/pom.xml b/modules/jooby-freemarker/pom.xml
index 7287451b3c..5fe7dcb731 100644
--- a/modules/jooby-freemarker/pom.xml
+++ b/modules/jooby-freemarker/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-freemarker</artifactId>
   <name>jooby-freemarker</name>
diff --git a/modules/jooby-gradle-plugin/src/main/java/io/jooby/gradle/OpenAPITask.java b/modules/jooby-gradle-plugin/src/main/java/io/jooby/gradle/OpenAPITask.java
index 9dc4ba6ba4..37518da61d 100644
--- a/modules/jooby-gradle-plugin/src/main/java/io/jooby/gradle/OpenAPITask.java
+++ b/modules/jooby-gradle-plugin/src/main/java/io/jooby/gradle/OpenAPITask.java
@@ -42,6 +42,8 @@ public class OpenAPITask extends BaseTask {
 
   private List<File> adoc;
 
+  private String javadoc;
+
   /**
    * Creates an OpenAPI task.
    */
@@ -85,6 +87,9 @@ public void generate() throws Throwable {
     }
     trim(includes).ifPresent(tool::setIncludes);
     trim(excludes).ifPresent(tool::setExcludes);
+    if (javadoc != null && !javadoc.trim().isEmpty()) {
+      tool.setJavadoc(javadoc.trim());
+    }
 
     OpenAPI result = tool.generate(mainClass);
 
@@ -195,6 +200,29 @@ public void setSpecVersion(String specVersion) {
     this.specVersion = specVersion;
   }
 
+  /**
+   * True/On to enabled javadoc output. Default is: <code>on</code>.
+   *
+   * @return True/On to enabled javadoc output. Default is: <code>on</code>.
+   */
+  @Input
+  @org.gradle.api.tasks.Optional
+  public String getJavadoc() {
+    return javadoc;
+  }
+
+
+  /**
+   * Enabled or disabled javadoc generation. Set to off/false to turn it off.
+   * Default is: <code>on</code>.
+   *
+   * @param javadoc Enabled or disabled javadoc generation. Set to off/false to turn it off.
+   *                Default is: <code>on</code>.
+   */
+  public void setJavadoc(String javadoc) {
+    this.javadoc = javadoc;
+  }
+
   /**
    * Optionally generates adoc output.
    *
diff --git a/modules/jooby-gradle-setup/pom.xml b/modules/jooby-gradle-setup/pom.xml
index e48bf67d61..d05398b08a 100644
--- a/modules/jooby-gradle-setup/pom.xml
+++ b/modules/jooby-gradle-setup/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-gradle-setup</artifactId>
   <name>jooby-gradle-setup</name>
diff --git a/modules/jooby-graphiql/pom.xml b/modules/jooby-graphiql/pom.xml
index dbf5d5b3b6..db614e85b7 100644
--- a/modules/jooby-graphiql/pom.xml
+++ b/modules/jooby-graphiql/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-graphiql</artifactId>
   <name>jooby-graphiql</name>
diff --git a/modules/jooby-graphql/pom.xml b/modules/jooby-graphql/pom.xml
index d02e754494..97144813cb 100644
--- a/modules/jooby-graphql/pom.xml
+++ b/modules/jooby-graphql/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-graphql</artifactId>
   <name>jooby-graphql</name>
diff --git a/modules/jooby-gson/pom.xml b/modules/jooby-gson/pom.xml
index caec656283..6b6c0c9c1c 100644
--- a/modules/jooby-gson/pom.xml
+++ b/modules/jooby-gson/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-gson</artifactId>
   <name>jooby-gson</name>
diff --git a/modules/jooby-guice/pom.xml b/modules/jooby-guice/pom.xml
index 48f5120d6f..7945de2bf4 100644
--- a/modules/jooby-guice/pom.xml
+++ b/modules/jooby-guice/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-guice</artifactId>
   <name>jooby-guice</name>
diff --git a/modules/jooby-handlebars/pom.xml b/modules/jooby-handlebars/pom.xml
index 40935145f1..ec3c0a2790 100644
--- a/modules/jooby-handlebars/pom.xml
+++ b/modules/jooby-handlebars/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-handlebars</artifactId>
   <name>jooby-handlebars</name>
diff --git a/modules/jooby-hibernate-validator/pom.xml b/modules/jooby-hibernate-validator/pom.xml
index 8d24873d8c..033e964197 100644
--- a/modules/jooby-hibernate-validator/pom.xml
+++ b/modules/jooby-hibernate-validator/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-hibernate-validator</artifactId>
   <name>jooby-hibernate-validator</name>
diff --git a/modules/jooby-hibernate/pom.xml b/modules/jooby-hibernate/pom.xml
index a8850596df..798ae17711 100644
--- a/modules/jooby-hibernate/pom.xml
+++ b/modules/jooby-hibernate/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-hibernate</artifactId>
   <name>jooby-hibernate</name>
diff --git a/modules/jooby-hikari/pom.xml b/modules/jooby-hikari/pom.xml
index b165fec661..9caf6c822d 100644
--- a/modules/jooby-hikari/pom.xml
+++ b/modules/jooby-hikari/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-hikari</artifactId>
   <name>jooby-hikari</name>
diff --git a/modules/jooby-jackson/pom.xml b/modules/jooby-jackson/pom.xml
index b2e7a2b649..aa491b44a9 100644
--- a/modules/jooby-jackson/pom.xml
+++ b/modules/jooby-jackson/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-jackson</artifactId>
   <name>jooby-jackson</name>
diff --git a/modules/jooby-jasypt/pom.xml b/modules/jooby-jasypt/pom.xml
index fedafc5276..741a18b13e 100644
--- a/modules/jooby-jasypt/pom.xml
+++ b/modules/jooby-jasypt/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-jasypt</artifactId>
   <name>jooby-jasypt</name>
diff --git a/modules/jooby-jdbi/pom.xml b/modules/jooby-jdbi/pom.xml
index d915d49e2a..2f9fd91b85 100644
--- a/modules/jooby-jdbi/pom.xml
+++ b/modules/jooby-jdbi/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-jdbi</artifactId>
   <name>jooby-jdbi</name>
diff --git a/modules/jooby-jetty/pom.xml b/modules/jooby-jetty/pom.xml
index 91abe17543..659a383054 100644
--- a/modules/jooby-jetty/pom.xml
+++ b/modules/jooby-jetty/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-jetty</artifactId>
   <name>jooby-jetty</name>
diff --git a/modules/jooby-jstachio/pom.xml b/modules/jooby-jstachio/pom.xml
index 1fc39fcccb..5e69224d1e 100644
--- a/modules/jooby-jstachio/pom.xml
+++ b/modules/jooby-jstachio/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-jstachio</artifactId>
   <name>jooby-jstachio</name>
diff --git a/modules/jooby-jte/pom.xml b/modules/jooby-jte/pom.xml
index 47832c2e0a..20639635fb 100644
--- a/modules/jooby-jte/pom.xml
+++ b/modules/jooby-jte/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-jte</artifactId>
   <name>jooby-jte</name>
diff --git a/modules/jooby-jwt/pom.xml b/modules/jooby-jwt/pom.xml
index f3214374e9..cbbf08cc1b 100644
--- a/modules/jooby-jwt/pom.xml
+++ b/modules/jooby-jwt/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-jwt</artifactId>
   <name>jooby-jwt</name>
diff --git a/modules/jooby-kafka/pom.xml b/modules/jooby-kafka/pom.xml
index 89e9b29ad3..d60ddb258b 100644
--- a/modules/jooby-kafka/pom.xml
+++ b/modules/jooby-kafka/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-kafka</artifactId>
   <name>jooby-kafka</name>
diff --git a/modules/jooby-kotlin/pom.xml b/modules/jooby-kotlin/pom.xml
index 6d43c5b1e2..3d26f8fba9 100644
--- a/modules/jooby-kotlin/pom.xml
+++ b/modules/jooby-kotlin/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-kotlin</artifactId>
   <name>jooby-kotlin</name>
diff --git a/modules/jooby-log4j/pom.xml b/modules/jooby-log4j/pom.xml
index aaf8c3f485..4282d7e726 100644
--- a/modules/jooby-log4j/pom.xml
+++ b/modules/jooby-log4j/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-log4j</artifactId>
   <name>jooby-log4j</name>
diff --git a/modules/jooby-logback/pom.xml b/modules/jooby-logback/pom.xml
index 81db5399e8..27baecd5bc 100644
--- a/modules/jooby-logback/pom.xml
+++ b/modules/jooby-logback/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-logback</artifactId>
   <name>jooby-logback</name>
diff --git a/modules/jooby-maven-plugin/pom.xml b/modules/jooby-maven-plugin/pom.xml
index 84abca699f..b226646ce7 100644
--- a/modules/jooby-maven-plugin/pom.xml
+++ b/modules/jooby-maven-plugin/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-maven-plugin</artifactId>
   <name>jooby-maven-plugin</name>
diff --git a/modules/jooby-maven-plugin/src/main/java/io/jooby/maven/OpenAPIMojo.java b/modules/jooby-maven-plugin/src/main/java/io/jooby/maven/OpenAPIMojo.java
index 35f8d41a1d..8f8d1786cd 100644
--- a/modules/jooby-maven-plugin/src/main/java/io/jooby/maven/OpenAPIMojo.java
+++ b/modules/jooby-maven-plugin/src/main/java/io/jooby/maven/OpenAPIMojo.java
@@ -49,6 +49,9 @@ public class OpenAPIMojo extends BaseMojo {
   @Parameter(property = "openAPI.specVersion")
   private String specVersion;
 
+  @Parameter(property = "openAPI.javadoc")
+  private String javadoc;
+
   @Parameter private List<File> adoc;
 
   @Override
@@ -76,6 +79,9 @@ protected void doExecute(@NonNull List<MavenProject> projects, @NonNull String m
     tool.setSources(sources);
     trim(includes).ifPresent(tool::setIncludes);
     trim(excludes).ifPresent(tool::setExcludes);
+    if (javadoc != null && !javadoc.trim().isEmpty()) {
+      tool.setJavadoc(javadoc.trim());
+    }
 
     var result = tool.generate(mainClass);
 
@@ -129,19 +135,57 @@ public void setExcludes(@Nullable String excludes) {
     this.excludes = excludes;
   }
 
+  /**
+   * Spec version. Default is <code>3.0</code>.
+   *
+   * @return Spec version. Default is <code>3.0</code>.
+   */
   public String getSpecVersion() {
     return specVersion;
   }
 
+  /**
+   * Set the desired spec output. Default is <code>3.0</code>.
+   *
+   * @param specVersion One of <code>3.0</code> or <code>3.0</code>.
+   */
   public void setSpecVersion(String specVersion) {
     this.specVersion = specVersion;
   }
 
+  /**
+   * List of asciidoc files to generate documentation.
+   *
+   * @return List of asciidoc files to generate documentation.
+   */
   public List<File> getAdoc() {
     return adoc;
   }
 
+  /**
+   * List of asciidoc files to generate documentation.
+   *
+   * @param adoc List of asciidoc files to generate documentation.
+   */
   public void setAdoc(List<File> adoc) {
     this.adoc = adoc;
   }
+
+  /**
+   * True/On to enabled. By default is: <code>on</code>.
+   *
+   * @param javadoc True/On to enabled.
+   */
+  public void setJavadoc(String javadoc) {
+    this.javadoc = javadoc;
+  }
+
+  /**
+   * True/On to enabled.
+   *
+   * @return True/On to enabled.
+   */
+  public String getJavadoc() {
+    return javadoc;
+  }
 }
diff --git a/modules/jooby-metrics/pom.xml b/modules/jooby-metrics/pom.xml
index fe5512e6b7..0905ce3b65 100644
--- a/modules/jooby-metrics/pom.xml
+++ b/modules/jooby-metrics/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-metrics</artifactId>
   <name>jooby-metrics</name>
diff --git a/modules/jooby-mutiny/pom.xml b/modules/jooby-mutiny/pom.xml
index d40a4b9bde..6407b95a83 100644
--- a/modules/jooby-mutiny/pom.xml
+++ b/modules/jooby-mutiny/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-mutiny</artifactId>
   <name>jooby-mutiny</name>
diff --git a/modules/jooby-netty/pom.xml b/modules/jooby-netty/pom.xml
index 026f77bbe6..3a9031fb97 100644
--- a/modules/jooby-netty/pom.xml
+++ b/modules/jooby-netty/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-netty</artifactId>
   <name>jooby-netty</name>
diff --git a/modules/jooby-openapi/pom.xml b/modules/jooby-openapi/pom.xml
index 9493236181..6deaaca0bf 100644
--- a/modules/jooby-openapi/pom.xml
+++ b/modules/jooby-openapi/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-openapi</artifactId>
   <name>jooby-openapi</name>
@@ -180,12 +180,7 @@
         <executions>
           <execution>
             <id>compile</id>
-            <configuration>
-              <sourceDirs>
-                <sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
-                <sourceDir>${project.basedir}/src/main/java</sourceDir>
-              </sourceDirs>
-            </configuration>
+            <phase>none</phase>
           </execution>
           <execution>
             <id>test-compile</id>
@@ -207,21 +202,17 @@
           <proc>none</proc>
         </configuration>
         <executions>
-          <execution>
-            <id>default-compile</id>
-            <phase>none</phase>
-          </execution>
           <execution>
             <id>default-testCompile</id>
             <phase>none</phase>
           </execution>
-          <execution>
-            <id>java-compile</id>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-            <phase>compile</phase>
-          </execution>
+<!--          <execution>-->
+<!--            <id>java-compile</id>-->
+<!--            <goals>-->
+<!--              <goal>compile</goal>-->
+<!--            </goals>-->
+<!--            <phase>compile</phase>-->
+<!--          </execution>-->
           <execution>
             <id>java-test-compile</id>
             <goals>
@@ -231,35 +222,6 @@
           </execution>
         </executions>
       </plugin>
-
-<!--      <plugin>-->
-<!--        <groupId>org.apache.maven.plugins</groupId>-->
-<!--        <artifactId>maven-shade-plugin</artifactId>-->
-<!--        <executions>-->
-<!--          <execution>-->
-<!--            <id>fat-jar</id>-->
-<!--            <goals>-->
-<!--              <goal>shade</goal>-->
-<!--            </goals>-->
-<!--            <phase>package</phase>-->
-<!--            <configuration>-->
-<!--              <minimizeJar>true</minimizeJar>-->
-<!--              <artifactSet>-->
-<!--                <includes>-->
-<!--                  <include>org.ow2.asm:*</include>-->
-<!--                </includes>-->
-<!--              </artifactSet>-->
-<!--              <relocations>-->
-<!--                <relocation>-->
-<!--                  <pattern>org.objectweb.asm</pattern>-->
-<!--                  <shadedPattern>io.jooby.internal.openapi.asm</shadedPattern>-->
-<!--                </relocation>-->
-<!--              </relocations>-->
-<!--            </configuration>-->
-<!--          </execution>-->
-<!--        </executions>-->
-<!--      </plugin>-->
-
     </plugins>
   </build>
 </project>
diff --git a/modules/jooby-openapi/src/main/java/io/jooby/openapi/OpenAPIGenerator.java b/modules/jooby-openapi/src/main/java/io/jooby/openapi/OpenAPIGenerator.java
index 4d0e2ea5de..8eaf5a02ec 100644
--- a/modules/jooby-openapi/src/main/java/io/jooby/openapi/OpenAPIGenerator.java
+++ b/modules/jooby-openapi/src/main/java/io/jooby/openapi/OpenAPIGenerator.java
@@ -531,9 +531,9 @@ public void setOutputDir(@NonNull Path outputDir) {
   }
 
   /**
-   * Set the desired spec output. Default is <code>3.1</code>.
+   * Set the desired spec output. Default is <code>3.0</code>.
    *
-   * @param specVersion One of <code>3.0</code> or <code>3.1</code>.
+   * @param specVersion One of <code>3.0</code> or <code>3.0</code>.
    */
   private void setSpecVersion(SpecVersion specVersion) {
     this.specVersion = specVersion;
diff --git a/modules/jooby-pac4j/pom.xml b/modules/jooby-pac4j/pom.xml
index ae7492f499..949d2acd4f 100644
--- a/modules/jooby-pac4j/pom.xml
+++ b/modules/jooby-pac4j/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-pac4j</artifactId>
   <name>jooby-pac4j</name>
diff --git a/modules/jooby-pebble/pom.xml b/modules/jooby-pebble/pom.xml
index da1f8e3cf7..834f47792e 100644
--- a/modules/jooby-pebble/pom.xml
+++ b/modules/jooby-pebble/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-pebble</artifactId>
   <name>jooby-pebble</name>
diff --git a/modules/jooby-quartz/pom.xml b/modules/jooby-quartz/pom.xml
index 0c28ae60e1..22b521f0cc 100644
--- a/modules/jooby-quartz/pom.xml
+++ b/modules/jooby-quartz/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-quartz</artifactId>
   <name>jooby-quartz</name>
diff --git a/modules/jooby-reactor/pom.xml b/modules/jooby-reactor/pom.xml
index d1324b9c42..f80e683e5d 100644
--- a/modules/jooby-reactor/pom.xml
+++ b/modules/jooby-reactor/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-reactor</artifactId>
   <name>jooby-reactor</name>
diff --git a/modules/jooby-redis/pom.xml b/modules/jooby-redis/pom.xml
index 2e9c1f3aa2..a31ffeceda 100644
--- a/modules/jooby-redis/pom.xml
+++ b/modules/jooby-redis/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-redis</artifactId>
   <name>jooby-redis</name>
diff --git a/modules/jooby-redoc/pom.xml b/modules/jooby-redoc/pom.xml
index 212a3cf11d..8592be6a29 100644
--- a/modules/jooby-redoc/pom.xml
+++ b/modules/jooby-redoc/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-redoc</artifactId>
   <name>jooby-redoc</name>
diff --git a/modules/jooby-rocker/pom.xml b/modules/jooby-rocker/pom.xml
index dbd1ab203b..0250eadecf 100644
--- a/modules/jooby-rocker/pom.xml
+++ b/modules/jooby-rocker/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-rocker</artifactId>
   <name>jooby-rocker</name>
diff --git a/modules/jooby-run/pom.xml b/modules/jooby-run/pom.xml
index 2a7a3691f1..49e3355f83 100644
--- a/modules/jooby-run/pom.xml
+++ b/modules/jooby-run/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-run</artifactId>
   <name>jooby-run</name>
diff --git a/modules/jooby-rxjava3/pom.xml b/modules/jooby-rxjava3/pom.xml
index a86a28f76c..582e90d54b 100644
--- a/modules/jooby-rxjava3/pom.xml
+++ b/modules/jooby-rxjava3/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-rxjava3</artifactId>
   <name>jooby-rxjava3</name>
diff --git a/modules/jooby-stork/pom.xml b/modules/jooby-stork/pom.xml
index 1ee67703bf..adc6e01cfa 100644
--- a/modules/jooby-stork/pom.xml
+++ b/modules/jooby-stork/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
 
   <artifactId>jooby-stork</artifactId>
diff --git a/modules/jooby-swagger-ui/pom.xml b/modules/jooby-swagger-ui/pom.xml
index fa8610cbba..c269902298 100644
--- a/modules/jooby-swagger-ui/pom.xml
+++ b/modules/jooby-swagger-ui/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-swagger-ui</artifactId>
   <name>jooby-swagger-ui</name>
diff --git a/modules/jooby-test/pom.xml b/modules/jooby-test/pom.xml
index 0fd5f13861..d4603bd494 100644
--- a/modules/jooby-test/pom.xml
+++ b/modules/jooby-test/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-test</artifactId>
   <name>jooby-test</name>
diff --git a/modules/jooby-thymeleaf/pom.xml b/modules/jooby-thymeleaf/pom.xml
index 0a1458860f..30b6a341cf 100644
--- a/modules/jooby-thymeleaf/pom.xml
+++ b/modules/jooby-thymeleaf/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-thymeleaf</artifactId>
   <name>jooby-thymeleaf</name>
diff --git a/modules/jooby-undertow/pom.xml b/modules/jooby-undertow/pom.xml
index e0fe851e47..6dd7648e29 100644
--- a/modules/jooby-undertow/pom.xml
+++ b/modules/jooby-undertow/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-undertow</artifactId>
   <name>jooby-undertow</name>
diff --git a/modules/jooby-vertx-mysql-client/pom.xml b/modules/jooby-vertx-mysql-client/pom.xml
index 76a6594277..8ae32ff54a 100644
--- a/modules/jooby-vertx-mysql-client/pom.xml
+++ b/modules/jooby-vertx-mysql-client/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-vertx-mysql-client</artifactId>
   <name>jooby-vertx-mysql-client</name>
diff --git a/modules/jooby-vertx-pg-client/pom.xml b/modules/jooby-vertx-pg-client/pom.xml
index 7d377a1144..80a903abf1 100644
--- a/modules/jooby-vertx-pg-client/pom.xml
+++ b/modules/jooby-vertx-pg-client/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-vertx-pg-client</artifactId>
   <name>jooby-vertx-pg-client</name>
diff --git a/modules/jooby-vertx-sql-client/pom.xml b/modules/jooby-vertx-sql-client/pom.xml
index 31513201d7..0ed5bf53ce 100644
--- a/modules/jooby-vertx-sql-client/pom.xml
+++ b/modules/jooby-vertx-sql-client/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-vertx-sql-client</artifactId>
   <name>jooby-vertx-sql-client</name>
diff --git a/modules/jooby-vertx/pom.xml b/modules/jooby-vertx/pom.xml
index ebd229b662..167eb62c56 100644
--- a/modules/jooby-vertx/pom.xml
+++ b/modules/jooby-vertx/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-vertx</artifactId>
   <name>jooby-vertx</name>
diff --git a/modules/jooby-whoops/pom.xml b/modules/jooby-whoops/pom.xml
index 65ebb1ccfe..45a39b784f 100644
--- a/modules/jooby-whoops/pom.xml
+++ b/modules/jooby-whoops/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-whoops</artifactId>
   <name>jooby-whoops</name>
diff --git a/modules/jooby-yasson/pom.xml b/modules/jooby-yasson/pom.xml
index 2965143ca1..f60d011ed4 100644
--- a/modules/jooby-yasson/pom.xml
+++ b/modules/jooby-yasson/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>modules</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>jooby-yasson</artifactId>
   <name>jooby-yasson</name>
diff --git a/modules/pom.xml b/modules/pom.xml
index b87cbead36..3d86995753 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>jooby-project</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
 
   <artifactId>modules</artifactId>
diff --git a/pom.xml b/pom.xml
index 5cb0cfa31a..d53ff154d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.jooby</groupId>
   <artifactId>jooby-project</artifactId>
-  <version>4.0.14</version>
+  <version>4.0.15</version>
   <packaging>pom</packaging>
 
   <name>jooby-project</name>
@@ -105,7 +105,7 @@
     <asm.version>9.9.1</asm.version>
 
     <!-- Server -->
-    <undertow.version>2.3.20.Final</undertow.version>
+    <undertow.version>2.3.21.Final</undertow.version>
     <jetty.version>12.1.5</jetty.version>
     <netty.version>4.2.9.Final</netty.version>
     <vertx.version>5.0.6</vertx.version>
@@ -210,7 +210,7 @@
     <maven.compiler.target>21</maven.compiler.target>
     <maven.compiler.release>21</maven.compiler.release>
     <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ssa</maven.build.timestamp.format>
-    <project.build.outputTimestamp>2026-01-12T18:40:46Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2026-01-14T14:25:56Z</project.build.outputTimestamp>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <pre-commit-hook>etc${file.separator}source${file.separator}formatter.sh</pre-commit-hook>
diff --git a/tests/pom.xml b/tests/pom.xml
index e1e84c261f..9cb452738a 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.jooby</groupId>
     <artifactId>jooby-project</artifactId>
-    <version>4.0.14</version>
+    <version>4.0.15</version>
   </parent>
   <artifactId>tests</artifactId>
   <name>tests</name>