Merge the missing changes from the 3.0 branch to master

Signed-off-by: Scott M Stark <starksm64@gmail.com>

api/pom.xml

@@ -20,14 +20,13 @@
 
 	<parent>
 		<groupId>jakarta.enterprise</groupId>
-		<artifactId>cdi-parent</artifactId>
+		<artifactId>jakarta.enterprise.cdi-parent</artifactId>
 		<version>3.0.0-SNAPSHOT</version>
 	</parent>
 
-	<groupId>jakarta.enterprise</groupId>
 	<artifactId>jakarta.enterprise.cdi-api</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.0-SNAPSHOT</version>
+	<version>3.0.0-M3</version>
 
 	<name>CDI APIs</name>
 	<description>APIs for CDI (Contexts and Dependency Injection for Java)</description>
@@ -131,9 +130,11 @@
 
 
 	<properties>
-		<atinject.api.version>2.0.0-RC3</atinject.api.version>
-		<uel.api.version>4.0.0.M1</uel.api.version>
+		<atinject.api.version>2.0.0-RC4</atinject.api.version>
+		<uel.api.version>4.0.0-RC1</uel.api.version>
 		<interceptor.api.version>2.0.0-RC2</interceptor.api.version>
+		<ejb.api.version>4.0.0-RC2</ejb.api.version>
+		<transaction.api.version>2.0.0-RC1</transaction.api.version>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<maven-bundle-plugin.version>2.5.4</maven-bundle-plugin.version>
@@ -169,6 +170,17 @@
 				<version>${interceptor.api.version}</version>
 			</dependency>
 
+			<!-- Only for javadoc references -->
+			<dependency>
+				<groupId>jakarta.transaction</groupId>
+				<artifactId>jakarta.transaction-api</artifactId>
+				<version>${transaction.api.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>jakarta.ejb</groupId>
+				<artifactId>jakarta.ejb-api</artifactId>
+				<version>${ejb.api.version}</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
@@ -184,8 +196,19 @@
 		</dependency>
 
 		<dependency>
-                        <groupId>jakarta.inject</groupId>
-                        <artifactId>jakarta.inject-api</artifactId>
+			<groupId>jakarta.inject</groupId>
+			<artifactId>jakarta.inject-api</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>jakarta.transaction</groupId>
+			<artifactId>jakarta.transaction-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>jakarta.ejb</groupId>
+			<artifactId>jakarta.ejb-api</artifactId>
+			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
@@ -332,6 +355,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
+				<version>3.2.0</version>
 				<configuration>
 					<archive>
 						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
@@ -368,6 +392,7 @@
 								<include>**/privileged/**</include>
 							</includes>
 							<argLine>-Djava.security.manager -Djava.security.policy=${project.build.testOutputDirectory}/java.policy</argLine>
+							<forkCount>0</forkCount>
 						</configuration>
 					</execution>
 				</executions>

api/src/main/java/jakarta/decorator/package-info.java

@@ -65,8 +65,8 @@
  *  
  * <p>By default, a bean archive has no enabled decorators. A 
  * decorator must be explicitly enabled by listing its bean class 
- * under the <tt>&lt;decorators&gt;</tt> element of the 
- * <tt>beans.xml</tt> file of the bean archive. The order of the 
+ * under the <code>&lt;decorators&gt;</code> element of the
+ * <code>beans.xml</code> file of the bean archive. The order of the
  * decorator declarations determines the decorator ordering. 
  * Decorators which occur earlier in the list are called first.</p>
  * 

api/src/main/java/jakarta/enterprise/context/ApplicationScoped.java

@@ -34,7 +34,7 @@
  * Specifies that a bean is application scoped.
  * </p>
  * <p>
- * While <tt>ApplicationScoped</tt> must be associated with the built-in application context required by the specification,
+ * While <code>ApplicationScoped</code> must be associated with the built-in application context required by the specification,
  * third-party extensions are
  * allowed to also associate it with their own context. Behavior described below is only related to the built-in application context.
  * </p>
@@ -44,15 +44,15 @@
  * </p>
  *
  * <ul>
- * <li>during the <tt>service()</tt> method of any servlet in the web application, during the <tt>doFilter()</tt> method of any
- * servlet filter and when the container calls any <tt>ServletContextListener</tt>, <tt>HttpSessionListener</tt>,
- * <tt>AsyncListener</tt> or <tt>ServletRequestListener</tt>,</li>
+ * <li>during the <code>service()</code> method of any servlet in the web application, during the <code>doFilter()</code> method of any
+ * servlet filter and when the container calls any <code>ServletContextListener</code>, <code>HttpSessionListener</code>,
+ * <code>AsyncListener</code> or <code>ServletRequestListener</code>,</li>
  * <li>during any Java EE web service invocation,</li>
  * <li>during any remote method invocation of any EJB, during any asynchronous method invocation of any EJB, during any call to
  * an EJB timeout method and during message delivery to any EJB message-driven bean,</li>
- * <li>when the disposer method or <tt>@PreDestroy</tt> callback of any bean with any normal scope other than
- * <tt>@ApplicationScoped</tt> is called, and</li>
- * <li>during <tt>@PostConstruct</tt> callback of any bean.</li>
+ * <li>when the disposer method or <code>@PreDestroy</code> callback of any bean with any normal scope other than
+ * <code>@ApplicationScoped</code> is called, and</li>
+ * <li>during <code>@PostConstruct</code> callback of any bean.</li>
  * </ul>
  *
  * <p>
@@ -65,14 +65,14 @@
  * </p>
  *
  * <p>
-  * An event with qualifier <tt>@Initialized(ApplicationScoped.class)</tt> is fired when the application context is initialized
-  * and an event with qualifier <tt>@Destroyed(ApplicationScoped.class)</tt> when the application context is destroyed.
+  * An event with qualifier <code>@Initialized(ApplicationScoped.class)</code> is fired when the application context is initialized
+  * and an event with qualifier <code>@Destroyed(ApplicationScoped.class)</code> when the application context is destroyed.
   * The event payload is:
   * </p>
   *
   * <ul>
-  * <li>the <tt>ServletContext</tt> if the application is a web application deployed to a Servlet container, or</li>
-  * <li>any <tt>java.lang.Object</tt> for other types of application.</li>
+  * <li>the <code>ServletContext</code> if the application is a web application deployed to a Servlet container, or</li>
+  * <li>any <code>java.lang.Object</code> for other types of application.</li>
   * </ul>
  *
  * @author Gavin King

api/src/main/java/jakarta/enterprise/context/BusyConversationException.java

@@ -26,7 +26,7 @@
  * <p>
  * The container ensures that a long-running conversation may be associated with at most one request at a time, by blocking or
  * rejecting concurrent requests. If the container rejects a request, it must associate the request with a new transient
- * conversation and throw an exception of type <tt>BusyConversationException</tt> from the restore view phase of the JSF
+ * conversation and throw an exception of type <code>BusyConversationException</code> from the restore view phase of the JSF
  * lifecycle.
  * </p>
  * 

api/src/main/java/jakarta/enterprise/context/Conversation.java

@@ -107,7 +107,7 @@ public interface Conversation {
      * Determine if the conversation is marked transient or long-running.
      * </p>
      * 
-     * @return <tt>true</tt> if the conversation is marked transient, or <tt>false</tt>if it is marked long-running.
+     * @return <code>true</code> if the conversation is marked transient, or <code>false</code>if it is marked long-running.
      */
     public boolean isTransient();
 }

api/src/main/java/jakarta/enterprise/context/ConversationScoped.java

@@ -34,7 +34,7 @@
  * Specifies that a bean is conversation scoped.
  * </p>
  *  <p>
- * While <tt>ConversationScoped</tt> must be associated with the built-in conversation context required by the specification,
+ * While <code>ConversationScoped</code> must be associated with the built-in conversation context required by the specification,
  * third-party extensions are
  * allowed to also associate it with their own context. Behavior described below is only related to the built-in conversation context.
  * </p>
@@ -45,14 +45,14 @@
  * <li>during all Servlet requests.</li>
  * </ul>
  * <p>
