Subsume PR 838 and rebase with HEAD of main

[edburns]

Steps taken to arrive at this PR.

1. My fork of git@github.com:jakartaee/jakartaee-platform.git is up to date with the upstream.
2. My fork from the preceding step has a remote I added with git remote add jakartaredhat git@github.com:jakartaredhat/jakartaee-platform.git
3. git fetch --all
4. I added a worktree in which I checked out the cdi-ee branch from jakartaredhat remote. My existing checkout is the branch for this PR.
5. In the local cdi-ee branch I ran git rebase -i HEAD~37.
6. In the editor I left the first link at pick and set all the remaining lines to squash.
7. I completed the rebase.
8. I copied the 1 commit (which is the squashed commit of the 37 commits in the cdi-ee branch) to the branch for this PR using this script.

   # pwd has the dest branch checked out
   # first argument is relative path to source branch, checked out with worktree
   # second argument is dest branch
   # third argument is num commits
   ontoValue=`git rev-parse HEAD`
   sourceBranch=$1
   destBranch=$2
   numLastCommitsOnPrivateBranch=$3
   
   pushd .
   cd $1
   startingCommit=`git rev-parse HEAD`
   endingCommit=`git rev-parse HEAD~${numLastCommitsOnPrivateBranch}`
   
   popd
   
   git rebase --onto ${ontoValue} ${endingCommit} ${startingCommit}
   git rebase HEAD ${destBranch}

9. I resolved any conflicts using The initial migration of the CDI component specification EE integration requirements to the platform #838 as a guide.

Here is the PR message from #838 for reference.

This is a work in progress to incorporate the CDI specification EE integration requirements to the platform.

This PR appears to include several commits in order to preserve the history of the related content from the CDI specification repository.

One big issue to resolve with this is how to handle the cross references to the CDI specification that no longer resolve. (FIXED)

fixes #837

AB#335

[starksm64]

All of the content from the CDI integration section is here

[starksm64]

Yes for WebProfile, not for CoreProfile.

…

On Tue, Mar 5, 2024 at 11:42 AM Jared Anderson ***@***.***> wrote: ***@***.**** commented on this pull request. ------------------------------ In specification/src/main/asciidoc/platform/Platform.adoc <#855 (comment)>: > @@ -23,6 +23,8 @@ include::ServiceProviderInterface.adoc[] include::CompatibilityMigration.adoc[] +include::IntegrationRequirements.adoc[] Does there need to be a similar include for WebProfile.adoc and CoreProfile.adoc? — Reply to this email directly, view it on GitHub <#855 (review)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AACRDMWE3J4MXTZXIK2DO2TYWX7WTAVCNFSM6AAAAABEGEHIHWVHI2DSMVQWIX3LMV43YUDVNRWFEZLROVSXG5CSMV3GSZLXHMYTSMJXG4YDQNJUHA> . You are receiving this because your review was requested.Message ID: ***@***.***>

[edburns]

Because this PR was subsumed from #838 , and that PR had no commits authored by me, I am effectively serving as a reviewer for that PR in this one. Therefore, this counts as my review.