diff --git a/client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/ClientDiscoverTest.java b/client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/integration/ClientDiscoverTest.java similarity index 99% rename from client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/ClientDiscoverTest.java rename to client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/integration/ClientDiscoverTest.java index f554979..33204ba 100644 --- a/client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/ClientDiscoverTest.java +++ b/client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/integration/ClientDiscoverTest.java @@ -11,7 +11,7 @@ * SmartCity Jena - initial * Stefan Bischof (bipolis.org) - initial */ -package org.eclipse.daanse.xmla.client.soapmessage; +package org.eclipse.daanse.xmla.client.soapmessage.integration; import jakarta.xml.soap.SOAPMessage; import jakarta.xml.ws.Provider; @@ -118,6 +118,10 @@ import org.eclipse.daanse.xmla.api.discover.mdschema.properties.MdSchemaPropertiesResponseRow; import org.eclipse.daanse.xmla.api.discover.mdschema.sets.MdSchemaSetsRequest; import org.eclipse.daanse.xmla.api.discover.mdschema.sets.MdSchemaSetsResponseRow; +import org.eclipse.daanse.xmla.client.soapmessage.MockProvider; +import org.eclipse.daanse.xmla.client.soapmessage.Responses; +import org.eclipse.daanse.xmla.client.soapmessage.XMLUtil; +import org.eclipse.daanse.xmla.client.soapmessage.XmlaServiceClientImpl; import org.eclipse.daanse.xmla.model.record.discover.PropertiesR; import org.eclipse.daanse.xmla.model.record.discover.dbschema.catalogs.DbSchemaCatalogsRequestR; import org.eclipse.daanse.xmla.model.record.discover.dbschema.catalogs.DbSchemaCatalogsRestrictionsR; diff --git a/client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/ClientExecuteTest.java b/client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/integration/ClientExecuteTest.java similarity index 99% rename from client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/ClientExecuteTest.java rename to client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/integration/ClientExecuteTest.java index d98ba0b..ec3db0c 100644 --- a/client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/ClientExecuteTest.java +++ b/client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/integration/ClientExecuteTest.java @@ -11,7 +11,7 @@ * SmartCity Jena - initial * Stefan Bischof (bipolis.org) - initial */ -package org.eclipse.daanse.xmla.client.soapmessage; +package org.eclipse.daanse.xmla.client.soapmessage.integration; import jakarta.xml.soap.SOAPMessage; import jakarta.xml.ws.Provider; @@ -58,6 +58,9 @@ import org.eclipse.daanse.xmla.api.xmla.ProactiveCaching; import org.eclipse.daanse.xmla.api.xmla.Scope; import org.eclipse.daanse.xmla.api.xmla_empty.Emptyresult; +import org.eclipse.daanse.xmla.client.soapmessage.MockProvider; +import org.eclipse.daanse.xmla.client.soapmessage.XMLUtil; +import org.eclipse.daanse.xmla.client.soapmessage.XmlaServiceClientImpl; import org.eclipse.daanse.xmla.model.record.discover.PropertiesR; import org.eclipse.daanse.xmla.model.record.execute.alter.AlterRequestR; import org.eclipse.daanse.xmla.model.record.execute.cancel.CancelRequestR; diff --git a/client/soapmessage/test.bndrun.deactivated b/client/soapmessage/test.bndrun.deactivated index 0114c59..714bbc0 100644 --- a/client/soapmessage/test.bndrun.deactivated +++ b/client/soapmessage/test.bndrun.deactivated @@ -21,108 +21,108 @@ -runvm: ${def;argLine} -runproperties: \ - org.slf4j.simpleLogger.defaultLogLevel=debug,\ - org.osgi.service.http.port=8090 + org.slf4j.simpleLogger.defaultLogLevel=debug,\ + org.osgi.service.http.port=8090 port : 17290 -runproperties.local.agent : osgi.fx.agent.port=0.0.0.0:${port} -runrequires: \ - bnd.identity;id='org.eclipse.daanse.xmla.client.soapmessage',\ - bnd.identity;id='org.eclipse.daanse.xmla.client.soapmessage-tests',\ - bnd.identity;id='com.sun.xml.ws.jaxws-rt',\ - bnd.identity;id='org.glassfish.hk2.osgi-resource-locator',\ - 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.apache.felix.scr',\ - bnd.identity;id='org.eclipse.daanse.jakarta.xml.ws.runtime.httpwhiteboard',\ - bnd.identity;id='org.eclipse.daanse.jakarta.xml.ws.handler',\ - bnd.identity;id='org.eclipse.daanse.jakarta.xml.ws.api' + bnd.identity;id='org.eclipse.daanse.xmla.client.soapmessage',\ + bnd.identity;id='org.eclipse.daanse.xmla.client.soapmessage-tests',\ + bnd.identity;id='com.sun.xml.ws.jaxws-rt',\ + bnd.identity;id='org.glassfish.hk2.osgi-resource-locator',\ + 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.apache.felix.scr',\ + bnd.identity;id='org.eclipse.daanse.jakarta.xml.ws.runtime.httpwhiteboard',\ + bnd.identity;id='org.eclipse.daanse.jakarta.xml.ws.handler',\ + bnd.identity;id='org.eclipse.daanse.jakarta.xml.ws.api' --runee: JavaSE-21 +-runee: JavaSE-25 #-runfw: org.apache.felix.framework -runfw: org.eclipse.osgi # This will help us keep -runbundles sorted -runstartlevel: \ - order=sortbynameversion,\ - begin=-1 + order=sortbynameversion,\ + 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)',\ - ch.qos.logback.core;version='[1.5.6,1.5.7)',\ - com.fasterxml.woodstox.woodstox-core;version='[6.5.1,6.5.2)',\ - com.sun.activation.jakarta.activation;version='[2.0.1,2.0.2)',\ - com.sun.xml.bind.jaxb-core;version='[4.0.4,4.0.5)',\ - com.sun.xml.bind.jaxb-impl;version='[4.0.4,4.0.5)',\ - com.sun.xml.fastinfoset.FastInfoset;version='[2.1.0,2.1.1)',\ - com.sun.xml.messaging.saaj.impl;version='[3.0.3,3.0.4)',\ - com.sun.xml.stream.buffer.streambuffer;version='[2.1.0,2.1.1)',\ - com.sun.xml.ws.jaxws-rt;version='[4.0.2,4.0.3)',\ - jakarta.activation-api;version='[2.1.2,2.1.3)',\ - jakarta.annotation-api;version='[2.1.1,2.1.2)',\ - jakarta.xml.bind-api;version='[4.0.1,4.0.2)',\ - jakarta.xml.soap-api;version='[3.0.2,3.0.3)',\ - jakarta.xml.ws-api;version='[4.0.1,4.0.2)',\ - javax.activation-api;version='[1.2.0,1.2.1)',\ - jaxb-api;version='[2.3.1,2.3.2)',\ - junit-jupiter-api;version='[5.9.2,5.9.3)',\ - junit-jupiter-engine;version='[5.9.2,5.9.3)',\ - junit-jupiter-params;version='[5.9.2,5.9.3)',\ - junit-platform-commons;version='[1.9.2,1.9.3)',\ - junit-platform-engine;version='[1.9.2,1.9.3)',\ - junit-platform-launcher;version='[1.9.2,1.9.3)',\ - net.bytebuddy.byte-buddy;version='[1.14.16,1.14.17)',\ - net.bytebuddy.byte-buddy-agent;version='[1.12.16,1.12.17)',\ - 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.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.servlet-api;version='[3.0.0,3.0.1)',\ - org.apache.felix.scr;version='[2.2.10,2.2.11)',\ - org.eclipse.daanse.jakarta.xml.ws.api;version='[0.0.1,0.0.2)',\ - org.eclipse.daanse.jakarta.xml.ws.handler;version='[0.0.1,0.0.2)',\ - org.eclipse.daanse.jakarta.xml.ws.runtime.httpwhiteboard;version='[0.0.1,0.0.2)',\ - org.eclipse.daanse.jakarta.xml.ws.runtime.registrar;version='[0.0.1,0.0.2)',\ - org.eclipse.daanse.xmla.api;version='[0.0.1,0.0.2)',\ - org.eclipse.daanse.xmla.client.soapmessage;version='[0.0.1,0.0.2)',\ - org.eclipse.daanse.xmla.client.soapmessage-tests;version='[0.0.1,0.0.2)',\ - org.eclipse.daanse.xmla.model.record;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.external.management-api;version='[3.2.3,3.2.4)',\ - org.glassfish.gmbal.gmbal-api-only;version='[4.0.3,4.0.4)',\ - org.glassfish.ha.ha-api;version='[3.1.13,3.1.14)',\ - org.glassfish.hk2.osgi-resource-locator;version='[2.4.0,2.4.1)',\ - org.jvnet.mimepull;version='[1.10.0,1.10.1)',\ - org.jvnet.staxex.stax-ex;version='[2.1.0,2.1.1)',\ - org.mockito.mockito-core;version='[4.9.0,4.9.1)',\ - org.objenesis;version='[3.3.0,3.3.1)',\ - org.opentest4j;version='[1.2.0,1.2.1)',\ - org.osgi.service.component;version='[1.5.1,1.5.2)',\ - org.osgi.test.common;version='[1.3.0,1.3.1)',\ - org.osgi.test.junit5;version='[1.3.0,1.3.1)',\ - org.osgi.test.junit5.cm;version='[1.3.0,1.3.1)',\ - org.osgi.util.function;version='[1.2.0,1.2.1)',\ - org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - org.xmlunit.xmlunit-assertj3;version='[2.9.0,2.9.1)',\ - org.xmlunit.xmlunit-core;version='[2.10.0,2.10.1)',\ - slf4j.api;version='[2.0.12,2.0.13)',\ - stax2-api;version='[4.2.2,4.2.3)' + assertj-core;version='[3.26.0,3.26.1)',\ + ch.qos.logback.classic;version='[1.5.6,1.5.7)',\ + ch.qos.logback.core;version='[1.5.6,1.5.7)',\ + com.fasterxml.woodstox.woodstox-core;version='[6.5.1,6.5.2)',\ + com.sun.activation.jakarta.activation;version='[2.0.1,2.0.2)',\ + com.sun.xml.bind.jaxb-core;version='[4.0.4,4.0.5)',\ + com.sun.xml.bind.jaxb-impl;version='[4.0.4,4.0.5)',\ + com.sun.xml.fastinfoset.FastInfoset;version='[2.1.0,2.1.1)',\ + com.sun.xml.messaging.saaj.impl;version='[3.0.3,3.0.4)',\ + com.sun.xml.stream.buffer.streambuffer;version='[2.1.0,2.1.1)',\ + com.sun.xml.ws.jaxws-rt;version='[4.0.2,4.0.3)',\ + jakarta.activation-api;version='[2.1.2,2.1.3)',\ + jakarta.annotation-api;version='[2.1.1,2.1.2)',\ + jakarta.xml.bind-api;version='[4.0.1,4.0.2)',\ + jakarta.xml.soap-api;version='[3.0.2,3.0.3)',\ + jakarta.xml.ws-api;version='[4.0.1,4.0.2)',\ + javax.activation-api;version='[1.2.0,1.2.1)',\ + jaxb-api;version='[2.3.1,2.3.2)',\ + junit-jupiter-api;version='[5.9.2,5.9.3)',\ + junit-jupiter-engine;version='[5.9.2,5.9.3)',\ + junit-jupiter-params;version='[5.9.2,5.9.3)',\ + junit-platform-commons;version='[1.9.2,1.9.3)',\ + junit-platform-engine;version='[1.9.2,1.9.3)',\ + junit-platform-launcher;version='[1.9.2,1.9.3)',\ + net.bytebuddy.byte-buddy;version='[1.14.16,1.14.17)',\ + net.bytebuddy.byte-buddy-agent;version='[1.12.16,1.12.17)',\ + 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.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.servlet-api;version='[3.0.0,3.0.1)',\ + org.apache.felix.scr;version='[2.2.10,2.2.11)',\ + org.eclipse.daanse.jakarta.xml.ws.api;version='[0.0.1,0.0.2)',\ + org.eclipse.daanse.jakarta.xml.ws.handler;version='[0.0.1,0.0.2)',\ + org.eclipse.daanse.jakarta.xml.ws.runtime.httpwhiteboard;version='[0.0.1,0.0.2)',\ + org.eclipse.daanse.jakarta.xml.ws.runtime.registrar;version='[0.0.1,0.0.2)',\ + org.eclipse.daanse.xmla.api;version='[0.0.1,0.0.2)',\ + org.eclipse.daanse.xmla.client.soapmessage;version='[0.0.1,0.0.2)',\ + org.eclipse.daanse.xmla.client.soapmessage-tests;version='[0.0.1,0.0.2)',\ + org.eclipse.daanse.xmla.model.record;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.external.management-api;version='[3.2.3,3.2.4)',\ + org.glassfish.gmbal.gmbal-api-only;version='[4.0.3,4.0.4)',\ + org.glassfish.ha.ha-api;version='[3.1.13,3.1.14)',\ + org.glassfish.hk2.osgi-resource-locator;version='[2.4.0,2.4.1)',\ + org.jvnet.mimepull;version='[1.10.0,1.10.1)',\ + org.jvnet.staxex.stax-ex;version='[2.1.0,2.1.1)',\ + org.mockito.mockito-core;version='[4.9.0,4.9.1)',\ + org.objenesis;version='[3.3.0,3.3.1)',\ + org.opentest4j;version='[1.2.0,1.2.1)',\ + org.osgi.service.component;version='[1.5.1,1.5.2)',\ + org.osgi.test.common;version='[1.3.0,1.3.1)',\ + org.osgi.test.junit5;version='[1.3.0,1.3.1)',\ + org.osgi.test.junit5.cm;version='[1.3.0,1.3.1)',\ + org.osgi.util.function;version='[1.2.0,1.2.1)',\ + org.osgi.util.promise;version='[1.3.0,1.3.1)',\ + org.xmlunit.xmlunit-assertj3;version='[2.9.0,2.9.1)',\ + org.xmlunit.xmlunit-core;version='[2.10.0,2.10.1)',\ + slf4j.api;version='[2.0.12,2.0.13)',\ + stax2-api;version='[4.2.2,4.2.3)' diff --git a/pom.xml b/pom.xml index 3c630b0..d53da9e 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ org.eclipse.daanse org.eclipse.daanse.pom.parent - 0.0.3 + 0.0.5-SNAPSHOT org.eclipse.daanse.xmla ${revision} @@ -63,6 +63,20 @@ 2.10.0 + + + ossrh + Sonatype Nexus Snapshots + https://central.sonatype.com/repository/maven-snapshots + + false + + + true + + + + api model.record diff --git a/server/jakarta.jws/src/test/java/org/eclipse/daanse/xmla/server/jakarta/jws/MsXmlAnalysisSoapTest.java b/server/jakarta.jws/src/test/java/org/eclipse/daanse/xmla/server/jakarta/jws/integration/MsXmlAnalysisSoapTest.java similarity index 97% rename from server/jakarta.jws/src/test/java/org/eclipse/daanse/xmla/server/jakarta/jws/MsXmlAnalysisSoapTest.java rename to server/jakarta.jws/src/test/java/org/eclipse/daanse/xmla/server/jakarta/jws/integration/MsXmlAnalysisSoapTest.java index 362ce56..6081d39 100644 --- a/server/jakarta.jws/src/test/java/org/eclipse/daanse/xmla/server/jakarta/jws/MsXmlAnalysisSoapTest.java +++ b/server/jakarta.jws/src/test/java/org/eclipse/daanse/xmla/server/jakarta/jws/integration/MsXmlAnalysisSoapTest.java @@ -11,7 +11,7 @@ * SmartCity Jena - initial * Stefan Bischof (bipolis.org) - initial */ -package org.eclipse.daanse.xmla.server.jakarta.jws; +package org.eclipse.daanse.xmla.server.jakarta.jws.integration; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doReturn; @@ -28,6 +28,7 @@ import org.eclipse.daanse.xmla.model.jakarta.xml.bind.xmla_rowset.Row; import org.eclipse.daanse.xmla.model.jakarta.xml.bind.xmla_rowset.Rowset; import org.eclipse.daanse.xmla.model.jakarta.xml.bind.xmla_rowset.discover.DiscoverPropertiesResponseRowXml; +import org.eclipse.daanse.xmla.server.jakarta.jws.MsXmlAnalysisSoap; import org.eclipse.daanse.xmla.server.tck.Constants; import org.eclipse.daanse.xmla.server.tck.SOAPUtil; import org.eclipse.daanse.xmla.server.tck.XMLUtil; diff --git a/server/jakarta.jws/src/test/java/org/eclipse/daanse/xmla/server/jakarta/jws/WsdlTest.java b/server/jakarta.jws/src/test/java/org/eclipse/daanse/xmla/server/jakarta/jws/integration/WsdlTest.java similarity index 99% rename from server/jakarta.jws/src/test/java/org/eclipse/daanse/xmla/server/jakarta/jws/WsdlTest.java rename to server/jakarta.jws/src/test/java/org/eclipse/daanse/xmla/server/jakarta/jws/integration/WsdlTest.java index 9211e80..b22ddd7 100644 --- a/server/jakarta.jws/src/test/java/org/eclipse/daanse/xmla/server/jakarta/jws/WsdlTest.java +++ b/server/jakarta.jws/src/test/java/org/eclipse/daanse/xmla/server/jakarta/jws/integration/WsdlTest.java @@ -11,7 +11,7 @@ * SmartCity Jena - initial * Stefan Bischof (bipolis.org) - initial */ -package org.eclipse.daanse.xmla.server.jakarta.jws; +package org.eclipse.daanse.xmla.server.jakarta.jws.integration; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/server/jakarta.jws/test.bndrun.deactivated b/server/jakarta.jws/test.bndrun.deactivated index 5c8fe60..0d33a64 100644 --- a/server/jakarta.jws/test.bndrun.deactivated +++ b/server/jakarta.jws/test.bndrun.deactivated @@ -21,107 +21,107 @@ -runproperties: \ org.slf4j.simpleLogger.defaultLogLevel=debug,\ - org.osgi.service.http.port=8090 + org.osgi.service.http.port=8090 -runrequires: \ - bnd.identity;id='${project.artifactId}-tests',\ - bnd.identity;id='${project.artifactId}',\ - bnd.identity;id='com.sun.xml.ws.jaxws-rt',\ - bnd.identity;id='org.glassfish.hk2.osgi-resource-locator',\ - 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.jakarta.xml.ws.runtime.httpwhiteboard',\ - bnd.identity;id='org.eclipse.daanse.jakarta.xml.ws.handler',\ - bnd.identity;id='org.eclipse.daanse.xmla.server.tck' + bnd.identity;id='${project.artifactId}-tests',\ + bnd.identity;id='${project.artifactId}',\ + bnd.identity;id='com.sun.xml.ws.jaxws-rt',\ + bnd.identity;id='org.glassfish.hk2.osgi-resource-locator',\ + 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.jakarta.xml.ws.runtime.httpwhiteboard',\ + bnd.identity;id='org.eclipse.daanse.jakarta.xml.ws.handler',\ + bnd.identity;id='org.eclipse.daanse.xmla.server.tck' --runee: JavaSE-21 +-runee: JavaSE-25 #-runfw: org.apache.felix.framework -runfw: org.eclipse.osgi # This will help us keep -runbundles sorted -runstartlevel: \ - order=sortbynameversion,\ - begin=-1 + order=sortbynameversion,\ + 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)',\ - ch.qos.logback.core;version='[1.5.6,1.5.7)',\ - com.fasterxml.woodstox.woodstox-core;version='[6.5.1,6.5.2)',\ - com.sun.activation.jakarta.activation;version='[2.0.1,2.0.2)',\ - com.sun.xml.bind.jaxb-core;version='[4.0.4,4.0.5)',\ - com.sun.xml.bind.jaxb-impl;version='[4.0.4,4.0.5)',\ - com.sun.xml.fastinfoset.FastInfoset;version='[2.1.0,2.1.1)',\ - com.sun.xml.messaging.saaj.impl;version='[3.0.3,3.0.4)',\ - com.sun.xml.stream.buffer.streambuffer;version='[2.1.0,2.1.1)',\ - com.sun.xml.ws.jaxws-rt;version='[4.0.2,4.0.3)',\ - jakarta.activation-api;version='[2.1.2,2.1.3)',\ - jakarta.annotation-api;version='[2.1.1,2.1.2)',\ - jakarta.xml.bind-api;version='[4.0.1,4.0.2)',\ - jakarta.xml.soap-api;version='[3.0.1,3.0.2)',\ - jakarta.xml.ws-api;version='[4.0.1,4.0.2)',\ - javax.activation-api;version='[1.2.0,1.2.1)',\ - jaxb-api;version='[2.3.1,2.3.2)',\ - junit-jupiter-api;version='[5.9.2,5.9.3)',\ - junit-jupiter-engine;version='[5.9.2,5.9.3)',\ - junit-jupiter-params;version='[5.9.2,5.9.3)',\ - junit-platform-commons;version='[1.9.2,1.9.3)',\ - junit-platform-engine;version='[1.9.2,1.9.3)',\ - junit-platform-launcher;version='[1.9.2,1.9.3)',\ - net.bytebuddy.byte-buddy;version='[1.14.16,1.14.17)',\ - net.bytebuddy.byte-buddy-agent;version='[1.12.16,1.12.17)',\ - 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.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.servlet-api;version='[3.0.0,3.0.1)',\ - org.apache.felix.scr;version='[2.2.10,2.2.11)',\ - org.eclipse.daanse.jakarta.xml.ws.handler;version='[0.0.1,0.0.2)',\ - org.eclipse.daanse.jakarta.xml.ws.runtime.httpwhiteboard;version='[0.0.1,0.0.2)',\ - org.eclipse.daanse.jakarta.xml.ws.runtime.registrar;version='[0.0.1,0.0.2)',\ - org.eclipse.daanse.xmla.api;version='[0.0.1,0.0.2)',\ - org.eclipse.daanse.xmla.model.jakarta.xml.bind.xmla;version='[0.0.1,0.0.2)',\ - org.eclipse.daanse.xmla.model.jakarta.xml.bind.xsd;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.jakarta.jws;version='[0.0.1,0.0.2)',\ - org.eclipse.daanse.xmla.server.jakarta.jws-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.external.management-api;version='[3.2.3,3.2.4)',\ - org.glassfish.gmbal.gmbal-api-only;version='[4.0.3,4.0.4)',\ - org.glassfish.ha.ha-api;version='[3.1.13,3.1.14)',\ - org.glassfish.hk2.osgi-resource-locator;version='[2.4.0,2.4.1)',\ - org.jvnet.mimepull;version='[1.10.0,1.10.1)',\ - org.jvnet.staxex.stax-ex;version='[2.1.0,2.1.1)',\ - org.mockito.mockito-core;version='[4.9.0,4.9.1)',\ - org.objenesis;version='[3.3.0,3.3.1)',\ - org.opentest4j;version='[1.2.0,1.2.1)',\ - org.osgi.service.component;version='[1.5.1,1.5.2)',\ - org.osgi.test.common;version='[1.3.0,1.3.1)',\ - org.osgi.test.junit5;version='[1.3.0,1.3.1)',\ - org.osgi.test.junit5.cm;version='[1.3.0,1.3.1)',\ - org.osgi.util.function;version='[1.2.0,1.2.1)',\ - org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - org.xmlunit.xmlunit-assertj3;version='[2.9.0,2.9.1)',\ - org.xmlunit.xmlunit-core;version='[2.10.0,2.10.1)',\ - slf4j.api;version='[2.0.12,2.0.13)',\ - stax2-api;version='[4.2.2,4.2.3)' + assertj-core;version='[3.26.0,3.26.1)',\ + ch.qos.logback.classic;version='[1.5.6,1.5.7)',\ + ch.qos.logback.core;version='[1.5.6,1.5.7)',\ + com.fasterxml.woodstox.woodstox-core;version='[6.5.1,6.5.2)',\ + com.sun.activation.jakarta.activation;version='[2.0.1,2.0.2)',\ + com.sun.xml.bind.jaxb-core;version='[4.0.4,4.0.5)',\ + com.sun.xml.bind.jaxb-impl;version='[4.0.4,4.0.5)',\ + com.sun.xml.fastinfoset.FastInfoset;version='[2.1.0,2.1.1)',\ + com.sun.xml.messaging.saaj.impl;version='[3.0.3,3.0.4)',\ + com.sun.xml.stream.buffer.streambuffer;version='[2.1.0,2.1.1)',\ + com.sun.xml.ws.jaxws-rt;version='[4.0.2,4.0.3)',\ + jakarta.activation-api;version='[2.1.2,2.1.3)',\ + jakarta.annotation-api;version='[2.1.1,2.1.2)',\ + jakarta.xml.bind-api;version='[4.0.1,4.0.2)',\ + jakarta.xml.soap-api;version='[3.0.1,3.0.2)',\ + jakarta.xml.ws-api;version='[4.0.1,4.0.2)',\ + javax.activation-api;version='[1.2.0,1.2.1)',\ + jaxb-api;version='[2.3.1,2.3.2)',\ + junit-jupiter-api;version='[5.9.2,5.9.3)',\ + junit-jupiter-engine;version='[5.9.2,5.9.3)',\ + junit-jupiter-params;version='[5.9.2,5.9.3)',\ + junit-platform-commons;version='[1.9.2,1.9.3)',\ + junit-platform-engine;version='[1.9.2,1.9.3)',\ + junit-platform-launcher;version='[1.9.2,1.9.3)',\ + net.bytebuddy.byte-buddy;version='[1.14.16,1.14.17)',\ + net.bytebuddy.byte-buddy-agent;version='[1.12.16,1.12.17)',\ + 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.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.servlet-api;version='[3.0.0,3.0.1)',\ + org.apache.felix.scr;version='[2.2.10,2.2.11)',\ + org.eclipse.daanse.jakarta.xml.ws.handler;version='[0.0.1,0.0.2)',\ + org.eclipse.daanse.jakarta.xml.ws.runtime.httpwhiteboard;version='[0.0.1,0.0.2)',\ + org.eclipse.daanse.jakarta.xml.ws.runtime.registrar;version='[0.0.1,0.0.2)',\ + org.eclipse.daanse.xmla.api;version='[0.0.1,0.0.2)',\ + org.eclipse.daanse.xmla.model.jakarta.xml.bind.xmla;version='[0.0.1,0.0.2)',\ + org.eclipse.daanse.xmla.model.jakarta.xml.bind.xsd;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.jakarta.jws;version='[0.0.1,0.0.2)',\ + org.eclipse.daanse.xmla.server.jakarta.jws-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.external.management-api;version='[3.2.3,3.2.4)',\ + org.glassfish.gmbal.gmbal-api-only;version='[4.0.3,4.0.4)',\ + org.glassfish.ha.ha-api;version='[3.1.13,3.1.14)',\ + org.glassfish.hk2.osgi-resource-locator;version='[2.4.0,2.4.1)',\ + org.jvnet.mimepull;version='[1.10.0,1.10.1)',\ + org.jvnet.staxex.stax-ex;version='[2.1.0,2.1.1)',\ + org.mockito.mockito-core;version='[4.9.0,4.9.1)',\ + org.objenesis;version='[3.3.0,3.3.1)',\ + org.opentest4j;version='[1.2.0,1.2.1)',\ + org.osgi.service.component;version='[1.5.1,1.5.2)',\ + org.osgi.test.common;version='[1.3.0,1.3.1)',\ + org.osgi.test.junit5;version='[1.3.0,1.3.1)',\ + org.osgi.test.junit5.cm;version='[1.3.0,1.3.1)',\ + org.osgi.util.function;version='[1.2.0,1.2.1)',\ + org.osgi.util.promise;version='[1.3.0,1.3.1)',\ + org.xmlunit.xmlunit-assertj3;version='[2.9.0,2.9.1)',\ + org.xmlunit.xmlunit-core;version='[2.10.0,2.10.1)',\ + slf4j.api;version='[2.0.12,2.0.13)',\ + stax2-api;version='[4.2.2,4.2.3)' diff --git a/server/jakarta.saaj/test.bndrun b/server/jakarta.saaj/test.bndrun index 9bd69f1..0ba572b 100644 --- a/server/jakarta.saaj/test.bndrun +++ b/server/jakarta.saaj/test.bndrun @@ -39,7 +39,7 @@ port : 17290 --runee: JavaSE-21 +-runee: JavaSE-25 #-runfw: org.apache.felix.framework -runfw: org.eclipse.osgi diff --git a/server/jakarta.xml.ws.provider.soapmessage/src/test/java/org/eclipse/daanse/xmla/server/jakarta/xml/ws/provider/soapmessage/InitialisationTest.java b/server/jakarta.xml.ws.provider.soapmessage/src/test/java/org/eclipse/daanse/xmla/server/jakarta/xml/ws/provider/soapmessage/integration/InitialisationTest.java similarity index 99% rename from server/jakarta.xml.ws.provider.soapmessage/src/test/java/org/eclipse/daanse/xmla/server/jakarta/xml/ws/provider/soapmessage/InitialisationTest.java rename to server/jakarta.xml.ws.provider.soapmessage/src/test/java/org/eclipse/daanse/xmla/server/jakarta/xml/ws/provider/soapmessage/integration/InitialisationTest.java index 37e82c8..676c8cd 100644 --- a/server/jakarta.xml.ws.provider.soapmessage/src/test/java/org/eclipse/daanse/xmla/server/jakarta/xml/ws/provider/soapmessage/InitialisationTest.java +++ b/server/jakarta.xml.ws.provider.soapmessage/src/test/java/org/eclipse/daanse/xmla/server/jakarta/xml/ws/provider/soapmessage/integration/InitialisationTest.java @@ -11,7 +11,7 @@ * SmartCity Jena - initial * Stefan Bischof (bipolis.org) - initial */ -package org.eclipse.daanse.xmla.server.jakarta.xml.ws.provider.soapmessage; +package org.eclipse.daanse.xmla.server.jakarta.xml.ws.provider.soapmessage.integration; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/server/jakarta.xml.ws.provider.soapmessage/test.bndrun.deactivated b/server/jakarta.xml.ws.provider.soapmessage/test.bndrun.deactivated index efa5a7f..18a1c74 100644 --- a/server/jakarta.xml.ws.provider.soapmessage/test.bndrun.deactivated +++ b/server/jakarta.xml.ws.provider.soapmessage/test.bndrun.deactivated @@ -22,103 +22,103 @@ -runvm: ${def;argLine} -runproperties: \ - org.slf4j.simpleLogger.defaultLogLevel=debug,\ - org.osgi.service.http.port=8090 + org.slf4j.simpleLogger.defaultLogLevel=debug,\ + org.osgi.service.http.port=8090 port : 17290 -runproperties.local.agent : osgi.fx.agent.port=0.0.0.0:${port} -runrequires: \ - bnd.identity;id='${project.artifactId}-tests',\ - bnd.identity;id='${project.artifactId}',\ - bnd.identity;id='com.sun.xml.ws.jaxws-rt',\ - bnd.identity;id='org.glassfish.hk2.osgi-resource-locator',\ - 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='${project.artifactId}-tests',\ + bnd.identity;id='${project.artifactId}',\ + bnd.identity;id='com.sun.xml.ws.jaxws-rt',\ + bnd.identity;id='org.glassfish.hk2.osgi-resource-locator',\ + 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' --runee: JavaSE-21 +-runee: JavaSE-25 #-runfw: org.apache.felix.framework -runfw: org.eclipse.osgi # This will help us keep -runbundles sorted -runstartlevel: \ - order=sortbynameversion,\ - begin=-1 + order=sortbynameversion,\ + 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)',\ - ch.qos.logback.core;version='[1.5.6,1.5.7)',\ - com.fasterxml.woodstox.woodstox-core;version='[6.5.1,6.5.2)',\ - com.sun.activation.jakarta.activation;version='[2.0.1,2.0.2)',\ - com.sun.xml.bind.jaxb-core;version='[4.0.4,4.0.5)',\ - com.sun.xml.bind.jaxb-impl;version='[4.0.4,4.0.5)',\ - com.sun.xml.fastinfoset.FastInfoset;version='[2.1.0,2.1.1)',\ - com.sun.xml.messaging.saaj.impl;version='[3.0.3,3.0.4)',\ - com.sun.xml.stream.buffer.streambuffer;version='[2.1.0,2.1.1)',\ - com.sun.xml.ws.jaxws-rt;version='[4.0.2,4.0.3)',\ - jakarta.activation-api;version='[2.1.2,2.1.3)',\ - jakarta.annotation-api;version='[2.1.1,2.1.2)',\ - jakarta.xml.bind-api;version='[4.0.1,4.0.2)',\ - jakarta.xml.soap-api;version='[3.0.1,3.0.2)',\ - jakarta.xml.ws-api;version='[4.0.1,4.0.2)',\ - javax.activation-api;version='[1.2.0,1.2.1)',\ - jaxb-api;version='[2.3.1,2.3.2)',\ - junit-jupiter-api;version='[5.9.2,5.9.3)',\ - junit-jupiter-engine;version='[5.9.2,5.9.3)',\ - junit-jupiter-params;version='[5.9.2,5.9.3)',\ - junit-platform-commons;version='[1.9.2,1.9.3)',\ - junit-platform-engine;version='[1.9.2,1.9.3)',\ - junit-platform-launcher;version='[1.9.2,1.9.3)',\ - net.bytebuddy.byte-buddy;version='[1.14.16,1.14.17)',\ - net.bytebuddy.byte-buddy-agent;version='[1.12.16,1.12.17)',\ - 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.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.servlet-api;version='[3.0.0,3.0.1)',\ - org.apache.felix.scr;version='[2.2.10,2.2.11)',\ - 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.xml.ws.provider.soapmessage;version='[0.0.1,0.0.2)',\ - org.eclipse.daanse.xmla.server.jakarta.xml.ws.provider.soapmessage-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.external.management-api;version='[3.2.3,3.2.4)',\ - org.glassfish.gmbal.gmbal-api-only;version='[4.0.3,4.0.4)',\ - org.glassfish.ha.ha-api;version='[3.1.13,3.1.14)',\ - org.glassfish.hk2.osgi-resource-locator;version='[2.4.0,2.4.1)',\ - org.jvnet.mimepull;version='[1.10.0,1.10.1)',\ - org.jvnet.staxex.stax-ex;version='[2.1.0,2.1.1)',\ - org.mockito.mockito-core;version='[4.9.0,4.9.1)',\ - org.objenesis;version='[3.3.0,3.3.1)',\ - org.opentest4j;version='[1.2.0,1.2.1)',\ - org.osgi.service.component;version='[1.5.1,1.5.2)',\ - org.osgi.test.common;version='[1.3.0,1.3.1)',\ - org.osgi.test.junit5;version='[1.3.0,1.3.1)',\ - org.osgi.test.junit5.cm;version='[1.3.0,1.3.1)',\ - org.osgi.util.function;version='[1.2.0,1.2.1)',\ - org.osgi.util.promise;version='[1.3.0,1.3.1)',\ - org.xmlunit.xmlunit-assertj3;version='[2.9.0,2.9.1)',\ - org.xmlunit.xmlunit-core;version='[2.10.0,2.10.1)',\ - slf4j.api;version='[2.0.12,2.0.13)',\ - stax2-api;version='[4.2.2,4.2.3)' + assertj-core;version='[3.26.0,3.26.1)',\ + ch.qos.logback.classic;version='[1.5.6,1.5.7)',\ + ch.qos.logback.core;version='[1.5.6,1.5.7)',\ + com.fasterxml.woodstox.woodstox-core;version='[6.5.1,6.5.2)',\ + com.sun.activation.jakarta.activation;version='[2.0.1,2.0.2)',\ + com.sun.xml.bind.jaxb-core;version='[4.0.4,4.0.5)',\ + com.sun.xml.bind.jaxb-impl;version='[4.0.4,4.0.5)',\ + com.sun.xml.fastinfoset.FastInfoset;version='[2.1.0,2.1.1)',\ + com.sun.xml.messaging.saaj.impl;version='[3.0.3,3.0.4)',\ + com.sun.xml.stream.buffer.streambuffer;version='[2.1.0,2.1.1)',\ + com.sun.xml.ws.jaxws-rt;version='[4.0.2,4.0.3)',\ + jakarta.activation-api;version='[2.1.2,2.1.3)',\ + jakarta.annotation-api;version='[2.1.1,2.1.2)',\ + jakarta.xml.bind-api;version='[4.0.1,4.0.2)',\ + jakarta.xml.soap-api;version='[3.0.1,3.0.2)',\ + jakarta.xml.ws-api;version='[4.0.1,4.0.2)',\ + javax.activation-api;version='[1.2.0,1.2.1)',\ + jaxb-api;version='[2.3.1,2.3.2)',\ + junit-jupiter-api;version='[5.9.2,5.9.3)',\ + junit-jupiter-engine;version='[5.9.2,5.9.3)',\ + junit-jupiter-params;version='[5.9.2,5.9.3)',\ + junit-platform-commons;version='[1.9.2,1.9.3)',\ + junit-platform-engine;version='[1.9.2,1.9.3)',\ + junit-platform-launcher;version='[1.9.2,1.9.3)',\ + net.bytebuddy.byte-buddy;version='[1.14.16,1.14.17)',\ + net.bytebuddy.byte-buddy-agent;version='[1.12.16,1.12.17)',\ + 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.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.servlet-api;version='[3.0.0,3.0.1)',\ + org.apache.felix.scr;version='[2.2.10,2.2.11)',\ + 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.xml.ws.provider.soapmessage;version='[0.0.1,0.0.2)',\ + org.eclipse.daanse.xmla.server.jakarta.xml.ws.provider.soapmessage-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.external.management-api;version='[3.2.3,3.2.4)',\ + org.glassfish.gmbal.gmbal-api-only;version='[4.0.3,4.0.4)',\ + org.glassfish.ha.ha-api;version='[3.1.13,3.1.14)',\ + org.glassfish.hk2.osgi-resource-locator;version='[2.4.0,2.4.1)',\ + org.jvnet.mimepull;version='[1.10.0,1.10.1)',\ + org.jvnet.staxex.stax-ex;version='[2.1.0,2.1.1)',\ + org.mockito.mockito-core;version='[4.9.0,4.9.1)',\ + org.objenesis;version='[3.3.0,3.3.1)',\ + org.opentest4j;version='[1.2.0,1.2.1)',\ + org.osgi.service.component;version='[1.5.1,1.5.2)',\ + org.osgi.test.common;version='[1.3.0,1.3.1)',\ + org.osgi.test.junit5;version='[1.3.0,1.3.1)',\ + org.osgi.test.junit5.cm;version='[1.3.0,1.3.1)',\ + org.osgi.util.function;version='[1.2.0,1.2.1)',\ + org.osgi.util.promise;version='[1.3.0,1.3.1)',\ + org.xmlunit.xmlunit-assertj3;version='[2.9.0,2.9.1)',\ + org.xmlunit.xmlunit-core;version='[2.10.0,2.10.1)',\ + slf4j.api;version='[2.0.12,2.0.13)',\ + stax2-api;version='[4.2.2,4.2.3)' diff --git a/server/jdk.httpserver/test.bndrun b/server/jdk.httpserver/test.bndrun index 3388328..6d476d1 100644 --- a/server/jdk.httpserver/test.bndrun +++ b/server/jdk.httpserver/test.bndrun @@ -39,7 +39,7 @@ port : 17290 --runee: JavaSE-21 +-runee: JavaSE-25 #-runfw: org.apache.felix.framework -runfw: org.eclipse.osgi diff --git a/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/AuthRequestTest.java b/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/integration/AuthRequestTest.java similarity index 96% rename from server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/AuthRequestTest.java rename to server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/integration/AuthRequestTest.java index 32f0f53..362d735 100644 --- a/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/AuthRequestTest.java +++ b/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/integration/AuthRequestTest.java @@ -11,13 +11,14 @@ * SmartCity Jena - initial * Stefan Bischof (bipolis.org) - initial */ -package org.eclipse.daanse.xmla.server.tck; +package org.eclipse.daanse.xmla.server.tck.integration; import static org.mockito.Mockito.mock; import java.util.Map; import org.eclipse.daanse.xmla.api.XmlaService; +import org.eclipse.daanse.xmla.server.tck.Constants; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/DiscoverRequestTest.java b/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/integration/DiscoverRequestTest.java similarity index 99% rename from server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/DiscoverRequestTest.java rename to server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/integration/DiscoverRequestTest.java index f0e700e..66fd605 100644 --- a/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/DiscoverRequestTest.java +++ b/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/integration/DiscoverRequestTest.java @@ -11,7 +11,7 @@ * SmartCity Jena - initial * Stefan Bischof (bipolis.org) - initial */ -package org.eclipse.daanse.xmla.server.tck; +package org.eclipse.daanse.xmla.server.tck.integration; import org.eclipse.daanse.xmla.api.RequestMetaData; import org.eclipse.daanse.xmla.api.XmlaService; @@ -55,6 +55,8 @@ import org.eclipse.daanse.xmla.api.discover.mdschema.members.MdSchemaMembersRequest; import org.eclipse.daanse.xmla.api.discover.mdschema.properties.MdSchemaPropertiesRequest; import org.eclipse.daanse.xmla.api.discover.mdschema.sets.MdSchemaSetsRequest; +import org.eclipse.daanse.xmla.server.tck.Constants; +import org.eclipse.daanse.xmla.server.tck.SOAPUtil; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/DiscoverResponseTest.java b/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/integration/DiscoverResponseTest.java similarity index 99% rename from server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/DiscoverResponseTest.java rename to server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/integration/DiscoverResponseTest.java index 9ab24bd..f0da4ec 100644 --- a/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/DiscoverResponseTest.java +++ b/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/integration/DiscoverResponseTest.java @@ -11,7 +11,7 @@ * SmartCity Jena - initial * Stefan Bischof (bipolis.org) - initial */ -package org.eclipse.daanse.xmla.server.tck; +package org.eclipse.daanse.xmla.server.tck.integration; import static org.eclipse.daanse.xmla.api.common.enums.AuthenticationModeEnum.UNAUTHENTICATED; import static org.eclipse.daanse.xmla.api.common.enums.ProviderTypeEnum.MDP; @@ -102,6 +102,9 @@ import org.eclipse.daanse.xmla.model.record.discover.mdschema.properties.MdSchemaPropertiesResponseRowR; import org.eclipse.daanse.xmla.model.record.discover.mdschema.sets.MdSchemaSetsResponseRowR; import org.eclipse.daanse.xmla.model.record.xmla.RestrictionR; +import org.eclipse.daanse.xmla.server.tck.Constants; +import org.eclipse.daanse.xmla.server.tck.SOAPUtil; +import org.eclipse.daanse.xmla.server.tck.XMLUtil; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/ExecuteRequestTest.java b/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/integration/ExecuteRequestTest.java similarity index 99% rename from server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/ExecuteRequestTest.java rename to server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/integration/ExecuteRequestTest.java index ba3b089..655420b 100644 --- a/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/ExecuteRequestTest.java +++ b/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/integration/ExecuteRequestTest.java @@ -11,7 +11,7 @@ * SmartCity Jena - initial * Stefan Bischof (bipolis.org) - initial */ -package org.eclipse.daanse.xmla.server.tck; +package org.eclipse.daanse.xmla.server.tck.integration; import org.eclipse.daanse.xmla.api.RequestMetaData; import org.eclipse.daanse.xmla.api.UserRolePrincipal; @@ -24,6 +24,8 @@ import org.eclipse.daanse.xmla.api.execute.statement.StatementResponse; import org.eclipse.daanse.xmla.api.xmla.ColumnBinding; import org.eclipse.daanse.xmla.api.xmla.DataSourceViewBinding; +import org.eclipse.daanse.xmla.server.tck.Constants; +import org.eclipse.daanse.xmla.server.tck.SOAPUtil; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/ExecuteResponseTest.java b/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/integration/ExecuteResponseTest.java similarity index 99% rename from server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/ExecuteResponseTest.java rename to server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/integration/ExecuteResponseTest.java index d3160ac..61d4cf4 100644 --- a/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/ExecuteResponseTest.java +++ b/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/integration/ExecuteResponseTest.java @@ -11,7 +11,7 @@ * SmartCity Jena - initial * Stefan Bischof (bipolis.org) - initial */ -package org.eclipse.daanse.xmla.server.tck; +package org.eclipse.daanse.xmla.server.tck.integration; import static org.eclipse.daanse.xmla.server.tck.SOAPUtil.string; import static org.eclipse.daanse.xmla.server.tck.TestRequests.ALTER_REQUEST; @@ -83,6 +83,9 @@ import org.eclipse.daanse.xmla.model.record.mddataset.RowSetRowR; import org.eclipse.daanse.xmla.model.record.mddataset.ValueR; import org.eclipse.daanse.xmla.model.record.xmla_empty.EmptyresultR; +import org.eclipse.daanse.xmla.server.tck.Constants; +import org.eclipse.daanse.xmla.server.tck.SOAPUtil; +import org.eclipse.daanse.xmla.server.tck.XMLUtil; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/MsClientTest.java b/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/integration/MsClientTest.java similarity index 98% rename from server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/MsClientTest.java rename to server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/integration/MsClientTest.java index ae05ff6..8c34322 100644 --- a/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/MsClientTest.java +++ b/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/integration/MsClientTest.java @@ -11,7 +11,7 @@ * SmartCity Jena - initial * Stefan Bischof (bipolis.org) - initial */ -package org.eclipse.daanse.xmla.server.tck; +package org.eclipse.daanse.xmla.server.tck.integration; import org.assertj.core.api.Assertions; import org.eclipse.daanse.xmla.api.XmlaService; @@ -19,6 +19,7 @@ import org.eclipse.daanse.xmla.api.discover.DiscoverService; import org.eclipse.daanse.xmla.api.discover.discover.properties.DiscoverPropertiesResponseRow; import org.eclipse.daanse.xmla.model.record.discover.discover.properties.DiscoverPropertiesResponseRowR; +import org.eclipse.daanse.xmla.server.tck.Constants; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test;