Add module-info to the api artifacts, update to Java SE 11 (#565)

* Correct the readme url in 2021-10-25-pages-here.md * Update the root readme * Update asciidoc plugin and config for #558 * Add explicit asciidoctorj version and dependency, update sourceDirectory and imagesdir * Change to canAccess to avoid isAccessible deprecation * Add module infos to api artifacts Signed-off-by: starksm64 <starksm64@gmail.com>
jakartaee · Dec 7, 2021 · 833bfdb · 833bfdb
1 parent 7b085ac
commit 833bfdb
Show file tree

Hide file tree

Showing 7 changed files with 71 additions and 16 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -130,18 +130,17 @@
 
 	<properties>
 		<annotation.api.version>2.1.0-B1</annotation.api.version>
-		<atinject.api.version>2.0.0</atinject.api.version>
-		<uel.api.version>4.0.0</uel.api.version>
-		<interceptor.api.version>2.0.0</interceptor.api.version>
+		<atinject.api.version>2.0.1</atinject.api.version>
+		<uel.api.version>5.0.0</uel.api.version>
+		<interceptor.api.version>2.0.1-RC1</interceptor.api.version>
 		<!-- These are only used in javadoc links -->
 		<ejb.api.version>4.0.0-RC2</ejb.api.version>
 		<transaction.api.version>2.0.0-RC2</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>
-		<maven-javadoc-plugin>3.2.0</maven-javadoc-plugin>
-		<maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
+		<maven.compiler.release>11</maven.compiler.release>
+		<maven-bundle-plugin.version>5.1.2</maven-bundle-plugin.version>
+		<maven-javadoc-plugin>3.3.0</maven-javadoc-plugin>
+		<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
@@ -310,6 +309,15 @@
 			</testResource>
 		</testResources>
 		<plugins>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.8.1</version>
+				<configuration>
+					<compilerArgs>
+						<arg>-Xlint:all</arg>
+					</compilerArgs>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
@@ -362,6 +370,7 @@
 							<excludes>
 								<exclude>**/privileged/**</exclude>
 							</excludes>
+							<useModulePath>false</useModulePath>
 						</configuration>
 					</execution>
 					<execution>
@@ -379,6 +388,7 @@
 							</includes>
 							<argLine>-Djava.security.manager -Djava.security.policy=${project.build.testOutputDirectory}/java.policy</argLine>
 							<forkCount>0</forkCount>
+							<useModulePath>false</useModulePath>
 						</configuration>
 					</execution>
 				</executions>
@@ -391,6 +401,7 @@
 					<docfilessubdirs>true</docfilessubdirs>
 					<description>Jakarta Context Dependency Injection API</description>
 					<doctitle>Jakarta Context Dependency Injection API</doctitle>
+					<detectJavaApiLink>false</detectJavaApiLink>
 					<windowtitle>Jakarta Context Dependency Injection API</windowtitle>
 					<header><![CDATA[<br>Jakarta Context Dependency Injection ${project.version}]]>
 					</header>

diff --git a/api/src/main/java/jakarta/enterprise/util/AnnotationLiteral.java b/api/src/main/java/jakarta/enterprise/util/AnnotationLiteral.java
@@ -287,7 +287,7 @@ private static Object getMemberValue(Method member, Annotation instance) {
 
     private static Object invoke(Method method, Object instance) {
         try {
-            if (!method.isAccessible())
+            if (!method.canAccess(instance))
                 SecurityActions.setAccessible(method);
             return method.invoke(instance);
         } catch (IllegalArgumentException | IllegalAccessException | InvocationTargetException e) {

diff --git a/api/src/main/java/module-info.java b/api/src/main/java/module-info.java
@@ -0,0 +1,27 @@
+module jakarta.cdi {
+    exports jakarta.decorator;
+    exports jakarta.enterprise.context;
+    exports jakarta.enterprise.context.control;
+    exports jakarta.enterprise.context.spi;
+    exports jakarta.enterprise.event;
+    exports jakarta.enterprise.inject;
+    exports jakarta.enterprise.inject.build.compatible.spi;
+    exports jakarta.enterprise.inject.literal;
+    exports jakarta.enterprise.inject.se;
+    exports jakarta.enterprise.inject.spi;
+    exports jakarta.enterprise.inject.spi.configurator;
+    exports jakarta.enterprise.util;
+
+    requires transitive jakarta.annotation;
+    requires transitive jakarta.interceptor;
+    requires transitive jakarta.cdi.lang.model;
+    requires transitive jakarta.inject;
+    requires static jakarta.el;
+    // For javadoc
+    requires static java.naming;
+    //TODO: requires static jakarta.transation;
+
+    uses jakarta.enterprise.inject.se.SeContainerInitializer;
+    uses jakarta.enterprise.inject.spi.CDIProvider;
+    uses jakarta.enterprise.inject.build.compatible.spi.BuildServices;
+}
diff --git a/api/src/test/java/org/jboss/cdi/api/test/se/DummySeContainerInitializer.java b/api/src/test/java/org/jboss/cdi/api/test/se/DummySeContainerInitializer.java
@@ -60,8 +60,9 @@ public SeContainerInitializer addExtensions(Extension... extensions) {
         return null;
     }
 
+    @SafeVarargs
     @Override
-    public SeContainerInitializer addExtensions(Class<? extends Extension>... extensions) {
+    public final SeContainerInitializer addExtensions(Class<? extends Extension>... extensions) {
         return null;
     }
 
@@ -80,8 +81,9 @@ public SeContainerInitializer selectAlternatives(Class<?>... alternativeClasses)
         return null;
     }
 
+    @SafeVarargs
     @Override
-    public SeContainerInitializer selectAlternativeStereotypes(Class<? extends Annotation>... alternativeStereotypeClasses) {
+    public final SeContainerInitializer selectAlternativeStereotypes(Class<? extends Annotation>... alternativeStereotypeClasses) {
         return null;
     }
 

diff --git a/api/src/test/java/org/jboss/cdi/api/test/se/DummySeContainerInitializer2.java b/api/src/test/java/org/jboss/cdi/api/test/se/DummySeContainerInitializer2.java
@@ -60,8 +60,9 @@ public SeContainerInitializer addExtensions(Extension... extensions) {
         return null;
     }
 
+    @SafeVarargs
     @Override
-    public SeContainerInitializer addExtensions(Class<? extends Extension>... extensions) {
+    public final SeContainerInitializer addExtensions(Class<? extends Extension>... extensions) {
         return null;
     }
 
@@ -80,8 +81,9 @@ public SeContainerInitializer selectAlternatives(Class<?>... alternativeClasses)
         return null;
     }
 
+    @SafeVarargs
     @Override
-    public SeContainerInitializer selectAlternativeStereotypes(Class<? extends Annotation>... alternativeStereotypeClasses) {
+    public final SeContainerInitializer selectAlternativeStereotypes(Class<? extends Annotation>... alternativeStereotypeClasses) {
         return null;
     }
 

diff --git a/lang-model/pom.xml b/lang-model/pom.xml
@@ -22,9 +22,8 @@
 	</licenses>
 
 	<properties>
-		<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>
+		<maven.compiler.release>11</maven.compiler.release>
+		<maven-bundle-plugin.version>5.1.2</maven-bundle-plugin.version>
 		<maven-javadoc-plugin>3.2.0</maven-javadoc-plugin>
 		<maven-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -46,6 +45,15 @@
 		</resources>
 
 		<plugins>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.8.1</version>
+				<configuration>
+					<compilerArgs>
+						<arg>-Xlint:all</arg>
+					</compilerArgs>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>

diff --git a/lang-model/src/main/java/module-info.java b/lang-model/src/main/java/module-info.java
@@ -0,0 +1,5 @@
+module jakarta.cdi.lang.model {
+    exports jakarta.enterprise.lang.model;
+    exports jakarta.enterprise.lang.model.declarations;
+    exports jakarta.enterprise.lang.model.types;
+}