diff --git a/.github/workflows/blueprint.yml b/.github/workflows/blueprint.yml index c45c7a663b..cab73b39c7 100644 --- a/.github/workflows/blueprint.yml +++ b/.github/workflows/blueprint.yml @@ -56,10 +56,10 @@ jobs: run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f testsupport - name: Build versioning shell: bash - run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f versioning + run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f util - name: Build util shell: bash - run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f util + run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f versioning - name: Build quiesce shell: bash run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f quiesce diff --git a/.github/workflows/jmx.yml b/.github/workflows/jmx.yml index cb2d0c6256..0083ceddcd 100644 --- a/.github/workflows/jmx.yml +++ b/.github/workflows/jmx.yml @@ -57,10 +57,10 @@ jobs: run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f testsupport - name: Build versioning shell: bash - run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f versioning + run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f util - name: Build util shell: bash - run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f util + run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f versioning - name: Build proxy shell: bash run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f proxy diff --git a/.github/workflows/jndi.yml b/.github/workflows/jndi.yml index 404b5b0236..eadcc7f419 100644 --- a/.github/workflows/jndi.yml +++ b/.github/workflows/jndi.yml @@ -54,10 +54,10 @@ jobs: run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f testsupport - name: Build versioning shell: bash - run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f versioning + run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f util - name: Build util shell: bash - run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f util + run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f versioning - 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 1fa13d9238..d87d53afd9 100644 --- a/.github/workflows/proxy.yml +++ b/.github/workflows/proxy.yml @@ -54,10 +54,10 @@ jobs: run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f testsupport - name: Build versioning shell: bash - run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f versioning + run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f util - name: Build util shell: bash - run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f util + run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f versioning - name: Set up Java ${{ matrix.java }} uses: actions/setup-java@v5 with: diff --git a/.github/workflows/quiesce.yml b/.github/workflows/quiesce.yml index 17a5e3fa39..cabb12b7cd 100644 --- a/.github/workflows/quiesce.yml +++ b/.github/workflows/quiesce.yml @@ -54,10 +54,10 @@ jobs: run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f testsupport - name: Build versioning shell: bash - run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f versioning + run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f util - name: Build util shell: bash - run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f util + run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f versioning - name: Set up Java ${{ matrix.java }} uses: actions/setup-java@v5 with: diff --git a/.github/workflows/subsystem.yml b/.github/workflows/subsystem.yml index b6985a5157..04eea741a6 100644 --- a/.github/workflows/subsystem.yml +++ b/.github/workflows/subsystem.yml @@ -60,10 +60,10 @@ jobs: run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f proxy - name: Build versioning shell: bash - run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f versioning + run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f util - name: Build util shell: bash - run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f util + run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f versioning - name: Build quiesce shell: bash run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f quiesce diff --git a/.github/workflows/util.yml b/.github/workflows/util.yml index 85b42a66de..acd307988a 100644 --- a/.github/workflows/util.yml +++ b/.github/workflows/util.yml @@ -17,7 +17,6 @@ on: paths: - parent/** - testsupport/** - - versioning/** - util/** - .github/workflows/util.yml push: @@ -51,9 +50,6 @@ jobs: - name: Build testsupport shell: bash run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f testsupport - - name: Build versioning - shell: bash - run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f versioning - name: Set up Java ${{ matrix.java }} uses: actions/setup-java@v5 with: diff --git a/.github/workflows/versioning.yml b/.github/workflows/versioning.yml index 54f79643fd..71131e1293 100644 --- a/.github/workflows/versioning.yml +++ b/.github/workflows/versioning.yml @@ -17,6 +17,7 @@ on: paths: - parent/** - testsupport/** + - util/** - versioning/** - .github/workflows/versioning.yml push: @@ -50,6 +51,9 @@ jobs: - name: Build testsupport shell: bash run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f testsupport + - name: Build util + shell: bash + run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f util - name: Set up Java uses: actions/setup-java@v5 with: diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml index 7fef007b37..5e0ae71013 100644 --- a/.github/workflows/web.yml +++ b/.github/workflows/web.yml @@ -54,10 +54,10 @@ jobs: run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f testsupport - name: Build versioning shell: bash - run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f versioning + run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f util - name: Build util shell: bash - run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f util + run: mvn -V -U -e -B -ntp -Dmaven.test.skip=true clean install -f versioning - name: Set up Java ${{ matrix.java }} uses: actions/setup-java@v5 with: diff --git a/util/pom.xml b/util/pom.xml index a24d0286f4..d205cbc56f 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -62,7 +62,8 @@ org.apache.aries.util.tracker.hook 1.1.3 - 0.3.2-SNAPSHOT + true + 0.3.1 3.12.0 2.0.0-SNAPSHOT diff --git a/versioning/versioning-checker/pom.xml b/versioning/versioning-checker/pom.xml index aa853cdb2c..7c5b331c02 100644 --- a/versioning/versioning-checker/pom.xml +++ b/versioning/versioning-checker/pom.xml @@ -62,7 +62,7 @@ 9.10.1 3.3.1 2.0.0-SNAPSHOT - 1.1.0 + 2.0.0-SNAPSHOT