This is an automated email from the ASF dual-hosted git repository.
benweidig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
The following commit(s) were added to refs/heads/master by this push:
new d56b1a8b3 TAP5-2828: Javadoc min Java version, convention added, minor
fixes
d56b1a8b3 is described below
commit d56b1a8b3cf5f90420e33989edbe710330cd300e
Author: Ben Weidig <[email protected]>
AuthorDate: Tue May 19 16:19:55 2026 +0200
TAP5-2828: Javadoc min Java version, convention added, minor fixes
---
.../main/groovy/tapestry.java-convention.gradle | 1 +
.../main/groovy/tapestry.javadoc-convention.gradle | 19 ++++++++++++++++++
.../javascript/EsModuleManagerContribution.java | 23 +++++++++++-----------
.../services/ComponentEventDispatcherTest.java | 4 +---
.../apache/tapestry5/test/SeleniumTestCase.java | 4 ++--
5 files changed, 34 insertions(+), 17 deletions(-)
diff --git a/buildSrc/src/main/groovy/tapestry.java-convention.gradle
b/buildSrc/src/main/groovy/tapestry.java-convention.gradle
index 862bef814..8066f6725 100644
--- a/buildSrc/src/main/groovy/tapestry.java-convention.gradle
+++ b/buildSrc/src/main/groovy/tapestry.java-convention.gradle
@@ -9,6 +9,7 @@ plugins {
id 'eclipse'
id 'idea'
id 'groovy'
+ id 'tapestry.javadoc-convention'
}
java {
diff --git a/buildSrc/src/main/groovy/tapestry.javadoc-convention.gradle
b/buildSrc/src/main/groovy/tapestry.javadoc-convention.gradle
new file mode 100644
index 000000000..7ec0a058d
--- /dev/null
+++ b/buildSrc/src/main/groovy/tapestry.javadoc-convention.gradle
@@ -0,0 +1,19 @@
+// Javadoc convention applied to all subprojects (via
tapestry.java-convention)
+// and to the root project's aggregateJavadoc task.
+// - HTML5 output
+// - Java 11 source parsing
+// - JDK API cross-links
+// - suppress unresolvable cross-module {@link} references
+// - declare @tapestrydoc so per-module builds don't treat it as an unknown
tag
+
+plugins {
+ id 'java-base'
+}
+
+tasks.withType(Javadoc).configureEach {
+ options.addStringOption('Xdoclint:all,-reference', '-quiet')
+ options.addStringOption('source', '11')
+ options.addBooleanOption('html5', true)
+ options.links('https://docs.oracle.com/javase/8/docs/api/')
+ options.tags = ['tapestrydoc:a:Component Documentation']
+}
diff --git
a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/EsModuleManagerContribution.java
b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/EsModuleManagerContribution.java
index 6997f6c68..f02a67539 100644
---
a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/EsModuleManagerContribution.java
+++
b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/EsModuleManagerContribution.java
@@ -30,21 +30,21 @@ import org.apache.tapestry5.commons.OrderedConfiguration;
public final class EsModuleManagerContribution
{
private final EsModuleConfigurationCallback callback;
-
+
private final boolean isBase;
-
+
private EsModuleManagerContribution(EsModuleConfigurationCallback
callback, boolean isBase)
{
super();
this.callback = callback;
this.isBase = isBase;
}
-
+
public EsModuleConfigurationCallback getCallback()
{
return callback;
}
-
+
public boolean isBase()
{
return isBase;
@@ -59,13 +59,13 @@ public final class EsModuleManagerContribution
{
return new EsModuleManagerContribution(callback, true);
}
-
+
/**
* Creates a base contribution which sets or overrides
* one module and its URL.
* @param id the module id.
* @param url the module URL.
- * @see EsModuleConfigurationCallback#create(String, String).
+ * @see EsModuleConfigurationCallback#create(String, String)
*/
public static EsModuleManagerContribution base(String id, String url)
{
@@ -82,7 +82,7 @@ public final class EsModuleManagerContribution
{
return new EsModuleManagerContribution(callback, false);
}
-
+
/**
* Contributes a base contribution which sets or overrides
* one module and its URL.
@@ -98,20 +98,20 @@ public final class EsModuleManagerContribution
{
configuration.add(id, base(id, url));
}
-
+
/**
* Creates a global per-request contribution which sets or overrides
* one module and its URL.
* @param id the module id.
* @param url the module URL.
- * @see EsModuleConfigurationCallback#create(String, String).
+ * @see EsModuleConfigurationCallback#create(String, String)
*/
public static EsModuleManagerContribution globalPerRequest(String id,
String url)
{
return new EsModuleManagerContribution(
EsModuleConfigurationCallback.create(id, url), false);
}
-
+
/**
* Contributes a global per-thread contribution which sets or overrides
* one module and its URL.
@@ -127,5 +127,4 @@ public final class EsModuleManagerContribution
{
configuration.add(id, globalPerRequest(id, url));
}
-
-}
\ No newline at end of file
+}
diff --git
a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventDispatcherTest.java
b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventDispatcherTest.java
index 60418b59b..e9f7251f9 100644
---
a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventDispatcherTest.java
+++
b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventDispatcherTest.java
@@ -14,7 +14,6 @@ package org.apache.tapestry5.internal.services;
import org.apache.tapestry5.EventConstants;
import org.apache.tapestry5.MetaDataConstants;
-import org.apache.tapestry5.beanmodel.services.*;
import org.apache.tapestry5.http.services.Dispatcher;
import org.apache.tapestry5.http.services.Request;
import org.apache.tapestry5.http.services.Response;
@@ -34,7 +33,6 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import java.io.IOException;
-import java.util.Locale;
public class ComponentEventDispatcherTest extends InternalBaseTestCase
{
@@ -78,7 +76,7 @@ public class ComponentEventDispatcherTest extends
InternalBaseTestCase
}
/**
- * @see {@link https://issues.apache.org/jira/browse/TAPESTRY-1949}
+ * @see https://issues.apache.org/jira/browse/TAPESTRY-1949
*/
@Test
public void event_on_page_with_name_and_dotted_parameters() throws
Exception
diff --git
a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java
b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java
index 6c4e84cf7..991d4baf6 100644
---
a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java
+++
b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java
@@ -73,14 +73,14 @@ public abstract class SeleniumTestCase extends Assert
implements Selenium
/**
* Default: 15 seconds
*
- * @see {@link TapestryTestConstants#PAGE_LOAD_TIMEOUT_PARAMETER}
+ * @see TapestryTestConstants#PAGE_LOAD_TIMEOUT_PARAMETER
*/
public static final String PAGE_LOAD_TIMEOUT = "15000";
/**
* Default: 15 seconds
*
- * @see {@link TapestryTestConstants#WEBDRIVER_WAIT_TIMEOUT_PARAMETER}
+ * @see TapestryTestConstants#WEBDRIVER_WAIT_TIMEOUT_PARAMETER
* @since 5.10
*/
public static final long WEBDRIVER_WAIT_TIMEOUT = 15L;
