This is an automated email from the ASF dual-hosted git repository.

alien11689 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/aries.git


The following commit(s) were added to refs/heads/trunk by this push:
     new eef071545 [MAINTENANCE] Split maven executions in workflows (#433)
eef071545 is described below

commit eef0715456e04ab251e923fc482e1f5ef64d77e0
Author: Dominik Przybysz <[email protected]>
AuthorDate: Fri Feb 7 21:58:27 2025 +0100

    [MAINTENANCE] Split maven executions in workflows (#433)
---
 .github/workflows/application.yml      |  9 +++++----
 .github/workflows/async.yml            |  5 ++---
 .github/workflows/blueprint.yml        | 13 ++++++++-----
 .github/workflows/eba-maven-plugin.yml |  5 ++---
 .github/workflows/ejb.yml              | 17 +++++++++++------
 .github/workflows/esa-ant-task.yml     |  5 ++---
 .github/workflows/esa-maven-plugin.yml |  5 ++---
 .github/workflows/jmx.yml              | 13 ++++++++-----
 .github/workflows/jndi.yml             | 13 ++++++++-----
 .github/workflows/proxy.yml            |  5 ++---
 .github/workflows/pushstream.yml       |  5 ++---
 .github/workflows/quiesce.yml          | 17 +++++++++++------
 .github/workflows/spi-fly.yml          | 14 +++-----------
 .github/workflows/subsystem.yml        | 13 ++++++++-----
 .github/workflows/testsupport.yml      |  5 ++---
 .github/workflows/transaction.yml      |  5 ++---
 .github/workflows/util.yml             |  5 ++---
 .github/workflows/versioning.yml       |  5 ++---
 .github/workflows/web.yml              | 13 ++++++++-----
 19 files changed, 90 insertions(+), 82 deletions(-)

diff --git a/.github/workflows/application.yml 
b/.github/workflows/application.yml
index da5782e4f..11cad7019 100644
--- a/.github/workflows/application.yml
+++ b/.github/workflows/application.yml
@@ -43,8 +43,9 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}
-    - name: Build
+    - name: Build parent
       shell: bash
-      run: |
-        mvn -U -e -B -ntp clean install -f parent/pom.xml
-        mvn -U -e -B -ntp clean install -f application/pom.xml
+      run: mvn -U -e -B -ntp clean install -f parent
+    - name: Build application
+      shell: bash
+      run: mvn -U -e -B -ntp clean install -f application
diff --git a/.github/workflows/async.yml b/.github/workflows/async.yml
index b52cea809..48d7c387d 100644
--- a/.github/workflows/async.yml
+++ b/.github/workflows/async.yml
@@ -43,7 +43,6 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}
-    - name: Build
+    - name: Build async
       shell: bash
-      run: |
-        mvn -U -e -B -ntp clean install -f async/pom.xml
+      run: mvn -U -e -B -ntp clean install -f async
diff --git a/.github/workflows/blueprint.yml b/.github/workflows/blueprint.yml
index 07306fcf5..a0ee1528e 100644
--- a/.github/workflows/blueprint.yml
+++ b/.github/workflows/blueprint.yml
@@ -44,9 +44,12 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}
-    - name: Build
+    - name: Build parent
       shell: bash
-      run: |
-        mvn -U -e -B -ntp clean install -f parent/pom.xml
-        mvn -U -e -B -ntp clean install -f testsupport/pom.xml
-        mvn -U -e -B -ntp clean install -f blueprint/pom.xml
+      run: mvn -U -e -B -ntp clean install -f parent
+    - name: Build testsupport
+      shell: bash
+      run: mvn -U -e -B -ntp clean install -f testsupport
+    - name: Build blueprint
+      shell: bash
+      run: mvn -U -e -B -ntp clean install -f blueprint
diff --git a/.github/workflows/eba-maven-plugin.yml 
b/.github/workflows/eba-maven-plugin.yml
index 97f86f74e..4b0a29ba8 100644
--- a/.github/workflows/eba-maven-plugin.yml
+++ b/.github/workflows/eba-maven-plugin.yml
@@ -43,7 +43,6 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}
-    - name: Build
+    - name: Build eba-maven-plugin
       shell: bash
-      run: |
-        mvn -U -e -B -ntp clean install -f eba-maven-plugin/pom.xml -P run-its
+      run: mvn -U -e -B -ntp clean install -f eba-maven-plugin -P run-its
diff --git a/.github/workflows/ejb.yml b/.github/workflows/ejb.yml
index 6beff816e..aad3e8cbd 100644
--- a/.github/workflows/ejb.yml
+++ b/.github/workflows/ejb.yml
@@ -45,10 +45,15 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}
-    - name: Build
+    - name: Build parent
       shell: bash
