diff --git a/api/pom.xml b/api/pom.xml
index 52c3120dd..e39b9561c 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -152,6 +152,7 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
                     <docfilessubdirs>true</docfilessubdirs>
                     <links>
                         <link>https://jakarta.ee/specifications/bean-validation/4.0/apidocs/</link>
+                        <link>https://jakarta.ee/specifications/cdi/5.0/apidocs/</link>
                         <link>https://jakarta.ee/specifications/concurrency/3.2/apidocs/</link>
                         <link>https://jakarta.ee/specifications/dependency-injection/2.0/apidocs/</link>
                         <link>https://jakarta.ee/specifications/nosql/1.1/apidocs/</link>
diff --git a/api/src/main/java/jakarta/data/Direction.java b/api/src/main/java/jakarta/data/Direction.java
index 956fec6d6..792785c92 100644
--- a/api/src/main/java/jakarta/data/Direction.java
+++ b/api/src/main/java/jakarta/data/Direction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022,2026 Contributors to the Eclipse Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,8 @@
 package jakarta.data;
 
 /**
- * Represents the direction of the ordering.
+ * Represents the {@linkplain Sort#of(String, Direction, boolean) direction}
+ * of the ordering.
  */
 public enum Direction {
     /**
diff --git a/api/src/main/java/jakarta/data/Limit.java b/api/src/main/java/jakarta/data/Limit.java
index 160197678..4b803c3da 100644
--- a/api/src/main/java/jakarta/data/Limit.java
+++ b/api/src/main/java/jakarta/data/Limit.java
@@ -24,9 +24,8 @@
 import jakarta.data.repository.Query;
 
 /**
- * <p>Specifies a limit on the number of results retrieved by a repository
- * method. The results of a single invocation of a repository method may be
- * limited to
+ * <p>Limits the number of results retrieved by a repository method.
+ * The results of a repository method invocation can be limited to
  * <ul>
  * <li>a {@linkplain #of(int) maximum number of results},</li>
  * <li>a {@linkplain #of(int, long) maximum number of results relative to an
diff --git a/api/src/main/java/jakarta/data/constraint/Constraint.java b/api/src/main/java/jakarta/data/constraint/Constraint.java
index 5f4bd21a1..ad0bd9af8 100644
--- a/api/src/main/java/jakarta/data/constraint/Constraint.java
+++ b/api/src/main/java/jakarta/data/constraint/Constraint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025 Contributors to the Eclipse Foundation
+ * Copyright (c) 2025,2026 Contributors to the Eclipse Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@
 
 import jakarta.data.Order;
 import jakarta.data.metamodel.Attribute;
-import jakarta.data.repository.Delete;
 import jakarta.data.repository.Find;
 import jakarta.data.repository.Is;
 import jakarta.data.restrict.Restriction;
@@ -30,14 +29,22 @@
 /**
  * <p>Supertype of interfaces that define constraints on entity attributes.</p>
  *
- * <p>Constraints are used on parameter-based {@link Find} and
- * {@link Delete} methods. Constraint parameters must be positioned before
- * special parameters (such as {@link Restriction} and {@link Order}) in the
- * method signature.</p>
+ * <p>A repository method annotated {@link Find} or
+ * <a href="../../repository/Delete.html#ConstraintQueryDelete">
+ * {@code Delete}</a> can define a query constraint by declaring the
+ * <a href="#MethodParamType">type of a method parameter</a> or the
+ * <a href="#IsAnnoValue">value of a method parameter's {@code Is} annotation
+ * </a> to be a subtype of {@code Constraint}. These method parameters must be
+ * positioned before <a href="../../../module-summary.html#SpecialParameters">
+ * special parameters</a> (such as {@link Restriction} and {@link Order})
+ * in the method signature.
  *
- * <h2>Method parameter</h2>
+ * <a id="MethodParamType">
+ * <h2>Type of method parameter</h2>
+ * </a>
  *
- * <p>Constraint parameters can be of type {@code C<T>} or {@code C<? super T>}
+ * <p>A repository method constraint parameter can be of type
+ * {@code C<T>} or {@code C<? super T>}
  * where {@code C} is {@code Constraint} or any subtype of {@code Constraint},
  * such as {@link Like} or {@link LessThan}, and {@code T} is the entity
  * attribute type. For example,
@@ -59,9 +66,11 @@
  *                                       _Car.vin.asc()));
  * }
  *
- * <h2>Annotation value</h2>
+ * <a id="IsAnnoValue">
+ * <h2>Value of {@code @Is} Annotation</h2>
+ * </a>
  *
- * <p>Constraint parameters of repository methods can be annotated with the
+ * <p>A repository method constraint parameter can be annotated with the
  * {@link Is @Is} annotation to indicate the subtype of {@code Constraint}.
  * The type of the method parameter must be the entity attribute type.
  * For example,
diff --git a/api/src/main/java/jakarta/data/constraint/package-info.java b/api/src/main/java/jakarta/data/constraint/package-info.java
index 89a09e376..ccaadbe10 100644
--- a/api/src/main/java/jakarta/data/constraint/package-info.java
+++ b/api/src/main/java/jakarta/data/constraint/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025 Contributors to the Eclipse Foundation
+ * Copyright (c) 2025,2026 Contributors to the Eclipse Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,10 +18,12 @@
 
 /**
  * <p>Constraints for parameter-based {@link Find} and {@link Delete} methods.
- * </p>
  *
  * <p>The {@link Is @Is} annotation and the constraint classes listed below
- * describe how to use constraints with repository methods.</p>
+ * describe how to use constraints with repository methods.
+ *
+ * <p>The module Javadoc provides an {@linkplain jakarta.data/ overview} of
+ * Jakarta Data.
  *
  * @since 1.1
  */
diff --git a/api/src/main/java/jakarta/data/event/LifecycleEvent.java b/api/src/main/java/jakarta/data/event/LifecycleEvent.java
index 2e7cf1f57..f17b5ae7b 100644
--- a/api/src/main/java/jakarta/data/event/LifecycleEvent.java
+++ b/api/src/main/java/jakarta/data/event/LifecycleEvent.java
@@ -19,6 +19,9 @@
 
 import jakarta.annotation.Nonnull;
 import jakarta.data.messages.Messages;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.event.ObservesAsync;
+import jakarta.enterprise.event.TransactionPhase;
 
 /**
  * <p>Abstract supertype of events relating to lifecycle methods.</p>
@@ -27,21 +30,21 @@
  *     void onInsertBook(@Observes PostInsertEvent<Book> bookInsertion) {
  *         Book book = bookInsertion.entity();
  *         ...
- * }
+ *     }
  * }
  * <p>As usual for a CDI event, an observer of a {@code LifecycleEvent}
  * is notified synchronously and immediately by default. An observer may elect
  * to receive notifications during a phase of the transaction completion cycle
- * by explicitly specifying a {@code TransactionPhase}, for example:</p>
+ * by explicitly specifying a {@link TransactionPhase}, for example:</p>
  * <ul>
- * <li>{@code @Observes(during=BEFORE_COMPLETION)} to be notified just
- *     before transaction completion, or</li>
- * <li>{@code @Observes(during=AFTER_SUCCESS)} to be notified after
- *     successful completion of the transaction.</li>
+ * <li>{@link Observes @Observes(during=BEFORE_COMPLETION)}
+ *     to be notified just before transaction completion, or</li>
+ * <li>{@link Observes @Observes(during=AFTER_SUCCESS)}
+ *     to be notified after successful completion of the transaction.</li>
  * </ul>
  * <p>An observer may choose to be notified asynchronously using
- * {@code @ObservesAsync}. However, the mutable state held by the
- * {@link #entity} is not in general safe for concurrent access,
+ * {@link ObservesAsync @ObservesAsync}. However, the mutable state held
+ * by the {@link #entity} is not in general safe for concurrent access,
  * and so portable applications must not use {@code @ObservesAsync}
  * to observe a {@code LifecycleEvent}. If the state of an entity is
  * accessed from an asynchronous observer method for a lifecycle
diff --git a/api/src/main/java/jakarta/data/event/package-info.java b/api/src/main/java/jakarta/data/event/package-info.java
new file mode 100644
index 000000000..93e15419a
--- /dev/null
+++ b/api/src/main/java/jakarta/data/event/package-info.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2026 Contributors to the Eclipse Foundation
+ *
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * <p>{@linkplain LifecycleEvent Events} related to the
+ * <a href="../../../module-summary.html#StatelessRepository">
+ * stateless lifecycle methods</a>.
+ *
+ * <p>For lifecycle events named with a prefix of {@code Pre}, the event is
+ * automatically published by the Jakarta Data provider after a lifecycle
+ * method is invoked, but before the corresponding operation is requested
+ * of the datastore.
+ *
+ * <p>For lifecycle events named with a prefix of {@code Post}, the event is
+ * automatically published by the Jakarta Data provider after the corresponding
+ * operation is requested of the datastore. The application can choose to
+ * receive the event at that point or at a later time, such as when the
+ * currently active transaction completes successfully. For example,
+ *
+ * {@snippet lang="java":
+ *     void productDeleted(@Observes(during = TransactionPhase.AFTER_SUCCESS)
+ *                         PostDeleteEvent<Product> event) {
+ *         Product deleted = event.entity();
+ *         System.out.println("Product #" + deleted.getId() + " was deleted");
+ *     }
+ * }
+ *
+ * <p>The module Javadoc provides an {@linkplain jakarta.data/ overview} of
+ * Jakarta Data.
+ *
+ * @since 1.1
+ */
+package jakarta.data.event;
diff --git a/api/src/main/java/jakarta/data/exceptions/package-info.java b/api/src/main/java/jakarta/data/exceptions/package-info.java
index a4adc65a8..1f59c4628 100644
--- a/api/src/main/java/jakarta/data/exceptions/package-info.java
+++ b/api/src/main/java/jakarta/data/exceptions/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022,2026 Contributors to the Eclipse Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,5 +18,8 @@
 
 /**
  * Common data access exceptions.
+ *
+ * <p>The module Javadoc provides an {@linkplain jakarta.data/ overview} of
+ * Jakarta Data.
  */
 package jakarta.data.exceptions;
\ No newline at end of file
diff --git a/api/src/main/java/jakarta/data/expression/package-info.java b/api/src/main/java/jakarta/data/expression/package-info.java
new file mode 100644
index 000000000..d385150ae
--- /dev/null
+++ b/api/src/main/java/jakarta/data/expression/package-info.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2026 Contributors to the Eclipse Foundation
+ *
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * <p>An {@linkplain Expression expression} represents an
+ * {@linkplain Attribute entity attribute}, function, or literal value.
+ *
+ * <p>Expressions are primarily used by the
+ * {@linkplain StaticMetamodel static metamodel} to compose
+ * {@linkplain Restriction restrictions} at runtime, but can also compose
+ * {@linkplain Sort#asc(ComparableExpression) sorts} and
+ * {@linkplain Constraint constraints}.
+ *
+ * <p>The module Javadoc provides an {@linkplain jakarta.data/ overview} of
+ * Jakarta Data.
+ *
+ * @since 1.1
+ */
+package jakarta.data.expression;
+
+import jakarta.data.constraint.Constraint;
+import jakarta.data.metamodel.Attribute;
+import jakarta.data.metamodel.StaticMetamodel;
+import jakarta.data.restrict.Restriction;
+import jakarta.data.Sort;
\ No newline at end of file
diff --git a/api/src/main/java/jakarta/data/messages/package-info.java b/api/src/main/java/jakarta/data/messages/package-info.java
new file mode 100644
index 000000000..ed06575c6
--- /dev/null
+++ b/api/src/main/java/jakarta/data/messages/package-info.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2026 Contributors to the Eclipse Foundation
+ *
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * <p>Internal package for messages. Do not use this package within
+ * applications. It is not exported by the data module.
+ *
+ * <p>The module Javadoc provides an {@linkplain jakarta.data/ overview} of
+ * Jakarta Data.
+ *
+ * @since 1.1
+ */
+package jakarta.data.messages;
diff --git a/api/src/main/java/jakarta/data/metamodel/StaticMetamodel.java b/api/src/main/java/jakarta/data/metamodel/StaticMetamodel.java
index f6e6b9231..12b90cc72 100644
--- a/api/src/main/java/jakarta/data/metamodel/StaticMetamodel.java
+++ b/api/src/main/java/jakarta/data/metamodel/StaticMetamodel.java
@@ -140,6 +140,12 @@
  * <p>And use it to refer to entity attributes in a type-safe manner,
  *
  * {@snippet lang="java":
+ *     Restriction<Person> childrenEToH =
+ *             Restrict.all(_Person.dateOfBirth.greaterThan(LocalDate.now().minusYears(12)),
+ *                          _Person.name_last.left(1).upper().in("E", "F", "G", "H"));
+ * }
+ *
+ * {@snippet lang="java":
  *     Order<Person> order =
  *             Order.by(_Person.dateOfBirth.desc(),
  *                      _Person.name_last.asc(),
diff --git a/api/src/main/java/jakarta/data/metamodel/impl/package-info.java b/api/src/main/java/jakarta/data/metamodel/impl/package-info.java
index 2e8b65cac..cfcfbbc59 100644
--- a/api/src/main/java/jakarta/data/metamodel/impl/package-info.java
+++ b/api/src/main/java/jakarta/data/metamodel/impl/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025 Contributors to the Eclipse Foundation
+ * Copyright (c) 2025,2026 Contributors to the Eclipse Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,5 +16,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+/**
+ * Deprecated - do not use. For more complete access to the static metamodel,
+ * use the most specific subtype of {@link jakarta.data.metamodel.Attribute}
+ * that applies to the entity attribute, such as
+ * {@link jakarta.data.metamodel.TextAttribute#of(Class, String) TextAttribute}
+ * or {@link jakarta.data.metamodel.NumericAttribute#of(Class, String, Class)
+ * NumericAttribute}.
+ */
 @Deprecated(since = "1.1")
 package jakarta.data.metamodel.impl;
diff --git a/api/src/main/java/jakarta/data/metamodel/package-info.java b/api/src/main/java/jakarta/data/metamodel/package-info.java
index 5d9f8e6f5..db32a9196 100644
--- a/api/src/main/java/jakarta/data/metamodel/package-info.java
+++ b/api/src/main/java/jakarta/data/metamodel/package-info.java
@@ -22,7 +22,7 @@
  *
  * <p>The {@link jakarta.data.metamodel.StaticMetamodel} allows for type-safe
  * operations that avoid the
- * need to hard-code entity attribute names as Strings. For example,
+ * need to hard-code entity attribute names as {@code String}s. For example,
  *
  * {@snippet lang="java":
  * @Entity
@@ -71,7 +71,7 @@
  *     page1 = products.findByNameLike(namePattern, pageRequest);
  * }
  *
- * <p>The module Javadoc provides an {@link jakarta.data/ overview} of Jakarta
- * Data.</p>
+ * <p>The module Javadoc provides an {@linkplain jakarta.data/ overview} of
+ * Jakarta Data.
  */
 package jakarta.data.metamodel;
diff --git a/api/src/main/java/jakarta/data/package-info.java b/api/src/main/java/jakarta/data/package-info.java
index b1ef00889..afa859307 100644
--- a/api/src/main/java/jakarta/data/package-info.java
+++ b/api/src/main/java/jakarta/data/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022,2026 Contributors to the Eclipse Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
  * focus on the data model, while delegating away the complexities of data
  * persistence.</p>
  *
- * <p>The module Javadoc provides an {@link jakarta.data/ overview} of Jakarta
- * Data.</p>
+ * <p>The module Javadoc provides an {@linkplain jakarta.data/ overview} of
+ * Jakarta Data.
  */
 package jakarta.data;
diff --git a/api/src/main/java/jakarta/data/page/impl/package-info.java b/api/src/main/java/jakarta/data/page/impl/package-info.java
new file mode 100644
index 000000000..a3bf852af
--- /dev/null
+++ b/api/src/main/java/jakarta/data/page/impl/package-info.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2026 Contributors to the Eclipse Foundation
+ *
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * <p>SPI related to pagination. This package forms part of the
+ * Jakarta Data Service Provider Interface (SPI). Jakarta Data providers
+ * can use the implementations of {@link jakarta.data.page.Page} and
+ * {@link jakarta.data.page.CursoredPage} found in this package.
+ * Applications must not use this package directly.
+ *
+ * <p>The module Javadoc provides an {@linkplain jakarta.data/ overview} of
+ * Jakarta Data.
+ */
+package jakarta.data.page.impl;
diff --git a/api/src/main/java/jakarta/data/spi/expression/function/package-info.java b/api/src/main/java/jakarta/data/spi/expression/function/package-info.java
new file mode 100644
index 000000000..ff4ab3b4f
--- /dev/null
+++ b/api/src/main/java/jakarta/data/spi/expression/function/package-info.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2026 Contributors to the Eclipse Foundation
+ *
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * SPI for function expressions. This package forms part of the
+ * Jakarta Data Service Provider Interface (SPI). Jakarta Data providers
+ * can use the interfaces within this package to identify the type of
+ * function expression and the arguments supplied to it. Applications
+ * must not use this package directly.
+ *
+ * <p>The module Javadoc provides an {@linkplain jakarta.data/ overview} of
+ * Jakarta Data.
+ *
+ * @since 1.1
+ */
+package jakarta.data.spi.expression.function;
diff --git a/api/src/main/java/jakarta/data/spi/expression/literal/package-info.java b/api/src/main/java/jakarta/data/spi/expression/literal/package-info.java
new file mode 100644
index 000000000..2e3e3ed6f
--- /dev/null
+++ b/api/src/main/java/jakarta/data/spi/expression/literal/package-info.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2026 Contributors to the Eclipse Foundation
+ *
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * SPI for literal expressions. This package forms part of the
+ * Jakarta Data Service Provider Interface (SPI). Jakarta Data providers
+ * can use the interfaces within this package to identify the type of
+ * literal expression and its value. Applications must not use this
+ * package directly.
+ *
+ * <p>The module Javadoc provides an {@linkplain jakarta.data/ overview} of
+ * Jakarta Data.
+ *
+ * @since 1.1
+ */
+package jakarta.data.spi.expression.literal;
diff --git a/api/src/main/java/jakarta/data/spi/expression/path/package-info.java b/api/src/main/java/jakarta/data/spi/expression/path/package-info.java
new file mode 100644
index 000000000..bdd14e2fa
--- /dev/null
+++ b/api/src/main/java/jakarta/data/spi/expression/path/package-info.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2026 Contributors to the Eclipse Foundation
+ *
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * SPI for navigable expressions. This package forms part of the
+ * Jakarta Data Service Provider Interface (SPI). Jakarta Data providers
+ * can use the interfaces within this package to identify the type of
+ * navigable expression and the attribute to which its path navigates.
+ * Applications must not use this package directly.
+ *
+ * <p>The module Javadoc provides an {@linkplain jakarta.data/ overview} of
+ * Jakarta Data.
+ *
+ * @since 1.1
+ */
+package jakarta.data.spi.expression.path;
diff --git a/api/src/main/java/jakarta/data/spi/package-info.java b/api/src/main/java/jakarta/data/spi/package-info.java
new file mode 100644
index 000000000..427093af4
--- /dev/null
+++ b/api/src/main/java/jakarta/data/spi/package-info.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2026 Contributors to the Eclipse Foundation
+ *
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * SPI for Jakarta Data providers. This package forms part of the
+ * Jakarta Data Service Provider Interface (SPI). Applications must not
+ * use this package directly.
+ *
+ * <p>The module Javadoc provides an {@linkplain jakarta.data/ overview} of
+ * Jakarta Data.
+ *
+ * @since 1.1
+ */
+package jakarta.data.spi;
diff --git a/api/src/main/java/module-info.java b/api/src/main/java/module-info.java
index d286658e6..1a4bc870a 100644
--- a/api/src/main/java/module-info.java
+++ b/api/src/main/java/module-info.java
@@ -1630,6 +1630,7 @@
  */
 module jakarta.data {
     requires static jakarta.annotation;    // compile time dependency for nullness annotations
+    requires static jakarta.cdi;           // Javadoc compile time dependency
     requires static jakarta.concurrency;   // Javadoc compile time dependency
     requires static jakarta.inject;        // Javadoc compile time dependency
     requires static jakarta.nosql.core;    // Javadoc compile time dependency