Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
12a0ddf
UNOMI-876: Migrate Unomi for running on Karaf 4.4.7
jayblanc Aug 12, 2025
c6db5bf
UNOMI-876: Upgrade to Java 17
jayblanc Aug 12, 2025
2fa0860
UNOMI-876: Restore unomi feature elements
jayblanc Aug 12, 2025
5b25788
UNOMI-876: Remove OGNL
jayblanc Aug 12, 2025
7b34b3e
UNOMI-876: Switch swagger generator for some extension (may be used g…
jayblanc Aug 12, 2025
8d88fe1
UNOMI-876: remove swagger plugin.
jayblanc Aug 12, 2025
2fe8022
UNOMI-876: Fix wiring for extensions packaged as features (groovy, ro…
jayblanc Aug 13, 2025
4296da1
UNOMI-876: Switch to Java 21, Upgrade to Karaf 4.4.8, Upgrade groovy …
jayblanc Aug 13, 2025
0f36295
UNOMI-876: Upgrade jacoco for JDK 21, add a dedicated users.propertie…
jayblanc Aug 13, 2025
f8bacdf
UNOMI-876: Remove embedded jackson into elasticsearch persistence, up…
jayblanc Aug 14, 2025
fd8e928
UNOMI-876: Remove SOAP annotations and dependencies
jayblanc Aug 14, 2025
a2f39dc
UNOMI-876: Remove useless dependency of slf4j
jayblanc Aug 14, 2025
ef3b4a0
UNOMI-876: Rename tools module to command and refactor build order to…
jayblanc Aug 14, 2025
643e2e8
UNOMI-876: Refactor build to ensure dependency order and feature veri…
jayblanc Aug 14, 2025
8f7e77a
UNOMI-876: Refactor web to avoid relying on servlet.init() for config…
jayblanc Aug 18, 2025
34b4f08
UNOMI-876: Remove empty test, adapt lifecycle watcher
jayblanc Aug 18, 2025
e6ba700
UNOMI-876: Adapt GraphQL Servlet declaration to use HttpService. Fix …
jayblanc Aug 19, 2025
39ec8a4
UNOMI-876: Fix property for actions
jayblanc Aug 19, 2025
5df15b9
UNOMI-876: Externalize all dependencies in a dedicated BOM and BOM Ar…
jayblanc Aug 19, 2025
ef434bf
UNOMI-876: Fix MigrationIT test by retrieving karaf data folder from …
jayblanc Aug 20, 2025
ae67995
UNOMI-876: Fix OffsetDateTime Jackson serialization problem in GraphQ…
jayblanc Aug 20, 2025
985d1fb
UNOMI-876: Upgrade CI to Java 17
jayblanc Aug 20, 2025
0f0c508
UNOMI-876: Adapt DateUtils to avoid parsing Map of int in GraphQL
jayblanc Aug 21, 2025
33df756
UNOMI-876: fix missing dependency after rebase
jayblanc Aug 28, 2025
849954e
UNOMI-876: fix missing dependency after rebase
jayblanc Aug 29, 2025
89d4ea9
UNOMI-876: fix bad rebase for feature
jayblanc Aug 29, 2025
00035dc
UNOMI-876: revert tools to commands module renaming
jayblanc Sep 1, 2025
6a17bc6
UNOMI-876: revert tools to commands module renaming
jayblanc Sep 1, 2025
d284188
UNOMI-876: restore REST-UI feature
jayblanc Sep 1, 2025
d90c512
UNOMI-876: restore REST-UI feature, document pom.xml for splitting ex…
jayblanc Sep 1, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis-java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ jobs:
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
- run: mvn -U -ntp -e clean install -DskipTests

- name: Perform CodeQL Analysis
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/unomi-ci-build-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
timeout-minutes: 15
steps:
- uses: actions/checkout@v4
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
cache: maven
- name: Build and Unit tests
run: mvn -U -ntp -e clean install
Expand All @@ -29,24 +29,24 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
cache: maven
- name: Integration tests
run: mvn -ntp clean install -Pintegration-tests
- name: Archive code coverage logs
uses: actions/upload-artifact@v4
if: false # UNOMI-746 Reactivate if necessary
with:
name: unomi-code-coverage-jdk11-${{ github.run_number }}
name: unomi-code-coverage-jdk17-${{ github.run_number }}
path: itests/target/site/jacoco
- name: Archive unomi logs
uses: actions/upload-artifact@v4
if: failure()
with:
name: unomi-log-jdk11-${{ github.run_number }}
name: unomi-log-jdk17-${{ github.run_number }}
path: |
itests/target/exam/**/data/log
itests/target/elasticsearch0/data
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/unomi-ci-docs-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
server-id: apache.snapshots.https
server-username: NEXUS_USER
server-password: NEXUS_PW
Expand All @@ -33,10 +33,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 17
server-id: apache.snapshots.https
server-username: NEXUS_USER
server-password: NEXUS_PW
Expand Down
3 changes: 1 addition & 2 deletions BUILDING
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ Building Apache Unomi
Initial Setup
-------------

1) Install J2SE 8.0 SDK (or later), which can be downloaded from
http://www.oracle.com/technetwork/java/javase/downloads/index.html
1) Install J2SE 17 SDK (or later), which can be downloaded from http://www.oracle.com/technetwork/java/javase/downloads/index.html

2) Make sure that your JAVA_HOME environment variable is set to the newly installed
JDK location, and that your PATH includes %JAVA_HOME%\bin (windows) or
Expand Down
23 changes: 21 additions & 2 deletions api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,32 +22,51 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>unomi-api</artifactId>
<name>Apache Unomi :: Specification API</name>
<description>Main API of the Apache Unomi Context server</description>
<packaging>bundle</packaging>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down
249 changes: 249 additions & 0 deletions bom/artifacts/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,249 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ 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.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>unomi-bom-artifacts</artifactId>
<name>Apache Unomi :: BOM :: Unomi Artifacts</name>
<packaging>pom</packaging>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-metrics</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-scripting</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-json-schema-services</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-json-schema-rest</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-rest</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-services</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-rest</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-rest</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-actions</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-rest</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-services</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-web-tracker-wab</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-lifecycle-watcher</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>shell-commands</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>shell-dev-commands</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-weather-update-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector-services</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector-rest</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-salesforce-connector-actions</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-router-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-router-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-router-service</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-router-rest</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-groovy-actions-services</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-groovy-actions</artifactId>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cdp-graphql-api-impl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cdp-graphql-feature</artifactId>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>graphql-providers-sample</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-base</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-request</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-mail</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-optimization-test</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-kar</artifactId>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-router-karaf-feature</artifactId>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
</dependency>
</dependencies>
</dependencyManagement>

</project>
Loading
Loading