Merge pull request #1903 from arjantijms/module-info

Add module info and update pom

api/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2022, 2023 Contributors to Eclipse Foundation.
+    Copyright (c) 2022, 2024 Contributors to Eclipse Foundation.
     Copyright (c) 2017, 2022 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -115,7 +115,7 @@
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
-            <version>6.1.0-M1</version>
+            <version>6.1.0-M2</version>
             <scope>provided</scope>
         </dependency>
 
@@ -135,21 +135,21 @@
         <dependency>
             <groupId>jakarta.el</groupId>
             <artifactId>jakarta.el-api</artifactId>
-            <version>6.0.0-M1</version>
+            <version>6.0.0</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>jakarta.enterprise</groupId>
             <artifactId>jakarta.enterprise.cdi-api</artifactId>
-            <version>4.1.0-M1</version>
+            <version>4.1.0</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>jakarta.enterprise</groupId>
             <artifactId>jakarta.enterprise.cdi-el-api</artifactId>
-            <version>4.1.0-M1</version>
+            <version>4.1.0</version>
             <scope>provided</scope>
         </dependency>
 
@@ -191,30 +191,30 @@
         <dependency>
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
-            <version>3.2.0-M1</version>
+            <version>3.2.0-M2</version>
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>jakarta.xml.ws</groupId>
             <artifactId>jakarta.xml.ws-api</artifactId>
-            <version>4.0.1</version>
+            <version>4.0.2</version>
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
-            <version>3.0.0-M1</version>
+            <version>3.0.0</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>4.0.1</version>
+            <version>4.0.2</version>
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
@@ -272,7 +272,7 @@
                         <configuration>
                             <rules>
                                 <requireMavenVersion>
-                                    <version>3.6.0</version>
+                                    <version>3.9.0</version>
                                 </requireMavenVersion>
                             </rules>
                         </configuration>
@@ -283,7 +283,7 @@
             <!-- Restricts the Java version to 17 - API remains at Java 17 for now. -->
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
+                <version>3.12.1</version>
                 <configuration>
                     <release>17</release>
                     <compilerArgument>-Xlint:unchecked</compilerArgument>
@@ -339,6 +339,8 @@
                             <target>
                                 <delete dir="src/main/java" />
                                 <delete dir="src/main/resources" />
+                                <copy file="src/main/module/module-info.java"
+                                      tofile="src/main/java/module-info.java"/>
                             </target>
                         </configuration>
                     </execution>
@@ -396,6 +398,7 @@
                         <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
                     </archive>
                     <includes>
+                        <include>module-info.*</include>
                         <include>jakarta/**</include>
                         <include>META-INF/LICENSE.md</include>
                         <include>META-INF/NOTICE.md</include>
@@ -432,14 +435,15 @@
                             <goal>jar</goal>
                         </goals>
                         <configuration>
+                            <sourcepath>src/main/java</sourcepath>
                             <additionalJOption>-Xdoclint:none</additionalJOption>
                             <description>Jakarta Faces API documentation</description>
                             <doctitle>Jakarta Faces API documentation</doctitle>
                             <windowtitle>Jakarta Faces API documentation</windowtitle>
                             <header><![CDATA[<br>Jakarta Faces API v${project.version}]]></header>
                             <bottom><![CDATA[
 Comments to: <a href="mailto:faces-dev@eclipse.org">faces-dev@eclipse.org</a>.<br>
-Copyright &#169; 2019, 2023 Eclipse Foundation. All rights reserved.<br>
+Copyright &#169; 2019, 2024 Eclipse Foundation. All rights reserved.<br>
 Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.]]>
                             </bottom>
                             <docfilessubdirs>true</docfilessubdirs>
@@ -459,7 +463,7 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>flatten-maven-plugin</artifactId>
-                <version>1.5.0</version>
+                <version>1.6.0</version>
                 <configuration>
                     <flattenMode>ossrh</flattenMode>
                 </configuration>
@@ -586,7 +590,7 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
-                        <version>3.1.1</version>
+                        <version>3.2.0</version>
                         <executions>
                             <execution>
                                 <id>generate-vdldoc</id>

api/src/main/module/module-info.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2024 Contributors to the Eclipse Foundation
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+module jakarta.faces {
+
+    requires jakarta.inject;
+    requires jakarta.validation;
+    requires java.logging;
+    requires java.naming;
+
+    requires static jakarta.cdi;
+    requires static jakarta.cdi.el;
+    requires static jakarta.el;
+    requires static jakarta.servlet;
+    requires static jakarta.websocket.client;
+    requires static jakarta.websocket;
+    requires static jakarta.persistence;
+    requires static jakarta.ejb;
+    requires static jakarta.xml.ws;
+    requires static jakarta.json;
+    requires transitive java.desktop;
+    requires transitive java.sql;
+    requires transitive java.xml;
+
+    exports jakarta.faces;
+    exports jakarta.faces.annotation;
+    exports jakarta.faces.application;
+    exports jakarta.faces.component;
+    exports jakarta.faces.component.behavior;
+    exports jakarta.faces.component.html;
+    exports jakarta.faces.component.search;
+    exports jakarta.faces.component.visit;
+    exports jakarta.faces.context;
+    exports jakarta.faces.convert;
+    exports jakarta.faces.el;
+    exports jakarta.faces.event;
+    exports jakarta.faces.flow;
+    exports jakarta.faces.flow.builder;
+    exports jakarta.faces.lifecycle;
+    exports jakarta.faces.model;
+    exports jakarta.faces.push;
+    exports jakarta.faces.render;
+    exports jakarta.faces.validator;
+    exports jakarta.faces.view;
+    exports jakarta.faces.view.facelets;
+    exports jakarta.faces.webapp;
+}