From 8f3db64183d1cbba857654bbe29be9cc23b4f0aa Mon Sep 17 00:00:00 2001
From: lprimak <lenny@flowlogix.com>
Date: Tue, 13 Jun 2023 11:29:09 -0500
Subject: [PATCH] Web profile is now a true dependency of Core profile, fixes
 #138

---
 jakartaee-api/pom.xml      |  17 +++---
 jakartaee-bom/pom.xml      |   2 -
 jakartaee-core-api/pom.xml |  24 +++-----
 jakartaee-web-api/pom.xml  | 115 +++++++++----------------------------
 pom.xml                    |  24 +++-----
 5 files changed, 54 insertions(+), 128 deletions(-)

diff --git a/jakartaee-api/pom.xml b/jakartaee-api/pom.xml
index 5ab607b..444f523 100644
--- a/jakartaee-api/pom.xml
+++ b/jakartaee-api/pom.xml
@@ -59,6 +59,7 @@
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
                     <sourcepath>${project.build.directory}/sources-dependency
+                        :../jakartaee-core-api/target/sources-dependency
                         :../jakartaee-web-api/target/sources-dependency</sourcepath>
                 </configuration>
             </plugin>
@@ -84,27 +85,32 @@
             <groupId>jakarta.platform</groupId>
             <artifactId>jakarta.jakartaee-web-api</artifactId>
             <version>${project.version}</version>
-            <optional>false</optional>
+        </dependency>
+        <!-- Core Profile API -->
+        <!-- We specify it here directly, so it's "closer" in the dependency tree to the user app.
+             This way it will resolve the user's intended version via Maven's resolution mechanism,
+             and integrate well with other dependencies such as MicroProfile -->
+        <dependency>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-core-api</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>jakarta.jms</groupId>
             <artifactId>jakarta.jms-api</artifactId>
             <version>${jakarta.jms-api.version}</version>
-            <optional>false</optional>
         </dependency>
         <dependency>
             <groupId>jakarta.activation</groupId>
             <artifactId>jakarta.activation-api</artifactId>
             <version>${jakarta.activation-api.version}</version>
-            <optional>false</optional>
         </dependency>
 
         <dependency>
             <groupId>jakarta.mail</groupId>
             <artifactId>jakarta.mail-api</artifactId>
             <version>${jakarta.mail-api.version}</version>
-            <optional>false</optional>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -116,7 +122,6 @@
             <groupId>jakarta.resource</groupId>
             <artifactId>jakarta.resource-api</artifactId>
             <version>${jakarta.resource-api.version}</version>
-            <optional>false</optional>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -128,7 +133,6 @@
             <groupId>jakarta.authorization</groupId>
             <artifactId>jakarta.authorization-api</artifactId>
             <version>${jakarta.authorization-api.version}</version>
-            <optional>false</optional>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -140,7 +144,6 @@
             <groupId>jakarta.batch</groupId>
             <artifactId>jakarta.batch-api</artifactId>
             <version>${jakarta.batch-api.version}</version>
-            <optional>false</optional>
              <exclusions>
                  <exclusion>
                      <groupId>*</groupId>
diff --git a/jakartaee-bom/pom.xml b/jakartaee-bom/pom.xml
index 83e7b30..fb05732 100644
--- a/jakartaee-bom/pom.xml
+++ b/jakartaee-bom/pom.xml
@@ -181,7 +181,6 @@
                 <groupId>jakarta.enterprise</groupId>
                 <artifactId>jakarta.enterprise.cdi-api</artifactId>
                 <version>${jakarta.enterprise.cdi-api.version}</version>
-                <optional>false</optional>
                 <exclusions>
                     <exclusion>
                         <groupId>*</groupId>
@@ -193,7 +192,6 @@
                 <groupId>jakarta.enterprise</groupId>
                 <artifactId>jakarta.enterprise.lang-model</artifactId>
                 <version>${jakarta.enterprise.cdi-api.version}</version>
