update pom version and remove unused dependencies

Signed-off-by: Stefan Bischof <stbischof@bipolis.org>

Author: stbischof

pom.xml

@@ -158,9 +158,8 @@
       <dependency>
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.http.jetty12</artifactId>
-        <version>1.0.2</version>
+        <version>1.1.6</version>
         <scope>runtime</scope>
-        <classifier>light</classifier>
       </dependency>
       <dependency>
         <groupId>org.osgi</groupId>
@@ -192,14 +191,6 @@
         <version>1.2.4</version>
         <scope>runtime</scope>
       </dependency>
-      <dependency>
-        <groupId>org.apache.aries.spifly</groupId>
-        <artifactId>
-          org.apache.aries.spifly.dynamic.framework.extension
-        </artifactId>
-        <version>${aries.spifly.version}</version>
-        <scope>runtime</scope>
-      </dependency>
       <dependency>
         <groupId>biz.aQute</groupId>
         <artifactId>biz.aQute.api.scheduler</artifactId>

server/adapter.soapmessage/src/main/java/org/eclipse/daanse/xmla/server/adapter/soapmessage/discover/DiscoverConstants.java

@@ -478,9 +478,9 @@ interface ROW {
         String BOOKMARK_TYPE = "BOOKMARK_TYPE";
         QName QN_BOOKMARK_TYPE = new QName(NS_URN, BOOKMARK_TYPE, PREFIX);
 
-        String BOOKMARK_DATATYPE = "BOOKMARK_DATATYPE";
-        QName QN_BOOKMARK_DATATYPE = new QName(NS_URN, BOOKMARK_DATATYPE, PREFIX);
-        QName QN_BOOKMARK_DATA_TYPE = QN_BOOKMARK_DATATYPE; // Alias for compatibility
+        String BOOKMARK_DATA_TYPE = "BOOKMARK_DATA_TYPE";
+        QName QN_BOOKMARK_DATA_TYPE = new QName(NS_URN, BOOKMARK_DATA_TYPE, PREFIX);
+        QName QN_BOOKMARK_DATATYPE = QN_BOOKMARK_DATA_TYPE;
 
         String BOOKMARK_MAXIMUM_LENGTH = "BOOKMARK_MAXIMUM_LENGTH";
         QName QN_BOOKMARK_MAXIMUM_LENGTH = new QName(NS_URN, BOOKMARK_MAXIMUM_LENGTH, PREFIX);

server/adapter.soapmessage/src/main/java/org/eclipse/daanse/xmla/server/adapter/soapmessage/discover/MdSchemaMembersHandler.java

@@ -129,6 +129,7 @@ private void addResponseRow(SOAPElement root, MdSchemaMembersResponseRow r) thro
         r.parentUniqueName().ifPresent(v -> SoapUtil.addChildElement(row, ROW.QN_PARENT_UNIQUE_NAME, v));
         r.parentCount().ifPresent(v -> SoapUtil.addChildElement(row, ROW.QN_PARENT_COUNT, String.valueOf(v)));
         r.description().ifPresent(v -> SoapUtil.addChildElement(row, ROW.QN_DESCRIPTION, v));
+        r.expression().ifPresent(v -> SoapUtil.addChildElement(row, ROW.QN_EXPRESSION, v));
         r.memberKey().ifPresent(v -> SoapUtil.addChildElement(row, ROW.QN_MEMBER_KEY, v));
         r.isPlaceHolderMember()
                 .ifPresent(v -> SoapUtil.addChildElement(row, ROW.QN_IS_PLACEHOLDERMEMBER, String.valueOf(v)));

server/adapter.soapmessage/src/main/java/org/eclipse/daanse/xmla/server/adapter/soapmessage/discover/MdSchemaPropertiesHandler.java

@@ -122,6 +122,7 @@ private void addResponseRow(SOAPElement root, MdSchemaPropertiesResponseRow r) t
         r.dimensionUniqueName().ifPresent(v -> SoapUtil.addChildElement(row, ROW.QN_DIMENSION_UNIQUE_NAME, v));
         r.hierarchyUniqueName().ifPresent(v -> SoapUtil.addChildElement(row, ROW.QN_HIERARCHY_UNIQUE_NAME, v));
         r.levelUniqueName().ifPresent(v -> SoapUtil.addChildElement(row, ROW.QN_LEVEL_UNIQUE_NAME, v));
+        r.memberUniqueName().ifPresent(v -> SoapUtil.addChildElement(row, ROW.QN_MEMBER_UNIQUE_NAME, v));
         r.propertyName().ifPresent(v -> SoapUtil.addChildElement(row, ROW.QN_PROPERTY_NAME, v));
         r.propertyCaption().ifPresent(v -> SoapUtil.addChildElement(row, ROW.QN_PROPERTY_CAPTION, v));
         r.propertyType()

server/jakarta.saaj/test.bndrun

@@ -19,7 +19,7 @@
 
 -runproperties: \
 org.slf4j.simpleLogger.defaultLogLevel=debug,\
-	org.osgi.service.http.port=18090
+	org.osgi.service.http.port=8090
 
 -runrequires: \
 	bnd.identity;id='${project.artifactId}-tests',\
@@ -28,11 +28,9 @@ org.slf4j.simpleLogger.defaultLogLevel=debug,\
 	bnd.identity;id=junit-jupiter-engine,\
 	bnd.identity;id=junit-platform-launcher,\
 	bnd.identity;id='com.sun.xml.messaging.saaj.impl',\
-	bnd.identity;id='org.eclipse.daanse.xmla.server.tck',\
-	bnd.identity;id='org.apache.aries.spifly.dynamic.bundle'
+	bnd.identity;id='org.eclipse.daanse.xmla.server.tck'
 
 -runee: JavaSE-25
-#-runfw: org.apache.felix.framework
 -runfw: org.apache.felix.framework
 
 # This will help us keep -runbundles sorted
@@ -41,6 +39,7 @@ org.slf4j.simpleLogger.defaultLogLevel=debug,\
 	begin=-1
 # The following is calculated by the bnd-resolver-maven-plugin
 
+
 -runbundles: \
 	assertj-core;version='[3.26.0,3.26.1)',\
 	ch.qos.logback.classic;version='[1.5.6,1.5.7)',\
@@ -60,33 +59,19 @@ org.slf4j.simpleLogger.defaultLogLevel=debug,\
 	net.bytebuddy.byte-buddy;version='[1.17.5,1.17.6)',\
 	net.bytebuddy.byte-buddy-agent;version='[1.17.5,1.17.6)',\
 	org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\
-	org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.7,1.3.8)',\
-	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.felix.configadmin;version='[1.9.26,1.9.27)',\
-	org.apache.felix.http.jetty12.light;version='[1.0.2,1.0.3)',\
+	org.apache.felix.http.jetty12;version='[1.1.6,1.1.7)',\
 	org.apache.felix.http.servlet-api;version='[3.0.0,3.0.1)',\
 	org.apache.felix.scr;version='[2.2.10,2.2.11)',\
-	org.apache.tomcat-servlet-api;version='[9.0.80,9.0.81)',\
 	org.eclipse.daanse.jakarta.servlet.soap;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.xmla.api;version='[0.0.1,0.0.2)',\
 	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.daanse.xmla.server.jakarta.saaj-tests;version='[0.0.1,0.0.2)',\
 	org.eclipse.daanse.xmla.server.tck;version='[0.0.1,0.0.2)',\
-	org.eclipse.jetty.alpn.server;version='[12.0.5,12.0.6)',\
-	org.eclipse.jetty.ee10.servlet;version='[12.0.5,12.0.6)',\
-	org.eclipse.jetty.http;version='[12.0.5,12.0.6)',\
-	org.eclipse.jetty.http2.common;version='[12.0.5,12.0.6)',\
-	org.eclipse.jetty.http2.hpack;version='[12.0.5,12.0.6)',\
-	org.eclipse.jetty.http2.server;version='[12.0.5,12.0.6)',\
-	org.eclipse.jetty.io;version='[12.0.5,12.0.6)',\
-	org.eclipse.jetty.jmx;version='[12.0.5,12.0.6)',\
-	org.eclipse.jetty.security;version='[12.0.5,12.0.6)',\
-	org.eclipse.jetty.server;version='[12.0.5,12.0.6)',\
-	org.eclipse.jetty.session;version='[12.0.5,12.0.6)',\
-	org.eclipse.jetty.util;version='[12.0.5,12.0.6)',\
 	org.glassfish.hk2.osgi-resource-locator;version='[2.4.0,2.4.1)',\
 	org.jvnet.staxex.stax-ex;version='[2.1.0,2.1.1)',\
 	org.mockito.mockito-core;version='[4.9.0,4.9.1)',\

server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/Constants.java

@@ -25,7 +25,7 @@ private Constants() {
 
     public static final String WS_PATH = "/xmla";
 
-    public static final String SERVER_PORT_WHITEBOARD = "18090";
+    public static final String SERVER_PORT_WHITEBOARD = "8090";
     public static final String URN_SCHEMAS_MICROSOFT_COM_XML_ANALYSIS = "urn:schemas-microsoft-com:xml-analysis";
 
     public static final QName QNAME_Discover = new QName(URN_SCHEMAS_MICROSOFT_COM_XML_ANALYSIS, "Discover");