Skip to content

Commit d23d9ec

Browse files
alien11689alien11689
authored
Merge pull request #297 from apache/add-jmx-and-blueprint-workflows
ARIES-2162: Add jmx and blueprint workflows
2 parents 6629195 + 4ad4d27 commit d23d9ec

File tree

8 files changed

+124
-12
lines changed

8 files changed

+124
-12
lines changed

‎.github/workflows/blueprint.yml

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# Licensed under the Apache License, Version 2.0 (the "License");
2+
# you may not use this file except in compliance with the License.
3+
# You may obtain a copy of the License at
4+
#
5+
# http://www.apache.org/licenses/LICENSE-2.0
6+
#
7+
# Unless required by applicable law or agreed to in writing, software
8+
# distributed under the License is distributed on an "AS IS" BASIS,
9+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
10+
# See the License for the specific language governing permissions and
11+
# limitations under the License.
12+
13+
name: Blueprint - CI Build
14+
15+
on:
16+
pull_request:
17+
paths:
18+
- testsupport/**
19+
- blueprint/**
20+
- .github/workflows/blueprint.yml
21+
push:
22+
branches:
23+
- 'trunk'
24+
25+
env:
26+
LC_ALL: en_US.UTF-8
27+
28+
jobs:
29+
JDKxx_Matrix:
30+
strategy:
31+
matrix:
32+
java: [ 8 ]
33+
os: [ ubuntu-latest ]
34+
name: JDK${{ matrix.java }} ${{ matrix.os }}
35+
runs-on: ${{ matrix.os }}
36+
steps:
37+
- name: Git Checkout
38+
uses: actions/checkout@v4
39+
- name: Set up Java
40+
uses: actions/setup-java@v4
41+
with:
42+
distribution: 'temurin'
43+
java-version: ${{ matrix.java }}
44+
- name: Build
45+
shell: bash
46+
run: |
47+
mvn -U -e -B -ntp clean install -f testsupport/pom.xml
48+
mvn -U -e -B -ntp clean install -f blueprint/pom.xml

‎.github/workflows/jmx.yml

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# Licensed under the Apache License, Version 2.0 (the "License");
2+
# you may not use this file except in compliance with the License.
3+
# You may obtain a copy of the License at
4+
#
5+
# http://www.apache.org/licenses/LICENSE-2.0
6+
#
7+
# Unless required by applicable law or agreed to in writing, software
8+
# distributed under the License is distributed on an "AS IS" BASIS,
9+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
10+
# See the License for the specific language governing permissions and
11+
# limitations under the License.
12+
13+
name: JMX - CI Build
14+
15+
on:
16+
pull_request:
17+
paths:
18+
- testsupport/**
19+
- jmx/**
20+
- .github/workflows/jmx.yml
21+
push:
22+
branches:
23+
- 'trunk'
24+
25+
env:
26+
LC_ALL: en_US.UTF-8
27+
28+
jobs:
29+
JDKxx_Matrix:
30+
strategy:
31+
matrix:
32+
java: [ 8 ]
33+
os: [ ubuntu-latest ]
34+
name: JDK${{ matrix.java }} ${{ matrix.os }}
35+
runs-on: ${{ matrix.os }}
36+
steps:
37+
- name: Git Checkout
38+
uses: actions/checkout@v4
39+
- name: Set up Java
40+
uses: actions/setup-java@v4
41+
with:
42+
distribution: 'temurin'
43+
java-version: ${{ matrix.java }}
44+
- name: Build
45+
shell: bash
46+
run: |
47+
mvn -U -e -B -ntp -am -pl jmx/jmx-itests clean install

‎.github/workflows/spi-fly.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@
1313
name: SPI Fly - CI Build
1414

1515
on:
16-
push:
17-
# Sequence of patterns matched against refs/heads
18-
branches-ignore:
19-
# Push events to branches matching refs/heads/dependabot/**
20-
- 'dependabot/**'
2116
pull_request:
17+
paths:
18+
- spi-fly/**
19+
- .github/workflows/spi-fly.yml
20+
push:
21+
branches:
22+
- 'trunk'
2223

2324
defaults:
2425
run:

‎blueprint/blueprint-parent/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.aries</groupId>
2626
<artifactId>parent</artifactId>
27-
<version>2.0.1</version>
27+
<version>2.1.0</version>
2828
<relativePath>../../parent/pom.xml</relativePath>
2929
</parent>
3030

@@ -45,9 +45,9 @@
4545

4646
<properties>
4747
<blueprint.api.dev.version>1.0.2-SNAPSHOT</blueprint.api.dev.version>
48-
<blueprint.core.dev.version>1.10.2-SNAPSHOT</blueprint.core.dev.version>
49-
<blueprint.cm.dev.version>1.3.2-SNAPSHOT</blueprint.cm.dev.version>
50-
<blueprint.parser.dev.version>1.6.1-SNAPSHOT</blueprint.parser.dev.version>
48+
<blueprint.core.dev.version>1.10.4-SNAPSHOT</blueprint.core.dev.version>
49+
<blueprint.cm.dev.version>1.3.3-SNAPSHOT</blueprint.cm.dev.version>
50+
<blueprint.parser.dev.version>1.6.2-SNAPSHOT</blueprint.parser.dev.version>
5151
<blueprint.authz.dev.version>1.0.1-SNAPSHOT</blueprint.authz.dev.version>
5252
<blueprint.spring.dev.version>1.0.0-SNAPSHOT</blueprint.spring.dev.version>
5353
<blueprint.spring.extender.dev.version>1.0.0-SNAPSHOT</blueprint.spring.extender.dev.version>

‎blueprint/itests/blueprint-itests/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
<properties>
4545
<exam.version>4.10.0</exam.version>
46-
<url.version>2.2.0</url.version>
46+
<url.version>2.5.3</url.version>
4747

4848
<blueprint.api.version>${blueprint.api.dev.version}</blueprint.api.version>
4949
<blueprint.core.version>${blueprint.core.dev.version}</blueprint.core.version>

‎jmx/jmx-bundle/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.aries.jmx</groupId>
2626
<artifactId>org.apache.aries.jmx.parent</artifactId>
27-
<version>1.1.6-SNAPSHOT</version>
27+
<version>1.1.5</version>
2828
<relativePath>../jmx-parent</relativePath>
2929
</parent>
3030

‎jmx/jmx-itests/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
<properties>
4040
<exam.version>3.4.0</exam.version>
41-
<url.version>1.6.0</url.version>
41+
<url.version>2.5.3</url.version>
4242
</properties>
4343

4444
<dependencies>

‎jmx/jmx-itests/src/test/java/org/apache/aries/jmx/test/MbeanServerActivator.java

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/**
2+
* Licensed to the Apache Software Foundation (ASF) under one or more
3+
* contributor license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright ownership.
5+
* The ASF licenses this file to You under the Apache License, Version 2.0
6+
* (the "License"); you may not use this file except in compliance with
7+
* the License. You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
117
package org.apache.aries.jmx.test;
218

319
import javax.management.MBeanServer;

0 commit comments

Comments
 (0)