-                <optional>false</optional>
             </dependency>
             <dependency>
                 <groupId>jakarta.inject</groupId>
diff --git a/jakartaee-core-api/pom.xml b/jakartaee-core-api/pom.xml
index ba34358..e12905c 100644
--- a/jakartaee-core-api/pom.xml
+++ b/jakartaee-core-api/pom.xml
@@ -74,32 +74,27 @@
         <dependency>
             <groupId>jakarta.ws.rs</groupId>
             <artifactId>jakarta.ws.rs-api</artifactId>
-            <version>${jakarta.ws.rs-api.cp.version}</version>
-            <optional>false</optional>
+            <version>${jakarta.ws.rs-api.version}</version>
         </dependency>
         <dependency>
             <groupId>jakarta.json</groupId>
             <artifactId>jakarta.json-api</artifactId>
-            <version>${jakarta.json-api.cp.version}</version>
-            <optional>false</optional>
+            <version>${jakarta.json-api.version}</version>
         </dependency>
         <dependency>
             <groupId>jakarta.json.bind</groupId>
             <artifactId>jakarta.json.bind-api</artifactId>
-            <version>${jakarta.json.bind-api.cp.version}</version>
-            <optional>false</optional>
+            <version>${jakarta.json.bind-api.version}</version>
         </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
-            <version>${jakarta.annotation-api.cp.version}</version>
-            <optional>false</optional>
+            <version>${jakarta.annotation-api.version}</version>
         </dependency>
         <dependency>
             <groupId>jakarta.interceptor</groupId>
             <artifactId>jakarta.interceptor-api</artifactId>
