diff --git a/application/pivot/daanse.pivot.bndrun b/application/pivot/daanse.pivot.bndrun index 1a1d785..e104b8d 100644 --- a/application/pivot/daanse.pivot.bndrun +++ b/application/pivot/daanse.pivot.bndrun @@ -56,16 +56,18 @@ ai.starlake.transpiler;version='[1.0.0,1.0.1)',\ ch.qos.logback.classic;version='[1.5.6,1.5.7)',\ com.github.ben-manes.caffeine;version='[3.1.8,3.1.9)',\ - com.sun.xml.messaging.saaj.impl;version='[3.0.3,3.0.4)',\ - jakarta.activation-api;version='[2.1.2,2.1.3)',\ + com.sun.xml.messaging.saaj.impl;version='[3.0.4,3.0.5)',\ + jakarta.activation-api;version='[2.1.3,2.1.4)',\ jakarta.xml.soap-api;version='[3.0.1,3.0.2)',\ json;version='[20250517.0.0,20250517.0.1)',\ net.sf.jsqlparser;version='[5.4.0,5.4.1)',\ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.7,1.3.8)',\ + org.apache.commons.commons-fileupload;version='[1.6.0,1.6.1)',\ + org.apache.commons.commons-io;version='[2.19.0,2.19.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.configadmin.plugin.interpolation;version='[1.2.8,1.2.9)',\ org.apache.felix.fileinstall;version='[3.7.4,3.7.5)',\ - org.apache.felix.http.jetty12;version='[1.0.36,1.0.37)',\ + org.apache.felix.http.jetty12;version='[1.1.4,1.1.5)',\ 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)',\ @@ -97,8 +99,10 @@ 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)',\ + org.osgi.service.cm;version='[1.6.1,1.6.2)',\ org.osgi.service.component;version='[1.5.1,1.5.2)',\ - org.osgi.service.log;version='[1.5.0,1.5.1)',\ + org.osgi.service.log;version='[1.4.0,1.4.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)' \ No newline at end of file + org.osgi.util.promise;version='[1.3.0,1.3.1)',\ + org.osgi.util.pushstream;version='[1.1.0,1.1.1)' \ No newline at end of file diff --git a/application/playground/daanse.playground.bndrun b/application/playground/daanse.playground.bndrun index 84777fa..7854127 100644 --- a/application/playground/daanse.playground.bndrun +++ b/application/playground/daanse.playground.bndrun @@ -88,21 +88,21 @@ com.h2database;version='[2.3.230,2.3.231)',\ com.microsoft.sqlserver.mssql-jdbc;version='[12.8.1,12.8.2)',\ com.mysql.cj;version='[9.0.0,9.0.1)',\ - com.sun.xml.messaging.saaj.impl;version='[3.0.3,3.0.4)',\ - jakarta.activation-api;version='[2.1.2,2.1.3)',\ + com.sun.xml.messaging.saaj.impl;version='[3.0.4,3.0.5)',\ + jakarta.activation-api;version='[2.1.3,2.1.4)',\ jakarta.xml.soap-api;version='[3.0.1,3.0.2)',\ joda-time;version='[2.8.1,2.8.2)',\ json;version='[20250517.0.0,20250517.0.1)',\ net.sf.jsqlparser;version='[5.4.0,5.4.1)',\ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.7,1.3.8)',\ org.apache.commons.commons-codec;version='[1.15.0,1.15.1)',\ - org.apache.commons.commons-fileupload;version='[1.5.0,1.5.1)',\ - org.apache.commons.commons-io;version='[2.11.0,2.11.1)',\ + org.apache.commons.commons-fileupload;version='[1.6.0,1.6.1)',\ + org.apache.commons.commons-io;version='[2.19.0,2.19.1)',\ org.apache.commons.logging;version='[1.1.3,1.1.4)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.configadmin.plugin.interpolation;version='[1.2.8,1.2.9)',\ org.apache.felix.fileinstall;version='[3.7.4,3.7.5)',\ - org.apache.felix.http.jetty12;version='[1.0.36,1.0.37)',\ + org.apache.felix.http.jetty12;version='[1.1.4,1.1.5)',\ org.apache.felix.http.servlet-api;version='[3.0.0,3.0.1)',\ org.apache.felix.inventory;version='[2.0.0,2.0.1)',\ org.apache.felix.metatype;version='[1.2.4,1.2.5)',\ @@ -158,11 +158,10 @@ 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.jetty.http2.common;version='[12.0.23,12.0.24)',\ - org.eclipse.jetty.security;version='[12.0.23,12.0.24)',\ 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)',\ + org.osgi.service.cm;version='[1.6.1,1.6.2)',\ 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.5.0,1.5.1)',\ diff --git a/application/playground/pom.xml b/application/playground/pom.xml index 446a99f..94b2209 100644 --- a/application/playground/pom.xml +++ b/application/playground/pom.xml @@ -128,12 +128,6 @@ runtime - - commons-fileupload - commons-fileupload - 1.5 - runtime - org.eclipse.osgi-technology.console diff --git a/application/pom.xml b/application/pom.xml index aca8547..648d788 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -107,9 +107,9 @@ - org.eclipse.daanse - org.eclipse.daanse.jakarta.xml.ws.runtime.registrar - ${revision} + com.sun.xml.messaging.saaj + saaj-impl + 3.0.4 runtime @@ -150,7 +150,14 @@ org.apache.felix org.apache.felix.http.jetty12 - 1.0.36 + 1.1.4 + runtime + + + + commons-fileupload + commons-fileupload + 1.6.0 runtime diff --git a/application/probe/README.md b/application/probe/README.md index d0486d5..7576cd3 100644 --- a/application/probe/README.md +++ b/application/probe/README.md @@ -82,16 +82,17 @@ Use containers for production deployments, isolated environments, and easy distr ```bash # Docker docker run --name probe \ + --userns=keep-id \ -v ~/temp/probe/catalog:/app/catalog/:rw,Z \ -v ~/temp/probe/output:/app/output/:rw,Z \ -p 8095:8080 \ - -d eclipsedaanse/probe:snapshot + -it eclipsedaanse/probe:snapshot ``` ##### Container Parameters Explained - `--name probe`: Container name -- `-v ~/temp/probe/catalog:/app/catalog/:rw,Z`: Mount local catalog directory (read-only with SELinux context) +- `-v ~/temp/probe/catalog:/app/catalog/:rw,Z`: Mount local catalog directory ( read-write with SELinux context) - `-v ~/temp/probe/output:/app/output/:rw,Z` mount the output folder e.g. for documnetation - `-p 8095:8080`: Map host port 8095 to container port 8080 - `-d`: Run in detached mode @@ -115,7 +116,6 @@ services: - type: bind source: ~/temp/probe/catalog target: /app/catalog/ - read_only: true bind: selinux: Z - type: bind diff --git a/application/probe/daanse.probe.bndrun b/application/probe/daanse.probe.bndrun index ef0ac01..d4af4f4 100644 --- a/application/probe/daanse.probe.bndrun +++ b/application/probe/daanse.probe.bndrun @@ -53,7 +53,8 @@ bnd.identity;id='org.eclipse.daanse.lcid.basic',\ bnd.identity;id='org.eclipse.daanse.jakarta.servlet.filter.auth.dummy.role',\ bnd.identity;id='org.eclipse.daanse.rolap.documentation.common',\ - bnd.identity;id='org.eclipse.daanse.olap.odc' + bnd.identity;id='org.eclipse.daanse.olap.odc',\ + bnd.identity;id='org.apache.felix.http.servlet-api' # This will help us keep -runbundles sorted @@ -66,15 +67,17 @@ ch.qos.logback.classic;version='[1.5.6,1.5.7)',\ 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.3,3.0.4)',\ + com.sun.xml.messaging.saaj.impl;version='[3.0.4,3.0.5)',\ de.siegmar.fastcsv;version='[3.1.0,3.1.1)',\ - jakarta.activation-api;version='[2.1.2,2.1.3)',\ + jakarta.activation-api;version='[2.1.3,2.1.4)',\ jakarta.xml.soap-api;version='[3.0.1,3.0.2)',\ json;version='[20250517.0.0,20250517.0.1)',\ net.sf.jsqlparser;version='[5.4.0,5.4.1)',\ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.7,1.3.8)',\ + org.apache.commons.commons-fileupload;version='[1.6.0,1.6.1)',\ + org.apache.commons.commons-io;version='[2.19.0,2.19.1)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ - org.apache.felix.http.jetty12;version='[1.0.36,1.0.37)',\ + org.apache.felix.http.jetty12;version='[1.1.4,1.1.5)',\ 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)',\ @@ -128,7 +131,8 @@ org.jvnet.staxex.stax-ex;version='[2.1.0,2.1.1)',\ org.osgi.service.cm;version='[1.6.1,1.6.2)',\ org.osgi.service.component;version='[1.5.1,1.5.2)',\ - org.osgi.service.log;version='[1.5.0,1.5.1)',\ + org.osgi.service.log;version='[1.4.0,1.4.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)' \ No newline at end of file + org.osgi.util.promise;version='[1.3.0,1.3.1)',\ + org.osgi.util.pushstream;version='[1.1.0,1.1.1)' \ No newline at end of file