Create a 3.0.x service release with a module-info

Signed-off-by: Scott M Stark <starksm64@gmail.com>
jakartaee · Jan 25, 2022 · 1941ce3 · 1941ce3
1 parent 4675f2a
commit 1941ce3
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 15 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -21,12 +21,11 @@
 	<parent>
 		<groupId>jakarta.enterprise</groupId>
 		<artifactId>jakarta.enterprise.cdi-parent</artifactId>
-		<version>3.0.0</version>
+		<version>3.0.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>jakarta.enterprise.cdi-api</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.0</version>
 
 	<name>CDI APIs</name>
 	<description>APIs for CDI (Contexts and Dependency Injection for Java)</description>
@@ -130,17 +129,16 @@
 
 
 	<properties>
-		<atinject.api.version>2.0.0</atinject.api.version>
+		<atinject.api.version>2.0.1</atinject.api.version>
 		<uel.api.version>4.0.0</uel.api.version>
-		<interceptor.api.version>2.0.0</interceptor.api.version>
+		<interceptor.api.version>2.0.1</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>
+		<ejb.api.version>4.0.0</ejb.api.version>
+		<transaction.api.version>2.0.0</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-surefire-plugin.version>2.22.0</maven-surefire-plugin.version>
+		<maven-bundle-plugin.version>5.1.2</maven-bundle-plugin.version>
+		<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
+		<maven-javadoc-plugin.version>3.3.0</maven-javadoc-plugin.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
@@ -305,7 +303,6 @@
 				</executions>
 				<configuration>
 					<instructions>
-						<Automatic-Module-Name>jakarta.cdi</Automatic-Module-Name>
 						<Export-Package>
 							jakarta.decorator;version=3.0,
 							jakarta.enterprise.*;version=3.0,
@@ -342,6 +339,7 @@
 							<excludes>
 								<exclude>**/privileged/**</exclude>
 							</excludes>
+							<useModulePath>false</useModulePath>
 						</configuration>
 					</execution>
 					<execution>
@@ -359,13 +357,46 @@
 							</includes>
 							<argLine>-Djava.security.manager -Djava.security.policy=${project.build.testOutputDirectory}/java.policy</argLine>
 							<forkCount>0</forkCount>
+							<useModulePath>false</useModulePath>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!--
+			Use the JDK 11+ compiler but with -source 1.8 for all
+			but the module-info.java file.
+			-->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.8.1</version>
+				<configuration>
+					<release>9</release>
+					<compilerArgs>
+						<arg>-Xlint:all</arg>
+					</compilerArgs>
+					<showDeprecation>true</showDeprecation>
+					<showWarnings>true</showWarnings>
+				</configuration>
+				<executions>
+					<execution>
+						<id>base-compile</id>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+						<configuration>
+							<release>8</release>
+							<excludes>
+								<exclude>module-info.java</exclude>
+							</excludes>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>${maven-javadoc-plugin.version}</version>
 				<configuration>
 					<docfilessubdirs>true</docfilessubdirs>
 					<description>Jakarta Context Dependency Injection API</description>

diff --git a/api/src/main/java/jakarta/enterprise/inject/spi/SessionBeanType.java b/api/src/main/java/jakarta/enterprise/inject/spi/SessionBeanType.java
@@ -16,8 +16,6 @@
  */
 package jakarta.enterprise.inject.spi;
 
-import jakarta.ejb.Stateless;
-
 /**
  * Identifies the kind of EJB session bean.
  * 

diff --git a/api/src/main/java/module-info.java b/api/src/main/java/module-info.java
@@ -0,0 +1,24 @@
+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.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.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;
+}
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 	<groupId>jakarta.enterprise</groupId>
 	<artifactId>jakarta.enterprise.cdi-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>3.0.0</version>
+	<version>3.0.1-SNAPSHOT</version>
 
 	<description>Parent module for CDI Specification</description>
 

diff --git a/spec/pom.xml b/spec/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>jakarta.enterprise</groupId>
 		<artifactId>jakarta.enterprise.cdi-parent</artifactId>
-		<version>3.0.0</version>
+		<version>3.0.1-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>jakarta.enterprise.cdi-spec-doc</artifactId>