This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch ARIES-2165-build-blueprint-with-java-11-17-21-25 in repository https://gitbox.apache.org/repos/asf/aries.git
commit 0e154e15a49ae32beb31372c578406a3b9eabbbd Author: Dominik Przybysz <[email protected]> AuthorDate: Sun Feb 1 17:06:13 2026 +0100 ARIES-2165: Run blueprint build on java 11, 17, 21 and 25 --- .github/workflows/blueprint.yml | 12 +++++++++--- blueprint/blueprint-api/pom.xml | 3 ++- blueprint/blueprint-bundle/pom.xml | 2 +- blueprint/blueprint-cm/pom.xml | 1 + blueprint/blueprint-core/pom.xml | 2 +- blueprint/blueprint-web-osgi/pom.xml | 1 + blueprint/examples/blueprint-sample/pom.xml | 1 + blueprint/itests/blueprint-itests/pom.xml | 18 ++++-------------- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/blueprint.yml b/.github/workflows/blueprint.yml index 8571c215f..37aad1e24 100644 --- a/.github/workflows/blueprint.yml +++ b/.github/workflows/blueprint.yml @@ -36,18 +36,18 @@ jobs: strategy: fail-fast: false matrix: - java: [ 8 ] + java: [ 8, 11, 17, 21, 25 ] os: [ ubuntu-latest ] name: JDK${{ matrix.java }} ${{ matrix.os }} runs-on: ${{ matrix.os }} steps: - name: Git Checkout uses: actions/checkout@v6 - - name: Set up Java + - name: Set up Java 8 uses: actions/setup-java@v5 with: distribution: 'temurin' - java-version: ${{ matrix.java }} + java-version: 8 - name: Build parent shell: bash run: mvn -U -e -B -ntp clean install -f parent @@ -66,6 +66,12 @@ jobs: - name: Build proxy shell: bash run: mvn -U -e -B -ntp -Dmaven.test.skip=true clean install -f proxy + - name: Set up Java + uses: actions/setup-java@v5 + with: + distribution: 'temurin' + java-version: ${{ matrix.java }} + if: ${{ 8 != matrix.java }} - name: Build blueprint shell: bash run: mvn -U -e -B -ntp clean install -f blueprint diff --git a/blueprint/blueprint-api/pom.xml b/blueprint/blueprint-api/pom.xml index be3524ce5..a24662f2c 100644 --- a/blueprint/blueprint-api/pom.xml +++ b/blueprint/blueprint-api/pom.xml @@ -55,8 +55,9 @@ org.osgi.framework </aries.osgi.import.pkg> <aries.osgi.private.pkg/> - <lastReleaseVersion>1.0.0</lastReleaseVersion> + <lastReleaseVersion>1.0.1</lastReleaseVersion> + <org.apache.aries.versioning.plugin.version>0.3.2-SNAPSHOT</org.apache.aries.versioning.plugin.version> <osgi.core.version>4.3.1</osgi.core.version> </properties> diff --git a/blueprint/blueprint-bundle/pom.xml b/blueprint/blueprint-bundle/pom.xml index f647deea7..12ff4de79 100644 --- a/blueprint/blueprint-bundle/pom.xml +++ b/blueprint/blueprint-bundle/pom.xml @@ -110,7 +110,7 @@ <org.apache.aries.proxy.api.version>1.0.0</org.apache.aries.proxy.api.version> <org.apache.aries.proxy.impl.version>1.0.6</org.apache.aries.proxy.impl.version> <org.apache.aries.quiesce.api.version>1.0.0</org.apache.aries.quiesce.api.version> - <org.apache.aries.versioning.plugin.version>0.3.1</org.apache.aries.versioning.plugin.version> + <org.apache.aries.versioning.plugin.version>0.3.2-SNAPSHOT</org.apache.aries.versioning.plugin.version> <osgi.cmpn.version>4.3.1</osgi.cmpn.version> <slf4j.version>2.0.17</slf4j.version> </properties> diff --git a/blueprint/blueprint-cm/pom.xml b/blueprint/blueprint-cm/pom.xml index 59f3a4076..112b0d89e 100644 --- a/blueprint/blueprint-cm/pom.xml +++ b/blueprint/blueprint-cm/pom.xml @@ -61,6 +61,7 @@ <blueprint.core.version>1.10.4-SNAPSHOT</blueprint.core.version> <blueprint.parser.version>1.6.2-SNAPSHOT</blueprint.parser.version> <maven-release-plugin.version>3.3.1</maven-release-plugin.version> + <org.apache.aries.versioning.plugin.version>0.3.2-SNAPSHOT</org.apache.aries.versioning.plugin.version> <osgi.cmpn.version>5.0.0</osgi.cmpn.version> <osgi.core.version>4.3.1</osgi.core.version> <slf4j.version>2.0.17</slf4j.version> diff --git a/blueprint/blueprint-core/pom.xml b/blueprint/blueprint-core/pom.xml index dac441c94..9654ea4d7 100644 --- a/blueprint/blueprint-core/pom.xml +++ b/blueprint/blueprint-core/pom.xml @@ -98,7 +98,7 @@ <blueprint.parser.version>1.6.2-SNAPSHOT</blueprint.parser.version> <easymock.version>5.6.0</easymock.version> <maven-release-plugin.version>3.3.1</maven-release-plugin.version> - <org.apache.aries.versioning.plugin.version>0.3.1</org.apache.aries.versioning.plugin.version> + <org.apache.aries.versioning.plugin.version>0.3.2-SNAPSHOT</org.apache.aries.versioning.plugin.version> <org.apache.felix.utils.version>1.11.8</org.apache.felix.utils.version> <osgi.cmpn.version>4.3.1</osgi.cmpn.version> <osgi.core.version>4.3.1</osgi.core.version> diff --git a/blueprint/blueprint-web-osgi/pom.xml b/blueprint/blueprint-web-osgi/pom.xml index 946d734a4..cee40d45a 100644 --- a/blueprint/blueprint-web-osgi/pom.xml +++ b/blueprint/blueprint-web-osgi/pom.xml @@ -57,6 +57,7 @@ <blueprint.core.version>1.10.4-SNAPSHOT</blueprint.core.version> <geronimo-servlet_2.5_spec.version>1.2</geronimo-servlet_2.5_spec.version> + <org.apache.aries.versioning.plugin.version>0.3.2-SNAPSHOT</org.apache.aries.versioning.plugin.version> <osgi.core.version>4.3.1</osgi.core.version> </properties> diff --git a/blueprint/examples/blueprint-sample/pom.xml b/blueprint/examples/blueprint-sample/pom.xml index 8e91c95d9..cd640d79a 100644 --- a/blueprint/examples/blueprint-sample/pom.xml +++ b/blueprint/examples/blueprint-sample/pom.xml @@ -58,6 +58,7 @@ <aries.osgi.private.pkg/> <blueprint.api.version>1.0.2-SNAPSHOT</blueprint.api.version> + <org.apache.aries.versioning.plugin.version>0.3.2-SNAPSHOT</org.apache.aries.versioning.plugin.version> <osgi.core.version>4.3.1</osgi.core.version> </properties> diff --git a/blueprint/itests/blueprint-itests/pom.xml b/blueprint/itests/blueprint-itests/pom.xml index b36106cf5..f4978c90d 100644 --- a/blueprint/itests/blueprint-itests/pom.xml +++ b/blueprint/itests/blueprint-itests/pom.xml @@ -323,10 +323,10 @@ <type>bundle</type> <scope>compile</scope> <exclusions> - <exclusion> - <groupId>org.apache.aries.blueprint</groupId> - <artifactId>org.apache.aries.blueprint.core</artifactId> - </exclusion> + <exclusion> + <groupId>org.apache.aries.blueprint</groupId> + <artifactId>org.apache.aries.blueprint.core</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -369,16 +369,6 @@ <plugin> <groupId>org.apache.servicemix.tooling</groupId> <artifactId>depends-maven-plugin</artifactId> - <!-- TODO ARIES-2165: remove configuration when the newest parent pom is used --> - <version>${depends-maven-plugin.version}</version> - <executions> - <execution> - <id>generate-depends-file</id> - <goals> - <goal>generate-depends-file</goal> - </goals> - </execution> - </executions> </plugin> </plugins> </build>
