Initial updates for EE 11 dependencies

.github/workflows/ci-actions.yml

@@ -21,27 +21,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ '11', '17', '21' ]
+        java: [ '17', '21' ]
     steps:
       - uses: actions/[email protected]
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v4.0.0
+        uses: actions/setup-java@v4.1.0
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
-      - if: ${{ matrix.java != '11' }}
-        name: "Maven install > 11"
+      - name: "Maven install"
         run: |
           mvn -Pstaging install -DskipTests=true -Dno-format -B -V
-      - if: ${{ matrix.java == '11' }}
-        name: "Maven install 11"
-        run: |
-          mvn -Pstaging -pl '!el' install -DskipTests=true -Dno-format -B -V
-      - if: ${{ matrix.java != '11' }}
-        name: "Maven test > 11"
+      - name: "Maven test"
         run: |
           mvn -Pstaging test -B
-      - if: ${{ matrix.java == '11' }}
-        name: "Maven test 11"
-        run: |
-          mvn -Pstaging -pl '!el' test -B
+

api/pom.xml

@@ -121,10 +121,10 @@
 
 
 	<properties>
-		<annotation.api.version>3.0.0-M1</annotation.api.version>
+		<annotation.api.version>3.0.0</annotation.api.version>
 		<atinject.api.version>2.0.1</atinject.api.version>
-		<uel.api.version>5.0.1</uel.api.version>
-		<interceptor.api.version>2.2.0-M1</interceptor.api.version>
+		<uel.api.version>6.0.0</uel.api.version>
+		<interceptor.api.version>2.2.0</interceptor.api.version>
 		<maven.build.timestamp.format>MMMM dd, yyyy</maven.build.timestamp.format>
 	</properties>
 

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

