From 864cd2a040ce4a44abb9f5552c34626c7a38e744 Mon Sep 17 00:00:00 2001 From: Stefan Bischof Date: Sun, 3 May 2026 21:59:03 +0200 Subject: [PATCH 1/2] update OSGi component versions and identities in bndrun files Signed-off-by: Stefan Bischof # Conflicts: # application/pivot/daanse.pivot.bndrun # application/playground/daanse.playground.bndrun --- application/pivot/daanse.pivot.bndrun | 4 +++- application/playground/daanse.playground.bndrun | 8 +++++--- application/probe/daanse.probe.bndrun | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/application/pivot/daanse.pivot.bndrun b/application/pivot/daanse.pivot.bndrun index fe1bf4e..f71a643 100644 --- a/application/pivot/daanse.pivot.bndrun +++ b/application/pivot/daanse.pivot.bndrun @@ -54,7 +54,6 @@ - -runbundles: \ ai.starlake.transpiler;version='[1.8.0,1.8.1)',\ ch.qos.logback.classic;version='[1.5.6,1.5.7)',\ @@ -73,7 +72,10 @@ org.apache.felix.http.servlet-api;version='[3.0.0,3.0.1)',\ org.apache.felix.metatype;version='[1.2.4,1.2.5)',\ org.apache.felix.scr;version='[2.2.10,2.2.11)',\ + org.eclipse.daanse.cwm.model;version='[0.0.1,0.0.2)',\ + org.eclipse.daanse.cwm.util;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.jakarta.servlet.soap;version='[0.0.1,0.0.2)',\ + org.eclipse.daanse.jdbc.db.api;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.jdbc.db.dialect.api;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.lcid.api;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.mdx.model.api;version='[0.0.1,0.0.2)',\ diff --git a/application/playground/daanse.playground.bndrun b/application/playground/daanse.playground.bndrun index 9896ff7..f3ae427 100644 --- a/application/playground/daanse.playground.bndrun +++ b/application/playground/daanse.playground.bndrun @@ -36,7 +36,7 @@ bnd.identity;id='org.eclipse.daanse.olap.xmla.bridge',\ bnd.identity;id='org.eclipse.daanse.xmla.server.jakarta.saaj',\ bnd.identity;id='ch.qos.logback.classic',\ - bnd.identity;id='org.eclipse.daanse.jdbc.db.core',\ + bnd.identity;id='org.eclipse.daanse.jdbc.db.impl',\ bnd.identity;id='org.eclipse.daanse.mdx.parser.api',\ bnd.identity;id='org.eclipse.daanse.mdx.parser.ccc',\ bnd.identity;id='org.eclipse.daanse.rolap.mapping.model',\ @@ -74,7 +74,6 @@ begin=-1 - -runbundles: \ ai.starlake.transpiler;version='[1.8.0,1.8.1)',\ ch.qos.logback.classic;version='[1.5.6,1.5.7)',\ @@ -98,6 +97,8 @@ org.apache.felix.metatype;version='[1.2.4,1.2.5)',\ org.apache.felix.scr;version='[2.2.10,2.2.11)',\ org.apache.felix.webconsole;version='[5.0.12,5.0.13)',\ + org.eclipse.daanse.cwm.model;version='[0.0.1,0.0.2)',\ + org.eclipse.daanse.cwm.util;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.jakarta.servlet.filter.cors;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.jakarta.servlet.soap;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.jdbc.datasource.common;version='[0.0.1,0.0.2)',\ @@ -108,7 +109,6 @@ org.eclipse.daanse.jdbc.datasource.postgresql;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.jdbc.datasource.sqlite;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.jdbc.db.api;version='[0.0.1,0.0.2)',\ - org.eclipse.daanse.jdbc.db.core;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.jdbc.db.dialect.api;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.jdbc.db.dialect.db.common;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.jdbc.db.dialect.db.h2;version='[0.0.1,0.0.2)',\ @@ -118,6 +118,7 @@ org.eclipse.daanse.jdbc.db.dialect.db.oracle;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.jdbc.db.dialect.db.postgresql;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.jdbc.db.dialect.db.sqlite;version='[0.0.1,0.0.2)',\ + org.eclipse.daanse.jdbc.db.impl;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.jdbc.db.record;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.lcid.api;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.lcid.basic;version='[0.0.1,0.0.2)',\ @@ -161,6 +162,7 @@ org.osgi.service.component;version='[1.5.1,1.5.2)',\ org.osgi.service.jdbc;version='[1.1.0,1.1.1)',\ org.osgi.service.log;version='[1.4.0,1.4.1)',\ + org.osgi.service.servlet;version='[2.0.0,2.0.1)',\ org.osgi.util.converter;version='[1.0.9,1.0.10)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ diff --git a/application/probe/daanse.probe.bndrun b/application/probe/daanse.probe.bndrun index 5aa965b..74b1f87 100644 --- a/application/probe/daanse.probe.bndrun +++ b/application/probe/daanse.probe.bndrun @@ -38,7 +38,7 @@ bnd.identity;id='ch.qos.logback.classic',\ bnd.identity;id='org.eclipse.daanse.jdbc.datasource.h2',\ bnd.identity;id='org.eclipse.daanse.jdbc.db.dialect.db.h2',\ - bnd.identity;id='org.eclipse.daanse.jdbc.db.core',\ + bnd.identity;id='org.eclipse.daanse.jdbc.db.impl',\ bnd.identity;id='org.eclipse.daanse.mdx.parser.api',\ bnd.identity;id='org.eclipse.daanse.mdx.parser.ccc',\ bnd.identity;id='org.eclipse.daanse.rolap.mapping.model',\ @@ -92,6 +92,8 @@ org.apache.felix.http.servlet-api;version='[3.0.0,3.0.1)',\ org.apache.felix.metatype;version='[1.2.4,1.2.5)',\ org.apache.felix.scr;version='[2.2.10,2.2.11)',\ + org.eclipse.daanse.cwm.model;version='[0.0.1,0.0.2)',\ + org.eclipse.daanse.cwm.util;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.io.fs.watcher.api;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.io.fs.watcher.watchservice;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.jakarta.servlet.filter.auth.dummy.noauth;version='[0.0.1,0.0.2)',\ @@ -101,10 +103,10 @@ org.eclipse.daanse.jdbc.datasource.common;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.jdbc.datasource.h2;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.jdbc.db.api;version='[0.0.1,0.0.2)',\ - org.eclipse.daanse.jdbc.db.core;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.jdbc.db.dialect.api;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.jdbc.db.dialect.db.common;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.jdbc.db.dialect.db.h2;version='[0.0.1,0.0.2)',\ + org.eclipse.daanse.jdbc.db.impl;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.jdbc.db.importer.csv;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.jdbc.db.record;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.lcid.api;version='[0.0.1,0.0.2)',\ From 77879b608b4a308820648eac89d4e9eeec63b405 Mon Sep 17 00:00:00 2001 From: Stefan Bischof Date: Sun, 3 May 2026 22:06:31 +0200 Subject: [PATCH 2/2] update caffeine dependency version and increment project version to 0.0.7 Signed-off-by: Stefan Bischof --- application/playground/daanse.playground.bndrun | 5 ----- application/probe/daanse.probe.bndrun | 2 +- pom.xml | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/application/playground/daanse.playground.bndrun b/application/playground/daanse.playground.bndrun index f3ae427..7e942e8 100644 --- a/application/playground/daanse.playground.bndrun +++ b/application/playground/daanse.playground.bndrun @@ -49,15 +49,10 @@ bnd.identity;id='org.eclipse.daanse.jdbc.datasource.h2',\ bnd.identity;id='org.eclipse.daanse.jdbc.db.dialect.db.h2',\ bnd.identity;id='org.eclipse.daanse.jdbc.datasource.mysql',\ - bnd.identity;id='org.eclipse.daanse.jdbc.datasource.sqlite',\ bnd.identity;id='org.eclipse.daanse.jdbc.datasource.oracle',\ bnd.identity;id='org.eclipse.daanse.jdbc.db.dialect.db.oracle',\ bnd.identity;id='org.eclipse.daanse.jdbc.db.dialect.db.postgresql',\ - bnd.identity;id='org.eclipse.daanse.jdbc.datasource.mssqlserver',\ bnd.identity;id='org.eclipse.daanse.jdbc.db.dialect.db.mysql',\ - bnd.identity;id='org.eclipse.daanse.jdbc.db.dialect.db.mssqlserver',\ - bnd.identity;id='org.eclipse.daanse.jdbc.db.dialect.db.mariadb',\ - bnd.identity;id='org.eclipse.daanse.jdbc.db.dialect.db.sqlite',\ bnd.identity;id='org.apache.felix.fileinstall',\ bnd.identity;id='org.eclipse.daanse.jakarta.servlet.filter.cors',\ bnd.identity;id='org.apache.commons.commons-fileupload',\ diff --git a/application/probe/daanse.probe.bndrun b/application/probe/daanse.probe.bndrun index 74b1f87..dffb948 100644 --- a/application/probe/daanse.probe.bndrun +++ b/application/probe/daanse.probe.bndrun @@ -77,7 +77,7 @@ -runbundles: \ ai.starlake.transpiler;version='[1.8.0,1.8.1)',\ ch.qos.logback.classic;version='[1.5.6,1.5.7)',\ - com.github.ben-manes.caffeine;version='[3.1.2,3.1.3)',\ + com.github.ben-manes.caffeine;version='[3.1.8,3.1.9)',\ com.h2database;version='[2.3.230,2.3.231)',\ com.sun.xml.messaging.saaj.impl;version='[3.0.4,3.0.5)',\ de.siegmar.fastcsv;version='[3.1.0,3.1.1)',\ diff --git a/pom.xml b/pom.xml index 40e2823..1901cff 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.daanse org.eclipse.daanse.pom.parent - 0.0.6 + 0.0.7 org.eclipse.daanse.server ${revision}