This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch add-versioning-workflow in repository https://gitbox.apache.org/repos/asf/aries.git
commit 5b4f5992cf622dedc4c8273ce8140f8520424cf5 Author: Dominik Przybysz <[email protected]> AuthorDate: Sat Jan 11 17:27:22 2025 +0100 [MAINTENANCE] Add versioning workflow --- .github/workflows/versioning.yml | 47 +++++++++++++++++++++++++++++++++++ versioning/versioning-checker/pom.xml | 17 +++++++++---- versioning/versioning-plugin/pom.xml | 9 ++----- 3 files changed, 61 insertions(+), 12 deletions(-) diff --git a/.github/workflows/versioning.yml b/.github/workflows/versioning.yml new file mode 100644 index 000000000..b4f324b1c --- /dev/null +++ b/.github/workflows/versioning.yml @@ -0,0 +1,47 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +name: Versioning - CI Build + +on: + pull_request: + paths: + - versioning/** + - .github/workflows/versioning.yml + push: + branches: + - 'trunk' + +env: + LC_ALL: en_US.UTF-8 + +jobs: + JDKxx_Matrix: + timeout-minutes: 10 + strategy: + matrix: + java: [ 8, 11 ] + os: [ ubuntu-latest ] + name: JDK${{ matrix.java }} ${{ matrix.os }} + runs-on: ${{ matrix.os }} + steps: + - name: Git Checkout + uses: actions/checkout@v4 + - name: Set up Java + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: ${{ matrix.java }} + - name: Build + shell: bash + run: | + mvn -U -e -B -ntp clean install -f versioning/pom.xml diff --git a/versioning/versioning-checker/pom.xml b/versioning/versioning-checker/pom.xml index 19b3ce867..1a819501d 100644 --- a/versioning/versioning-checker/pom.xml +++ b/versioning/versioning-checker/pom.xml @@ -23,8 +23,8 @@ <parent> <groupId>org.apache.aries</groupId> - <artifactId>java5-parent</artifactId> - <version>1.0.0</version> + <artifactId>parent</artifactId> + <version>2.1.1</version> <relativePath /> </parent> @@ -46,7 +46,7 @@ ${project.artifactId};blueprint.graceperiod:=false </aries.osgi.symbolic.name> <aries.osgi.import> - org.objectweb.asm*;version=3.2;resolution:=optional, + org.objectweb.asm*;version="[9,10)";resolution:=optional, org.osgi.framework;version="[1.5,2)", org.slf4j;version="[1.5,2)", * @@ -58,6 +58,7 @@ org.apache.aries.versioning.utils; </aries.osgi.private.pkg> <lastReleaseVersion>0.2.0</lastReleaseVersion> + <aries.skip.version.check>true</aries.skip.version.check> </properties> <dependencies> @@ -82,9 +83,15 @@ </dependency> <dependency> <groupId>org.ow2.asm</groupId> - <artifactId>asm-debug-all</artifactId> + <artifactId>asm</artifactId> <optional>true</optional> - <version>5.0.3</version> + <version>9.6</version> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-commons</artifactId> + <optional>true</optional> + <version>9.6</version> </dependency> <dependency> <groupId>org.osgi</groupId> diff --git a/versioning/versioning-plugin/pom.xml b/versioning/versioning-plugin/pom.xml index 4f3c97f95..22ead0d11 100644 --- a/versioning/versioning-plugin/pom.xml +++ b/versioning/versioning-plugin/pom.xml @@ -23,8 +23,8 @@ <parent> <groupId>org.apache.aries</groupId> - <artifactId>java5-parent</artifactId> - <version>1.0.0</version> + <artifactId>parent</artifactId> + <version>2.1.1</version> <relativePath /> </parent> @@ -46,11 +46,6 @@ <artifactId>org.apache.aries.versioning.checker</artifactId> <version>0.3.2-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm-debug-all</artifactId> - <version>5.0.3</version> - </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId>
