diff --git a/components/business-adaptors/org.wso2.micro.integrator.business.messaging.hl7/pom.xml b/components/business-adaptors/org.wso2.micro.integrator.business.messaging.hl7/pom.xml index 0a69bbd758..8b59f85737 100644 --- a/components/business-adaptors/org.wso2.micro.integrator.business.messaging.hl7/pom.xml +++ b/components/business-adaptors/org.wso2.micro.integrator.business.messaging.hl7/pom.xml @@ -21,7 +21,7 @@ business-adaptors org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/business-adaptors/pom.xml b/components/business-adaptors/pom.xml index 6e0757b4f7..50855f5720 100644 --- a/components/business-adaptors/pom.xml +++ b/components/business-adaptors/pom.xml @@ -21,7 +21,7 @@ mi-component-parent org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/crypto-service/org.wso2.micro.integrator.crypto.impl/pom.xml b/components/crypto-service/org.wso2.micro.integrator.crypto.impl/pom.xml index 56fd0070b6..dc4f5931e4 100644 --- a/components/crypto-service/org.wso2.micro.integrator.crypto.impl/pom.xml +++ b/components/crypto-service/org.wso2.micro.integrator.crypto.impl/pom.xml @@ -22,7 +22,7 @@ crypto-service org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/crypto-service/org.wso2.micro.integrator.crypto.provider/pom.xml b/components/crypto-service/org.wso2.micro.integrator.crypto.provider/pom.xml index 3be79fceb1..458b982aee 100644 --- a/components/crypto-service/org.wso2.micro.integrator.crypto.provider/pom.xml +++ b/components/crypto-service/org.wso2.micro.integrator.crypto.provider/pom.xml @@ -22,7 +22,7 @@ crypto-service org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/crypto-service/pom.xml b/components/crypto-service/pom.xml index 49edd9d603..2e1d0590e2 100644 --- a/components/crypto-service/pom.xml +++ b/components/crypto-service/pom.xml @@ -22,7 +22,7 @@ mi-component-parent org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/data/data-services/org.wso2.micro.integrator.dataservices.capp.deployer/pom.xml b/components/data/data-services/org.wso2.micro.integrator.dataservices.capp.deployer/pom.xml index ca19abee70..44be98d96c 100644 --- a/components/data/data-services/org.wso2.micro.integrator.dataservices.capp.deployer/pom.xml +++ b/components/data/data-services/org.wso2.micro.integrator.dataservices.capp.deployer/pom.xml @@ -21,7 +21,7 @@ org.wso2.ei data-services - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/data/data-services/org.wso2.micro.integrator.dataservices.common/pom.xml b/components/data/data-services/org.wso2.micro.integrator.dataservices.common/pom.xml index 33b5cb3545..cee5e7c931 100644 --- a/components/data/data-services/org.wso2.micro.integrator.dataservices.common/pom.xml +++ b/components/data/data-services/org.wso2.micro.integrator.dataservices.common/pom.xml @@ -19,7 +19,7 @@ org.wso2.ei data-services - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/data/data-services/org.wso2.micro.integrator.dataservices.core/pom.xml b/components/data/data-services/org.wso2.micro.integrator.dataservices.core/pom.xml index a21c7c6ed9..90bf7482c0 100644 --- a/components/data/data-services/org.wso2.micro.integrator.dataservices.core/pom.xml +++ b/components/data/data-services/org.wso2.micro.integrator.dataservices.core/pom.xml @@ -21,7 +21,7 @@ org.wso2.ei data-services - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/data/data-services/org.wso2.micro.integrator.dataservices.odata.endpoint/pom.xml b/components/data/data-services/org.wso2.micro.integrator.dataservices.odata.endpoint/pom.xml index 3ff1f34f98..b21c1cd195 100644 --- a/components/data/data-services/org.wso2.micro.integrator.dataservices.odata.endpoint/pom.xml +++ b/components/data/data-services/org.wso2.micro.integrator.dataservices.odata.endpoint/pom.xml @@ -21,7 +21,7 @@ org.wso2.ei data-services - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/data/data-services/org.wso2.micro.integrator.dataservices.sql.driver/pom.xml b/components/data/data-services/org.wso2.micro.integrator.dataservices.sql.driver/pom.xml index 2b78aad02f..4f4db79bdd 100644 --- a/components/data/data-services/org.wso2.micro.integrator.dataservices.sql.driver/pom.xml +++ b/components/data/data-services/org.wso2.micro.integrator.dataservices.sql.driver/pom.xml @@ -21,7 +21,7 @@ org.wso2.ei data-services - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/data/data-services/pom.xml b/components/data/data-services/pom.xml index 3aecd10820..6f30cb90e3 100644 --- a/components/data/data-services/pom.xml +++ b/components/data/data-services/pom.xml @@ -21,7 +21,7 @@ data org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/data/pom.xml b/components/data/pom.xml index b66399951f..475ed65475 100644 --- a/components/data/pom.xml +++ b/components/data/pom.xml @@ -21,7 +21,7 @@ mi-component-parent org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/javax.cache/pom.xml b/components/javax.cache/pom.xml index 746253fd9d..779c7dcb44 100644 --- a/components/javax.cache/pom.xml +++ b/components/javax.cache/pom.xml @@ -21,7 +21,7 @@ mi-component-parent org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/mediation/data-publishers/org.wso2.micro.integrator.analytics.data.publisher.util/pom.xml b/components/mediation/data-publishers/org.wso2.micro.integrator.analytics.data.publisher.util/pom.xml index aff407c3d5..6fa41c7c08 100644 --- a/components/mediation/data-publishers/org.wso2.micro.integrator.analytics.data.publisher.util/pom.xml +++ b/components/mediation/data-publishers/org.wso2.micro.integrator.analytics.data.publisher.util/pom.xml @@ -23,7 +23,7 @@ org.wso2.ei data-publishers - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/mediation/data-publishers/org.wso2.micro.integrator.analytics.messageflow.data.publisher/pom.xml b/components/mediation/data-publishers/org.wso2.micro.integrator.analytics.messageflow.data.publisher/pom.xml index c2b9773fdd..95504f6199 100644 --- a/components/mediation/data-publishers/org.wso2.micro.integrator.analytics.messageflow.data.publisher/pom.xml +++ b/components/mediation/data-publishers/org.wso2.micro.integrator.analytics.messageflow.data.publisher/pom.xml @@ -22,7 +22,7 @@ org.wso2.ei data-publishers - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/mediation/data-publishers/org.wso2.micro.integrator.observability/pom.xml b/components/mediation/data-publishers/org.wso2.micro.integrator.observability/pom.xml index a953f5e679..db5bf3f675 100644 --- a/components/mediation/data-publishers/org.wso2.micro.integrator.observability/pom.xml +++ b/components/mediation/data-publishers/org.wso2.micro.integrator.observability/pom.xml @@ -21,7 +21,7 @@ data-publishers org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/mediation/data-publishers/pom.xml b/components/mediation/data-publishers/pom.xml index ea85db155c..73ea65aee4 100644 --- a/components/mediation/data-publishers/pom.xml +++ b/components/mediation/data-publishers/pom.xml @@ -21,7 +21,7 @@ mediation org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/components/mediation/extensions/org.wso2.micro.integrator.security.handlers/pom.xml b/components/mediation/extensions/org.wso2.micro.integrator.security.handlers/pom.xml index 5f096b43c8..cdd74bbc72 100644 --- a/components/mediation/extensions/org.wso2.micro.integrator.security.handlers/pom.xml +++ b/components/mediation/extensions/org.wso2.micro.integrator.security.handlers/pom.xml @@ -21,7 +21,7 @@ extensions org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml 4.0.0 diff --git a/components/mediation/extensions/org.wso2.micro.integrator.security.handlers/utsecurity/pom.xml b/components/mediation/extensions/org.wso2.micro.integrator.security.handlers/utsecurity/pom.xml index 6a5fd018b9..bc4c6f98b1 100644 --- a/components/mediation/extensions/org.wso2.micro.integrator.security.handlers/utsecurity/pom.xml +++ b/components/mediation/extensions/org.wso2.micro.integrator.security.handlers/utsecurity/pom.xml @@ -21,7 +21,7 @@ org.wso2.ei org.wso2.micro.integrator.security.handlers - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/mediation/extensions/org.wso2.micro.integrator.transport.handlers/pom.xml b/components/mediation/extensions/org.wso2.micro.integrator.transport.handlers/pom.xml index 53da2fd2a4..a796cabfbc 100644 --- a/components/mediation/extensions/org.wso2.micro.integrator.transport.handlers/pom.xml +++ b/components/mediation/extensions/org.wso2.micro.integrator.transport.handlers/pom.xml @@ -21,7 +21,7 @@ org.wso2.ei extensions - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/mediation/extensions/pom.xml b/components/mediation/extensions/pom.xml index 392b190e51..569fe91a6d 100644 --- a/components/mediation/extensions/pom.xml +++ b/components/mediation/extensions/pom.xml @@ -22,7 +22,7 @@ mediation org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint.osgi/pom.xml b/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint.osgi/pom.xml index ccfcb449a6..2231b1fd56 100644 --- a/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint.osgi/pom.xml +++ b/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint.osgi/pom.xml @@ -23,7 +23,7 @@ inbound-endpoints org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint.persistence/pom.xml b/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint.persistence/pom.xml index a3a81d1e2d..06a1fa1d5d 100644 --- a/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint.persistence/pom.xml +++ b/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint.persistence/pom.xml @@ -21,7 +21,7 @@ inbound-endpoints org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint/pom.xml b/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint/pom.xml index bb7dd45d96..20b678602e 100644 --- a/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint/pom.xml +++ b/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint/pom.xml @@ -20,7 +20,7 @@ inbound-endpoints org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml @@ -170,6 +170,10 @@ org.apache.axis2.transport axis2-transport-rabbitmq-amqp + + org.wso2.orbit.debezium + debezium + org.apache.logging.log4j log4j-core @@ -181,24 +185,12 @@ test - org.wso2.carbon.mediation - org.wso2.carbon.inbound.endpoint.persistence - - - io.debezium - debezium-embedded - - - io.debezium - debezium-api - - - io.debezium - debezium-connector-mysql + com.google.code.gson + gson - org.slf4j - slf4j-api + org.wso2.carbon + org.wso2.carbon.securevault @@ -232,7 +224,8 @@ org.wso2.carbon.inbound.endpoint.persistence, - org.wso2.carbon.inbound.endpoint.osgi.service; + org.wso2.carbon.inbound.endpoint.osgi.service, + *;resolution:=optional * diff --git a/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint/src/main/java/org/wso2/carbon/inbound/endpoint/protocol/cdc/CDCEventOutput.java b/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint/src/main/java/org/wso2/carbon/inbound/endpoint/protocol/cdc/CDCEventOutput.java index ec3af80f6a..cdb52b0b9d 100644 --- a/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint/src/main/java/org/wso2/carbon/inbound/endpoint/protocol/cdc/CDCEventOutput.java +++ b/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint/src/main/java/org/wso2/carbon/inbound/endpoint/protocol/cdc/CDCEventOutput.java @@ -18,8 +18,10 @@ package org.wso2.carbon.inbound.endpoint.protocol.cdc; +import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; import io.debezium.engine.ChangeEvent; -import org.json.JSONObject; import static org.wso2.carbon.inbound.endpoint.protocol.cdc.InboundCDCConstants.AFTER; import static org.wso2.carbon.inbound.endpoint.protocol.cdc.InboundCDCConstants.BEFORE; @@ -32,36 +34,27 @@ public class CDCEventOutput { - private JSONObject payload; + private JsonObject payload; private enum operations {c, r, u, d}; CDCEventOutput(ChangeEvent event) { String valueString = event.value().toString(); - JSONObject value = new JSONObject(valueString); - this.payload = value.getJSONObject(PAYLOAD); + JsonObject value = new Gson().fromJson(valueString, JsonObject.class); + this.payload = value.getAsJsonObject(PAYLOAD); } - public Object getJsonPayloadBeforeEvent() { - Object beforeObject = null; - if (payload.has(BEFORE)) { - beforeObject = payload.get(BEFORE); - } - return beforeObject; - + public JsonElement getJsonPayloadBeforeEvent() { + return payload.get(BEFORE); } - public Object getJsonPayloadAfterEvent() { - Object afterObject = null; - if (payload.has(AFTER)) { - afterObject = payload.get(AFTER); - } - return afterObject; + public JsonElement getJsonPayloadAfterEvent() { + return payload.get(AFTER); } public Long getTs_ms() { if (payload.has(TS_MS)) { - return payload.getLong(TS_MS); + return payload.get(TS_MS).getAsLong(); } return null; } @@ -69,15 +62,15 @@ public Long getTs_ms() { public String getDatabase() { if (getSource() != null) { if (getSource().has(DB)) { - return getSource().getString(DB); + return getSource().get(DB).getAsString(); } return null; } return null; } - public Object getTable() { - Object tableObject = null; + public JsonElement getTable() { + JsonElement tableObject = null; if (getSource() != null) { if (getSource().has(TABLE)) { tableObject = getSource().get(TABLE); @@ -86,16 +79,16 @@ public Object getTable() { return tableObject; } - private JSONObject getSource () { + private JsonObject getSource () { if (payload.has(SOURCE)) { - return payload.getJSONObject(SOURCE); + return payload.getAsJsonObject(SOURCE); } return null; } public String getOp() { if (payload.has(OP)) { - return getOpString(payload.getString(OP)); + return getOpString(payload.get(OP).getAsString()); } return null; } @@ -116,14 +109,14 @@ private String getOpString(String op) { return null; } - public JSONObject getOutputJsonPayload () { + public JsonObject getOutputJsonPayload () { if (payload == null) { return null; } - JSONObject jsonPayload = new JSONObject(); - jsonPayload.put(OP, getOp()); - jsonPayload.put(BEFORE, getJsonPayloadBeforeEvent()); - jsonPayload.put(AFTER, getJsonPayloadAfterEvent()); + JsonObject jsonPayload = new JsonObject(); + jsonPayload.addProperty(OP, getOp()); + jsonPayload.add(BEFORE, getJsonPayloadBeforeEvent()); + jsonPayload.add(AFTER, getJsonPayloadAfterEvent()); return jsonPayload; } } diff --git a/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint/src/main/java/org/wso2/carbon/inbound/endpoint/protocol/cdc/CDCInjectHandler.java b/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint/src/main/java/org/wso2/carbon/inbound/endpoint/protocol/cdc/CDCInjectHandler.java index baad141530..6fa691502f 100644 --- a/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint/src/main/java/org/wso2/carbon/inbound/endpoint/protocol/cdc/CDCInjectHandler.java +++ b/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint/src/main/java/org/wso2/carbon/inbound/endpoint/protocol/cdc/CDCInjectHandler.java @@ -24,20 +24,16 @@ import org.apache.axis2.AxisFault; import org.apache.axis2.context.MessageContext; import org.apache.axis2.transport.TransportUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.synapse.SynapseConstants; -import org.apache.synapse.SynapseException; import org.apache.synapse.commons.json.JsonUtil; import org.apache.synapse.core.SynapseEnvironment; import org.apache.synapse.inbound.InboundEndpoint; -import org.apache.synapse.mediators.MediatorFaultHandler; import org.apache.synapse.mediators.base.SequenceMediator; import org.apache.synapse.transport.customlogsetter.CustomLogSetter; -import org.wso2.carbon.inbound.endpoint.protocol.generic.GenericConstants; -import java.io.InputStream; -import java.util.Map; import java.util.Properties; import static org.wso2.carbon.inbound.endpoint.protocol.cdc.InboundCDCConstants.CDC_DATABASE_NAME; @@ -54,8 +50,6 @@ public class CDCInjectHandler { private boolean sequential; private Properties cdcProperties; private SynapseEnvironment synapseEnvironment; - private Map transportHeaders; - private static final String contentType = "application/json"; public CDCInjectHandler(String injectingSeq, String onErrorSeq, boolean sequential, SynapseEnvironment synapseEnvironment, Properties cdcProperties) { @@ -69,101 +63,76 @@ public CDCInjectHandler(String injectingSeq, String onErrorSeq, boolean sequenti /** * Inject the message to the sequence */ - public boolean invoke(Object object, String inboundEndpointName) throws SynapseException { + public boolean invoke(Object object, String inboundEndpointName) { ChangeEvent eventRecord = (ChangeEvent) object; if (eventRecord == null || eventRecord.value() == null) { logger.debug("CDC Source Handler received empty event record"); } else { - InputStream in = null; + org.apache.synapse.MessageContext msgCtx = createMessageContext(); + msgCtx.setProperty(SynapseConstants.INBOUND_ENDPOINT_NAME, inboundEndpointName); + msgCtx.setProperty(SynapseConstants.ARTIFACT_NAME, SynapseConstants.FAIL_SAFE_MODE_INBOUND_ENDPOINT + inboundEndpointName); + msgCtx.setProperty(SynapseConstants.IS_INBOUND, true); + InboundEndpoint inboundEndpoint = msgCtx.getConfiguration().getInboundEndpoint(inboundEndpointName); + CustomLogSetter.getInstance().setLogAppender(inboundEndpoint.getArtifactContainerName()); + + CDCEventOutput cdcEventOutput = new CDCEventOutput(eventRecord); + msgCtx.setProperty(CDC_DATABASE_NAME, cdcEventOutput.getDatabase()); + msgCtx.setProperty(CDC_TABLES, cdcEventOutput.getTable().toString()); + msgCtx.setProperty(CDC_OPERATIONS, cdcEventOutput.getOp()); + msgCtx.setProperty(CDC_TS_MS, cdcEventOutput.getTs_ms().toString()); + + if (logger.isDebugEnabled()) { + logger.debug("Processed event : " + eventRecord); + } + MessageContext axis2MsgCtx = ((org.apache.synapse.core.axis2.Axis2MessageContext) msgCtx) + .getAxis2MessageContext(); + + OMElement documentElement = null; try { - org.apache.synapse.MessageContext msgCtx = createMessageContext(); - msgCtx.setProperty(SynapseConstants.INBOUND_ENDPOINT_NAME, inboundEndpointName); - msgCtx.setProperty(SynapseConstants.ARTIFACT_NAME, SynapseConstants.FAIL_SAFE_MODE_INBOUND_ENDPOINT + inboundEndpointName); - msgCtx.setProperty(SynapseConstants.IS_INBOUND, true); - InboundEndpoint inboundEndpoint = msgCtx.getConfiguration().getInboundEndpoint(inboundEndpointName); - CustomLogSetter.getInstance().setLogAppender(inboundEndpoint.getArtifactContainerName()); - - CDCEventOutput cdcEventOutput = new CDCEventOutput(eventRecord); - msgCtx.setProperty(CDC_DATABASE_NAME, cdcEventOutput.getDatabase()); - msgCtx.setProperty(CDC_TABLES, cdcEventOutput.getTable().toString()); - msgCtx.setProperty(CDC_OPERATIONS, cdcEventOutput.getOp()); - msgCtx.setProperty(CDC_TS_MS, cdcEventOutput.getTs_ms().toString()); + documentElement = JsonUtil.getNewJsonPayload(axis2MsgCtx, + cdcEventOutput.getOutputJsonPayload().toString(), true, true); - if (logger.isDebugEnabled()) { - logger.debug("Processed event : " + eventRecord); - } - MessageContext axis2MsgCtx = ((org.apache.synapse.core.axis2.Axis2MessageContext) msgCtx) - .getAxis2MessageContext(); - - //Builder builder = null; - OMElement documentElement = null; - try { - documentElement = JsonUtil.getNewJsonPayload(axis2MsgCtx, - cdcEventOutput.getOutputJsonPayload().toString(), true, true); - - } catch (AxisFault ex) { - logger.error("Error while creating the OMElement", ex); - msgCtx.setProperty(SynapseConstants.ERROR_CODE, GenericConstants.INBOUND_BUILD_ERROR); - msgCtx.setProperty(SynapseConstants.ERROR_MESSAGE, ex.getMessage()); - SequenceMediator faultSequence = getFaultSequence(msgCtx); - faultSequence.mediate(msgCtx); - return true; - } + } catch (AxisFault ex) { + handleError("Error while creating the OMElement"); + } - // Inject the message to the sequence. + // Inject the message to the sequence. + try { msgCtx.setEnvelope(TransportUtils.createSOAPEnvelope(documentElement)); - if (injectingSeq == null || injectingSeq.equals("")) { - logger.error("Sequence name not specified. Sequence : " + injectingSeq); - return false; + } catch (AxisFault e) { + handleError("Error while creating the SOAP Envelop"); + } + + if (StringUtils.isBlank(injectingSeq)) { + handleError("Injecting sequence name not specified"); + } + SequenceMediator seq = (SequenceMediator) synapseEnvironment.getSynapseConfiguration() + .getSequence(injectingSeq); + if (seq != null) { + if (logger.isDebugEnabled()) { + logger.debug("injecting message to sequence : " + injectingSeq); } - SequenceMediator seq = (SequenceMediator) synapseEnvironment.getSynapseConfiguration() - .getSequence(injectingSeq); - if (seq != null) { - if (logger.isDebugEnabled()) { - logger.debug("injecting message to sequence : " + injectingSeq); - } - if (!seq.isInitialized()) { - seq.init(synapseEnvironment); - } - SequenceMediator faultSequence = getFaultSequence(msgCtx); - MediatorFaultHandler mediatorFaultHandler = new MediatorFaultHandler(faultSequence); - msgCtx.pushFaultHandler(mediatorFaultHandler); - - if (!synapseEnvironment.injectInbound(msgCtx, seq, sequential)) { - return false; - } - } else { - logger.error("Sequence: " + injectingSeq + " not found"); + if (!seq.isInitialized()) { + seq.init(synapseEnvironment); } - } catch (AxisFault e) { - throw new RuntimeException(e); + seq.setErrorHandler(onErrorSeq); + + if (!synapseEnvironment.injectInbound(msgCtx, seq, sequential)) { + handleError("Failed to inject the sequence"); + } + } else { + handleError("Sequence:" + injectingSeq + " not found"); } } return true; } - private SequenceMediator getFaultSequence(org.apache.synapse.MessageContext synCtx) { - SequenceMediator faultSequence = null; - if (this.onErrorSeq != null) { - faultSequence = (SequenceMediator) synCtx.getSequence(this.onErrorSeq); - } - - if (faultSequence == null) { - faultSequence = (SequenceMediator) synCtx.getFaultSequence(); - } - - return faultSequence; - } - - - /** - * @param transportHeaders the transportHeaders to set - */ - public void setTransportHeaders(Map transportHeaders) { - this.transportHeaders = transportHeaders; - } + private void handleError(String msg) { + logger.error(msg); + throw new RuntimeException(msg); + } /** * Create the initial message context for the file @@ -175,7 +144,6 @@ private org.apache.synapse.MessageContext createMessageContext() { .getAxis2MessageContext(); axis2MsgCtx.setServerSide(true); axis2MsgCtx.setMessageID(UUIDGenerator.getUUID()); - axis2MsgCtx.setProperty(MessageContext.TRANSPORT_HEADERS, transportHeaders); msgCtx.setProperty(MessageContext.CLIENT_API_NON_BLOCKING, true); return msgCtx; } diff --git a/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint/src/main/java/org/wso2/carbon/inbound/endpoint/protocol/cdc/CDCPollingConsumer.java b/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint/src/main/java/org/wso2/carbon/inbound/endpoint/protocol/cdc/CDCPollingConsumer.java index c10698dd6f..906982c1ac 100644 --- a/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint/src/main/java/org/wso2/carbon/inbound/endpoint/protocol/cdc/CDCPollingConsumer.java +++ b/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint/src/main/java/org/wso2/carbon/inbound/endpoint/protocol/cdc/CDCPollingConsumer.java @@ -72,25 +72,21 @@ public void registerHandler(CDCInjectHandler injectHandler) { * interval. Timestamp based check is done to avoid that. */ public void execute() { - try { - if (logger.isDebugEnabled()) { - logger.debug("Start : CDC Inbound EP : " + inboundEndpointName); - } - // Check if the cycles are running in correct interval and start - // scan - long currentTime = (new Date()).getTime(); - if (lastRanTime == null || ((lastRanTime + (scanInterval)) <= currentTime)) { - lastRanTime = currentTime; - poll(); - } else if (logger.isDebugEnabled()) { - logger.debug( - "Skip cycle since cuncurrent rate is higher than the scan interval : CDC Inbound EP : " + inboundEndpointName); - } - if (logger.isDebugEnabled()) { - logger.debug("End : CDC Inbound EP : " + inboundEndpointName); - } - } catch (Exception e) { - logger.error("Error while getting events. " + e.getMessage(), e); + if (logger.isDebugEnabled()) { + logger.debug("Start : CDC Inbound EP : " + inboundEndpointName); + } + // Check if the cycles are running in correct interval and start + // scan + long currentTime = (new Date()).getTime(); + if (lastRanTime == null || ((lastRanTime + (scanInterval)) <= currentTime)) { + lastRanTime = currentTime; + poll(); + } else if (logger.isDebugEnabled()) { + logger.debug( + "Skip cycle since concurrent rate is higher than the scan interval : CDC Inbound EP : " + inboundEndpointName); + } + if (logger.isDebugEnabled()) { + logger.debug("End : CDC Inbound EP : " + inboundEndpointName); } } @@ -132,7 +128,7 @@ protected void destroy () { engine.close(); } } catch (IOException e) { - throw new RuntimeException(e); + throw new RuntimeException("Error while closing the Debezium Engine", e); } } diff --git a/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint/src/main/java/org/wso2/carbon/inbound/endpoint/protocol/cdc/CDCProcessor.java b/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint/src/main/java/org/wso2/carbon/inbound/endpoint/protocol/cdc/CDCProcessor.java index 41479d471e..2219fbd80f 100644 --- a/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint/src/main/java/org/wso2/carbon/inbound/endpoint/protocol/cdc/CDCProcessor.java +++ b/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint/src/main/java/org/wso2/carbon/inbound/endpoint/protocol/cdc/CDCProcessor.java @@ -18,18 +18,14 @@ package org.wso2.carbon.inbound.endpoint.protocol.cdc; -import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.synapse.MessageContext; import org.apache.synapse.SynapseException; import org.apache.synapse.core.SynapseEnvironment; import org.apache.synapse.inbound.InboundProcessorParams; import org.apache.synapse.inbound.InboundTaskProcessor; -import org.apache.synapse.mediators.Value; import org.apache.synapse.task.TaskStartupObserver; -import org.apache.synapse.util.xpath.SynapseXPath; -import org.jaxen.JaxenException; +import org.apache.synapse.util.resolver.SecureVaultResolver; import org.wso2.carbon.inbound.endpoint.common.InboundRequestProcessorImpl; import org.wso2.carbon.inbound.endpoint.common.InboundTask; import org.wso2.carbon.inbound.endpoint.protocol.PollingConstants; @@ -38,8 +34,6 @@ import java.io.IOException; import java.util.List; import java.util.Properties; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -67,9 +61,6 @@ public class CDCProcessor extends InboundRequestProcessorImpl implements TaskSta private String injectingSeq; private String onErrorSeq; private boolean sequential; - - private static final String SECURE_VAULT_REGEX = "(wso2:vault-lookup\\('(.*?)'\\))"; - private static Pattern vaultLookupPattern = Pattern.compile(SECURE_VAULT_REGEX); private static final String ENDPOINT_POSTFIX = "CDC" + COMMON_ENDPOINT_POSTFIX; private static final String FILE_OFFSET_STORAGE_CLASS = "org.apache.kafka.connect.storage.FileOffsetBackingStore"; private static final String FILE_SCHEMA_HISTORY_STORAGE_CLASS = "io.debezium.storage.file.history.FileSchemaHistory"; @@ -89,8 +80,6 @@ public CDCProcessor(InboundProcessorParams params) { this.interval = Long.parseLong(cdcProperties.getProperty(PollingConstants.INBOUND_ENDPOINT_INTERVAL)); } catch (NumberFormatException nfe) { throw new SynapseException("Invalid numeric value for interval.", nfe); - } catch (Exception e) { - throw new SynapseException("Invalid value for interval.", e); } this.sequential = true; if (cdcProperties.getProperty(PollingConstants.INBOUND_ENDPOINT_SEQUENTIAL) != null) { @@ -126,9 +115,8 @@ private void setProperties () { String passwordString = this.cdcProperties.getProperty(DEBEZIUM_DATABASE_PASSWORD); SynapseEnvironment synapseEnvironment = this.synapseEnvironment; - MessageContext messageContext = synapseEnvironment.createMessageContext(); - this.cdcProperties.setProperty(DEBEZIUM_DATABASE_PASSWORD, resolveSecureVault(messageContext, passwordString)); + this.cdcProperties.setProperty(DEBEZIUM_DATABASE_PASSWORD, SecureVaultResolver.resolve(synapseEnvironment, passwordString)); if (this.cdcProperties.getProperty(DEBEZIUM_DATABASE_ALLOW_PUBLIC_KEY_RETRIEVAL) == null) { this.cdcProperties.setProperty(DEBEZIUM_DATABASE_ALLOW_PUBLIC_KEY_RETRIEVAL, TRUE); @@ -165,10 +153,9 @@ private void setProperties () { } } catch (IOException e) { - throw new RuntimeException(e); - } catch (NullPointerException e) { - LOGGER.error("A required property value is not defined", e); - throw new RuntimeException(e); + String msg = "Error While creating the SCHEMAHISTORY or OFFSET storage file"; + LOGGER.error(msg); + throw new RuntimeException(msg, e); } } @@ -180,32 +167,6 @@ private void createFile (String filePath) throws IOException { } } - private static synchronized String resolveSecureVault(MessageContext messageContext, String passwordString) { - if (passwordString == null) { - return null; - } - Matcher lookupMatcher = vaultLookupPattern.matcher(passwordString); - String resolvedValue = ""; - if (lookupMatcher.find()) { - Value expression; - String expressionStr = lookupMatcher.group(1); - try { - expression = new Value(new SynapseXPath(expressionStr)); - - } catch (JaxenException e) { - throw new SynapseException("Error while building the expression : " + expressionStr, e); - } - resolvedValue = expression.evaluateValue(messageContext); - if (StringUtils.isEmpty(resolvedValue)) { - LOGGER.warn("Found Empty value for expression : " + expression.getExpression()); - resolvedValue = ""; - } - } else { - resolvedValue = passwordString; - } - return resolvedValue; - } - /** * This will be called at the time of synapse artifact deployment. diff --git a/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint/src/test/resources/CDCInbound/cdc-inbound-endpoint.xml b/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint/src/test/resources/CDCInbound/cdc-inbound-endpoint.xml index e3caf7bc88..fcbe80b71e 100644 --- a/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint/src/test/resources/CDCInbound/cdc-inbound-endpoint.xml +++ b/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint/src/test/resources/CDCInbound/cdc-inbound-endpoint.xml @@ -1,19 +1,22 @@ - 9091 + 1000 engine + initial org.apache.kafka.connect.storage.FileOffsetBackingStore - + cdc/offsetStorage/offsets1_.dat io.debezium.connector.mysql.MySqlConnector localhost 3306 root - rusiri@wso2 + wso2:vault-lookup('mysql_password') students - 85744 + 8574444 + server_1 + topic2 io.debezium.storage.file.history.FileSchemaHistory - + cdc/schemaHistory/schema_history1_.dat students.marks - c + create - \ No newline at end of file + diff --git a/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint/src/test/resources/CDCInbound/cdc_process_seq.xml b/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint/src/test/resources/CDCInbound/cdc_process_seq.xml index 16bab87ac4..982d9998d9 100644 --- a/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint/src/test/resources/CDCInbound/cdc_process_seq.xml +++ b/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint/src/test/resources/CDCInbound/cdc_process_seq.xml @@ -2,15 +2,15 @@ - + - + - + - + diff --git a/components/mediation/inbound-endpoints/pom.xml b/components/mediation/inbound-endpoints/pom.xml index 66833fbb3c..5ce4036683 100644 --- a/components/mediation/inbound-endpoints/pom.xml +++ b/components/mediation/inbound-endpoints/pom.xml @@ -22,7 +22,7 @@ mediation org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/mediation/mediators/cache-mediator/org.wso2.carbon.mediator.cache/pom.xml b/components/mediation/mediators/cache-mediator/org.wso2.carbon.mediator.cache/pom.xml index 4e16af2941..cdc613863b 100644 --- a/components/mediation/mediators/cache-mediator/org.wso2.carbon.mediator.cache/pom.xml +++ b/components/mediation/mediators/cache-mediator/org.wso2.carbon.mediator.cache/pom.xml @@ -19,7 +19,7 @@ mediators org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../../pom.xml diff --git a/components/mediation/mediators/dataservices-mediator/org.wso2.micro.integrator.mediator.dataservice/pom.xml b/components/mediation/mediators/dataservices-mediator/org.wso2.micro.integrator.mediator.dataservice/pom.xml index dff14d9ad2..efb477fd35 100644 --- a/components/mediation/mediators/dataservices-mediator/org.wso2.micro.integrator.mediator.dataservice/pom.xml +++ b/components/mediation/mediators/dataservices-mediator/org.wso2.micro.integrator.mediator.dataservice/pom.xml @@ -19,7 +19,7 @@ mediators org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../../pom.xml diff --git a/components/mediation/mediators/entitlement-mediator/org.wso2.micro.integrator.identity.entitlement.mediator/pom.xml b/components/mediation/mediators/entitlement-mediator/org.wso2.micro.integrator.identity.entitlement.mediator/pom.xml index 5394cf59e8..7a35d3c5e7 100644 --- a/components/mediation/mediators/entitlement-mediator/org.wso2.micro.integrator.identity.entitlement.mediator/pom.xml +++ b/components/mediation/mediators/entitlement-mediator/org.wso2.micro.integrator.identity.entitlement.mediator/pom.xml @@ -21,7 +21,7 @@ org.wso2.ei mediators - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../../pom.xml diff --git a/components/mediation/mediators/oauth-mediator/org.wso2.micro.integrator.mediator.oauth/pom.xml b/components/mediation/mediators/oauth-mediator/org.wso2.micro.integrator.mediator.oauth/pom.xml index 81d0947c06..2009bf2ad2 100644 --- a/components/mediation/mediators/oauth-mediator/org.wso2.micro.integrator.mediator.oauth/pom.xml +++ b/components/mediation/mediators/oauth-mediator/org.wso2.micro.integrator.mediator.oauth/pom.xml @@ -18,7 +18,7 @@ mediators org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../../pom.xml diff --git a/components/mediation/mediators/pom.xml b/components/mediation/mediators/pom.xml index 59ac91f643..4c2eca448b 100644 --- a/components/mediation/mediators/pom.xml +++ b/components/mediation/mediators/pom.xml @@ -21,7 +21,7 @@ mediation org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/mediation/pom.xml b/components/mediation/pom.xml index 7106440b85..e1b09e5e05 100644 --- a/components/mediation/pom.xml +++ b/components/mediation/pom.xml @@ -21,7 +21,7 @@ mi-component-parent org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/mediation/registry/org.wso2.micro.integrator.registry/pom.xml b/components/mediation/registry/org.wso2.micro.integrator.registry/pom.xml index 518dda038c..20666dc9ee 100644 --- a/components/mediation/registry/org.wso2.micro.integrator.registry/pom.xml +++ b/components/mediation/registry/org.wso2.micro.integrator.registry/pom.xml @@ -21,7 +21,7 @@ registry org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/mediation/registry/pom.xml b/components/mediation/registry/pom.xml index 32ad58347c..c4d8540be5 100644 --- a/components/mediation/registry/pom.xml +++ b/components/mediation/registry/pom.xml @@ -21,7 +21,7 @@ mediation org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/mediation/security/org.wso2.micro.integrator.mediation.security/pom.xml b/components/mediation/security/org.wso2.micro.integrator.mediation.security/pom.xml index b1b8b2d4df..975d584d03 100644 --- a/components/mediation/security/org.wso2.micro.integrator.mediation.security/pom.xml +++ b/components/mediation/security/org.wso2.micro.integrator.mediation.security/pom.xml @@ -21,7 +21,7 @@ org.wso2.ei security - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT 4.0.0 diff --git a/components/mediation/security/pom.xml b/components/mediation/security/pom.xml index 1aec46d0fe..83fed6869e 100644 --- a/components/mediation/security/pom.xml +++ b/components/mediation/security/pom.xml @@ -21,7 +21,7 @@ mediation org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT 4.0.0 diff --git a/components/mediation/startup/mediation-startup/pom.xml b/components/mediation/startup/mediation-startup/pom.xml index e28101052e..f1c45d8b02 100644 --- a/components/mediation/startup/mediation-startup/pom.xml +++ b/components/mediation/startup/mediation-startup/pom.xml @@ -21,7 +21,7 @@ org.wso2.ei startup - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/mediation/startup/pom.xml b/components/mediation/startup/pom.xml index cc09b17595..c8395abe36 100644 --- a/components/mediation/startup/pom.xml +++ b/components/mediation/startup/pom.xml @@ -21,7 +21,7 @@ mediation org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/mediation/tasks/org.wso2.micro.integrator.mediation.ntask/pom.xml b/components/mediation/tasks/org.wso2.micro.integrator.mediation.ntask/pom.xml index a83fbc44fe..1444c7a9f4 100644 --- a/components/mediation/tasks/org.wso2.micro.integrator.mediation.ntask/pom.xml +++ b/components/mediation/tasks/org.wso2.micro.integrator.mediation.ntask/pom.xml @@ -21,7 +21,7 @@ tasks org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/mediation/tasks/org.wso2.micro.integrator.ntask.core/pom.xml b/components/mediation/tasks/org.wso2.micro.integrator.ntask.core/pom.xml index 5f076c79d6..caa1ea1f69 100644 --- a/components/mediation/tasks/org.wso2.micro.integrator.ntask.core/pom.xml +++ b/components/mediation/tasks/org.wso2.micro.integrator.ntask.core/pom.xml @@ -21,7 +21,7 @@ tasks org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/mediation/tasks/pom.xml b/components/mediation/tasks/pom.xml index 0453ce0ecd..103f572b9f 100644 --- a/components/mediation/tasks/pom.xml +++ b/components/mediation/tasks/pom.xml @@ -22,7 +22,7 @@ mediation org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/mediation/transports/org.wso2.micro.integrator.websocket.transport/pom.xml b/components/mediation/transports/org.wso2.micro.integrator.websocket.transport/pom.xml index 3c07ca7f05..5c49872413 100644 --- a/components/mediation/transports/org.wso2.micro.integrator.websocket.transport/pom.xml +++ b/components/mediation/transports/org.wso2.micro.integrator.websocket.transport/pom.xml @@ -21,7 +21,7 @@ org.wso2.ei transports - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/mediation/transports/pom.xml b/components/mediation/transports/pom.xml index ff4e8043fd..b146732d53 100644 --- a/components/mediation/transports/pom.xml +++ b/components/mediation/transports/pom.xml @@ -21,7 +21,7 @@ mediation org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.micro.integrator.bootstrap/pom.xml b/components/org.wso2.micro.integrator.bootstrap/pom.xml index 832ce0bfbe..1a44dd26f9 100644 --- a/components/org.wso2.micro.integrator.bootstrap/pom.xml +++ b/components/org.wso2.micro.integrator.bootstrap/pom.xml @@ -21,7 +21,7 @@ mi-component-parent org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.micro.integrator.coordination/pom.xml b/components/org.wso2.micro.integrator.coordination/pom.xml index f20eaa0e85..50a65e072c 100644 --- a/components/org.wso2.micro.integrator.coordination/pom.xml +++ b/components/org.wso2.micro.integrator.coordination/pom.xml @@ -20,14 +20,14 @@ mi-component-parent org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml 4.0.0 org.wso2.micro.integrator.coordination bundle - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT org.wso2.ei diff --git a/components/org.wso2.micro.integrator.core/pom.xml b/components/org.wso2.micro.integrator.core/pom.xml index 037e10722d..28b06c6eb5 100644 --- a/components/org.wso2.micro.integrator.core/pom.xml +++ b/components/org.wso2.micro.integrator.core/pom.xml @@ -22,7 +22,7 @@ org.wso2.ei mi-component-parent - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.micro.integrator.extensions/org.wso2.micro.integrator.management.apis/pom.xml b/components/org.wso2.micro.integrator.extensions/org.wso2.micro.integrator.management.apis/pom.xml index 5173d84d66..796ec2f9dc 100644 --- a/components/org.wso2.micro.integrator.extensions/org.wso2.micro.integrator.management.apis/pom.xml +++ b/components/org.wso2.micro.integrator.extensions/org.wso2.micro.integrator.management.apis/pom.xml @@ -4,7 +4,7 @@ org.wso2.ei org.wso2.micro.integrator.extensions - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.micro.integrator.extensions/org.wso2.micro.integrator.probes/pom.xml b/components/org.wso2.micro.integrator.extensions/org.wso2.micro.integrator.probes/pom.xml index 286307adf9..4f6b438c97 100644 --- a/components/org.wso2.micro.integrator.extensions/org.wso2.micro.integrator.probes/pom.xml +++ b/components/org.wso2.micro.integrator.extensions/org.wso2.micro.integrator.probes/pom.xml @@ -21,7 +21,7 @@ org.wso2.ei org.wso2.micro.integrator.extensions - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.micro.integrator.extensions/pom.xml b/components/org.wso2.micro.integrator.extensions/pom.xml index fb0db4285d..5423075175 100644 --- a/components/org.wso2.micro.integrator.extensions/pom.xml +++ b/components/org.wso2.micro.integrator.extensions/pom.xml @@ -23,7 +23,7 @@ org.wso2.ei mi-component-parent - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.micro.integrator.initializer/pom.xml b/components/org.wso2.micro.integrator.initializer/pom.xml index 56150bcc78..55c56f25b6 100755 --- a/components/org.wso2.micro.integrator.initializer/pom.xml +++ b/components/org.wso2.micro.integrator.initializer/pom.xml @@ -24,7 +24,7 @@ org.wso2.ei mi-component-parent - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.micro.integrator.log4j2.plugins/pom.xml b/components/org.wso2.micro.integrator.log4j2.plugins/pom.xml index 10a697aab5..517b5a895d 100644 --- a/components/org.wso2.micro.integrator.log4j2.plugins/pom.xml +++ b/components/org.wso2.micro.integrator.log4j2.plugins/pom.xml @@ -21,7 +21,7 @@ org.wso2.ei mi-component-parent - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.micro.integrator.logging.updater/pom.xml b/components/org.wso2.micro.integrator.logging.updater/pom.xml index 8c58da3ea4..bcb41a3603 100644 --- a/components/org.wso2.micro.integrator.logging.updater/pom.xml +++ b/components/org.wso2.micro.integrator.logging.updater/pom.xml @@ -21,7 +21,7 @@ org.wso2.ei mi-component-parent - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.micro.integrator.ndatasource.capp.deployer/pom.xml b/components/org.wso2.micro.integrator.ndatasource.capp.deployer/pom.xml index 5439d19261..9ae38e9def 100644 --- a/components/org.wso2.micro.integrator.ndatasource.capp.deployer/pom.xml +++ b/components/org.wso2.micro.integrator.ndatasource.capp.deployer/pom.xml @@ -21,7 +21,7 @@ org.wso2.ei mi-component-parent - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.micro.integrator.ndatasource.common/pom.xml b/components/org.wso2.micro.integrator.ndatasource.common/pom.xml index 5dc73c3e64..9a1c25c982 100644 --- a/components/org.wso2.micro.integrator.ndatasource.common/pom.xml +++ b/components/org.wso2.micro.integrator.ndatasource.common/pom.xml @@ -21,7 +21,7 @@ org.wso2.ei mi-component-parent - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.micro.integrator.ndatasource.core/pom.xml b/components/org.wso2.micro.integrator.ndatasource.core/pom.xml index 4c96487cb4..5d0e141e5f 100644 --- a/components/org.wso2.micro.integrator.ndatasource.core/pom.xml +++ b/components/org.wso2.micro.integrator.ndatasource.core/pom.xml @@ -19,7 +19,7 @@ org.wso2.ei mi-component-parent - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.micro.integrator.ndatasource.rdbms/pom.xml b/components/org.wso2.micro.integrator.ndatasource.rdbms/pom.xml index 35a65f4a7e..5b369f3f0f 100644 --- a/components/org.wso2.micro.integrator.ndatasource.rdbms/pom.xml +++ b/components/org.wso2.micro.integrator.ndatasource.rdbms/pom.xml @@ -21,7 +21,7 @@ org.wso2.ei mi-component-parent - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.micro.integrator.security/pom.xml b/components/org.wso2.micro.integrator.security/pom.xml index f0176c0e5d..a196f2a3d8 100644 --- a/components/org.wso2.micro.integrator.security/pom.xml +++ b/components/org.wso2.micro.integrator.security/pom.xml @@ -20,7 +20,7 @@ org.wso2.ei mi-component-parent - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.micro.integrator.server/pom.xml b/components/org.wso2.micro.integrator.server/pom.xml index 7df41940ec..df77746ccd 100644 --- a/components/org.wso2.micro.integrator.server/pom.xml +++ b/components/org.wso2.micro.integrator.server/pom.xml @@ -22,7 +22,7 @@ org.wso2.ei mi-component-parent - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/org.wso2.micro.integrator.utils/pom.xml b/components/org.wso2.micro.integrator.utils/pom.xml index 7f0de07457..c245e25e1c 100644 --- a/components/org.wso2.micro.integrator.utils/pom.xml +++ b/components/org.wso2.micro.integrator.utils/pom.xml @@ -19,7 +19,7 @@ org.wso2.ei mi-component-parent - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/components/pom.xml b/components/pom.xml index 4e79757887..8f9f7eaabb 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -22,7 +22,7 @@ org.wso2.ei wso2-micro-integrator-parent - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/distribution/pom.xml b/distribution/pom.xml index c98a375b15..411a80bbf0 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -21,7 +21,7 @@ org.wso2.ei wso2-micro-integrator-parent - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/features/crypto-feature/org.wso2.micro.integrator.crypto.feature/pom.xml b/features/crypto-feature/org.wso2.micro.integrator.crypto.feature/pom.xml index ee8d87b051..7817c6489c 100644 --- a/features/crypto-feature/org.wso2.micro.integrator.crypto.feature/pom.xml +++ b/features/crypto-feature/org.wso2.micro.integrator.crypto.feature/pom.xml @@ -21,7 +21,7 @@ micro-integrator-features org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../../pom.xml diff --git a/features/data-features/data-services-feature/org.wso2.micro.integrator.dataservices.server.feature/pom.xml b/features/data-features/data-services-feature/org.wso2.micro.integrator.dataservices.server.feature/pom.xml index 80063f6e62..906e496f7e 100644 --- a/features/data-features/data-services-feature/org.wso2.micro.integrator.dataservices.server.feature/pom.xml +++ b/features/data-features/data-services-feature/org.wso2.micro.integrator.dataservices.server.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.ei data-services-feature - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/features/data-features/data-services-feature/pom.xml b/features/data-features/data-services-feature/pom.xml index a6e04fa737..d73f25cd47 100644 --- a/features/data-features/data-services-feature/pom.xml +++ b/features/data-features/data-services-feature/pom.xml @@ -22,7 +22,7 @@ org.wso2.ei data-features - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/features/data-features/pom.xml b/features/data-features/pom.xml index e99acc9081..78d0fac8fe 100644 --- a/features/data-features/pom.xml +++ b/features/data-features/pom.xml @@ -21,7 +21,7 @@ micro-integrator-features org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/features/mediation-features/builtin-mediators/org.wso2.micro.integrator.mediators.server.feature/pom.xml b/features/mediation-features/builtin-mediators/org.wso2.micro.integrator.mediators.server.feature/pom.xml index 9d8673499b..179f499a89 100644 --- a/features/mediation-features/builtin-mediators/org.wso2.micro.integrator.mediators.server.feature/pom.xml +++ b/features/mediation-features/builtin-mediators/org.wso2.micro.integrator.mediators.server.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.ei builtin-mediators - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/features/mediation-features/builtin-mediators/pom.xml b/features/mediation-features/builtin-mediators/pom.xml index b988d2485a..8083b0e4d9 100644 --- a/features/mediation-features/builtin-mediators/pom.xml +++ b/features/mediation-features/builtin-mediators/pom.xml @@ -22,7 +22,7 @@ org.wso2.ei mediation-features - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/features/mediation-features/data-publisher-features/org.wso2.micro.integrator.analytics.messageflow.data.publisher.feature/pom.xml b/features/mediation-features/data-publisher-features/org.wso2.micro.integrator.analytics.messageflow.data.publisher.feature/pom.xml index 2604162d08..411119de59 100644 --- a/features/mediation-features/data-publisher-features/org.wso2.micro.integrator.analytics.messageflow.data.publisher.feature/pom.xml +++ b/features/mediation-features/data-publisher-features/org.wso2.micro.integrator.analytics.messageflow.data.publisher.feature/pom.xml @@ -22,7 +22,7 @@ data-publisher-features org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/features/mediation-features/data-publisher-features/org.wso2.micro.integrator.observability.feature/pom.xml b/features/mediation-features/data-publisher-features/org.wso2.micro.integrator.observability.feature/pom.xml index d86b3960cb..bb7e55a1c7 100644 --- a/features/mediation-features/data-publisher-features/org.wso2.micro.integrator.observability.feature/pom.xml +++ b/features/mediation-features/data-publisher-features/org.wso2.micro.integrator.observability.feature/pom.xml @@ -21,7 +21,7 @@ data-publisher-features org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/features/mediation-features/data-publisher-features/pom.xml b/features/mediation-features/data-publisher-features/pom.xml index 7258167c63..79ef4f8d1e 100644 --- a/features/mediation-features/data-publisher-features/pom.xml +++ b/features/mediation-features/data-publisher-features/pom.xml @@ -21,7 +21,7 @@ mediation-features org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/features/mediation-features/dataservice-mediator-feature/org.wso2.micro.integrator.mediator.dataservice/pom.xml b/features/mediation-features/dataservice-mediator-feature/org.wso2.micro.integrator.mediator.dataservice/pom.xml index 0c788efecb..c59c4179bf 100644 --- a/features/mediation-features/dataservice-mediator-feature/org.wso2.micro.integrator.mediator.dataservice/pom.xml +++ b/features/mediation-features/dataservice-mediator-feature/org.wso2.micro.integrator.mediator.dataservice/pom.xml @@ -20,7 +20,7 @@ mediation-features org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../../pom.xml diff --git a/features/mediation-features/entitlement-mediator-feature/org.wso2.micro.integrator.identity.xacml.mediator/pom.xml b/features/mediation-features/entitlement-mediator-feature/org.wso2.micro.integrator.identity.xacml.mediator/pom.xml index 2a1af54e87..5c865654a0 100644 --- a/features/mediation-features/entitlement-mediator-feature/org.wso2.micro.integrator.identity.xacml.mediator/pom.xml +++ b/features/mediation-features/entitlement-mediator-feature/org.wso2.micro.integrator.identity.xacml.mediator/pom.xml @@ -20,7 +20,7 @@ mediation-features org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../../pom.xml diff --git a/features/mediation-features/inbound-endpoint/org.wso2.micro.integrator.inbound.endpoints.server.feature/pom.xml b/features/mediation-features/inbound-endpoint/org.wso2.micro.integrator.inbound.endpoints.server.feature/pom.xml index 3cd44e86e8..8e22c3533a 100644 --- a/features/mediation-features/inbound-endpoint/org.wso2.micro.integrator.inbound.endpoints.server.feature/pom.xml +++ b/features/mediation-features/inbound-endpoint/org.wso2.micro.integrator.inbound.endpoints.server.feature/pom.xml @@ -22,7 +22,7 @@ inbound-endpoint org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/features/mediation-features/inbound-endpoint/pom.xml b/features/mediation-features/inbound-endpoint/pom.xml index 19625648bf..50975f771a 100644 --- a/features/mediation-features/inbound-endpoint/pom.xml +++ b/features/mediation-features/inbound-endpoint/pom.xml @@ -21,7 +21,7 @@ mediation-features org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/features/mediation-features/ntask-feature/pom.xml b/features/mediation-features/ntask-feature/pom.xml index 13f2fd644f..959c45d7aa 100644 --- a/features/mediation-features/ntask-feature/pom.xml +++ b/features/mediation-features/ntask-feature/pom.xml @@ -21,7 +21,7 @@ mediation-features org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/features/mediation-features/pom.xml b/features/mediation-features/pom.xml index e09b63d26c..6d38fe1b47 100644 --- a/features/mediation-features/pom.xml +++ b/features/mediation-features/pom.xml @@ -21,7 +21,7 @@ micro-integrator-features org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/features/mediation-features/security-features/org.wso2.micro.integrator.security.server.feature/pom.xml b/features/mediation-features/security-features/org.wso2.micro.integrator.security.server.feature/pom.xml index 0db9cea038..173d908fb0 100644 --- a/features/mediation-features/security-features/org.wso2.micro.integrator.security.server.feature/pom.xml +++ b/features/mediation-features/security-features/org.wso2.micro.integrator.security.server.feature/pom.xml @@ -21,7 +21,7 @@ org.wso2.ei security-features - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/features/mediation-features/security-features/pom.xml b/features/mediation-features/security-features/pom.xml index e6cb585676..add4a4717b 100644 --- a/features/mediation-features/security-features/pom.xml +++ b/features/mediation-features/security-features/pom.xml @@ -21,7 +21,7 @@ org.wso2.ei mediation-features - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/features/mediation-features/transport-features/org.wso2.micro.integrator.websocket.feature/pom.xml b/features/mediation-features/transport-features/org.wso2.micro.integrator.websocket.feature/pom.xml index 2f2abf0081..4063dc455f 100644 --- a/features/mediation-features/transport-features/org.wso2.micro.integrator.websocket.feature/pom.xml +++ b/features/mediation-features/transport-features/org.wso2.micro.integrator.websocket.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.ei transport-features - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/features/mediation-features/transport-features/pom.xml b/features/mediation-features/transport-features/pom.xml index 65fd33e73b..93697a9c02 100644 --- a/features/mediation-features/transport-features/pom.xml +++ b/features/mediation-features/transport-features/pom.xml @@ -21,7 +21,7 @@ mediation-features org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT 4.0.0 diff --git a/features/org.wso2.micro.integrator.initializer.feature/pom.xml b/features/org.wso2.micro.integrator.initializer.feature/pom.xml index 81946ea1fc..4098e2f2d2 100644 --- a/features/org.wso2.micro.integrator.initializer.feature/pom.xml +++ b/features/org.wso2.micro.integrator.initializer.feature/pom.xml @@ -24,7 +24,7 @@ org.wso2.ei micro-integrator-features - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/features/org.wso2.micro.integrator.logging.updater.feature/pom.xml b/features/org.wso2.micro.integrator.logging.updater.feature/pom.xml index c8c7659742..adca9f84eb 100644 --- a/features/org.wso2.micro.integrator.logging.updater.feature/pom.xml +++ b/features/org.wso2.micro.integrator.logging.updater.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.ei micro-integrator-features - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/features/org.wso2.micro.integrator.ntask.core.feature/pom.xml b/features/org.wso2.micro.integrator.ntask.core.feature/pom.xml index 81944ae1a1..b4ca053a8c 100644 --- a/features/org.wso2.micro.integrator.ntask.core.feature/pom.xml +++ b/features/org.wso2.micro.integrator.ntask.core.feature/pom.xml @@ -23,7 +23,7 @@ org.wso2.ei micro-integrator-features - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/features/org.wso2.micro.integrator.server.feature/pom.xml b/features/org.wso2.micro.integrator.server.feature/pom.xml index 46855f9ed7..502e0d720d 100644 --- a/features/org.wso2.micro.integrator.server.feature/pom.xml +++ b/features/org.wso2.micro.integrator.server.feature/pom.xml @@ -20,7 +20,7 @@ org.wso2.ei micro-integrator-features - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/features/pom.xml b/features/pom.xml index ed4d6e342c..1b7701de8d 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -22,7 +22,7 @@ org.wso2.ei wso2-micro-integrator-parent - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/features/wso2mi-hl7/pom.xml b/features/wso2mi-hl7/pom.xml index e4953ed90a..f81d709ec6 100644 --- a/features/wso2mi-hl7/pom.xml +++ b/features/wso2mi-hl7/pom.xml @@ -21,7 +21,7 @@ micro-integrator-features org.wso2.ei - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT 4.0.0 diff --git a/integration/automation-extensions/pom.xml b/integration/automation-extensions/pom.xml index f4c18501ef..1d7fc44da2 100644 --- a/integration/automation-extensions/pom.xml +++ b/integration/automation-extensions/pom.xml @@ -23,7 +23,7 @@ org.wso2.ei micro-integrator-integration-test - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/integration/dataservice-hosting-tests/pom.xml b/integration/dataservice-hosting-tests/pom.xml index 53e71d7b21..b902e4cb8f 100755 --- a/integration/dataservice-hosting-tests/pom.xml +++ b/integration/dataservice-hosting-tests/pom.xml @@ -22,7 +22,7 @@ org.wso2.ei micro-integrator-integration-test - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/integration/dataservice-hosting-tests/samples/data-services/clients/pom.xml b/integration/dataservice-hosting-tests/samples/data-services/clients/pom.xml index bc5cd14f59..8f1525b1ac 100755 --- a/integration/dataservice-hosting-tests/samples/data-services/clients/pom.xml +++ b/integration/dataservice-hosting-tests/samples/data-services/clients/pom.xml @@ -21,7 +21,7 @@ org.wso2.ei dataservices-samples-parent - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/integration/dataservice-hosting-tests/samples/data-services/pom.xml b/integration/dataservice-hosting-tests/samples/data-services/pom.xml index d8a0f2c12f..00b06d17b8 100755 --- a/integration/dataservice-hosting-tests/samples/data-services/pom.xml +++ b/integration/dataservice-hosting-tests/samples/data-services/pom.xml @@ -20,7 +20,7 @@ org.wso2.ei mi-samples-parent - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/integration/dataservice-hosting-tests/samples/pom.xml b/integration/dataservice-hosting-tests/samples/pom.xml index 0a7f4b11c3..12e4a59f98 100644 --- a/integration/dataservice-hosting-tests/samples/pom.xml +++ b/integration/dataservice-hosting-tests/samples/pom.xml @@ -22,7 +22,7 @@ org.wso2.ei dataservice-integration - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/integration/dataservice-hosting-tests/tests-common/admin-clients/pom.xml b/integration/dataservice-hosting-tests/tests-common/admin-clients/pom.xml index fdcec13e4c..d3073f425c 100644 --- a/integration/dataservice-hosting-tests/tests-common/admin-clients/pom.xml +++ b/integration/dataservice-hosting-tests/tests-common/admin-clients/pom.xml @@ -21,7 +21,7 @@ org.wso2.ei dataservice-integration-tests-common - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/integration/dataservice-hosting-tests/tests-common/integration-test-utils/pom.xml b/integration/dataservice-hosting-tests/tests-common/integration-test-utils/pom.xml index 6d650f17dc..30217d7110 100644 --- a/integration/dataservice-hosting-tests/tests-common/integration-test-utils/pom.xml +++ b/integration/dataservice-hosting-tests/tests-common/integration-test-utils/pom.xml @@ -21,7 +21,7 @@ org.wso2.ei dataservice-integration-tests-common - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/integration/dataservice-hosting-tests/tests-common/pom.xml b/integration/dataservice-hosting-tests/tests-common/pom.xml index 76a9dcecfd..a202590487 100644 --- a/integration/dataservice-hosting-tests/tests-common/pom.xml +++ b/integration/dataservice-hosting-tests/tests-common/pom.xml @@ -20,7 +20,7 @@ org.wso2.ei dataservice-integration - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/integration/dataservice-hosting-tests/tests-integration/pom.xml b/integration/dataservice-hosting-tests/tests-integration/pom.xml index b32dd14b3b..ae3adb7777 100644 --- a/integration/dataservice-hosting-tests/tests-integration/pom.xml +++ b/integration/dataservice-hosting-tests/tests-integration/pom.xml @@ -20,7 +20,7 @@ org.wso2.ei dataservice-integration - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/integration/dataservice-hosting-tests/tests-integration/tests/pom.xml b/integration/dataservice-hosting-tests/tests-integration/tests/pom.xml index cf30ba11d1..fe23e4dfd6 100644 --- a/integration/dataservice-hosting-tests/tests-integration/tests/pom.xml +++ b/integration/dataservice-hosting-tests/tests-integration/tests/pom.xml @@ -21,7 +21,7 @@ org.wso2.ei dataservice-integration-tests - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/integration/management-api-tests/pom.xml b/integration/management-api-tests/pom.xml index 8899308fc5..4113715ef6 100644 --- a/integration/management-api-tests/pom.xml +++ b/integration/management-api-tests/pom.xml @@ -21,7 +21,7 @@ org.wso2.ei micro-integrator-integration-test - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/integration/mediation-tests/coverage-report/pom.xml b/integration/mediation-tests/coverage-report/pom.xml index 7298ac2e8e..f77e6fd99e 100644 --- a/integration/mediation-tests/coverage-report/pom.xml +++ b/integration/mediation-tests/coverage-report/pom.xml @@ -4,7 +4,7 @@ org.wso2.ei mediation-integration - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/integration/mediation-tests/pom.xml b/integration/mediation-tests/pom.xml index 90c7489f19..917145041a 100755 --- a/integration/mediation-tests/pom.xml +++ b/integration/mediation-tests/pom.xml @@ -22,7 +22,7 @@ org.wso2.ei micro-integrator-integration-test - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/integration/mediation-tests/service-samples/pom.xml b/integration/mediation-tests/service-samples/pom.xml index 82f8b58244..5548c7c112 100644 --- a/integration/mediation-tests/service-samples/pom.xml +++ b/integration/mediation-tests/service-samples/pom.xml @@ -4,7 +4,7 @@ org.wso2.ei mediation-integration - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/integration/mediation-tests/tests-http/pom.xml b/integration/mediation-tests/tests-http/pom.xml index 3d28f17abe..1064a56354 100644 --- a/integration/mediation-tests/tests-http/pom.xml +++ b/integration/mediation-tests/tests-http/pom.xml @@ -21,7 +21,7 @@ org.wso2.ei mediation-integration - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/integration/mediation-tests/tests-mediator-1/pom.xml b/integration/mediation-tests/tests-mediator-1/pom.xml index 011c9fd680..929a237385 100644 --- a/integration/mediation-tests/tests-mediator-1/pom.xml +++ b/integration/mediation-tests/tests-mediator-1/pom.xml @@ -21,7 +21,7 @@ org.wso2.ei mediation-integration - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/integration/mediation-tests/tests-mediator-2/pom.xml b/integration/mediation-tests/tests-mediator-2/pom.xml index b3c728e6a1..630120bd26 100644 --- a/integration/mediation-tests/tests-mediator-2/pom.xml +++ b/integration/mediation-tests/tests-mediator-2/pom.xml @@ -4,7 +4,7 @@ org.wso2.ei mediation-integration - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/integration/mediation-tests/tests-other/pom.xml b/integration/mediation-tests/tests-other/pom.xml index 98813da842..18296c04c3 100644 --- a/integration/mediation-tests/tests-other/pom.xml +++ b/integration/mediation-tests/tests-other/pom.xml @@ -4,7 +4,7 @@ org.wso2.ei mediation-integration - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/integration/mediation-tests/tests-patches-with-smb2/pom.xml b/integration/mediation-tests/tests-patches-with-smb2/pom.xml index 6bf367e418..81573eeec3 100644 --- a/integration/mediation-tests/tests-patches-with-smb2/pom.xml +++ b/integration/mediation-tests/tests-patches-with-smb2/pom.xml @@ -4,7 +4,7 @@ org.wso2.ei mediation-integration - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/integration/mediation-tests/tests-patches/pom.xml b/integration/mediation-tests/tests-patches/pom.xml index 784a735ac8..8cef21f449 100644 --- a/integration/mediation-tests/tests-patches/pom.xml +++ b/integration/mediation-tests/tests-patches/pom.xml @@ -4,7 +4,7 @@ org.wso2.ei mediation-integration - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/integration/mediation-tests/tests-platform/pom.xml b/integration/mediation-tests/tests-platform/pom.xml index 49ebf460de..e30198d2f3 100644 --- a/integration/mediation-tests/tests-platform/pom.xml +++ b/integration/mediation-tests/tests-platform/pom.xml @@ -22,7 +22,7 @@ org.wso2.ei mediation-integration - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/integration/mediation-tests/tests-platform/tests-coordination/pom.xml b/integration/mediation-tests/tests-platform/tests-coordination/pom.xml index 27bf436a78..77272c9161 100644 --- a/integration/mediation-tests/tests-platform/tests-coordination/pom.xml +++ b/integration/mediation-tests/tests-platform/tests-coordination/pom.xml @@ -22,7 +22,7 @@ org.wso2.ei mediation-integration - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../../pom.xml diff --git a/integration/mediation-tests/tests-platform/tests-rabbitmq/pom.xml b/integration/mediation-tests/tests-platform/tests-rabbitmq/pom.xml index ef2f503463..2809a29834 100644 --- a/integration/mediation-tests/tests-platform/tests-rabbitmq/pom.xml +++ b/integration/mediation-tests/tests-platform/tests-rabbitmq/pom.xml @@ -22,7 +22,7 @@ org.wso2.ei org.wso2.carbon.ei.tests.platform - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/integration/mediation-tests/tests-platform/tests-transaction/pom.xml b/integration/mediation-tests/tests-platform/tests-transaction/pom.xml index 405387b6ec..1beeadb05a 100644 --- a/integration/mediation-tests/tests-platform/tests-transaction/pom.xml +++ b/integration/mediation-tests/tests-platform/tests-transaction/pom.xml @@ -22,7 +22,7 @@ org.wso2.ei mediation-integration - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../../pom.xml diff --git a/integration/mediation-tests/tests-platform/tests-userstore/pom.xml b/integration/mediation-tests/tests-platform/tests-userstore/pom.xml index f05ab2f352..1794ebcaed 100644 --- a/integration/mediation-tests/tests-platform/tests-userstore/pom.xml +++ b/integration/mediation-tests/tests-platform/tests-userstore/pom.xml @@ -22,7 +22,7 @@ org.wso2.ei mediation-integration - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../../pom.xml diff --git a/integration/mediation-tests/tests-sample/pom.xml b/integration/mediation-tests/tests-sample/pom.xml index 52693e1d41..f7b95f465e 100644 --- a/integration/mediation-tests/tests-sample/pom.xml +++ b/integration/mediation-tests/tests-sample/pom.xml @@ -4,7 +4,7 @@ org.wso2.ei mediation-integration - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/integration/mediation-tests/tests-service/pom.xml b/integration/mediation-tests/tests-service/pom.xml index bdd177c55e..acfb7cea56 100644 --- a/integration/mediation-tests/tests-service/pom.xml +++ b/integration/mediation-tests/tests-service/pom.xml @@ -4,7 +4,7 @@ org.wso2.ei mediation-integration - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/integration/mediation-tests/tests-transport-2/pom.xml b/integration/mediation-tests/tests-transport-2/pom.xml index 3db8fdbda6..0bf1a4de2d 100644 --- a/integration/mediation-tests/tests-transport-2/pom.xml +++ b/integration/mediation-tests/tests-transport-2/pom.xml @@ -22,7 +22,7 @@ org.wso2.ei mediation-integration - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/integration/mediation-tests/tests-transport/pom.xml b/integration/mediation-tests/tests-transport/pom.xml index 1edac05e38..bf35eba37c 100644 --- a/integration/mediation-tests/tests-transport/pom.xml +++ b/integration/mediation-tests/tests-transport/pom.xml @@ -4,7 +4,7 @@ org.wso2.ei mediation-integration - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/integration/pom.xml b/integration/pom.xml index ba17ee36b6..69de98222f 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -22,7 +22,7 @@ org.wso2.ei wso2-micro-integrator-parent - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/integration/samples/product/pom.xml b/integration/samples/product/pom.xml index b410214473..5b0c180582 100755 --- a/integration/samples/product/pom.xml +++ b/integration/samples/product/pom.xml @@ -22,7 +22,7 @@ org.wso2.ei micro-integrator-integration-test - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../../pom.xml diff --git a/integration/tests-common/admin-clients/pom.xml b/integration/tests-common/admin-clients/pom.xml index 4ecd4529ae..859491eb5c 100644 --- a/integration/tests-common/admin-clients/pom.xml +++ b/integration/tests-common/admin-clients/pom.xml @@ -5,7 +5,7 @@ org.wso2.ei integration-test-common - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/integration/tests-common/integration-test-utils/pom.xml b/integration/tests-common/integration-test-utils/pom.xml index b3397cce83..d89a703ca8 100644 --- a/integration/tests-common/integration-test-utils/pom.xml +++ b/integration/tests-common/integration-test-utils/pom.xml @@ -8,7 +8,7 @@ org.wso2.ei integration-test-common - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/integration/tests-common/pom.xml b/integration/tests-common/pom.xml index c786674e20..9d767f963e 100644 --- a/integration/tests-common/pom.xml +++ b/integration/tests-common/pom.xml @@ -4,7 +4,7 @@ org.wso2.ei micro-integrator-integration-test - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/p2-profile/pom.xml b/p2-profile/pom.xml index 9a7f9e383c..89edb8aaec 100644 --- a/p2-profile/pom.xml +++ b/p2-profile/pom.xml @@ -21,7 +21,7 @@ org.wso2.ei wso2-micro-integrator-parent - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 0a87249f76..83c0ef3a5f 100644 --- a/pom.xml +++ b/pom.xml @@ -1104,12 +1104,6 @@ ${mysql.connector.version} test - - com.oracle.database.jdbc - ojdbc8 - ${ojdbc8.version} - test - org.apache.derby.wso2 derby @@ -1268,7 +1262,7 @@ org.wso2.ei org.wso2.micro.integrator.coordination - 4.2.0-SNAPSHOT + 4.3.0-SNAPSHOT @@ -1457,116 +1451,14 @@ ${opencensus.orbit.version} - io.debezium - debezium-embedded - ${debezium.version} - - - io.debezium - debezium-api - ${debezium.version} - - - io.debezium - debezium-connector-mysql - ${debezium.version} - - - io.debezium - debezium-connector-sqlserver - ${debezium.version} - - - io.debezium - debezium-connector-postgres - ${debezium.version} - - - io.debezium - debezium-connector-oracle - ${debezium.version} - - - io.debezium - debezium-core - ${debezium.version} - - - org.slf4j - slf4j-api - - - - - io.debezium - debezium-storage-kafka - ${debezium.version} - - - org.slf4j - slf4j-api - - - - - io.debezium - debezium-storage-file - ${debezium.version} - - - org.slf4j - slf4j-api - - - - - io.debezium - debezium-ddl-parser + org.wso2.orbit.debezium + debezium ${debezium.version} - - - org.slf4j - slf4j-api - - - - - com.github.shyiko - mysql-binlog-connector-java - 0.27.2 - - - org.apache.kafka - kafka-clients - ${kafka.version} - - - org.slf4j - slf4j-api - - - - - org.apache.kafka - connect-runtime - ${kafka.version} - - - org.slf4j - slf4j-api - - - org.apache.kafka - connect-json - ${kafka.version} - - - org.slf4j - slf4j-api - - + com.google.code.gson + gson + ${version.com.google.code.gson} @@ -1663,14 +1555,10 @@ 2.3.0 2.3.1 - - 2.4.1.Final - 21.3.0.0 - - - 3.3.1 + + 2.1.4.Final.wso2v1 - 4.0.0-wso2v40 + 4.0.0-wso2v47 [4.0.0, 4.0.1) 4.7.175 1.1.3