- * An event with qualifier <tt>@Initialized(ConversationScoped.class)</tt> is fired when the conversation context is initialized
- * and an event with qualifier <tt>@Destroyed(ConversationScoped.class)</tt> is fired when the conversation is destroyed.
+ * An event with qualifier <code>@Initialized(ConversationScoped.class)</code> is fired when the conversation context is initialized
+ * and an event with qualifier <code>@Destroyed(ConversationScoped.class)</code> is fired when the conversation is destroyed.
  * The event payload is:
  * </p>
  * <ul>
  * <li>the conversation id if the conversation context is destroyed and is not associated with a current Servlet request, or</li>
- * <li>the <tt>ServletRequest</tt> if the application is a web application deployed to a Servlet container, or</li>
- * <li>any <tt>java.lang.Object</tt> for other types of application.</li>
+ * <li>the <code>ServletRequest</code> if the application is a web application deployed to a Servlet container, or</li>
+ * <li>any <code>java.lang.Object</code> for other types of application.</li>
  * </ul>
  *
  * <p>
@@ -62,12 +62,12 @@
  *
  * <ul>
  * <li>Any Servlet request has exactly one associated conversation.</li>
- * <li>The container provides a filter with the name "CDI Conversation Filter", which may be mapped in <tt>web.xml</tt>,
+ * <li>The container provides a filter with the name "CDI Conversation Filter", which may be mapped in <code>web.xml</code>,
  * allowing the user alter when the conversation is associated with the servlet request. If this filter is not mapped in any
- * <tt>web.xml</tt> in the application, the conversation associated with a Servlet request is determined at the beginning of the
- * request before calling any <tt>service()</tt> method of any servlet in the web application, calling the <tt>doFilter()</tt>
- * method of any servlet filter in the web application and before the container calls any <tt>ServletRequestListener</tt> or
- * <tt>AsyncListener</tt> in the web application.</li>
+ * <code>web.xml</code> in the application, the conversation associated with a Servlet request is determined at the beginning of the
+ * request before calling any <code>service()</code> method of any servlet in the web application, calling the <code>doFilter()</code>
+ * method of any servlet filter in the web application and before the container calls any <code>ServletRequestListener</code> or
+ * <code>AsyncListener</code> in the web application.</li>
  * </ul>
  *
  *
@@ -94,7 +94,7 @@
  * <p>
  * If the conversation associated with the current Servlet request is in the <em>long-running</em> state at the end of a Servlet
  * request, it is not destroyed. The long-running conversation associated with a request may be propagated to any Servlet
- * request via use of a request parameter named <tt>cid</tt> containing the unique identifier of the conversation. In this
+ * request via use of a request parameter named <code>cid</code> containing the unique identifier of the conversation. In this
  * case, the application must manage this request parameter.
  * </p>
  *
@@ -107,21 +107,21 @@
  * <li>The long-running conversation context associated with a request that renders a JSF view is automatically propagated to
  * any faces request (JSF form submission) that originates from that rendered page.</li>
  * <li>The long-running conversation context associated with a request that results in a JSF redirect (a redirect resulting from
- * a navigation rule or JSF <tt>NavigationHandler</tt>) is automatically propagated to the resulting non-faces request, and to any other
- * subsequent request to the same URL. This is accomplished via use of a request parameter named <tt>cid</tt> containing the
+ * a navigation rule or JSF <code>NavigationHandler</code>) is automatically propagated to the resulting non-faces request, and to any other
+ * subsequent request to the same URL. This is accomplished via use of a request parameter named <code>cid</code> containing the
  * unique identifier of the conversation.</li>
  * </ul>
  *
  * <p>
- * When no conversation is propagated to a Servlet request, or if a request parameter named <tt>conversationPropagation</tt> has
- * the value <tt>none</tt> the request is associated with a new transient conversation.
+ * When no conversation is propagated to a Servlet request, or if a request parameter named <code>conversationPropagation</code> has
+ * the value <code>none</code> the request is associated with a new transient conversation.
  * All long-running conversations are scoped to a particular HTTP servlet session and may not cross session boundaries.
  * In the following cases, a propagated long-running conversation cannot be restored and re-associated with the request:
  * </p>
  *
  * <ul>
  * <li>When the HTTP servlet session is invalidated, all long-running conversation contexts created during the current session
