Skip to content

Commit 324372e

Browse files
committed
rm xml ws runtinme - will come from osgi later
Signed-off-by: Stefan Bischof <[email protected]>
1 parent 0aa0f07 commit 324372e

File tree

5 files changed

+36
-28
lines changed

5 files changed

+36
-28
lines changed

application/pivot/daanse.pivot.bndrun

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,18 @@
5656
ai.starlake.transpiler;version='[1.0.0,1.0.1)',\
5757
ch.qos.logback.classic;version='[1.5.6,1.5.7)',\
5858
com.github.ben-manes.caffeine;version='[3.1.8,3.1.9)',\
59-
com.sun.xml.messaging.saaj.impl;version='[3.0.3,3.0.4)',\
60-
jakarta.activation-api;version='[2.1.2,2.1.3)',\
59+
com.sun.xml.messaging.saaj.impl;version='[3.0.4,3.0.5)',\
60+
jakarta.activation-api;version='[2.1.3,2.1.4)',\
6161
jakarta.xml.soap-api;version='[3.0.1,3.0.2)',\
6262
json;version='[20250517.0.0,20250517.0.1)',\
6363
net.sf.jsqlparser;version='[5.4.0,5.4.1)',\
6464
org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.7,1.3.8)',\
65+
org.apache.commons.commons-fileupload;version='[1.6.0,1.6.1)',\
66+
org.apache.commons.commons-io;version='[2.19.0,2.19.1)',\
6567
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
6668
org.apache.felix.configadmin.plugin.interpolation;version='[1.2.8,1.2.9)',\
6769
org.apache.felix.fileinstall;version='[3.7.4,3.7.5)',\
68-
org.apache.felix.http.jetty12;version='[1.0.36,1.0.37)',\
70+
org.apache.felix.http.jetty12;version='[1.1.4,1.1.5)',\
6971
org.apache.felix.http.servlet-api;version='[3.0.0,3.0.1)',\
7072
org.apache.felix.metatype;version='[1.2.4,1.2.5)',\
7173
org.apache.felix.scr;version='[2.2.10,2.2.11)',\
@@ -97,8 +99,10 @@
9799
org.gecko.emf.osgi.component;version='[6.2.0,6.2.1)',\
98100
org.glassfish.hk2.osgi-resource-locator;version='[2.5.0,2.5.1)',\
99101
org.jvnet.staxex.stax-ex;version='[2.1.0,2.1.1)',\
102+
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
100103
org.osgi.service.component;version='[1.5.1,1.5.2)',\
101-
org.osgi.service.log;version='[1.5.0,1.5.1)',\
104+
org.osgi.service.log;version='[1.4.0,1.4.1)',\
102105
org.osgi.util.converter;version='[1.0.9,1.0.10)',\
103106
org.osgi.util.function;version='[1.2.0,1.2.1)',\
104-
org.osgi.util.promise;version='[1.3.0,1.3.1)'
107+
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
108+
org.osgi.util.pushstream;version='[1.1.0,1.1.1)'

application/playground/daanse.playground.bndrun

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,21 +88,21 @@
8888
com.h2database;version='[2.3.230,2.3.231)',\
8989
com.microsoft.sqlserver.mssql-jdbc;version='[12.8.1,12.8.2)',\
9090
com.mysql.cj;version='[9.0.0,9.0.1)',\
91-
com.sun.xml.messaging.saaj.impl;version='[3.0.3,3.0.4)',\
92-
jakarta.activation-api;version='[2.1.2,2.1.3)',\
91+
com.sun.xml.messaging.saaj.impl;version='[3.0.4,3.0.5)',\
92+
jakarta.activation-api;version='[2.1.3,2.1.4)',\
9393
jakarta.xml.soap-api;version='[3.0.1,3.0.2)',\
9494
joda-time;version='[2.8.1,2.8.2)',\
9595
json;version='[20250517.0.0,20250517.0.1)',\
9696
net.sf.jsqlparser;version='[5.4.0,5.4.1)',\
9797
org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.7,1.3.8)',\
9898
org.apache.commons.commons-codec;version='[1.15.0,1.15.1)',\
99-
org.apache.commons.commons-fileupload;version='[1.5.0,1.5.1)',\
100-
org.apache.commons.commons-io;version='[2.11.0,2.11.1)',\
99+
org.apache.commons.commons-fileupload;version='[1.6.0,1.6.1)',\
100+
org.apache.commons.commons-io;version='[2.19.0,2.19.1)',\
101101
org.apache.commons.logging;version='[1.1.3,1.1.4)',\
102102
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
103103
org.apache.felix.configadmin.plugin.interpolation;version='[1.2.8,1.2.9)',\
104104
org.apache.felix.fileinstall;version='[3.7.4,3.7.5)',\
105-
org.apache.felix.http.jetty12;version='[1.0.36,1.0.37)',\
105+
org.apache.felix.http.jetty12;version='[1.1.4,1.1.5)',\
106106
org.apache.felix.http.servlet-api;version='[3.0.0,3.0.1)',\
107107
org.apache.felix.inventory;version='[2.0.0,2.0.1)',\
108108
org.apache.felix.metatype;version='[1.2.4,1.2.5)',\
@@ -158,11 +158,10 @@
158158
org.eclipse.emf.common;version='[2.30.0,2.30.1)',\
159159
org.eclipse.emf.ecore;version='[2.36.0,2.36.1)',\
160160
org.eclipse.emf.ecore.xmi;version='[2.37.0,2.37.1)',\
161-
org.eclipse.jetty.http2.common;version='[12.0.23,12.0.24)',\
162-
org.eclipse.jetty.security;version='[12.0.23,12.0.24)',\
163161
org.gecko.emf.osgi.component;version='[6.2.0,6.2.1)',\
164162
org.glassfish.hk2.osgi-resource-locator;version='[2.5.0,2.5.1)',\
165163
org.jvnet.staxex.stax-ex;version='[2.1.0,2.1.1)',\
164+
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
166165
org.osgi.service.component;version='[1.5.1,1.5.2)',\
167166
org.osgi.service.jdbc;version='[1.1.0,1.1.1)',\
168167
org.osgi.service.log;version='[1.5.0,1.5.1)',\