-      run: |
-        mvn -U -e -B -ntp clean install -f parent/pom.xml
-        mvn -U -e -B -ntp clean install -f testsupport/pom.xml
-        mvn -U -e -B -ntp clean install -f proxy/pom.xml
-        mvn -U -e -B -ntp clean install -f ejb/pom.xml
+      run: mvn -U -e -B -ntp clean install -f parent
+    - name: Build testsupport
+      shell: bash
+      run: mvn -U -e -B -ntp clean install -f testsupport
+    - name: Build proxy
+      shell: bash
+      run: mvn -U -e -B -ntp clean install -f proxy
+    - name: Build ejb
+      shell: bash
+      run: mvn -U -e -B -ntp clean install -f ejb
diff --git a/.github/workflows/esa-ant-task.yml 
b/.github/workflows/esa-ant-task.yml
index bc904990e..f8989c3d4 100644
--- a/.github/workflows/esa-ant-task.yml
+++ b/.github/workflows/esa-ant-task.yml
@@ -43,7 +43,6 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}
-    - name: Build
+    - name: Build esa-ant-task
       shell: bash
-      run: |
-        mvn -U -e -B -ntp clean install -f esa-ant-task/pom.xml
+      run: mvn -U -e -B -ntp clean install -f esa-ant-task
diff --git a/.github/workflows/esa-maven-plugin.yml 
b/.github/workflows/esa-maven-plugin.yml
index 1f2faea23..6a3ffbdd2 100644
--- a/.github/workflows/esa-maven-plugin.yml
+++ b/.github/workflows/esa-maven-plugin.yml
@@ -43,7 +43,6 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}
-    - name: Build
+    - name: Build esa-maven-plugin
       shell: bash
-      run: |
-        mvn -U -e -B -ntp clean install -f esa-maven-plugin/pom.xml -P run-its
+      run: mvn -U -e -B -ntp clean install -f esa-maven-plugin -P run-its
diff --git a/.github/workflows/jmx.yml b/.github/workflows/jmx.yml
index 6653cac6c..7b72ffb97 100644
--- a/.github/workflows/jmx.yml
+++ b/.github/workflows/jmx.yml
@@ -44,9 +44,12 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}
-    - name: Build
+    - name: Build parent
       shell: bash
-      run: |
-        mvn -U -e -B -ntp clean install -f parent/pom.xml
-        mvn -U -e -B -ntp clean install -f testsupport/pom.xml
-        mvn -U -e -B -ntp clean install -f jmx/pom.xml
+      run: mvn -U -e -B -ntp clean install -f parent
+    - name: Build testsupport
+      shell: bash
+      run: mvn -U -e -B -ntp clean install -f testsupport
+    - name: Build jmx
+      shell: bash
+      run: mvn -U -e -B -ntp clean install -f jmx
diff --git a/.github/workflows/jndi.yml b/.github/workflows/jndi.yml
index 06108656e..c5ee6f4d3 100644
--- a/.github/workflows/jndi.yml
+++ b/.github/workflows/jndi.yml
@@ -44,9 +44,12 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}
-    - name: Build
+    - name: Build parent
       shell: bash
-      run: |
-        mvn -U -e -B -ntp clean install -f parent/pom.xml
-        mvn -U -e -B -ntp clean install -f testsupport/pom.xml
-        mvn -U -e -B -ntp clean install -f jndi/pom.xml
+      run: mvn -U -e -B -ntp clean install -f parent
+    - name: Build testsupport
+      shell: bash
+      run: mvn -U -e -B -ntp clean install -f testsupport
+    - name: Build jndi
+      shell: bash
+      run: mvn -U -e -B -ntp clean install -f jndi
diff --git a/.github/workflows/proxy.yml b/.github/workflows/proxy.yml
index 6ff277438..67a6982a0 100644
--- a/.github/workflows/proxy.yml
+++ b/.github/workflows/proxy.yml
@@ -43,7 +43,6 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}
-    - name: Build
+    - name: Build proxy
       shell: bash
-      run: |
-        mvn -U -e -B -ntp clean install -f proxy/pom.xml
+      run: mvn -U -e -B -ntp clean install -f proxy
diff --git a/.github/workflows/pushstream.yml b/.github/workflows/pushstream.yml
index 77204f44d..b68229138 100644
--- a/.github/workflows/pushstream.yml
+++ b/.github/workflows/pushstream.yml
@@ -43,7 +43,6 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}
-    - name: Build
+    - name: Build pushstream
       shell: bash
-      run: |
-        mvn -U -e -B -ntp clean install -f pushstream/pom.xml
+      run: mvn -U -e -B -ntp clean install -f pushstream
diff --git a/.github/workflows/quiesce.yml b/.github/workflows/quiesce.yml
index 2f434e964..a07e6fae8 100644
--- a/.github/workflows/quiesce.yml
+++ b/.github/workflows/quiesce.yml
@@ -45,10 +45,15 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}
-    - name: Build
+    - name: Build parent
       shell: bash
