From 1417d4520b5d5a0fd1fd7e28d496f7706a967d9e Mon Sep 17 00:00:00 2001 From: Stefan Bischof Date: Mon, 2 Feb 2026 15:53:51 +0100 Subject: [PATCH 1/2] improve log Signed-off-by: Stefan Bischof --- application/pom.xml | 2 +- application/probe/pom.xml | 3 +-- application/probe/start.bat | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/application/pom.xml b/application/pom.xml index d421b7b..2a194d9 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -25,7 +25,7 @@ probe pivot - playground + diff --git a/application/probe/pom.xml b/application/probe/pom.xml index b49a0ba..401e339 100644 --- a/application/probe/pom.xml +++ b/application/probe/pom.xml @@ -132,8 +132,7 @@ org.eclipse.daanse - - org.eclipse.daanse.olap.odc + org.eclipse.daanse.olap.odc 0.0.1-SNAPSHOT compile diff --git a/application/probe/start.bat b/application/probe/start.bat index b014dbf..9c6cddb 100644 --- a/application/probe/start.bat +++ b/application/probe/start.bat @@ -11,18 +11,18 @@ set "LOGBACK_CONFIG=.\logback.xml" REM Check if java -version works "%JAVA_EXEC%" -version >nul 2>&1 if errorlevel 1 ( - echo Java is installed but not working properly (java -version failed). + echo "Java is installed but not working properly (java -version failed)." exit /b 1 ) REM Check Logback configuration file exists if not exist "%LOGBACK_CONFIG%" ( - echo Logback configuration file "%LOGBACK_CONFIG%" not found. + echo "Logback configuration file "%LOGBACK_CONFIG%" not found." exit /b 1 ) REM Start Server -echo Starting server... +echo "Starting server..." "%JAVA_EXEC%" -Dlogback.configurationFile=file:"%LOGBACK_CONFIG%" -jar daanse.probe.jar endlocal From 65321f478fb91d85c2d76fb7961a53fa6be8cc83 Mon Sep 17 00:00:00 2001 From: Stefan Bischof Date: Mon, 2 Feb 2026 21:47:23 +0100 Subject: [PATCH 2/2] add org.eclipse.fennec.emf.osgi.component dependency and update versions in bndrun files Signed-off-by: Stefan Bischof --- application/pivot/daanse.pivot.bndrun | 11 ++++++----- application/playground/daanse.playground.bndrun | 4 ++-- application/pom.xml | 13 +++++++++++++ application/probe/daanse.probe.bndrun | 5 +++-- 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/application/pivot/daanse.pivot.bndrun b/application/pivot/daanse.pivot.bndrun index 831e34a..1bf6b95 100644 --- a/application/pivot/daanse.pivot.bndrun +++ b/application/pivot/daanse.pivot.bndrun @@ -38,12 +38,12 @@ 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',\ - bnd.identity;id='org.gecko.emf.osgi.component',\ bnd.identity;id='org.eclipse.daanse.sql.guard.api',\ bnd.identity;id='org.eclipse.daanse.sql.guard.jsqltranspiler',\ bnd.identity;id='org.eclipse.daanse.rolap.core',\ bnd.identity;id='org.apache.felix.fileinstall',\ - bnd.identity;id='org.apache.felix.configadmin.plugin.interpolation' + bnd.identity;id='org.apache.felix.configadmin.plugin.interpolation',\ + bnd.identity;id='org.eclipse.fennec.emf.osgi.component' # This will help us keep -runbundles sorted @@ -91,9 +91,10 @@ org.eclipse.daanse.xmla.model.record;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.xmla.server.adapter.soapmessage;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.xmla.server.jakarta.saaj;version='[0.0.1,0.0.2)',\ - org.eclipse.emf.common;version='[2.30.0,2.30.1)',\ - org.eclipse.emf.ecore;version='[2.36.0,2.36.1)',\ - org.eclipse.emf.ecore.xmi;version='[2.37.0,2.37.1)',\ + org.eclipse.emf.common;version='[2.44.0,2.44.1)',\ + org.eclipse.emf.ecore;version='[2.41.0,2.41.1)',\ + org.eclipse.emf.ecore.xmi;version='[2.39.0,2.39.1)',\ + org.eclipse.fennec.emf.osgi.component;version='[1.0.0,1.0.1)',\ org.gecko.emf.osgi.component;version='[6.2.0,6.2.1)',\ org.glassfish.hk2.osgi-resource-locator;version='[2.5.0,2.5.1)',\ org.jvnet.staxex.stax-ex;version='[2.1.0,2.1.1)',\ diff --git a/application/playground/daanse.playground.bndrun b/application/playground/daanse.playground.bndrun index 19bef92..68ff223 100644 --- a/application/playground/daanse.playground.bndrun +++ b/application/playground/daanse.playground.bndrun @@ -41,7 +41,6 @@ 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',\ - bnd.identity;id='org.gecko.emf.osgi.component',\ bnd.identity;id='org.eclipse.daanse.sql.guard.api',\ bnd.identity;id='org.eclipse.daanse.sql.guard.jsqltranspiler',\ bnd.identity;id='org.eclipse.daanse.rolap.core',\ @@ -68,7 +67,8 @@ bnd.identity;id='org.eclipse.daanse.webconsole.branding',\ bnd.identity;id='org.apache.felix.configadmin.plugin.interpolation',\ bnd.identity;id='org.eclipse.daanse.lcid.basic',\ - bnd.identity;id='org.eclipse.daanse.lcid.cfg' + bnd.identity;id='org.eclipse.daanse.lcid.cfg',\ + bnd.identity;id='org.eclipse.fennec.emf.osgi.component' # This will help us keep -runbundles sorted diff --git a/application/pom.xml b/application/pom.xml index 2a194d9..349c252 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -127,6 +127,7 @@ runtime + org.eclipse.daanse ${revision} @@ -162,4 +163,16 @@ + + + + + org.eclipse.fennec.emf + org.eclipse.fennec.emf.osgi.component + 1.0.0-SNAPSHOT + runtime + + + + \ No newline at end of file diff --git a/application/probe/daanse.probe.bndrun b/application/probe/daanse.probe.bndrun index 2b8a7e4..8c96378 100644 --- a/application/probe/daanse.probe.bndrun +++ b/application/probe/daanse.probe.bndrun @@ -43,7 +43,6 @@ bnd.identity;id='org.eclipse.daanse.mdx.parser.ccc',\ bnd.identity;id='org.eclipse.daanse.rolap.mapping.model',\ bnd.identity;id='org.eclipse.daanse.jdbc.db.importer.csv',\ - bnd.identity;id='org.gecko.emf.osgi.component',\ bnd.identity;id='org.eclipse.daanse.sql.guard.api',\ bnd.identity;id='org.eclipse.daanse.sql.guard.jsqltranspiler',\ bnd.identity;id='org.eclipse.daanse.rolap.core',\ @@ -55,7 +54,8 @@ bnd.identity;id='org.apache.felix.http.servlet-api',\ bnd.identity;id='org.eclipse.daanse.jakarta.servlet.filter.auth.dummy.noauth',\ bnd.identity;id='org.eclipse.daanse.sql.deparser.api',\ - bnd.identity;id='org.eclipse.daanse.sql.deparser.jsqlparser' + bnd.identity;id='org.eclipse.daanse.sql.deparser.jsqlparser',\ + bnd.identity;id='org.eclipse.fennec.emf.osgi.component' @@ -134,6 +134,7 @@ org.eclipse.emf.common;version='[2.44.0,2.44.1)',\ org.eclipse.emf.ecore;version='[2.41.0,2.41.1)',\ org.eclipse.emf.ecore.xmi;version='[2.39.0,2.39.1)',\ + org.eclipse.fennec.emf.osgi.component;version='[1.0.0,1.0.1)',\ org.gecko.emf.osgi.component;version='[6.2.0,6.2.1)',\ org.glassfish.hk2.osgi-resource-locator;version='[2.5.0,2.5.1)',\ org.jvnet.staxex.stax-ex;version='[2.1.0,2.1.1)',\