application/playground/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,6 @@
128128
<scope>runtime</scope>
129129
</dependency>
130130

131-
<dependency>
132-
<groupId>commons-fileupload</groupId>
133-
<artifactId>commons-fileupload</artifactId>
134-
<version>1.5</version>
135-
<scope>runtime</scope>
136-
</dependency>
137131

138132
<dependency>
139133
<groupId>org.eclipse.osgi-technology.console</groupId>

application/pom.xml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@
107107
</dependency>
108108

109109
<dependency>
110-
<groupId>org.eclipse.daanse</groupId>
111-
<artifactId>org.eclipse.daanse.jakarta.xml.ws.runtime.registrar</artifactId>
112-
<version>${revision}</version>
110+
<groupId>com.sun.xml.messaging.saaj</groupId>
111+
<artifactId>saaj-impl</artifactId>
112+
<version>3.0.4</version>
113113
<scope>runtime</scope>
114114
</dependency>
115115

@@ -150,7 +150,14 @@
150150
<dependency>
151151
<groupId>org.apache.felix</groupId>
152152
<artifactId>org.apache.felix.http.jetty12</artifactId>
153-
<version>1.0.36</version>
153+
<version>1.1.4</version>
154+
<scope>runtime</scope>
155+
</dependency>
156+
157+
<dependency>
158+
<groupId>commons-fileupload</groupId>
159+
<artifactId>commons-fileupload</artifactId>
160+
<version>1.6.0</version>
154161
<scope>runtime</scope>
155162
</dependency>
156163

application/probe/daanse.probe.bndrun

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@
5353
bnd.identity;id='org.eclipse.daanse.lcid.basic',\
5454
bnd.identity;id='org.eclipse.daanse.jakarta.servlet.filter.auth.dummy.role',\
5555
bnd.identity;id='org.eclipse.daanse.rolap.documentation.common',\
56-
bnd.identity;id='org.eclipse.daanse.olap.odc'
56+
bnd.identity;id='org.eclipse.daanse.olap.odc',\
57+
bnd.identity;id='org.apache.felix.http.servlet-api'
5758

5859

5960
# This will help us keep -runbundles sorted
@@ -66,15 +67,17 @@
6667
ch.qos.logback.classic;version='[1.5.6,1.5.7)',\
6768
com.github.ben-manes.caffeine;version='[3.1.8,3.1.9)',\
6869
com.h2database;version='[2.3.230,2.3.231)',\
69-
com.sun.xml.messaging.saaj.impl;version='[3.0.3,3.0.4)',\
70+
com.sun.xml.messaging.saaj.impl;version='[3.0.4,3.0.5)',\
7071
de.siegmar.fastcsv;version='[3.1.0,3.1.1)',\
71-
jakarta.activation-api;version='[2.1.2,2.1.3)',\
72+
jakarta.activation-api;version='[2.1.3,2.1.4)',\
7273
jakarta.xml.soap-api;version='[3.0.1,3.0.2)',\
7374
json;version='[20250517.0.0,20250517.0.1)',\
7475
net.sf.jsqlparser;version='[5.4.0,5.4.1)',\
7576
org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.7,1.3.8)',\
77+
org.apache.commons.commons-fileupload;version='[1.6.0,1.6.1)',\
78+
org.apache.commons.commons-io;version='[2.19.0,2.19.1)',\
7679
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
77-
org.apache.felix.http.jetty12;version='[1.0.36,1.0.37)',\
80+
org.apache.felix.http.jetty12;version='[1.1.4,1.1.5)',\
7881
org.apache.felix.http.servlet-api;version='[3.0.0,3.0.1)',\
7982
org.apache.felix.metatype;version='[1.2.4,1.2.5)',\
8083
org.apache.felix.scr;version='[2.2.10,2.2.11)',\
@@ -128,7 +131,8 @@
128131
org.jvnet.staxex.stax-ex;version='[2.1.0,2.1.1)',\
129132
org.osgi.service.cm;version='[1.6.1,1.6.2)',\
130133
org.osgi.service.component;version='[1.5.1,1.5.2)',\
131-
org.osgi.service.log;version='[1.5.0,1.5.1)',\
134+
org.osgi.service.log;version='[1.4.0,1.4.1)',\
132135
org.osgi.util.converter;version='[1.0.9,1.0.10)',\
133136
org.osgi.util.function;version='[1.2.0,1.2.1)',\
134-
org.osgi.util.promise;version='[1.3.0,1.3.1)'
137+
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
138+
org.osgi.util.pushstream;version='[1.1.0,1.1.1)'

0 commit comments

Comments
 (0)