-      run: |
-        mvn -U -e -B -ntp clean install -f parent/pom.xml
-        mvn -U -e -B -ntp clean install -f testsupport/pom.xml
-        mvn -U -e -B -ntp clean install -f util/pom.xml
-        mvn -U -e -B -ntp clean install -f quiesce/pom.xml
+      run: mvn -U -e -B -ntp clean install -f parent
+    - name: Build testsupport
+      shell: bash
+      run: mvn -U -e -B -ntp clean install -f testsupport
+    - name: Build util
+      shell: bash
+      run: mvn -U -e -B -ntp clean install -f util
+    - name: Build quiesce
+      shell: bash
+      run: mvn -U -e -B -ntp clean install -f quiesce
diff --git a/.github/workflows/spi-fly.yml b/.github/workflows/spi-fly.yml
index 792e34ce9..72307bf8b 100644
--- a/.github/workflows/spi-fly.yml
+++ b/.github/workflows/spi-fly.yml
@@ -15,17 +15,12 @@ name: SPI Fly - CI Build
 on:
   pull_request:
     paths:
-      - parent/**
       - spi-fly/**
       - .github/workflows/spi-fly.yml
   push:
     branches:
       - 'trunk'
 
-defaults:
-  run:
-    working-directory: spi-fly
-
 env:
   LC_ALL: en_US.UTF-8
 
@@ -50,11 +45,8 @@ jobs:
     - name: Set up Java
       uses: actions/setup-java@v4
       with:
-        distribution: 'zulu'
-        check-latest: ${{ endsWith(matrix.java, '-ea') }}
+        distribution: 'temurin'
         java-version: ${{ matrix.java }}
-    - name: Build
-      continue-on-error: ${{contains(matrix.java, '-ea')}}
+    - name: Build spi-fly
       shell: bash
-      run: |
-        mvn -U -e -B -ntp install
+      run: mvn -U -e -B -ntp clean install -f spi-fly
diff --git a/.github/workflows/subsystem.yml b/.github/workflows/subsystem.yml
index 2e760e99b..d987072a0 100644
--- a/.github/workflows/subsystem.yml
+++ b/.github/workflows/subsystem.yml
@@ -44,9 +44,12 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}
-    - name: Build
+    - name: Build parent
       shell: bash
-      run: |
-        mvn -U -e -B -ntp clean install -f parent/pom.xml
-        mvn -U -e -B -ntp clean install -f testsupport/pom.xml
-        mvn -U -e -B -ntp clean install -f subsystem/pom.xml
+      run: mvn -U -e -B -ntp clean install -f parent
+    - name: Build testsupport
+      shell: bash
+      run: mvn -U -e -B -ntp clean install -f testsupport
+    - name: Build subsystem
+      shell: bash
+      run: mvn -U -e -B -ntp clean install -f subsystem
diff --git a/.github/workflows/testsupport.yml 
b/.github/workflows/testsupport.yml
index e91ec346b..29282f244 100644
--- a/.github/workflows/testsupport.yml
+++ b/.github/workflows/testsupport.yml
@@ -43,7 +43,6 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}
-    - name: Build
+    - name: Build testsupport
       shell: bash
-      run: |
-        mvn -U -e -B -ntp clean install -f testsupport/pom.xml
+      run: mvn -U -e -B -ntp clean install -f testsupport
diff --git a/.github/workflows/transaction.yml 
b/.github/workflows/transaction.yml
index bc0ba57ba..1b01b5606 100644
--- a/.github/workflows/transaction.yml
+++ b/.github/workflows/transaction.yml
@@ -43,7 +43,6 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}
-    - name: Build
+    - name: Build transaction
       shell: bash
-      run: |
-        mvn -U -e -B -ntp clean install -f transaction/pom.xml
+      run: mvn -U -e -B -ntp clean install -f transaction
diff --git a/.github/workflows/util.yml b/.github/workflows/util.yml
index 639796a1c..f8d1ad740 100644
--- a/.github/workflows/util.yml
+++ b/.github/workflows/util.yml
@@ -43,7 +43,6 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}
-    - name: Build
+    - name: Build util
       shell: bash
-      run: |
-        mvn -U -e -B -ntp clean install -f util/pom.xml
+      run: mvn -U -e -B -ntp clean install -f util
diff --git a/.github/workflows/versioning.yml b/.github/workflows/versioning.yml
index df0201455..f64714efb 100644
--- a/.github/workflows/versioning.yml
+++ b/.github/workflows/versioning.yml
@@ -43,7 +43,6 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}
-    - name: Build
+    - name: Build versioning
       shell: bash
-      run: |
-        mvn -U -e -B -ntp clean install -f versioning/pom.xml
+      run: mvn -U -e -B -ntp clean install -f versioning
diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
index df4408e82..80ffde82f 100644
--- a/.github/workflows/web.yml
+++ b/.github/workflows/web.yml
@@ -44,9 +44,12 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}
-    - name: Build
+    - name: Build parent
       shell: bash
-      run: |
-        mvn -U -e -B -ntp clean install -f parent/pom.xml
-        mvn -U -e -B -ntp clean install -f testsupport/pom.xml
-        mvn -U -e -B -ntp clean install -f web/pom.xml
+      run: mvn -U -e -B -ntp clean install -f parent
+    - name: Build testsupport
+      shell: bash
+      run: mvn -U -e -B -ntp clean install -f testsupport
+    - name: Build web
+      shell: bash
+      run: mvn -U -e -B -ntp clean install -f web

Reply via email to