This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch unomi-3-dev in repository https://gitbox.apache.org/repos/asf/unomi.git
commit eca005fd8c306e8eeaddece809597e3a41fd22e9 Merge: ccc07678e c85fb8856 Author: Serge Huber <[email protected]> AuthorDate: Wed May 6 08:02:38 2026 +0200 Merge remote-tracking branch 'origin/master' into unomi-3-dev # Conflicts: # .github/workflows/unomi-ci-docs.yml # manual/pom.xml .github/workflows/codeql-analysis-javascript.yml | 6 +-- .github/workflows/unomi-ci-docs.yml | 12 ++--- bom/pom.xml | 6 --- extensions/healthcheck/pom.xml | 1 - extensions/router/router-karaf-feature/pom.xml | 1 - extensions/router/router-rest/pom.xml | 1 - .../apache/unomi/lifecycle/BundleWatcherImpl.java | 63 +++++++++++----------- manual/pom.xml | 1 + .../main/resources/etc/org.ops4j.pax.logging.cfg | 30 ++++++++++- tools/shell-commands/pom.xml | 1 - tools/shell-dev-commands/pom.xml | 1 - 11 files changed, 71 insertions(+), 52 deletions(-) diff --cc .github/workflows/unomi-ci-docs.yml index b5381b92a,99b369286..b327bec09 --- a/.github/workflows/unomi-ci-docs.yml +++ b/.github/workflows/unomi-ci-docs.yml @@@ -15,30 -15,30 +15,30 @@@ jobs runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 -- ++ - name: Set up JDK 17 uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '17' cache: 'maven' -- ++ - name: Install GraphViz run: | sudo apt-get update sudo apt-get install -y graphviz dot -V -- ++ - name: Build Manual run: | cd manual mvn -U -ntp clean install -- ++ - name: Archive documentation - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: unomi-documentation path: | manual/target/generated-docs/html/latest/ manual/target/generated-docs/pdf/latest/ -- manual/target/*.pdf ++ manual/target/*.pdf
