Skip to content
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.

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

ARIES-2162: Add jmx and blueprint workflows #297

Merged
merged 4 commits into from
Dec 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
48 changes: 48 additions & 0 deletions .github/workflows/blueprint.yml
Original file line number Diff line number Diff line change
@@ -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
47 changes: 47 additions & 0 deletions .github/workflows/jmx.yml
Original file line number Diff line number Diff line change
@@ -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
11 changes: 6 additions & 5 deletions .github/workflows/spi-fly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions blueprint/blueprint-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
<version>2.0.1</version>
<version>2.1.0</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>

Expand All @@ -45,9 +45,9 @@

<properties>
<blueprint.api.dev.version>1.0.2-SNAPSHOT</blueprint.api.dev.version>
<blueprint.core.dev.version>1.10.2-SNAPSHOT</blueprint.core.dev.version>
<blueprint.cm.dev.version>1.3.2-SNAPSHOT</blueprint.cm.dev.version>
<blueprint.parser.dev.version>1.6.1-SNAPSHOT</blueprint.parser.dev.version>
<blueprint.core.dev.version>1.10.4-SNAPSHOT</blueprint.core.dev.version>
<blueprint.cm.dev.version>1.3.3-SNAPSHOT</blueprint.cm.dev.version>
<blueprint.parser.dev.version>1.6.2-SNAPSHOT</blueprint.parser.dev.version>
<blueprint.authz.dev.version>1.0.1-SNAPSHOT</blueprint.authz.dev.version>
<blueprint.spring.dev.version>1.0.0-SNAPSHOT</blueprint.spring.dev.version>
<blueprint.spring.extender.dev.version>1.0.0-SNAPSHOT</blueprint.spring.extender.dev.version>
Expand Down
2 changes: 1 addition & 1 deletion blueprint/itests/blueprint-itests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

<properties>
<exam.version>4.10.0</exam.version>
<url.version>2.2.0</url.version>
<url.version>2.5.3</url.version>

<blueprint.api.version>${blueprint.api.dev.version}</blueprint.api.version>
<blueprint.core.version>${blueprint.core.dev.version}</blueprint.core.version>
Expand Down
2 changes: 1 addition & 1 deletion jmx/jmx-bundle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.aries.jmx</groupId>
<artifactId>org.apache.aries.jmx.parent</artifactId>
<version>1.1.6-SNAPSHOT</version>
<version>1.1.5</version>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Out of curiosity, why did you switch back to a release version for this module?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The parent artifact has its parent updated (by you in #295 ) and I tested it during creation of workflows.
My goal is to prepare green workflows before making any changes, so the solution may not be perfect but... it works :)
Without changing the version here to the last published version there are test errors in itest:

java.lang.ClassNotFoundException: org.osgi.jmx.framework.*

I wrote about the root reason in #296 (comment)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I missed that this is about the parent pom, sorry. So no concerns here.

Final comment from me - would it make sense to build the whole reactor instead of all the ITs and dependant projects?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not able to force jmx/jmx-whiteboard to pass tests in reactor from zero:

  1. current code has problems to fetch artifacts because of http addresses
  2. With upgraded parent, pax url and added javax.inject the code compiles but tests failes and btw artifacts are downloaded via https so...
  3. when removing upgrades and running build again the tests passes

I think that many other tests needs changes for new parent :(

For your @rombert tests it should be fine to add new tests to itest and -am option should include your new bundle build and test.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good, thank you.

<relativePath>../jmx-parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion jmx/jmx-itests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

<properties>
<exam.version>3.4.0</exam.version>
<url.version>1.6.0</url.version>
<url.version>2.5.3</url.version>
</properties>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down