Update ci build

jakartaee · Jul 9, 2024 · 51ad3a0 · 51ad3a0
1 parent 0a9be12
commit 51ad3a0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git 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 --file pom.xml
+    - name: Build relocation
+      run: mvn -B --file relocation/pom.xml
diff --git 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
@@ -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