From 97f9baf050a5a0662f8f0d34e92975edd59d7958 Mon Sep 17 00:00:00 2001
From: Kyle Aure <KyleJAure@gmail.com>
Date: Tue, 9 Jul 2024 16:07:53 -0500
Subject: [PATCH] Update ci build

---
 .github/workflows/ci.yml            | 7 ++++---
 .github/workflows/specification.yml | 5 ++---
 .github/workflows/update.yml        | 5 ++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 13620959..2b366775 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -34,6 +34,7 @@ jobs:
         java-version: ${{ matrix.java-version }}
         distribution: 'temurin'
         cache: maven
-    - name: Build with Maven
-      #TODO remove -Pstaging once all Jakarta EE 11 dependencies are GA
-      run: mvn -B -Pstaging package --file pom.xml
+    - name: Build project
+      run: mvn -B package --file pom.xml
+    - name: Build relocation
+      run: mvn -B package --file relocation/pom.xml
diff --git a/.github/workflows/specification.yml b/.github/workflows/specification.yml
index 4b4f8ef3..403983b0 100644
--- a/.github/workflows/specification.yml
+++ b/.github/workflows/specification.yml
@@ -24,10 +24,9 @@ jobs:
         distribution: 'temurin'
         cache: maven
     - name: Generate specification docs
-      #TODO remove -Pstaging once all Jakarta EE 11 dependencies are GA
       run: |
-        mvn package -Pstaging --file api/pom.xml -Dspec.version=${{ github.event.inputs.specVersion }}
-        mvn package -Pstaging --file specification/pom.xml -Dstatus=FINAL -Dspec.version=${{ github.event.inputs.specVersion }}
+        mvn package --file api/pom.xml -Dspec.version=${{ github.event.inputs.specVersion }}
+        mvn package --file specification/pom.xml -Dstatus=FINAL -Dspec.version=${{ github.event.inputs.specVersion }}
     - name: Assemble documentation
       run: |
         mkdir documentation/
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index 7020154c..51e0814f 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -27,10 +27,9 @@ jobs:
       id: checkout
       run: .github/scripts/checkout.sh update-generated-files-${{ github.sha }}
     - name: Generate signatures
-      #TODO remove -Pstaging once all Jakarta EE 11 dependencies are GA
       run: |
-        mvn install -Pstaging --file api/pom.xml
-        mvn package -Pstaging -Psignature-generation --file tck/pom.xml
+        mvn install --file api/pom.xml
+        mvn package -Psignature-generation --file tck/pom.xml
     ## Add any other automated update steps here
     - name: Needs updates
       id: update