diff --git a/.github/workflows/blueprint.yml b/.github/workflows/blueprint.yml new file mode 100644 index 0000000000..8bd4135734 --- /dev/null +++ b/.github/workflows/blueprint.yml @@ -0,0 +1,48 @@ +# 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: Blueprint - CI Build + +on: + pull_request: + paths: + - testsupport/** + - blueprint/** + - .github/workflows/blueprint.yml + push: + branches: + - 'trunk' + +env: + LC_ALL: en_US.UTF-8 + +jobs: + JDKxx_Matrix: + strategy: + matrix: + java: [ 8 ] + 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 testsupport/pom.xml + mvn -U -e -B -ntp clean install -f blueprint/pom.xml diff --git a/.github/workflows/jmx.yml b/.github/workflows/jmx.yml new file mode 100644 index 0000000000..99d90b0a95 --- /dev/null +++ b/.github/workflows/jmx.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: JMX - CI Build + +on: + pull_request: + paths: + - testsupport/** + - jmx/** + - .github/workflows/jmx.yml + push: + branches: + - 'trunk' + +env: + LC_ALL: en_US.UTF-8 + +jobs: + JDKxx_Matrix: + strategy: + matrix: + java: [ 8 ] + 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 -am -pl jmx/jmx-itests clean install diff --git a/.github/workflows/spi-fly.yml b/.github/workflows/spi-fly.yml index 01bb968f61..39368d3a54 100644 --- a/.github/workflows/spi-fly.yml +++ b/.github/workflows/spi-fly.yml @@ -13,12 +13,13 @@ name: SPI Fly - CI Build on: - push: - # Sequence of patterns matched against refs/heads - branches-ignore: - # Push events to branches matching refs/heads/dependabot/** - - 'dependabot/**' pull_request: + paths: + - spi-fly/** + - .github/workflows/spi-fly.yml + push: + branches: + - 'trunk' defaults: run: diff --git a/blueprint/blueprint-parent/pom.xml b/blueprint/blueprint-parent/pom.xml index 4856bc5ab4..b22c801ef7 100644 --- a/blueprint/blueprint-parent/pom.xml +++ b/blueprint/blueprint-parent/pom.xml @@ -24,7 +24,7 @@ org.apache.aries parent - 2.0.1 + 2.1.0 ../../parent/pom.xml @@ -45,9 +45,9 @@ 1.0.2-SNAPSHOT - 1.10.2-SNAPSHOT - 1.3.2-SNAPSHOT - 1.6.1-SNAPSHOT + 1.10.4-SNAPSHOT + 1.3.3-SNAPSHOT + 1.6.2-SNAPSHOT 1.0.1-SNAPSHOT 1.0.0-SNAPSHOT 1.0.0-SNAPSHOT diff --git a/blueprint/itests/blueprint-itests/pom.xml b/blueprint/itests/blueprint-itests/pom.xml index 10385f2f26..fdde354c47 100644 --- a/blueprint/itests/blueprint-itests/pom.xml +++ b/blueprint/itests/blueprint-itests/pom.xml @@ -43,7 +43,7 @@ 4.10.0 - 2.2.0 + 2.5.3 ${blueprint.api.dev.version} ${blueprint.core.dev.version} diff --git a/jmx/jmx-bundle/pom.xml b/jmx/jmx-bundle/pom.xml index 26e05199d9..1acb2c9eff 100644 --- a/jmx/jmx-bundle/pom.xml +++ b/jmx/jmx-bundle/pom.xml @@ -24,7 +24,7 @@ org.apache.aries.jmx org.apache.aries.jmx.parent - 1.1.6-SNAPSHOT + 1.1.5 ../jmx-parent diff --git a/jmx/jmx-itests/pom.xml b/jmx/jmx-itests/pom.xml index 10f920f17e..b3bae890f5 100644 --- a/jmx/jmx-itests/pom.xml +++ b/jmx/jmx-itests/pom.xml @@ -38,7 +38,7 @@ 3.4.0 - 1.6.0 + 2.5.3 diff --git a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/MbeanServerActivator.java b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/MbeanServerActivator.java index 1c46981417..3b07a222e9 100644 --- a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/MbeanServerActivator.java +++ b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/MbeanServerActivator.java @@ -1,3 +1,19 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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. + */ package org.apache.aries.jmx.test; import javax.management.MBeanServer;