-            <version>${jakarta.interceptor-api.cp.version}</version>
-            <optional>false</optional>
+            <version>${jakarta.interceptor-api.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -110,8 +105,7 @@
         <dependency>
             <groupId>jakarta.enterprise</groupId>
             <artifactId>jakarta.enterprise.cdi-api</artifactId>
-            <version>${jakarta.enterprise.cdi-api.cp.version}</version>
-            <optional>false</optional>
+            <version>${jakarta.enterprise.cdi-api.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -122,14 +116,12 @@
         <dependency>
             <groupId>jakarta.inject</groupId>
             <artifactId>jakarta.inject-api</artifactId>
-            <version>${jakarta.inject.cp.version}</version>
-            <optional>false</optional>
+            <version>${jakarta.inject.version}</version>
         </dependency>
         <dependency>
             <groupId>jakarta.enterprise</groupId>
             <artifactId>jakarta.enterprise.lang-model</artifactId>
-            <version>${jakarta.enterprise.cdi-api.cp.version}</version>
-            <optional>false</optional>
+            <version>${jakarta.enterprise.cdi-api.version}</version>
         </dependency>
 
         <!-- Only needed to compile the RESTful Link class as it uses XML Binding -->
diff --git a/jakartaee-web-api/pom.xml b/jakartaee-web-api/pom.xml
index 5a57c51..6bc09d6 100644
--- a/jakartaee-web-api/pom.xml
+++ b/jakartaee-web-api/pom.xml
@@ -54,6 +54,14 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <sourcepath>${project.build.directory}/sources-dependency
+                        :../jakartaee-core-api/target/sources-dependency</sourcepath>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
@@ -71,11 +79,16 @@
     </build>
 
     <dependencies>
+        <!-- Core Profile API  -->
+        <dependency>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-core-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
             <version>${jakarta.servlet-api.version}</version>
-            <optional>false</optional>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -87,7 +100,6 @@
             <groupId>jakarta.servlet.jsp</groupId>
             <artifactId>jakarta.servlet.jsp-api</artifactId>
             <version>${jakarta.servlet.jsp-api.version}</version>
-            <optional>false</optional>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -95,17 +107,16 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <!-- Override from core profile to be non-optional and compiled scope -->
         <dependency>
             <groupId>jakarta.el</groupId>
             <artifactId>jakarta.el-api</artifactId>
             <version>${jakarta.el-api.version}</version>
-            <optional>false</optional>
         </dependency>
         <dependency>
             <groupId>jakarta.servlet.jsp.jstl</groupId>
             <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
             <version>${jakarta.servlet.jsp.jstl-api.version}</version>
-            <optional>false</optional>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -117,7 +128,6 @@
             <groupId>jakarta.faces</groupId>
             <artifactId>jakarta.faces-api</artifactId>
             <version>${jakarta.faces-api.version}</version>
-            <optional>false</optional>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -125,47 +135,20 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>jakarta.ws.rs</groupId>
-            <artifactId>jakarta.ws.rs-api</artifactId>
-            <version>${jakarta.ws.rs-api.version}</version>
-            <optional>false</optional>
-        </dependency>
         <dependency>
             <groupId>jakarta.websocket</groupId>
             <artifactId>jakarta.websocket-api</artifactId>
             <version>${jakarta.websocket-api.version}</version>
-            <optional>false</optional>
         </dependency>
         <dependency>
             <groupId>jakarta.websocket</groupId>
             <artifactId>jakarta.websocket-client-api</artifactId>
             <version>${jakarta.websocket-api.version}</version>
-            <optional>false</optional>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.json</groupId>
-            <artifactId>jakarta.json-api</artifactId>
-            <version>${jakarta.json-api.version}</version>
-            <optional>false</optional>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.json.bind</groupId>
-            <artifactId>jakarta.json.bind-api</artifactId>
-            <version>${jakarta.json.bind-api.version}</version>
-            <optional>false</optional>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.annotation</groupId>
-            <artifactId>jakarta.annotation-api</artifactId>
-            <version>${jakarta.annotation-api.version}</version>
-            <optional>false</optional>
         </dependency>
         <dependency>
             <groupId>jakarta.ejb</groupId>
             <artifactId>jakarta.ejb-api</artifactId>
             <version>${jakarta.ejb-api.version}</version>
-            <optional>false</optional>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -177,7 +160,6 @@
             <groupId>jakarta.transaction</groupId>
             <artifactId>jakarta.transaction-api</artifactId>
             <version>${jakarta.transaction-api.version}</version>
-            <optional>false</optional>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -189,37 +171,11 @@
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
             <version>${jakarta.persistence-api.version}</version>
-            <optional>false</optional>
         </dependency>
         <dependency>
             <groupId>jakarta.validation</groupId>
             <artifactId>jakarta.validation-api</artifactId>
             <version>${jakarta.validation-api.version}</version>
-            <optional>false</optional>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.interceptor</groupId>
-            <artifactId>jakarta.interceptor-api</artifactId>
-            <version>${jakarta.interceptor-api.version}</version>
-            <optional>false</optional>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.enterprise</groupId>
-            <artifactId>jakarta.enterprise.cdi-api</artifactId>
-            <version>${jakarta.enterprise.cdi-api.version}</version>
-            <optional>false</optional>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -227,23 +183,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>jakarta.enterprise</groupId>
-            <artifactId>jakarta.enterprise.lang-model</artifactId>
-            <version>${jakarta.enterprise.cdi-api.version}</version>
-            <optional>false</optional>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.inject</groupId>
-            <artifactId>jakarta.inject-api</artifactId>
-            <version>${jakarta.inject.version}</version>
-            <optional>false</optional>
-        </dependency>
         <dependency>
             <groupId>jakarta.authentication</groupId>
             <artifactId>jakarta.authentication-api</artifactId>
             <version>${jakarta.authentication-api.version}</version>
-            <optional>false</optional>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -255,7 +198,6 @@
             <groupId>jakarta.security.enterprise</groupId>
             <artifactId>jakarta.security.enterprise-api</artifactId>
             <version>${jakarta.security.enterprise-api.version}</version>
-            <optional>false</optional>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -275,20 +217,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <!-- This is an optional dependency of Jakarta RESTful Web Services -->
-        <dependency>
-            <groupId>jakarta.xml.bind</groupId>
-            <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>${jakarta.xml.bind-api.version}</version>
-            <optional>true</optional>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>jakarta.activation</groupId>
             <artifactId>jakarta.activation-api</artifactId>
@@ -310,6 +238,19 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <!-- Included only for Javadoc resolution (optional, non-transitive) -->
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>${jakarta.xml.bind-api.version}</version>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 1451145..10ae930 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,14 +45,13 @@
         <javadoc.options />
 
         <!-- Core Profile -->
-        <!-- Theoretically these versions could be different from Web Profile -->
-        <jakarta.json-api.cp.version>2.1.0</jakarta.json-api.cp.version>
-        <jakarta.json.bind-api.cp.version>3.0.0</jakarta.json.bind-api.cp.version>
-        <jakarta.annotation-api.cp.version>2.1.1</jakarta.annotation-api.cp.version>
-        <jakarta.inject.cp.version>2.0.1</jakarta.inject.cp.version>
-        <jakarta.interceptor-api.cp.version>2.1.0</jakarta.interceptor-api.cp.version>
-        <jakarta.enterprise.cdi-api.cp.version>4.0.1</jakarta.enterprise.cdi-api.cp.version>
-        <jakarta.ws.rs-api.cp.version>3.1.0</jakarta.ws.rs-api.cp.version>
+        <jakarta.json-api.version>2.1.0</jakarta.json-api.version>
+        <jakarta.json.bind-api.version>3.0.0</jakarta.json.bind-api.version>
+        <jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
+        <jakarta.inject.version>2.0.1</jakarta.inject.version>
+        <jakarta.interceptor-api.version>2.1.0</jakarta.interceptor-api.version>
+        <jakarta.enterprise.cdi-api.version>4.0.1</jakarta.enterprise.cdi-api.version>
+        <jakarta.ws.rs-api.version>3.1.0</jakarta.ws.rs-api.version>
 
         <!-- Web Profile -->
         <jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
@@ -61,19 +60,12 @@
         <jakarta.faces-api.version>4.0.1</jakarta.faces-api.version>
         <jakarta.el-api.version>5.0.1</jakarta.el-api.version>
         <jakarta.websocket-api.version>2.1.0</jakarta.websocket-api.version>
-        <jakarta.json-api.version>2.1.0</jakarta.json-api.version>
-        <jakarta.json.bind-api.version>3.0.0</jakarta.json.bind-api.version>
-        <jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
         <jakarta.ejb-api.version>4.0.1</jakarta.ejb-api.version>
         <jakarta.transaction-api.version>2.0.1</jakarta.transaction-api.version>
         <jakarta.persistence-api.version>3.1.0</jakarta.persistence-api.version>
         <jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
-        <jakarta.interceptor-api.version>2.1.0</jakarta.interceptor-api.version>
-        <jakarta.enterprise.cdi-api.version>4.0.1</jakarta.enterprise.cdi-api.version>
-        <jakarta.inject.version>2.0.1</jakarta.inject.version>
         <jakarta.authentication-api.version>3.0.0</jakarta.authentication-api.version>
         <jakarta.security.enterprise-api.version>3.0.0</jakarta.security.enterprise-api.version>
-        <jakarta.ws.rs-api.version>3.1.0</jakarta.ws.rs-api.version>
         <jakarta.enterprise.concurrent-api.version>3.0.1</jakarta.enterprise.concurrent-api.version>
         
         <!--  Full platform -->
@@ -247,7 +239,7 @@
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <version>3.1.0</version>
                     <configuration>
-                        <failOnError>false</failOnError>
+                        <failOnError>true</failOnError>
                         <additionalJOptions>${javadoc.options}</additionalJOptions>
                         <docfilessubdirs>true</docfilessubdirs>
                         <javadocDirectory>${project.basedir}/../src/main/javadoc</javadocDirectory>