@@ -91,7 +91,7 @@
      * @since 2.0
      */
     public final static class Literal extends AnnotationLiteral<ApplicationScoped> implements ApplicationScoped {
-
+        /** Default ApplicationScoped literal */
         public static final Literal INSTANCE = new Literal();
 
         private static final long serialVersionUID = 1L;

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

@@ -54,19 +54,29 @@
      * Supports inline instantiation of the {@link BeforeDestroyed} qualifier.
      */
     public final static class Literal extends AnnotationLiteral<BeforeDestroyed> implements BeforeDestroyed {
-
+        /** Default BeforeDestroyed literal for the RequestScoped scope */
         public static final Literal REQUEST = of(RequestScoped.class);
 
+        /** Default BeforeDestroyed literal for the ConversationScoped scope */
         public static final Literal CONVERSATION = of(ConversationScoped.class);
 
+        /** Default BeforeDestroyed literal for the SessionScoped scope */
         public static final Literal SESSION = of(SessionScoped.class);
 
+        /** Default BeforeDestroyed literal for the ApplicationScoped scope */
         public static final Literal APPLICATION = of(ApplicationScoped.class);
 
         private static final long serialVersionUID = 1L;
 
+        /** The scope annotation */
         private final Class<? extends Annotation> value;
 
+        /**
+         * Obtain the literal for the provided scope annotation
+         *
+         * @param value the scope annotation
+         * @return a new literal value for the provided scope annotation
+         */
         public static Literal of(Class<? extends Annotation> value) {
             return new Literal(value);
         }

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

@@ -41,18 +41,37 @@ public class BusyConversationException extends ContextException {
 
     private static final long serialVersionUID = -3599813072560026919L;
 
+    /**
+     * Creates the exception with no detail message or cause.
+     */
     public BusyConversationException() {
         super();
     }
 
+    /**
+     * Creates the exception with given detail message.
+     *
+     * @param message the detail message
+     */
     public BusyConversationException(String message) {
         super(message);
     }
 
+    /**
+     * Creates the exception with given cause.
+     *
+     * @param cause the cause
+     */
     public BusyConversationException(Throwable cause) {
         super(cause);
     }
 
+    /**
+     * Creates the exception with given detail message and cause.
+     *
+     * @param message the detail message
+     * @param cause the cause
+     */
     public BusyConversationException(String message, Throwable cause) {
         super(message, cause);
     }

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

@@ -26,18 +26,37 @@ public class ContextException extends RuntimeException {
 
     private static final long serialVersionUID = -3599813072560026919L;
 
+    /**
+     * Creates the exception with no detail message or cause.
+     */
     public ContextException() {
         super();
     }
 
+    /**
+     * Creates the exception with given detail message.
+     *
+     * @param message the detail message
+     */
     public ContextException(String message) {
         super(message);
     }
 
+    /**
+     * Creates the exception with given cause.
+     *
+     * @param cause the cause
+     */
     public ContextException(Throwable cause) {
         super(cause);
     }
 
+    /**
+     * Creates the exception with given detail message and cause.
+     *
+     * @param message the detail message
+     * @param cause the cause
+     */
     public ContextException(String message, Throwable cause) {
         super(message, cause);
     }

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

@@ -32,18 +32,37 @@ public class ContextNotActiveException extends ContextException {
 
     private static final long serialVersionUID = -3599813072560026919L;
 
+    /**
+     * Creates the exception with no detail message or cause.
+     */
     public ContextNotActiveException() {
         super();
     }
 
+    /**
+     * Creates the exception with given detail message.
+     *
+     * @param message the detail message
+     */
     public ContextNotActiveException(String message) {
         super(message);
     }
 
+    /**
+     * Creates the exception with given cause.
+     *
+     * @param cause the cause
+     */
     public ContextNotActiveException(Throwable cause) {
         super(cause);
     }
 
+    /**
+     * Creates the exception with given detail message and cause.
+     *
+     * @param message the detail message
+     * @param cause the cause
+     */
     public ContextNotActiveException(String message, Throwable cause) {
         super(message, cause);
     }

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

@@ -151,7 +151,7 @@
      * @since 2.0
      */
     public final static class Literal extends AnnotationLiteral<ConversationScoped> implements ConversationScoped {
-
+        /** Default ConversationScoped literal */
         public static final Literal INSTANCE = new Literal();
 
         private static final long serialVersionUID = 1L;

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

@@ -108,7 +108,7 @@
      * @since 2.0
      */
     public final static class Literal extends AnnotationLiteral<Dependent> implements Dependent {
-
+        /** Default Dependent literal */
         public static final Literal INSTANCE = new Literal();
 
         private static final long serialVersionUID = 1L;

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

@@ -55,19 +55,29 @@
      * @author Martin Kouba
      */
     public final static class Literal extends AnnotationLiteral<Destroyed> implements Destroyed {
-
+        /** Default Destroyed literal for the RequestScoped scope */
         public static final Literal REQUEST = of(RequestScoped.class);
 
+        /** Default Destroyed literal for the ConversationScoped scope */
         public static final Literal CONVERSATION = of(ConversationScoped.class);
 
+        /** Default Destroyed literal for the SessionScoped scope */
         public static final Literal SESSION = of(SessionScoped.class);
 
+        /** Default Destroyed literal for the ApplicationScoped scope */
         public static final Literal APPLICATION = of(ApplicationScoped.class);
 
         private static final long serialVersionUID = 1L;
 
+        /** The scope annotation */
         private final Class<? extends Annotation> value;
 
+        /**
+         * Obtain the literal of the provided scope annotation
+         *
+         * @param value the scope annotation
+         * @return a new Literal value for the provided scope annotation
+         */
         public static Literal of(Class<? extends Annotation> value) {
             return new Literal(value);
         }

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

@@ -55,19 +55,29 @@
      * @author Martin Kouba
      */
     public final static class Literal extends AnnotationLiteral<Initialized> implements Initialized {
-
+        /** Default Initialized literal for the RequestScoped scope */
         public static final Literal REQUEST = of(RequestScoped.class);
 
+        /** Default Initialized literal for the ConversationScoped scope */
         public static final Literal CONVERSATION = of(ConversationScoped.class);
 
+        /** Default Initialized literal for the SessionScoped scope */
         public static final Literal SESSION = of(SessionScoped.class);
 
+        /** Default Initialized literal for the ApplicationScoped scope */
         public static final Literal APPLICATION = of(ApplicationScoped.class);
 
         private static final long serialVersionUID = 1L;
 
+        /** The scope annotation */
         private final Class<? extends Annotation> value;
 
+        /**
+         * Obtain the literal of the provided scope annotation
+         *
+         * @param value the scope annotation
+         * @return a new Literal value for the provided scope annotation
+         */
         public static Literal of(Class<? extends Annotation> value) {
             return new Literal(value);
         }

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

@@ -38,18 +38,37 @@ public class NonexistentConversationException extends ContextException {
 
     private static final long serialVersionUID = -3599813072560026919L;
 
+    /**
+     * Creates the exception with no detail message or cause.
+     */
     public NonexistentConversationException() {
         super();
     }
 
+    /**
+     * Creates the exception with given detail message.
+     *
+     * @param message the detail message
+     */
     public NonexistentConversationException(String message) {
         super(message);
     }
 
+    /**
+     * Creates the exception with given cause.
+     *
+     * @param cause the cause
+     */
     public NonexistentConversationException(Throwable cause) {
         super(cause);
     }
 
+    /**
+     * Creates the exception with given detail message and cause.
+     *
+     * @param message the detail message
+     * @param cause the cause
+     */
     public NonexistentConversationException(String message, Throwable cause) {
         super(message, cause);
     }

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

@@ -95,7 +95,7 @@
      * @since 2.0
      */
     public final static class Literal extends AnnotationLiteral<RequestScoped> implements RequestScoped {
-
+        /** Default RequestScoped literal */
         public static final Literal INSTANCE = new Literal();
 
         private static final long serialVersionUID = 1L;

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

@@ -87,7 +87,7 @@
      * @since 2.0
      */
     public final static class Literal extends AnnotationLiteral<SessionScoped> implements SessionScoped {
-
+        /** Default SessionScoped literal */
         public static final Literal INSTANCE = new Literal();
 
         private static final long serialVersionUID = 1L;

api/src/main/java/jakarta/enterprise/event/NotificationOptions.java

@@ -72,10 +72,28 @@ static Builder builder() {
      */
     interface Builder {
 
+        /**
+         * Set the notification executor
+         *
+         * @param executor the {@linkplain Executor}
+         * @return this
+         */
         Builder setExecutor(Executor executor);
 
+        /**
+         * Set an option value
+         *
+         * @param optionName option name
+         * @param optionValue option value
+         * @return this
+         */
         Builder set(String optionName, Object optionValue);
 
+        /**
+         * Build the notification options
+         *
+         * @return NotificationOptions
+         */
         NotificationOptions build();
 
     }