This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch invert-versioning-and-util-dependency in repository https://gitbox.apache.org/repos/asf/aries.git
commit dc3fd6c8fead1c3fe4b1d7d7ced19ae35f90a778 Author: Dominik Przybysz <[email protected]> AuthorDate: Thu Jul 16 20:20:14 2026 +0200 [MAINTENANCE] Invert versioning and util relation --- .github/workflows/blueprint.yml | 4 ++-- .github/workflows/jmx.yml | 4 ++-- .github/workflows/jndi.yml | 4 ++-- .github/workflows/proxy.yml | 4 ++-- .github/workflows/quiesce.yml | 4 ++-- .github/workflows/subsystem.yml | 4 ++-- .github/workflows/util.yml | 4 ---- .github/workflows/versioning.yml | 4 ++++ .github/workflows/web.yml | 4 ++-- util/pom.xml | 3 ++- versioning/versioning-checker/pom.xml | 2 +- 11 files changed, 21 insertions(+), 20 deletions(-) diff --git a/.github/workflows/blueprint.yml b/.github/workflows/blueprint.yml index c45c7a663..cab73b39c 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 cb2d0c625..0083ceddc 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 404b5b023..eadcc7f41 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 1fa13d923..d87d53afd 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 17a5e3fa3..cabb12b7c 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 b6985a515..04eea741a 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 85b42a66d..acd307988 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 54f79643f..71131e129 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 7fef007b3..5e0ae7101 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 a24d0286f..d205cbc56 100644 --- a/util/pom.xml +++ b/util/pom.xml @@ -62,7 +62,8 @@ org.apache.aries.util.tracker.hook </aries.osgi.private.pkg> <lastReleaseVersion>1.1.3</lastReleaseVersion> - <org.apache.aries.versioning.plugin.version>0.3.2-SNAPSHOT</org.apache.aries.versioning.plugin.version> + <aries.skip.version.check>true</aries.skip.version.check> + <org.apache.aries.versioning.plugin.version>0.3.1</org.apache.aries.versioning.plugin.version> <maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version> <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version> diff --git a/versioning/versioning-checker/pom.xml b/versioning/versioning-checker/pom.xml index aa853cdb2..7c5b331c0 100644 --- a/versioning/versioning-checker/pom.xml +++ b/versioning/versioning-checker/pom.xml @@ -62,7 +62,7 @@ <asm.version>9.10.1</asm.version> <maven-release-plugin.version>3.3.1</maven-release-plugin.version> <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version> - <org.apache.aries.util.version>1.1.0</org.apache.aries.util.version> + <org.apache.aries.util.version>2.0.0-SNAPSHOT</org.apache.aries.util.version> </properties> <dependencies>