- * are destroyed, after the servlet <tt>service()</tt> method completes.</li>
+ * are destroyed, after the servlet <code>service()</code> method completes.</li>
  * <li>The container is permitted to arbitrarily destroy any long-running conversation that is associated with no current
  * Servlet request, in order to conserve resources.</li>
  * </ul>

api/src/main/java/jakarta/enterprise/context/Dependent.java

@@ -41,8 +41,8 @@
  * </p>
  *
  * <p>
- * Beans declared with scope <tt>@Dependent</tt> behave differently to beans with other built-in scope types. When a bean is
- * declared to have scope <tt>@Dependent</tt>:
+ * Beans declared with scope <code>@Dependent</code> behave differently to beans with other built-in scope types. When a bean is
+ * declared to have scope <code>@Dependent</code>:
  * </p>
  *
  * <ul>
@@ -61,37 +61,37 @@
  *
  * <p>
  * Every invocation of the {@link Context#get(Contextual, CreationalContext)} operation of the
- * context object for the <tt>@Dependent</tt> scope returns a new instance of the given bean.
+ * context object for the <code>@Dependent</code> scope returns a new instance of the given bean.
  * </p>
  *
  * <p>
  * Every invocation of the {@link Context#get(Contextual)} operation of the context object for the
- * <tt>@Dependent</tt> scope returns a null value.
+ * <code>@Dependent</code> scope returns a null value.
  * </p>
  *
  * <p>
- * The <tt>@Dependent</tt> scope is always active.
+ * The <code>@Dependent</code> scope is always active.
  * </p>
  *
  * <p>
- * Many instances of beans with scope <tt>@Dependent</tt> belong to some other bean or Java EE component class instance and are
+ * Many instances of beans with scope <code>@Dependent</code> belong to some other bean or Java EE component class instance and are
  * called dependent objects.
  * </p>
  *
  * <ul>
  * <li>Instances of decorators and interceptors are dependent objects of the bean instance they decorate.</li>
- * <li>An instance of a bean with scope <tt>@Dependent</tt> injected into a field, bean constructor or initializer method is a
+ * <li>An instance of a bean with scope <code>@Dependent</code> injected into a field, bean constructor or initializer method is a
  * dependent object of the bean or Java EE component class instance into which it was injected.</li>
- * <li>An instance of a bean with scope <tt>@Dependent</tt> injected into a producer method is a dependent object of the
+ * <li>An instance of a bean with scope <code>@Dependent</code> injected into a producer method is a dependent object of the
  * producer method bean instance that is being produced.</li>
- * <li>An instance of a bean with scope <tt>@Dependent</tt> obtained by direct invocation of an
+ * <li>An instance of a bean with scope <code>@Dependent</code> obtained by direct invocation of an
  * {@link Instance} is a dependent object of the instance of {@link Instance}.</li>
  * </ul>
  *
  * <p>
  * When the container destroys an instance of a bean or of any Java EE component class supporting injection, the container
- * destroys all its dependent objects, after the <tt>@PreDestroy</tt> callback completes and after the servlet
- * <tt>destroy()</tt> method is called.
+ * destroys all its dependent objects, after the <code>@PreDestroy</code> callback completes and after the servlet
+ * <code>destroy()</code> method is called.
  * </p>
  *
  * @author Gavin King

api/src/main/java/jakarta/enterprise/context/NonexistentConversationException.java

@@ -24,7 +24,7 @@
  * 
  * <p>
  * If the propagated conversation cannot be restored, the container must associate the request with a new transient conversation
- * and throw an exception of type <tt>NonexistentConversationException</tt>.
+ * and throw an exception of type <code>NonexistentConversationException</code>.
  * </p>
  * 
  * @see ConversationScoped

api/src/main/java/jakarta/enterprise/context/NormalScope.java

@@ -49,7 +49,7 @@
      * secondary storage. A passivating scope requires that beans with the scope are passivation capable.
      * </p>
      * 
-     * @return <tt>true</tt> if the scope type is a passivating scope type
+     * @return <code>true</code> if the scope type is a passivating scope type
      */
     boolean passivating() default false;