Skip to content

[MAINTENANCE] Invert versioning and util relation #866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alien11689 merged 1 commit into from
Jul 16, 2026
Merged

[MAINTENANCE] Invert versioning and util relation #866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/blueprint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/jmx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/jndi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions .github/workflows/proxy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/quiesce.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/subsystem.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/util.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ on:
paths:
- parent/**
- testsupport/**
- versioning/**
- util/**
- .github/workflows/util.yml
push:
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/versioning.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ on:
paths:
- parent/**
- testsupport/**
- util/**
- versioning/**
- .github/workflows/versioning.yml
push:
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/web.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion util/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion versioning/versioning-checker/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading