From bca7b226b0db87c90eff75d2735c5bdec1a9c44a Mon Sep 17 00:00:00 2001 From: malakaganga Date: Mon, 7 Oct 2024 10:37:18 +0530 Subject: [PATCH 01/14] Remove JSON Stream when JsonSyntaxException occurs Fixes: https://github.com/wso2/micro-integrator/issues/3596 --- .../synapse/mediators/AbstractListMediator.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.java index ead1f90a90..4ed880fa64 100644 --- a/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.java +++ b/modules/core/src/main/java/org/apache/synapse/mediators/AbstractListMediator.java @@ -32,6 +32,7 @@ import org.apache.synapse.SynapseLog; import org.apache.synapse.aspects.flow.statistics.collectors.RuntimeStatisticCollector; import org.apache.synapse.aspects.flow.statistics.data.artifact.ArtifactHolder; +import org.apache.synapse.commons.json.Constants; import org.apache.synapse.config.SynapsePropertiesLoader; import org.apache.synapse.core.SynapseEnvironment; import org.apache.synapse.core.axis2.Axis2MessageContext; @@ -54,7 +55,11 @@ public abstract class AbstractListMediator extends AbstractMediator implements ListMediator { private static final String MSG_BUILD_FAILURE_EXCEPTION_PATTERN = ".*(Wstx)(.*Exception)" + - "|.*MalformedJsonException|.*(synapse\\.commons\\.staxon\\.core)|.*(com\\.fasterxml\\.jackson\\.core)"; + "|.*MalformedJsonException|.*(synapse\\.commons\\.staxon\\.core)|.*(com\\.fasterxml\\.jackson\\.core)" + + "|.*JsonSyntaxException"; + + private static final String ORG_APACHE_SYNAPSE_COMMONS_JSON_IS_JSON_OBJECT = + "org.apache.synapse.commons.json.JsonInputStream.IsJsonObject"; // Create a Pattern object protected Pattern msgBuildFailureExpattern = Pattern.compile(MSG_BUILD_FAILURE_EXCEPTION_PATTERN); @@ -274,6 +279,13 @@ private void consumeInputOnOmException(MessageContext synCtx) { } catch (AxisFault axisFault) { log.error("Exception while consuming the input stream on Om Exception", axisFault); } + //removing JSONstream from the message Context since it is outdated. + org.apache.axis2.context.MessageContext axis2MessageContext = + ((Axis2MessageContext) synCtx).getAxis2MessageContext(); + axis2MessageContext.removeProperty(Constants.ORG_APACHE_SYNAPSE_COMMONS_JSON_JSON_INPUT_STREAM); + axis2MessageContext.removeProperty(ORG_APACHE_SYNAPSE_COMMONS_JSON_IS_JSON_OBJECT); + //Clearing the buffered input stream when there is an build exception occurred. + axis2MessageContext.setProperty(PassThroughConstants.BUFFERED_INPUT_STREAM, null); SOAPEnvelope soapEnvelope; if (synCtx.isSOAP11()) { soapEnvelope = OMAbstractFactory.getSOAP11Factory().createSOAPEnvelope(); From 04882deb09410e6f2d81c971fd993d548a8c5dea Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 7 Oct 2024 05:47:11 +0000 Subject: [PATCH 02/14] [WSO2 Release] [Jenkins #7148] [Release 4.0.0-wso2v129] prepare release v4.0.0-wso2v129 --- modules/commons/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/coverage-report/pom.xml | 2 +- modules/distribution/pom.xml | 2 +- modules/experimental/pom.xml | 2 +- modules/extensions/pom.xml | 2 +- modules/features/org.apache.synapse.samples.feature/pom.xml | 2 +- .../features/org.apache.synapse.transport.fix.feature/pom.xml | 2 +- .../org.apache.synapse.transport.nhttp.feature/pom.xml | 2 +- .../features/org.apache.synapse.transport.vfs.feature/pom.xml | 2 +- .../org.apache.synapse.transport.vfs.smb.feature/pom.xml | 2 +- .../org.apache.synapse.transport.vfs.smb2.feature/pom.xml | 2 +- modules/features/org.apache.synapse.wso2.feature/pom.xml | 2 +- modules/features/pom.xml | 2 +- modules/handler/pom.xml | 2 +- modules/integration/pom.xml | 4 ++-- modules/migrator/pom.xml | 2 +- modules/packaging/package-archetype/pom.xml | 2 +- modules/packaging/package-skeleton/pom.xml | 2 +- modules/patches/pom.xml | 2 +- modules/samples/pom.xml | 2 +- modules/securevault/pom.xml | 2 +- modules/tasks/pom.xml | 2 +- modules/transports/core/nhttp/pom.xml | 2 +- modules/transports/core/pipe/pom.xml | 2 +- modules/transports/core/vfs/pom.xml | 2 +- modules/transports/optional/fix/pom.xml | 2 +- modules/transports/pom.xml | 2 +- modules/war/pom.xml | 2 +- modules/xar-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- 31 files changed, 33 insertions(+), 33 deletions(-) diff --git a/modules/commons/pom.xml b/modules/commons/pom.xml index 41cda4bf30..62d217f948 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129-SNAPSHOT + 4.0.0-wso2v129 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index d2f55d9eaf..fc636b9573 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129-SNAPSHOT + 4.0.0-wso2v129 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index dada263699..e0be24575c 100644 --- a/modules/coverage-report/pom.xml +++ b/modules/coverage-report/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129-SNAPSHOT + 4.0.0-wso2v129 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 69569ac715..4b90bdf71f 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129-SNAPSHOT + 4.0.0-wso2v129 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index aed9d92b90..09adb0576c 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129-SNAPSHOT + 4.0.0-wso2v129 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 6f28f24d2c..0aef49e963 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129-SNAPSHOT + 4.0.0-wso2v129 ../../pom.xml diff --git a/modules/features/org.apache.synapse.samples.feature/pom.xml b/modules/features/org.apache.synapse.samples.feature/pom.xml index 773b823df0..3d87a9b80e 100644 --- a/modules/features/org.apache.synapse.samples.feature/pom.xml +++ b/modules/features/org.apache.synapse.samples.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v129-SNAPSHOT + 4.0.0-wso2v129 org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.fix.feature/pom.xml b/modules/features/org.apache.synapse.transport.fix.feature/pom.xml index 4c2f58f63f..827178ceee 100644 --- a/modules/features/org.apache.synapse.transport.fix.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.fix.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v129-SNAPSHOT + 4.0.0-wso2v129 org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml b/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml index 7503f5084b..374784c152 100644 --- a/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v129-SNAPSHOT + 4.0.0-wso2v129 org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.vfs.feature/pom.xml b/modules/features/org.apache.synapse.transport.vfs.feature/pom.xml index 79a58a1d3c..a473507630 100644 --- a/modules/features/org.apache.synapse.transport.vfs.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.vfs.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v129-SNAPSHOT + 4.0.0-wso2v129 org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.vfs.smb.feature/pom.xml b/modules/features/org.apache.synapse.transport.vfs.smb.feature/pom.xml index 50371fb128..16fa81b694 100644 --- a/modules/features/org.apache.synapse.transport.vfs.smb.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.vfs.smb.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v129-SNAPSHOT + 4.0.0-wso2v129 org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.vfs.smb2.feature/pom.xml b/modules/features/org.apache.synapse.transport.vfs.smb2.feature/pom.xml index ca5d667aed..6073e7d4cc 100644 --- a/modules/features/org.apache.synapse.transport.vfs.smb2.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.vfs.smb2.feature/pom.xml @@ -20,7 +20,7 @@ synapse-features org.apache.synapse - 4.0.0-wso2v129-SNAPSHOT + 4.0.0-wso2v129 4.0.0 diff --git a/modules/features/org.apache.synapse.wso2.feature/pom.xml b/modules/features/org.apache.synapse.wso2.feature/pom.xml index dfa7eb1911..0cd58a03fc 100644 --- a/modules/features/org.apache.synapse.wso2.feature/pom.xml +++ b/modules/features/org.apache.synapse.wso2.feature/pom.xml @@ -20,7 +20,7 @@ synapse-features org.apache.synapse - 4.0.0-wso2v129-SNAPSHOT + 4.0.0-wso2v129 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index e2874a2064..6c191d4829 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129-SNAPSHOT + 4.0.0-wso2v129 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index e9f7c20cf1..f48d1c58e7 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129-SNAPSHOT + 4.0.0-wso2v129 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index fc1f523e43..5173722ef4 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129-SNAPSHOT + 4.0.0-wso2v129 ../../pom.xml @@ -37,7 +37,7 @@ scm:svn:http://svn.apache.org/repos/asf/synapse/trunk/java/modules/integration scm:svn:https://svn.apache.org/repos/asf/synapse/trunk/java/modules/integration http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration - HEAD + v4.0.0-wso2v129 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 3beb690d49..eae8b4c8b1 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129-SNAPSHOT + 4.0.0-wso2v129 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 9b64780598..6342949589 100644 --- a/modules/packaging/package-archetype/pom.xml +++ b/modules/packaging/package-archetype/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129-SNAPSHOT + 4.0.0-wso2v129 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 8aa2dd207e..b8651a4373 100644 --- a/modules/packaging/package-skeleton/pom.xml +++ b/modules/packaging/package-skeleton/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129-SNAPSHOT + 4.0.0-wso2v129 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 0079c88dee..339950ce5b 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129-SNAPSHOT + 4.0.0-wso2v129 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 3075edb169..7d35caa249 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129-SNAPSHOT + 4.0.0-wso2v129 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index b228015a3f..033d297b18 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129-SNAPSHOT + 4.0.0-wso2v129 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 6c7441e509..60ebd25690 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129-SNAPSHOT + 4.0.0-wso2v129 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 842a67c486..7b722ba09f 100644 --- a/modules/transports/core/nhttp/pom.xml +++ b/modules/transports/core/nhttp/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse synapse-transports - 4.0.0-wso2v129-SNAPSHOT + 4.0.0-wso2v129 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index e6e3a7f9d8..3e248942f1 100644 --- a/modules/transports/core/pipe/pom.xml +++ b/modules/transports/core/pipe/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse synapse-transports - 4.0.0-wso2v129-SNAPSHOT + 4.0.0-wso2v129 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index f43f8cef5a..ec84457854 100644 --- a/modules/transports/core/vfs/pom.xml +++ b/modules/transports/core/vfs/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse synapse-transports - 4.0.0-wso2v129-SNAPSHOT + 4.0.0-wso2v129 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 1af5eaca23..66eace14c3 100644 --- a/modules/transports/optional/fix/pom.xml +++ b/modules/transports/optional/fix/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse synapse-transports - 4.0.0-wso2v129-SNAPSHOT + 4.0.0-wso2v129 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 98f1c1e067..925184ca03 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129-SNAPSHOT + 4.0.0-wso2v129 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index dbb9ec781c..8387823840 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129-SNAPSHOT + 4.0.0-wso2v129 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 51c74efd74..5f39e6f1b9 100644 --- a/modules/xar-maven-plugin/pom.xml +++ b/modules/xar-maven-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129-SNAPSHOT + 4.0.0-wso2v129 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 291099c15c..d05d4039a1 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129-SNAPSHOT + 4.0.0-wso2v129 Apache Synapse Apache Synapse pom @@ -69,7 +69,7 @@ scm:git:https://github.com/wso2/wso2-synapse.git scm:git:https://github.com/wso2/wso2-synapse.git https://github.com/wso2/wso2-synapse.git/ - HEAD + v4.0.0-wso2v129 Apache Software Foundation From b17305adc0413f859284cb150c27ec47bdfdbc7f Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 7 Oct 2024 05:47:13 +0000 Subject: [PATCH 03/14] [WSO2 Release] [Jenkins #7148] [Release 4.0.0-wso2v129] prepare for next development iteration --- modules/commons/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/coverage-report/pom.xml | 2 +- modules/distribution/pom.xml | 2 +- modules/experimental/pom.xml | 2 +- modules/extensions/pom.xml | 2 +- modules/features/org.apache.synapse.samples.feature/pom.xml | 2 +- .../features/org.apache.synapse.transport.fix.feature/pom.xml | 2 +- .../org.apache.synapse.transport.nhttp.feature/pom.xml | 2 +- .../features/org.apache.synapse.transport.vfs.feature/pom.xml | 2 +- .../org.apache.synapse.transport.vfs.smb.feature/pom.xml | 2 +- .../org.apache.synapse.transport.vfs.smb2.feature/pom.xml | 2 +- modules/features/org.apache.synapse.wso2.feature/pom.xml | 2 +- modules/features/pom.xml | 2 +- modules/handler/pom.xml | 2 +- modules/integration/pom.xml | 4 ++-- modules/migrator/pom.xml | 2 +- modules/packaging/package-archetype/pom.xml | 2 +- modules/packaging/package-skeleton/pom.xml | 2 +- modules/patches/pom.xml | 2 +- modules/samples/pom.xml | 2 +- modules/securevault/pom.xml | 2 +- modules/tasks/pom.xml | 2 +- modules/transports/core/nhttp/pom.xml | 2 +- modules/transports/core/pipe/pom.xml | 2 +- modules/transports/core/vfs/pom.xml | 2 +- modules/transports/optional/fix/pom.xml | 2 +- modules/transports/pom.xml | 2 +- modules/war/pom.xml | 2 +- modules/xar-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- 31 files changed, 33 insertions(+), 33 deletions(-) diff --git a/modules/commons/pom.xml b/modules/commons/pom.xml index 62d217f948..9034ab70fd 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129 + 4.0.0-wso2v130-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index fc636b9573..9694f58716 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129 + 4.0.0-wso2v130-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index e0be24575c..686ee31e46 100644 --- a/modules/coverage-report/pom.xml +++ b/modules/coverage-report/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129 + 4.0.0-wso2v130-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 4b90bdf71f..e7d9de4126 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129 + 4.0.0-wso2v130-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 09adb0576c..854bb9b061 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129 + 4.0.0-wso2v130-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 0aef49e963..07402b142f 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129 + 4.0.0-wso2v130-SNAPSHOT ../../pom.xml diff --git a/modules/features/org.apache.synapse.samples.feature/pom.xml b/modules/features/org.apache.synapse.samples.feature/pom.xml index 3d87a9b80e..fe6ff2d285 100644 --- a/modules/features/org.apache.synapse.samples.feature/pom.xml +++ b/modules/features/org.apache.synapse.samples.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v129 + 4.0.0-wso2v130-SNAPSHOT org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.fix.feature/pom.xml b/modules/features/org.apache.synapse.transport.fix.feature/pom.xml index 827178ceee..825af4ba50 100644 --- a/modules/features/org.apache.synapse.transport.fix.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.fix.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v129 + 4.0.0-wso2v130-SNAPSHOT org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml b/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml index 374784c152..c3501b8553 100644 --- a/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v129 + 4.0.0-wso2v130-SNAPSHOT org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.vfs.feature/pom.xml b/modules/features/org.apache.synapse.transport.vfs.feature/pom.xml index a473507630..64f581e066 100644 --- a/modules/features/org.apache.synapse.transport.vfs.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.vfs.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v129 + 4.0.0-wso2v130-SNAPSHOT org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.vfs.smb.feature/pom.xml b/modules/features/org.apache.synapse.transport.vfs.smb.feature/pom.xml index 16fa81b694..6f27fe7c7d 100644 --- a/modules/features/org.apache.synapse.transport.vfs.smb.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.vfs.smb.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v129 + 4.0.0-wso2v130-SNAPSHOT org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.vfs.smb2.feature/pom.xml b/modules/features/org.apache.synapse.transport.vfs.smb2.feature/pom.xml index 6073e7d4cc..1bdc1ba3c9 100644 --- a/modules/features/org.apache.synapse.transport.vfs.smb2.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.vfs.smb2.feature/pom.xml @@ -20,7 +20,7 @@ synapse-features org.apache.synapse - 4.0.0-wso2v129 + 4.0.0-wso2v130-SNAPSHOT 4.0.0 diff --git a/modules/features/org.apache.synapse.wso2.feature/pom.xml b/modules/features/org.apache.synapse.wso2.feature/pom.xml index 0cd58a03fc..df85f9725d 100644 --- a/modules/features/org.apache.synapse.wso2.feature/pom.xml +++ b/modules/features/org.apache.synapse.wso2.feature/pom.xml @@ -20,7 +20,7 @@ synapse-features org.apache.synapse - 4.0.0-wso2v129 + 4.0.0-wso2v130-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 6c191d4829..cb02854fa1 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129 + 4.0.0-wso2v130-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index f48d1c58e7..b876659925 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129 + 4.0.0-wso2v130-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 5173722ef4..af97fe0fea 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129 + 4.0.0-wso2v130-SNAPSHOT ../../pom.xml @@ -37,7 +37,7 @@ scm:svn:http://svn.apache.org/repos/asf/synapse/trunk/java/modules/integration scm:svn:https://svn.apache.org/repos/asf/synapse/trunk/java/modules/integration http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration - v4.0.0-wso2v129 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index eae8b4c8b1..c9b0b2c217 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129 + 4.0.0-wso2v130-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 6342949589..bd8f9c72a6 100644 --- a/modules/packaging/package-archetype/pom.xml +++ b/modules/packaging/package-archetype/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129 + 4.0.0-wso2v130-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index b8651a4373..d279b43394 100644 --- a/modules/packaging/package-skeleton/pom.xml +++ b/modules/packaging/package-skeleton/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129 + 4.0.0-wso2v130-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 339950ce5b..4487b09412 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129 + 4.0.0-wso2v130-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 7d35caa249..7dbfda165b 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129 + 4.0.0-wso2v130-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 033d297b18..78db618335 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129 + 4.0.0-wso2v130-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 60ebd25690..f6a0725285 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129 + 4.0.0-wso2v130-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 7b722ba09f..66844f91b4 100644 --- a/modules/transports/core/nhttp/pom.xml +++ b/modules/transports/core/nhttp/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse synapse-transports - 4.0.0-wso2v129 + 4.0.0-wso2v130-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 3e248942f1..4872deffa0 100644 --- a/modules/transports/core/pipe/pom.xml +++ b/modules/transports/core/pipe/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse synapse-transports - 4.0.0-wso2v129 + 4.0.0-wso2v130-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index ec84457854..09687ff236 100644 --- a/modules/transports/core/vfs/pom.xml +++ b/modules/transports/core/vfs/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse synapse-transports - 4.0.0-wso2v129 + 4.0.0-wso2v130-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 66eace14c3..fa0402e7e1 100644 --- a/modules/transports/optional/fix/pom.xml +++ b/modules/transports/optional/fix/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse synapse-transports - 4.0.0-wso2v129 + 4.0.0-wso2v130-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 925184ca03..accbf6112a 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129 + 4.0.0-wso2v130-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 8387823840..74b13d2bb7 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129 + 4.0.0-wso2v130-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 5f39e6f1b9..4eb22f7b35 100644 --- a/modules/xar-maven-plugin/pom.xml +++ b/modules/xar-maven-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129 + 4.0.0-wso2v130-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index d05d4039a1..fff9d6a5a0 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v129 + 4.0.0-wso2v130-SNAPSHOT Apache Synapse Apache Synapse pom @@ -69,7 +69,7 @@ scm:git:https://github.com/wso2/wso2-synapse.git scm:git:https://github.com/wso2/wso2-synapse.git https://github.com/wso2/wso2-synapse.git/ - v4.0.0-wso2v129 + HEAD Apache Software Foundation From 026ce8ba17f7085ee784f53cf0422b010fab3e11 Mon Sep 17 00:00:00 2001 From: Bhashinee Date: Wed, 9 Oct 2024 13:36:26 +0530 Subject: [PATCH 04/14] Change the log level error to warn for the un-deploy errors where user is not required to do anything --- .../org/apache/synapse/deployers/LibraryArtifactDeployer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/synapse/deployers/LibraryArtifactDeployer.java b/modules/core/src/main/java/org/apache/synapse/deployers/LibraryArtifactDeployer.java index f1441da6fe..cdc0208fde 100644 --- a/modules/core/src/main/java/org/apache/synapse/deployers/LibraryArtifactDeployer.java +++ b/modules/core/src/main/java/org/apache/synapse/deployers/LibraryArtifactDeployer.java @@ -205,7 +205,7 @@ public void undeploy(String fileName) throws DeploymentException { } else { String msg = "Artifact representing the filename " + fileName + " is not deployed on Synapse"; - log.error(msg); + log.warn(msg); throw new DeploymentException(msg); } From b5622a6f8ba09340165130c8b8e875b887daf789 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 11 Oct 2024 06:42:42 +0000 Subject: [PATCH 05/14] [WSO2 Release] [Jenkins #7154] [Release 4.0.0-wso2v130] prepare release v4.0.0-wso2v130 --- modules/commons/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/coverage-report/pom.xml | 2 +- modules/distribution/pom.xml | 2 +- modules/experimental/pom.xml | 2 +- modules/extensions/pom.xml | 2 +- modules/features/org.apache.synapse.samples.feature/pom.xml | 2 +- .../features/org.apache.synapse.transport.fix.feature/pom.xml | 2 +- .../org.apache.synapse.transport.nhttp.feature/pom.xml | 2 +- .../features/org.apache.synapse.transport.vfs.feature/pom.xml | 2 +- .../org.apache.synapse.transport.vfs.smb.feature/pom.xml | 2 +- .../org.apache.synapse.transport.vfs.smb2.feature/pom.xml | 2 +- modules/features/org.apache.synapse.wso2.feature/pom.xml | 2 +- modules/features/pom.xml | 2 +- modules/handler/pom.xml | 2 +- modules/integration/pom.xml | 4 ++-- modules/migrator/pom.xml | 2 +- modules/packaging/package-archetype/pom.xml | 2 +- modules/packaging/package-skeleton/pom.xml | 2 +- modules/patches/pom.xml | 2 +- modules/samples/pom.xml | 2 +- modules/securevault/pom.xml | 2 +- modules/tasks/pom.xml | 2 +- modules/transports/core/nhttp/pom.xml | 2 +- modules/transports/core/pipe/pom.xml | 2 +- modules/transports/core/vfs/pom.xml | 2 +- modules/transports/optional/fix/pom.xml | 2 +- modules/transports/pom.xml | 2 +- modules/war/pom.xml | 2 +- modules/xar-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- 31 files changed, 33 insertions(+), 33 deletions(-) diff --git a/modules/commons/pom.xml b/modules/commons/pom.xml index 9034ab70fd..81c1ef8855 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130-SNAPSHOT + 4.0.0-wso2v130 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 9694f58716..afeed3f040 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130-SNAPSHOT + 4.0.0-wso2v130 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 686ee31e46..db8224b5a7 100644 --- a/modules/coverage-report/pom.xml +++ b/modules/coverage-report/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130-SNAPSHOT + 4.0.0-wso2v130 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index e7d9de4126..e04bc3c9eb 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130-SNAPSHOT + 4.0.0-wso2v130 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 854bb9b061..0761e5b18f 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130-SNAPSHOT + 4.0.0-wso2v130 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 07402b142f..2057db9e27 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130-SNAPSHOT + 4.0.0-wso2v130 ../../pom.xml diff --git a/modules/features/org.apache.synapse.samples.feature/pom.xml b/modules/features/org.apache.synapse.samples.feature/pom.xml index fe6ff2d285..e17ea7813b 100644 --- a/modules/features/org.apache.synapse.samples.feature/pom.xml +++ b/modules/features/org.apache.synapse.samples.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v130-SNAPSHOT + 4.0.0-wso2v130 org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.fix.feature/pom.xml b/modules/features/org.apache.synapse.transport.fix.feature/pom.xml index 825af4ba50..bbe6030047 100644 --- a/modules/features/org.apache.synapse.transport.fix.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.fix.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v130-SNAPSHOT + 4.0.0-wso2v130 org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml b/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml index c3501b8553..bdd57c77f2 100644 --- a/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v130-SNAPSHOT + 4.0.0-wso2v130 org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.vfs.feature/pom.xml b/modules/features/org.apache.synapse.transport.vfs.feature/pom.xml index 64f581e066..a3053f171d 100644 --- a/modules/features/org.apache.synapse.transport.vfs.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.vfs.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v130-SNAPSHOT + 4.0.0-wso2v130 org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.vfs.smb.feature/pom.xml b/modules/features/org.apache.synapse.transport.vfs.smb.feature/pom.xml index 6f27fe7c7d..a9cb01afb0 100644 --- a/modules/features/org.apache.synapse.transport.vfs.smb.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.vfs.smb.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v130-SNAPSHOT + 4.0.0-wso2v130 org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.vfs.smb2.feature/pom.xml b/modules/features/org.apache.synapse.transport.vfs.smb2.feature/pom.xml index 1bdc1ba3c9..9546d30b01 100644 --- a/modules/features/org.apache.synapse.transport.vfs.smb2.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.vfs.smb2.feature/pom.xml @@ -20,7 +20,7 @@ synapse-features org.apache.synapse - 4.0.0-wso2v130-SNAPSHOT + 4.0.0-wso2v130 4.0.0 diff --git a/modules/features/org.apache.synapse.wso2.feature/pom.xml b/modules/features/org.apache.synapse.wso2.feature/pom.xml index df85f9725d..c1fd1bcbf0 100644 --- a/modules/features/org.apache.synapse.wso2.feature/pom.xml +++ b/modules/features/org.apache.synapse.wso2.feature/pom.xml @@ -20,7 +20,7 @@ synapse-features org.apache.synapse - 4.0.0-wso2v130-SNAPSHOT + 4.0.0-wso2v130 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index cb02854fa1..b62c500156 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130-SNAPSHOT + 4.0.0-wso2v130 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index b876659925..59df617388 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130-SNAPSHOT + 4.0.0-wso2v130 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index af97fe0fea..1bc8f33996 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130-SNAPSHOT + 4.0.0-wso2v130 ../../pom.xml @@ -37,7 +37,7 @@ scm:svn:http://svn.apache.org/repos/asf/synapse/trunk/java/modules/integration scm:svn:https://svn.apache.org/repos/asf/synapse/trunk/java/modules/integration http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration - HEAD + v4.0.0-wso2v130 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index c9b0b2c217..92f781e710 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130-SNAPSHOT + 4.0.0-wso2v130 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index bd8f9c72a6..cf25b34f14 100644 --- a/modules/packaging/package-archetype/pom.xml +++ b/modules/packaging/package-archetype/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130-SNAPSHOT + 4.0.0-wso2v130 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index d279b43394..303e4cee31 100644 --- a/modules/packaging/package-skeleton/pom.xml +++ b/modules/packaging/package-skeleton/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130-SNAPSHOT + 4.0.0-wso2v130 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 4487b09412..af3788a31d 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130-SNAPSHOT + 4.0.0-wso2v130 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 7dbfda165b..77ee52de3d 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130-SNAPSHOT + 4.0.0-wso2v130 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 78db618335..834deb3486 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130-SNAPSHOT + 4.0.0-wso2v130 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index f6a0725285..d4a4b111e9 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130-SNAPSHOT + 4.0.0-wso2v130 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 66844f91b4..5beb548fc3 100644 --- a/modules/transports/core/nhttp/pom.xml +++ b/modules/transports/core/nhttp/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse synapse-transports - 4.0.0-wso2v130-SNAPSHOT + 4.0.0-wso2v130 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 4872deffa0..e867101113 100644 --- a/modules/transports/core/pipe/pom.xml +++ b/modules/transports/core/pipe/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse synapse-transports - 4.0.0-wso2v130-SNAPSHOT + 4.0.0-wso2v130 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 09687ff236..c4de14245d 100644 --- a/modules/transports/core/vfs/pom.xml +++ b/modules/transports/core/vfs/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse synapse-transports - 4.0.0-wso2v130-SNAPSHOT + 4.0.0-wso2v130 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index fa0402e7e1..a2eaea9f6e 100644 --- a/modules/transports/optional/fix/pom.xml +++ b/modules/transports/optional/fix/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse synapse-transports - 4.0.0-wso2v130-SNAPSHOT + 4.0.0-wso2v130 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index accbf6112a..335fbfd0c5 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130-SNAPSHOT + 4.0.0-wso2v130 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 74b13d2bb7..3e0025bf7d 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130-SNAPSHOT + 4.0.0-wso2v130 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 4eb22f7b35..92cc31cf57 100644 --- a/modules/xar-maven-plugin/pom.xml +++ b/modules/xar-maven-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130-SNAPSHOT + 4.0.0-wso2v130 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index fff9d6a5a0..b4bcd7b516 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130-SNAPSHOT + 4.0.0-wso2v130 Apache Synapse Apache Synapse pom @@ -69,7 +69,7 @@ scm:git:https://github.com/wso2/wso2-synapse.git scm:git:https://github.com/wso2/wso2-synapse.git https://github.com/wso2/wso2-synapse.git/ - HEAD + v4.0.0-wso2v130 Apache Software Foundation From 695642eeea96c12eb2be4ddefc5b1ba9a90cce17 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 11 Oct 2024 06:42:44 +0000 Subject: [PATCH 06/14] [WSO2 Release] [Jenkins #7154] [Release 4.0.0-wso2v130] prepare for next development iteration --- modules/commons/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/coverage-report/pom.xml | 2 +- modules/distribution/pom.xml | 2 +- modules/experimental/pom.xml | 2 +- modules/extensions/pom.xml | 2 +- modules/features/org.apache.synapse.samples.feature/pom.xml | 2 +- .../features/org.apache.synapse.transport.fix.feature/pom.xml | 2 +- .../org.apache.synapse.transport.nhttp.feature/pom.xml | 2 +- .../features/org.apache.synapse.transport.vfs.feature/pom.xml | 2 +- .../org.apache.synapse.transport.vfs.smb.feature/pom.xml | 2 +- .../org.apache.synapse.transport.vfs.smb2.feature/pom.xml | 2 +- modules/features/org.apache.synapse.wso2.feature/pom.xml | 2 +- modules/features/pom.xml | 2 +- modules/handler/pom.xml | 2 +- modules/integration/pom.xml | 4 ++-- modules/migrator/pom.xml | 2 +- modules/packaging/package-archetype/pom.xml | 2 +- modules/packaging/package-skeleton/pom.xml | 2 +- modules/patches/pom.xml | 2 +- modules/samples/pom.xml | 2 +- modules/securevault/pom.xml | 2 +- modules/tasks/pom.xml | 2 +- modules/transports/core/nhttp/pom.xml | 2 +- modules/transports/core/pipe/pom.xml | 2 +- modules/transports/core/vfs/pom.xml | 2 +- modules/transports/optional/fix/pom.xml | 2 +- modules/transports/pom.xml | 2 +- modules/war/pom.xml | 2 +- modules/xar-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- 31 files changed, 33 insertions(+), 33 deletions(-) diff --git a/modules/commons/pom.xml b/modules/commons/pom.xml index 81c1ef8855..e898e85952 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130 + 4.0.0-wso2v131-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index afeed3f040..f9985835e5 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130 + 4.0.0-wso2v131-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index db8224b5a7..f9fd27933d 100644 --- a/modules/coverage-report/pom.xml +++ b/modules/coverage-report/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130 + 4.0.0-wso2v131-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index e04bc3c9eb..f4ca3688b4 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130 + 4.0.0-wso2v131-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 0761e5b18f..43daaa0a78 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130 + 4.0.0-wso2v131-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 2057db9e27..8a796c8b12 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130 + 4.0.0-wso2v131-SNAPSHOT ../../pom.xml diff --git a/modules/features/org.apache.synapse.samples.feature/pom.xml b/modules/features/org.apache.synapse.samples.feature/pom.xml index e17ea7813b..8ee0404661 100644 --- a/modules/features/org.apache.synapse.samples.feature/pom.xml +++ b/modules/features/org.apache.synapse.samples.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v130 + 4.0.0-wso2v131-SNAPSHOT org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.fix.feature/pom.xml b/modules/features/org.apache.synapse.transport.fix.feature/pom.xml index bbe6030047..585bf6bf83 100644 --- a/modules/features/org.apache.synapse.transport.fix.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.fix.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v130 + 4.0.0-wso2v131-SNAPSHOT org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml b/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml index bdd57c77f2..7a1976e62d 100644 --- a/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v130 + 4.0.0-wso2v131-SNAPSHOT org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.vfs.feature/pom.xml b/modules/features/org.apache.synapse.transport.vfs.feature/pom.xml index a3053f171d..24d4863206 100644 --- a/modules/features/org.apache.synapse.transport.vfs.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.vfs.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v130 + 4.0.0-wso2v131-SNAPSHOT org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.vfs.smb.feature/pom.xml b/modules/features/org.apache.synapse.transport.vfs.smb.feature/pom.xml index a9cb01afb0..d1d3594468 100644 --- a/modules/features/org.apache.synapse.transport.vfs.smb.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.vfs.smb.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v130 + 4.0.0-wso2v131-SNAPSHOT org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.vfs.smb2.feature/pom.xml b/modules/features/org.apache.synapse.transport.vfs.smb2.feature/pom.xml index 9546d30b01..f9c527852c 100644 --- a/modules/features/org.apache.synapse.transport.vfs.smb2.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.vfs.smb2.feature/pom.xml @@ -20,7 +20,7 @@ synapse-features org.apache.synapse - 4.0.0-wso2v130 + 4.0.0-wso2v131-SNAPSHOT 4.0.0 diff --git a/modules/features/org.apache.synapse.wso2.feature/pom.xml b/modules/features/org.apache.synapse.wso2.feature/pom.xml index c1fd1bcbf0..898e92de8f 100644 --- a/modules/features/org.apache.synapse.wso2.feature/pom.xml +++ b/modules/features/org.apache.synapse.wso2.feature/pom.xml @@ -20,7 +20,7 @@ synapse-features org.apache.synapse - 4.0.0-wso2v130 + 4.0.0-wso2v131-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index b62c500156..a39a22d914 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130 + 4.0.0-wso2v131-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 59df617388..268669e59d 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130 + 4.0.0-wso2v131-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 1bc8f33996..16eb71905b 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130 + 4.0.0-wso2v131-SNAPSHOT ../../pom.xml @@ -37,7 +37,7 @@ scm:svn:http://svn.apache.org/repos/asf/synapse/trunk/java/modules/integration scm:svn:https://svn.apache.org/repos/asf/synapse/trunk/java/modules/integration http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration - v4.0.0-wso2v130 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 92f781e710..c6652c4140 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130 + 4.0.0-wso2v131-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index cf25b34f14..78e5043550 100644 --- a/modules/packaging/package-archetype/pom.xml +++ b/modules/packaging/package-archetype/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130 + 4.0.0-wso2v131-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 303e4cee31..3b23af7922 100644 --- a/modules/packaging/package-skeleton/pom.xml +++ b/modules/packaging/package-skeleton/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130 + 4.0.0-wso2v131-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index af3788a31d..b9221bd250 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130 + 4.0.0-wso2v131-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 77ee52de3d..e0a3fe218d 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130 + 4.0.0-wso2v131-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 834deb3486..28fbf8a63a 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130 + 4.0.0-wso2v131-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index d4a4b111e9..c852abe6a1 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130 + 4.0.0-wso2v131-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 5beb548fc3..02ae71c3af 100644 --- a/modules/transports/core/nhttp/pom.xml +++ b/modules/transports/core/nhttp/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse synapse-transports - 4.0.0-wso2v130 + 4.0.0-wso2v131-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index e867101113..c26c283930 100644 --- a/modules/transports/core/pipe/pom.xml +++ b/modules/transports/core/pipe/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse synapse-transports - 4.0.0-wso2v130 + 4.0.0-wso2v131-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index c4de14245d..82f84cb7b3 100644 --- a/modules/transports/core/vfs/pom.xml +++ b/modules/transports/core/vfs/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse synapse-transports - 4.0.0-wso2v130 + 4.0.0-wso2v131-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index a2eaea9f6e..2fda9e5bc2 100644 --- a/modules/transports/optional/fix/pom.xml +++ b/modules/transports/optional/fix/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse synapse-transports - 4.0.0-wso2v130 + 4.0.0-wso2v131-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 335fbfd0c5..2c5b7ec8ad 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130 + 4.0.0-wso2v131-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 3e0025bf7d..79bdd5c13f 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130 + 4.0.0-wso2v131-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 92cc31cf57..29101ccbe6 100644 --- a/modules/xar-maven-plugin/pom.xml +++ b/modules/xar-maven-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130 + 4.0.0-wso2v131-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index b4bcd7b516..c71060faa5 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v130 + 4.0.0-wso2v131-SNAPSHOT Apache Synapse Apache Synapse pom @@ -69,7 +69,7 @@ scm:git:https://github.com/wso2/wso2-synapse.git scm:git:https://github.com/wso2/wso2-synapse.git https://github.com/wso2/wso2-synapse.git/ - v4.0.0-wso2v130 + HEAD Apache Software Foundation From 25bbab2373b179815128d467f118b19bd1f879be Mon Sep 17 00:00:00 2001 From: Ashirwada Date: Tue, 15 Oct 2024 12:20:41 +0530 Subject: [PATCH 07/14] Fixing certificate revocation validation not working with JAVA 17 --- .../CertificateVerificationManager.java | 15 ++++++--------- .../http/conn/ClientSSLSetupHandler.java | 2 +- .../http/conn/ServerSSLSetupHandler.java | 2 +- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/CertificateVerificationManager.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/CertificateVerificationManager.java index a1c9a1a831..72aa21cc14 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/CertificateVerificationManager.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/CertificateVerificationManager.java @@ -28,6 +28,7 @@ import org.apache.synapse.transport.certificatevalidation.pathvalidation.CertificatePathValidator; import org.apache.synapse.transport.nhttp.config.TrustStoreHolder; +import java.security.cert.Certificate; import java.io.ByteArrayInputStream; import java.security.InvalidKeyException; import java.security.KeyStore; @@ -93,10 +94,10 @@ public CertificateVerificationManager(Integer cacheAllocatedSize, Integer cacheD * It first tries to verify using OCSP since OCSP verification is faster. If that fails it tries to do the * verification using CRL. * - * @param peerCertificates javax.security.cert.X509Certificate[] array of peer certificate chain from peer/client. + * @param peerCertificates java.security.cert.Certificate[] array of peer certificate chain from peer/client. * @throws CertificateVerificationException */ - public void verifyCertificateValidity(javax.security.cert.X509Certificate[] peerCertificates) + public void verifyCertificateValidity(Certificate[] peerCertificates) throws CertificateVerificationException { X509Certificate[] convertedCertificates = convert(peerCertificates); @@ -154,11 +155,11 @@ public void verifyCertificateValidity(javax.security.cert.X509Certificate[] peer } /** - * @param certs array of javax.security.cert.X509Certificate[] s. + * @param certs array of java.security.cert.Certificate[] s. * @return the converted array of java.security.cert.X509Certificate[] s. * @throws CertificateVerificationException */ - private X509Certificate[] convert(javax.security.cert.X509Certificate[] certs) + private X509Certificate[] convert(Certificate[] certs) throws CertificateVerificationException { X509Certificate[] certChain = new X509Certificate[certs.length]; Throwable exceptionThrown; @@ -170,11 +171,7 @@ private X509Certificate[] convert(javax.security.cert.X509Certificate[] certs) = java.security.cert.CertificateFactory.getInstance("X.509"); certChain[i]=((X509Certificate)cf.generateCertificate(bis)); continue; - } catch (java.security.cert.CertificateEncodingException e) { - exceptionThrown = e; - } catch (javax.security.cert.CertificateEncodingException e) { - exceptionThrown = e; - } catch (java.security.cert.CertificateException e) { + } catch (CertificateException e) { exceptionThrown = e; } throw new CertificateVerificationException("Cant Convert certificates from javax to java", exceptionThrown); diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/conn/ClientSSLSetupHandler.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/conn/ClientSSLSetupHandler.java index caf0c87e73..9b61eea80d 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/conn/ClientSSLSetupHandler.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/conn/ClientSSLSetupHandler.java @@ -183,7 +183,7 @@ public void verify(IOSession iosession, SSLSession sslsession) throws SSLExcepti if (verificationManager!=null) { try { - verificationManager.verifyCertificateValidity(sslsession.getPeerCertificateChain()); + verificationManager.verifyCertificateValidity(sslsession.getPeerCertificates()); } catch (CertificateVerificationException e) { throw new SSLException("Certificate Chain Validation failed for host : " + address, e); } diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/conn/ServerSSLSetupHandler.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/conn/ServerSSLSetupHandler.java index 9898979455..779bf38820 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/conn/ServerSSLSetupHandler.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/conn/ServerSSLSetupHandler.java @@ -77,7 +77,7 @@ public void verify( if (verificationManager != null) { try { - verificationManager.verifyCertificateValidity(sslsession.getPeerCertificateChain()); + verificationManager.verifyCertificateValidity(sslsession.getPeerCertificates()); } catch (CertificateVerificationException e) { SocketAddress remoteAddress = iosession.getRemoteAddress(); String address; From 58e7371fac5ef90d849faa42d22aeadb9a3c1f56 Mon Sep 17 00:00:00 2001 From: DedunuKarunarathne <46235093+DedunuKarunarathne@users.noreply.github.com> Date: Tue, 8 Oct 2024 10:02:10 +0530 Subject: [PATCH 08/14] Handle ConcurrentModificationException in OpenTelemetry Handle ConcurrentModificationException in OpenTelemetry. Fixes: https://github.com/wso2/micro-integrator/issues/3656 --- .../management/handling/span/SpanHandler.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/core/src/main/java/org/apache/synapse/aspects/flow/statistics/tracing/opentelemetry/management/handling/span/SpanHandler.java b/modules/core/src/main/java/org/apache/synapse/aspects/flow/statistics/tracing/opentelemetry/management/handling/span/SpanHandler.java index 70880d6eac..cbf5bf1218 100644 --- a/modules/core/src/main/java/org/apache/synapse/aspects/flow/statistics/tracing/opentelemetry/management/handling/span/SpanHandler.java +++ b/modules/core/src/main/java/org/apache/synapse/aspects/flow/statistics/tracing/opentelemetry/management/handling/span/SpanHandler.java @@ -49,6 +49,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; /** * Controls Jaeger spans, with respect to various events received during Synapse message flow. @@ -203,13 +204,13 @@ private void startSpan(StatisticDataUnit statisticDataUnit, MessageContext synCt Span span; Map tracerSpecificCarrier = new HashMap<>(); - Map headersMap = (Map) ((Axis2MessageContext) synCtx).getAxis2MessageContext() - .getProperty(org.apache.axis2.context.MessageContext.TRANSPORT_HEADERS); + Map headersMap = new ConcurrentHashMap<>((Map) ((Axis2MessageContext) synCtx).getAxis2MessageContext() + .getProperty(org.apache.axis2.context.MessageContext.TRANSPORT_HEADERS)); Object statusCode = ((Axis2MessageContext) synCtx).getAxis2MessageContext().getProperty("HTTP_SC"); Object statusDescription = ((Axis2MessageContext) synCtx).getAxis2MessageContext().getProperty("HTTP_DESC"); // We only need to extract span context from headers when there are trp headers available if (headersMap == null) { - headersMap = new HashMap(); + headersMap = new ConcurrentHashMap(); } if (isOuterLevelSpan(statisticDataUnit, spanStore)) { // Extract span context from headers From fd49dedb1a8ec4e32dae5109abeef6c33461ddc2 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 18 Oct 2024 09:01:02 +0000 Subject: [PATCH 09/14] [WSO2 Release] [Jenkins #7162] [Release 4.0.0-wso2v131] prepare release v4.0.0-wso2v131 --- modules/commons/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/coverage-report/pom.xml | 2 +- modules/distribution/pom.xml | 2 +- modules/experimental/pom.xml | 2 +- modules/extensions/pom.xml | 2 +- modules/features/org.apache.synapse.samples.feature/pom.xml | 2 +- .../features/org.apache.synapse.transport.fix.feature/pom.xml | 2 +- .../org.apache.synapse.transport.nhttp.feature/pom.xml | 2 +- .../features/org.apache.synapse.transport.vfs.feature/pom.xml | 2 +- .../org.apache.synapse.transport.vfs.smb.feature/pom.xml | 2 +- .../org.apache.synapse.transport.vfs.smb2.feature/pom.xml | 2 +- modules/features/org.apache.synapse.wso2.feature/pom.xml | 2 +- modules/features/pom.xml | 2 +- modules/handler/pom.xml | 2 +- modules/integration/pom.xml | 4 ++-- modules/migrator/pom.xml | 2 +- modules/packaging/package-archetype/pom.xml | 2 +- modules/packaging/package-skeleton/pom.xml | 2 +- modules/patches/pom.xml | 2 +- modules/samples/pom.xml | 2 +- modules/securevault/pom.xml | 2 +- modules/tasks/pom.xml | 2 +- modules/transports/core/nhttp/pom.xml | 2 +- modules/transports/core/pipe/pom.xml | 2 +- modules/transports/core/vfs/pom.xml | 2 +- modules/transports/optional/fix/pom.xml | 2 +- modules/transports/pom.xml | 2 +- modules/war/pom.xml | 2 +- modules/xar-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- 31 files changed, 33 insertions(+), 33 deletions(-) diff --git a/modules/commons/pom.xml b/modules/commons/pom.xml index e898e85952..d39f9f4ca6 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131-SNAPSHOT + 4.0.0-wso2v131 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index f9985835e5..86f6ebb2d9 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131-SNAPSHOT + 4.0.0-wso2v131 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index f9fd27933d..51ee93b8ff 100644 --- a/modules/coverage-report/pom.xml +++ b/modules/coverage-report/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131-SNAPSHOT + 4.0.0-wso2v131 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index f4ca3688b4..19af4e6341 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131-SNAPSHOT + 4.0.0-wso2v131 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 43daaa0a78..167944dcf9 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131-SNAPSHOT + 4.0.0-wso2v131 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 8a796c8b12..07131fad6d 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131-SNAPSHOT + 4.0.0-wso2v131 ../../pom.xml diff --git a/modules/features/org.apache.synapse.samples.feature/pom.xml b/modules/features/org.apache.synapse.samples.feature/pom.xml index 8ee0404661..232f99e01a 100644 --- a/modules/features/org.apache.synapse.samples.feature/pom.xml +++ b/modules/features/org.apache.synapse.samples.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v131-SNAPSHOT + 4.0.0-wso2v131 org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.fix.feature/pom.xml b/modules/features/org.apache.synapse.transport.fix.feature/pom.xml index 585bf6bf83..56fa299090 100644 --- a/modules/features/org.apache.synapse.transport.fix.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.fix.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v131-SNAPSHOT + 4.0.0-wso2v131 org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml b/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml index 7a1976e62d..466c6b70b1 100644 --- a/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v131-SNAPSHOT + 4.0.0-wso2v131 org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.vfs.feature/pom.xml b/modules/features/org.apache.synapse.transport.vfs.feature/pom.xml index 24d4863206..c9bf2a9d22 100644 --- a/modules/features/org.apache.synapse.transport.vfs.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.vfs.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v131-SNAPSHOT + 4.0.0-wso2v131 org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.vfs.smb.feature/pom.xml b/modules/features/org.apache.synapse.transport.vfs.smb.feature/pom.xml index d1d3594468..f2c51d5141 100644 --- a/modules/features/org.apache.synapse.transport.vfs.smb.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.vfs.smb.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v131-SNAPSHOT + 4.0.0-wso2v131 org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.vfs.smb2.feature/pom.xml b/modules/features/org.apache.synapse.transport.vfs.smb2.feature/pom.xml index f9c527852c..cc54864d44 100644 --- a/modules/features/org.apache.synapse.transport.vfs.smb2.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.vfs.smb2.feature/pom.xml @@ -20,7 +20,7 @@ synapse-features org.apache.synapse - 4.0.0-wso2v131-SNAPSHOT + 4.0.0-wso2v131 4.0.0 diff --git a/modules/features/org.apache.synapse.wso2.feature/pom.xml b/modules/features/org.apache.synapse.wso2.feature/pom.xml index 898e92de8f..cae90044e4 100644 --- a/modules/features/org.apache.synapse.wso2.feature/pom.xml +++ b/modules/features/org.apache.synapse.wso2.feature/pom.xml @@ -20,7 +20,7 @@ synapse-features org.apache.synapse - 4.0.0-wso2v131-SNAPSHOT + 4.0.0-wso2v131 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index a39a22d914..535e81b7ec 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131-SNAPSHOT + 4.0.0-wso2v131 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 268669e59d..73c65bff9f 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131-SNAPSHOT + 4.0.0-wso2v131 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 16eb71905b..225572347a 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131-SNAPSHOT + 4.0.0-wso2v131 ../../pom.xml @@ -37,7 +37,7 @@ scm:svn:http://svn.apache.org/repos/asf/synapse/trunk/java/modules/integration scm:svn:https://svn.apache.org/repos/asf/synapse/trunk/java/modules/integration http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration - HEAD + v4.0.0-wso2v131 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index c6652c4140..02e9b150c4 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131-SNAPSHOT + 4.0.0-wso2v131 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 78e5043550..d20ee9947e 100644 --- a/modules/packaging/package-archetype/pom.xml +++ b/modules/packaging/package-archetype/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131-SNAPSHOT + 4.0.0-wso2v131 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 3b23af7922..ec75905d11 100644 --- a/modules/packaging/package-skeleton/pom.xml +++ b/modules/packaging/package-skeleton/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131-SNAPSHOT + 4.0.0-wso2v131 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index b9221bd250..58f7145166 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131-SNAPSHOT + 4.0.0-wso2v131 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index e0a3fe218d..1a62c4d822 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131-SNAPSHOT + 4.0.0-wso2v131 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 28fbf8a63a..17de400f80 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131-SNAPSHOT + 4.0.0-wso2v131 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index c852abe6a1..e9674650e7 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131-SNAPSHOT + 4.0.0-wso2v131 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 02ae71c3af..ead25d63d0 100644 --- a/modules/transports/core/nhttp/pom.xml +++ b/modules/transports/core/nhttp/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse synapse-transports - 4.0.0-wso2v131-SNAPSHOT + 4.0.0-wso2v131 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index c26c283930..132aa1ae52 100644 --- a/modules/transports/core/pipe/pom.xml +++ b/modules/transports/core/pipe/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse synapse-transports - 4.0.0-wso2v131-SNAPSHOT + 4.0.0-wso2v131 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 82f84cb7b3..cfcc2f6ed7 100644 --- a/modules/transports/core/vfs/pom.xml +++ b/modules/transports/core/vfs/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse synapse-transports - 4.0.0-wso2v131-SNAPSHOT + 4.0.0-wso2v131 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 2fda9e5bc2..a3e71577a0 100644 --- a/modules/transports/optional/fix/pom.xml +++ b/modules/transports/optional/fix/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse synapse-transports - 4.0.0-wso2v131-SNAPSHOT + 4.0.0-wso2v131 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 2c5b7ec8ad..d6d6450208 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131-SNAPSHOT + 4.0.0-wso2v131 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 79bdd5c13f..3180132b14 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131-SNAPSHOT + 4.0.0-wso2v131 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 29101ccbe6..0fc5f64333 100644 --- a/modules/xar-maven-plugin/pom.xml +++ b/modules/xar-maven-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131-SNAPSHOT + 4.0.0-wso2v131 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index c71060faa5..122913ceef 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131-SNAPSHOT + 4.0.0-wso2v131 Apache Synapse Apache Synapse pom @@ -69,7 +69,7 @@ scm:git:https://github.com/wso2/wso2-synapse.git scm:git:https://github.com/wso2/wso2-synapse.git https://github.com/wso2/wso2-synapse.git/ - HEAD + v4.0.0-wso2v131 Apache Software Foundation From 33e7ad1b6d57fdbba4a8e199e069e80de0acf531 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 18 Oct 2024 09:01:03 +0000 Subject: [PATCH 10/14] [WSO2 Release] [Jenkins #7162] [Release 4.0.0-wso2v131] prepare for next development iteration --- modules/commons/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/coverage-report/pom.xml | 2 +- modules/distribution/pom.xml | 2 +- modules/experimental/pom.xml | 2 +- modules/extensions/pom.xml | 2 +- modules/features/org.apache.synapse.samples.feature/pom.xml | 2 +- .../features/org.apache.synapse.transport.fix.feature/pom.xml | 2 +- .../org.apache.synapse.transport.nhttp.feature/pom.xml | 2 +- .../features/org.apache.synapse.transport.vfs.feature/pom.xml | 2 +- .../org.apache.synapse.transport.vfs.smb.feature/pom.xml | 2 +- .../org.apache.synapse.transport.vfs.smb2.feature/pom.xml | 2 +- modules/features/org.apache.synapse.wso2.feature/pom.xml | 2 +- modules/features/pom.xml | 2 +- modules/handler/pom.xml | 2 +- modules/integration/pom.xml | 4 ++-- modules/migrator/pom.xml | 2 +- modules/packaging/package-archetype/pom.xml | 2 +- modules/packaging/package-skeleton/pom.xml | 2 +- modules/patches/pom.xml | 2 +- modules/samples/pom.xml | 2 +- modules/securevault/pom.xml | 2 +- modules/tasks/pom.xml | 2 +- modules/transports/core/nhttp/pom.xml | 2 +- modules/transports/core/pipe/pom.xml | 2 +- modules/transports/core/vfs/pom.xml | 2 +- modules/transports/optional/fix/pom.xml | 2 +- modules/transports/pom.xml | 2 +- modules/war/pom.xml | 2 +- modules/xar-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- 31 files changed, 33 insertions(+), 33 deletions(-) diff --git a/modules/commons/pom.xml b/modules/commons/pom.xml index d39f9f4ca6..6a5a43740e 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131 + 4.0.0-wso2v132-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 86f6ebb2d9..229fd24aad 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131 + 4.0.0-wso2v132-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 51ee93b8ff..ac39cb3c2d 100644 --- a/modules/coverage-report/pom.xml +++ b/modules/coverage-report/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131 + 4.0.0-wso2v132-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 19af4e6341..e1490d6106 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131 + 4.0.0-wso2v132-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 167944dcf9..d4e32d3028 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131 + 4.0.0-wso2v132-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 07131fad6d..b5abea7ba3 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131 + 4.0.0-wso2v132-SNAPSHOT ../../pom.xml diff --git a/modules/features/org.apache.synapse.samples.feature/pom.xml b/modules/features/org.apache.synapse.samples.feature/pom.xml index 232f99e01a..6b7f34fc9f 100644 --- a/modules/features/org.apache.synapse.samples.feature/pom.xml +++ b/modules/features/org.apache.synapse.samples.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v131 + 4.0.0-wso2v132-SNAPSHOT org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.fix.feature/pom.xml b/modules/features/org.apache.synapse.transport.fix.feature/pom.xml index 56fa299090..e009080df7 100644 --- a/modules/features/org.apache.synapse.transport.fix.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.fix.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v131 + 4.0.0-wso2v132-SNAPSHOT org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml b/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml index 466c6b70b1..ae57b1fd75 100644 --- a/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v131 + 4.0.0-wso2v132-SNAPSHOT org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.vfs.feature/pom.xml b/modules/features/org.apache.synapse.transport.vfs.feature/pom.xml index c9bf2a9d22..9833bbabc6 100644 --- a/modules/features/org.apache.synapse.transport.vfs.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.vfs.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v131 + 4.0.0-wso2v132-SNAPSHOT org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.vfs.smb.feature/pom.xml b/modules/features/org.apache.synapse.transport.vfs.smb.feature/pom.xml index f2c51d5141..47d3b25a52 100644 --- a/modules/features/org.apache.synapse.transport.vfs.smb.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.vfs.smb.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v131 + 4.0.0-wso2v132-SNAPSHOT org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.vfs.smb2.feature/pom.xml b/modules/features/org.apache.synapse.transport.vfs.smb2.feature/pom.xml index cc54864d44..93339ed402 100644 --- a/modules/features/org.apache.synapse.transport.vfs.smb2.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.vfs.smb2.feature/pom.xml @@ -20,7 +20,7 @@ synapse-features org.apache.synapse - 4.0.0-wso2v131 + 4.0.0-wso2v132-SNAPSHOT 4.0.0 diff --git a/modules/features/org.apache.synapse.wso2.feature/pom.xml b/modules/features/org.apache.synapse.wso2.feature/pom.xml index cae90044e4..7bd24b277d 100644 --- a/modules/features/org.apache.synapse.wso2.feature/pom.xml +++ b/modules/features/org.apache.synapse.wso2.feature/pom.xml @@ -20,7 +20,7 @@ synapse-features org.apache.synapse - 4.0.0-wso2v131 + 4.0.0-wso2v132-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 535e81b7ec..e5ebf4959f 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131 + 4.0.0-wso2v132-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 73c65bff9f..54ece8bdc2 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131 + 4.0.0-wso2v132-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 225572347a..ba3229f3d4 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131 + 4.0.0-wso2v132-SNAPSHOT ../../pom.xml @@ -37,7 +37,7 @@ scm:svn:http://svn.apache.org/repos/asf/synapse/trunk/java/modules/integration scm:svn:https://svn.apache.org/repos/asf/synapse/trunk/java/modules/integration http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration - v4.0.0-wso2v131 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 02e9b150c4..a07eed4316 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131 + 4.0.0-wso2v132-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index d20ee9947e..972ccf9955 100644 --- a/modules/packaging/package-archetype/pom.xml +++ b/modules/packaging/package-archetype/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131 + 4.0.0-wso2v132-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index ec75905d11..55a30fd2dc 100644 --- a/modules/packaging/package-skeleton/pom.xml +++ b/modules/packaging/package-skeleton/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131 + 4.0.0-wso2v132-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 58f7145166..e202487890 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131 + 4.0.0-wso2v132-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 1a62c4d822..a9fda8b51b 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131 + 4.0.0-wso2v132-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 17de400f80..6e34aef4bf 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131 + 4.0.0-wso2v132-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index e9674650e7..319c9a5347 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131 + 4.0.0-wso2v132-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index ead25d63d0..9b4d3c2bcd 100644 --- a/modules/transports/core/nhttp/pom.xml +++ b/modules/transports/core/nhttp/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse synapse-transports - 4.0.0-wso2v131 + 4.0.0-wso2v132-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 132aa1ae52..83d65142f7 100644 --- a/modules/transports/core/pipe/pom.xml +++ b/modules/transports/core/pipe/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse synapse-transports - 4.0.0-wso2v131 + 4.0.0-wso2v132-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index cfcc2f6ed7..caa0f4193b 100644 --- a/modules/transports/core/vfs/pom.xml +++ b/modules/transports/core/vfs/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse synapse-transports - 4.0.0-wso2v131 + 4.0.0-wso2v132-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index a3e71577a0..63f381aa74 100644 --- a/modules/transports/optional/fix/pom.xml +++ b/modules/transports/optional/fix/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse synapse-transports - 4.0.0-wso2v131 + 4.0.0-wso2v132-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index d6d6450208..57cf28859d 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131 + 4.0.0-wso2v132-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 3180132b14..6a41755bf2 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131 + 4.0.0-wso2v132-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 0fc5f64333..b763d2d559 100644 --- a/modules/xar-maven-plugin/pom.xml +++ b/modules/xar-maven-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131 + 4.0.0-wso2v132-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 122913ceef..f3da908452 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v131 + 4.0.0-wso2v132-SNAPSHOT Apache Synapse Apache Synapse pom @@ -69,7 +69,7 @@ scm:git:https://github.com/wso2/wso2-synapse.git scm:git:https://github.com/wso2/wso2-synapse.git https://github.com/wso2/wso2-synapse.git/ - v4.0.0-wso2v131 + HEAD Apache Software Foundation From b5df7b1a622d802ba4686ef299fa20ac200794eb Mon Sep 17 00:00:00 2001 From: Sanoj Punchihewa Date: Wed, 23 Oct 2024 13:29:34 +0530 Subject: [PATCH 11/14] Add new variable mediator --- .../org/apache/synapse/MessageContext.java | 23 ++ .../config/xml/AbstractMediatorFactory.java | 2 + .../config/xml/MediatorFactoryFinder.java | 3 +- .../config/xml/MediatorSerializerFinder.java | 3 +- .../config/xml/VariableMediatorFactory.java | 95 ++++++ .../xml/VariableMediatorSerializer.java | 77 +++++ .../core/axis2/Axis2MessageContext.java | 23 ++ .../mediators/v2/VariableMediator.java | 288 ++++++++++++++++++ .../apache/synapse/TestMessageContext.java | 20 ++ .../bsf/CommonScriptMessageContext.java | 30 ++ .../bsf/GraalVMJavaScriptMessageContext.java | 24 ++ .../bsf/NashornJavaScriptMessageContext.java | 25 ++ ...penJDKNashornJavaScriptMessageContext.java | 25 ++ 13 files changed, 636 insertions(+), 2 deletions(-) create mode 100644 modules/core/src/main/java/org/apache/synapse/config/xml/VariableMediatorFactory.java create mode 100644 modules/core/src/main/java/org/apache/synapse/config/xml/VariableMediatorSerializer.java create mode 100644 modules/core/src/main/java/org/apache/synapse/mediators/v2/VariableMediator.java diff --git a/modules/core/src/main/java/org/apache/synapse/MessageContext.java b/modules/core/src/main/java/org/apache/synapse/MessageContext.java index 9b9efb16e0..e44795c222 100644 --- a/modules/core/src/main/java/org/apache/synapse/MessageContext.java +++ b/modules/core/src/main/java/org/apache/synapse/MessageContext.java @@ -457,4 +457,27 @@ public interface MessageContext { * @param tracingState Set whether the message flowtracing is enabled or not */ public void setMessageFlowTracingState(int tracingState); + + /** + * Get the value of a variable on the message instance + * + * @param key key to look up variable + * @return value for the given key + */ + public Object getVariable(String key); + + /** + * Set a variable with the given name on the message instance + * + * @param key key to be used + * @param value value to be saved + */ + public void setVariable(String key, Object value); + + /** + * Returns the Set of keys over the variables on this message context + * + * @return a Set of keys over message variables + */ + public Set getVariableKeySet(); } diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java index 03d5e388c9..aac6c3112e 100644 --- a/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java +++ b/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractMediatorFactory.java @@ -65,6 +65,8 @@ public abstract class AbstractMediatorFactory implements MediatorFactory { = new QName(XMLConfigConstants.STATISTICS_ATTRIB_NAME); protected static final QName PROP_Q = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "property"); + protected static final QName VARIABLE_Q + = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "variable"); protected static final QName PROPERTY_GROUP_Q = new QName(XMLConfigConstants.SYNAPSE_NAMESPACE, "propertyGroup"); protected static final QName FEATURE_Q diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java b/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java index 30e2d902c8..49b3a3ff27 100644 --- a/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java +++ b/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorFactoryFinder.java @@ -102,7 +102,8 @@ public class MediatorFactoryFinder implements XMLToObjectMapper { CommentMediatorFactory.class, ForEachMediatorFactory.class, JSONTransformMediatorFactory.class, - NTLMMediatorFactory.class + NTLMMediatorFactory.class, + VariableMediatorFactory.class }; private final static MediatorFactoryFinder instance = new MediatorFactoryFinder(); diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorSerializerFinder.java b/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorSerializerFinder.java index 95053ff14d..174d90511c 100644 --- a/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorSerializerFinder.java +++ b/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorSerializerFinder.java @@ -76,7 +76,8 @@ public class MediatorSerializerFinder { CommentMediatorSerializer.class, ForEachMediatorSerializer.class, JSONTransformMediatorSerializer.class, - NTLMMediatorSerializer.class + NTLMMediatorSerializer.class, + VariableMediatorSerializer.class }; private final static MediatorSerializerFinder instance = new MediatorSerializerFinder(); diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/VariableMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/VariableMediatorFactory.java new file mode 100644 index 0000000000..4114d4d3b3 --- /dev/null +++ b/modules/core/src/main/java/org/apache/synapse/config/xml/VariableMediatorFactory.java @@ -0,0 +1,95 @@ +/* + * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 LLC. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.synapse.config.xml; + +import org.apache.axiom.om.OMAttribute; +import org.apache.axiom.om.OMElement; +import org.apache.synapse.Mediator; +import org.apache.synapse.SynapseException; +import org.apache.synapse.mediators.v2.VariableMediator; +import org.jaxen.JaxenException; + +import java.util.Properties; +import javax.xml.namespace.QName; + +/** + * Creates a variable mediator through the supplied XML configuration + *

+ * 

+ * <variable name="string" [action=set/remove] (value="literal" | expression="expression") type="string|integer|JSON"/>
+ *
+ */ +public class VariableMediatorFactory extends AbstractMediatorFactory { + + private static final QName ATT_ACTION = new QName("action"); + private static final QName ATT_TYPE = new QName("type"); + + public Mediator createSpecificMediator(OMElement elem, Properties properties) { + + VariableMediator variableMediator = new VariableMediator(); + OMAttribute name = elem.getAttribute(ATT_NAME); + OMAttribute value = elem.getAttribute(ATT_VALUE); + OMAttribute expression = elem.getAttribute(ATT_EXPRN); + OMAttribute action = elem.getAttribute(ATT_ACTION); + OMAttribute type = elem.getAttribute(ATT_TYPE); + + if (name == null || name.getAttributeValue().isEmpty()) { + String msg = "The 'name' attribute is required for the configuration of a variable mediator"; + log.error(msg); + throw new SynapseException(msg); + } else if ((value == null && expression == null) && + !(action != null && "remove".equals(action.getAttributeValue()))) { + String msg = "'value' or 'expression' attributes is required for a variable mediator when action is SET"; + log.error(msg); + throw new SynapseException(msg); + } + variableMediator.setName(name.getAttributeValue()); + + String dataType = null; + if (type != null) { + dataType = type.getAttributeValue(); + } + + if (value != null) { + variableMediator.setValue(value.getAttributeValue(), dataType); + } else if (expression != null) { + try { + variableMediator.setExpression(SynapsePathFactory.getSynapsePath(elem, ATT_EXPRN), + dataType); + } catch (JaxenException e) { + String msg = "Invalid expression for attribute 'expression' : " + + expression.getAttributeValue(); + log.error(msg); + throw new SynapseException(msg); + } + } + + if (action != null && "remove".equals(action.getAttributeValue())) { + variableMediator.setAction(VariableMediator.ACTION_REMOVE); + } + processAuditStatus(variableMediator, elem); + addAllCommentChildrenToList(elem, variableMediator.getCommentsList()); + return variableMediator; + } + + public QName getTagQName() { + + return VARIABLE_Q; + } +} diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/VariableMediatorSerializer.java b/modules/core/src/main/java/org/apache/synapse/config/xml/VariableMediatorSerializer.java new file mode 100644 index 0000000000..2c9bc5ced3 --- /dev/null +++ b/modules/core/src/main/java/org/apache/synapse/config/xml/VariableMediatorSerializer.java @@ -0,0 +1,77 @@ +/* + * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 LLC. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.synapse.config.xml; + +import org.apache.axiom.om.OMElement; +import org.apache.synapse.Mediator; +import org.apache.synapse.mediators.v2.VariableMediator; + +/** + * 
+ * <variable name="string" [action=set/remove] (value="literal" | expression="expression") type="string|integer|JSON"/>
+ *
+ */ +public class VariableMediatorSerializer extends AbstractMediatorSerializer { + + public OMElement serializeSpecificMediator(Mediator m) { + + if (!(m instanceof VariableMediator)) { + handleException("Unsupported mediator passed in for serialization : " + m.getType()); + } + + VariableMediator mediator = (VariableMediator) m; + OMElement variable = fac.createOMElement("variable", synNS); + saveTracingState(variable, mediator); + + if (mediator.getName() != null) { + variable.addAttribute(fac.createOMAttribute( + "name", nullNS, mediator.getName())); + } else { + handleException("Invalid variable mediator. Name is required"); + } + + if (mediator.getValue() != null) { + variable.addAttribute(fac.createOMAttribute( + "value", nullNS, mediator.getValue().toString())); + } else if (mediator.getExpression() != null) { + SynapsePathSerializer.serializePath((SynapsePath) mediator.getExpression(), + variable, "expression"); + } else if (mediator.getAction() == VariableMediator.ACTION_SET) { + handleException("Invalid variable mediator. Value or expression is required if " + + "action is SET"); + } + + if (mediator.getAction() == VariableMediator.ACTION_REMOVE) { + variable.addAttribute(fac.createOMAttribute( + "action", nullNS, "remove")); + } else if (mediator.getType() != null) { + variable.addAttribute(fac.createOMAttribute( + "type", nullNS, mediator.getType())); + } + + serializeComments(variable, mediator.getCommentsList()); + + return variable; + } + + public String getMediatorClassName() { + + return VariableMediator.class.getName(); + } +} diff --git a/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java b/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java index 5bc21ab140..311cd72027 100644 --- a/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java +++ b/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2MessageContext.java @@ -68,6 +68,11 @@ public class Axis2MessageContext implements MessageContext { */ private final Map properties = new HashMap(); + /** + * Synapse Message Context variables + */ + private final Map variables = new HashMap<>(); + /** * Local entries fetched from the configuration or from the registry for the transactional * resource access @@ -725,4 +730,22 @@ public HashMap getAnalyticsMetadata() { //noinspection unchecked return (HashMap) getProperty(SynapseConstants.ANALYTICS_METADATA); } + + @Override + public Object getVariable(String key) { + return variables.get(key); + } + + @Override + public void setVariable(String key, Object value) { + if (value == null) { + return; + } + variables.put(key, value); + } + + @Override + public Set getVariableKeySet() { + return variables.keySet(); + } } diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/v2/VariableMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/v2/VariableMediator.java new file mode 100644 index 0000000000..03f773bd58 --- /dev/null +++ b/modules/core/src/main/java/org/apache/synapse/mediators/v2/VariableMediator.java @@ -0,0 +1,288 @@ +/* + * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 LLC. licenses this file to you under the Apache License, + * Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.synapse.mediators.v2; + +import com.google.gson.JsonElement; +import com.google.gson.JsonParser; +import com.google.gson.JsonSyntaxException; +import org.apache.axiom.om.OMElement; +import org.apache.axis2.util.JavaUtils; +import org.apache.synapse.MessageContext; +import org.apache.synapse.SynapseException; +import org.apache.synapse.SynapseLog; +import org.apache.synapse.aspects.ComponentType; +import org.apache.synapse.aspects.flow.statistics.collectors.CloseEventCollector; +import org.apache.synapse.config.SynapseConfigUtils; +import org.apache.synapse.config.xml.SynapsePath; +import org.apache.synapse.config.xml.XMLConfigConstants; +import org.apache.synapse.mediators.AbstractMediator; + +import java.util.Set; + +/** + * The variable mediator save or remove a named variable in the Synapse Message Context. + */ +public class VariableMediator extends AbstractMediator { + + public static final int ACTION_SET = 0; + public static final int ACTION_REMOVE = 1; + private String name = null; + private SynapsePath expression = null; + private Object value = null; + private String type = null; + private int action = ACTION_SET; + + public boolean mediate(MessageContext synCtx) { + + if (synCtx.getEnvironment().isDebuggerEnabled()) { + if (super.divertMediationRoute(synCtx)) { + return true; + } + } + + SynapseLog synLog = getLog(synCtx); + + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Start : Variable mediator"); + + if (synLog.isTraceTraceEnabled()) { + synLog.traceTrace("Message : " + synCtx.getEnvelope()); + } + } + + String name = this.name; + if (action == ACTION_SET) { + + Object resultValue = getResultValue(synCtx); + + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Setting variable : " + name + " to : " + resultValue); + } + + if (resultValue instanceof OMElement) { + ((OMElement) resultValue).build(); + } + + synCtx.setVariable(name, resultValue); + + } else { + if (synLog.isTraceOrDebugEnabled()) { + synLog.traceOrDebug("Removing variable : " + name); + } + Set variableKeySet = synCtx.getVariableKeySet(); + if (variableKeySet != null) { + variableKeySet.remove(name); + } + } + synLog.traceOrDebug("End : Variable mediator"); + + return true; + } + + public String getName() { + + return name; + } + + public void setName(String name) { + + this.name = name; + } + + public Object getValue() { + + return value; + } + + public void setValue(String value) { + + setValue(value, null); + } + + /** + * Set the value to be set by this variable mediator and the data type to be used when setting the value. + * Accepted type names are defined in XMLConfigConstants.DATA_TYPES enumeration. Passing null as the type + * implies that 'STRING' type should be used. + * + * @param value the value to be set as a string + * @param type the type name + */ + public void setValue(String value, String type) { + + this.type = type; + this.value = convertValue(value, type, false); + } + + public String getType() { + + return type; + } + + public void reportCloseStatistics(MessageContext messageContext, Integer currentIndex) { + + CloseEventCollector + .closeEntryEvent(messageContext, getMediatorName(), ComponentType.MEDIATOR, currentIndex, + isContentAltering()); + } + + public int getAction() { + + return action; + } + + public void setAction(int action) { + + this.action = action; + } + + public SynapsePath getExpression() { + + return expression; + } + + public void setExpression(SynapsePath expression, String type) { + + this.expression = expression; + this.type = type; + } + + private Object getResultValue(MessageContext synCtx) { + + if (value != null) { + return value; + } else { + if (expression != null) { + return convertValue(expression.stringValueOf(synCtx), type, true); + } + } + + return null; + } + + private Object convertValue(String value, String type, boolean isExpression) { + + if (type == null) { + return value; + } + + try { + XMLConfigConstants.DATA_TYPES dataType = XMLConfigConstants.DATA_TYPES.valueOf(type); + switch (dataType) { + case BOOLEAN: + return JavaUtils.isTrueExplicitly(value); + case DOUBLE: + return Double.parseDouble(value); + case FLOAT: + return Float.parseFloat(value); + case INTEGER: + return parseInteger(value, isExpression); + case LONG: + return Long.parseLong(value); + case OM: + return buildOMElement(value); + case SHORT: + return parseShort(value, isExpression); + case JSON: + return buildJSONElement(value); + default: + return value; + } + } catch (IllegalArgumentException e) { + String msg = "Unknown type : " + type + " for the variable mediator or the " + + "variable value cannot be converted into the specified type."; + log.error(msg, e); + throw new SynapseException(msg, e); + } + } + + /** + * This method will explicitly convert decimals to int since XPAth functions return numbers with decimal. + * + * @param value String value returned from XPAth function + * @param isExpression Boolean to check whether the value is from XPAth function + * @return parsed Short value + */ + private int parseInteger(String value, boolean isExpression) { + + if (isExpression && value.contains(".")) { + return (int) Double.parseDouble(value); + } + return Integer.parseInt(value); + } + + /** + * This method will explicitly convert decimals to short since XPAth functions return numbers with decimal. + * + * @param value String value returned from XPAth function + * @param isExpression Boolean to check whether the value is from XPAth function + * @return parsed Short value + */ + private short parseShort(String value, boolean isExpression) { + + if (isExpression && value.contains(".")) { + return (short) Double.parseDouble(value); + } + return Short.parseShort(value); + } + + @Override + public boolean isContentAware() { + + boolean contentAware = false; + if (expression != null) { + contentAware = expression.isContentAware(); + } + return contentAware; + } + + private OMElement buildOMElement(String xml) { + + if (xml == null) { + return null; + } + OMElement result = SynapseConfigUtils.stringToOM(xml); + result.buildWithAttachments(); + return result; + } + + private JsonElement buildJSONElement(String jsonPayload) { + + JsonParser jsonParser = new JsonParser(); + try { + return jsonParser.parse(jsonPayload); + } catch (JsonSyntaxException ex) { + // Enclosing using quotes due to the following issue + // https://github.com/google/gson/issues/1286 + String enclosed = "\"" + jsonPayload + "\""; + try { + return jsonParser.parse(enclosed); + } catch (JsonSyntaxException e) { + // log the original exception and discard the new exception + log.error("Malformed JSON payload : " + jsonPayload, ex); + return null; + } + } + } + + @Override + public String getMediatorName() { + + return super.getMediatorName() + ":" + name; + } +} diff --git a/modules/core/src/test/java/org/apache/synapse/TestMessageContext.java b/modules/core/src/test/java/org/apache/synapse/TestMessageContext.java index 727a062bf2..3f2b944d6b 100644 --- a/modules/core/src/test/java/org/apache/synapse/TestMessageContext.java +++ b/modules/core/src/test/java/org/apache/synapse/TestMessageContext.java @@ -43,6 +43,8 @@ public class TestMessageContext implements MessageContext { private Map properties = new HashMap(); + private Map variables = new HashMap(); + private Map localEntries = new HashMap(); private Stack faultStack = new Stack(); @@ -386,4 +388,22 @@ public void setMessageFlowTracingState(int tracingState){ public int getMessageFlowTracingState(){ return SynapseConstants.TRACING_OFF; } + + @Override + public Object getVariable(String key) { + + return variables.get(key); + } + + @Override + public void setVariable(String key, Object value) { + + variables.put(key, value); + } + + @Override + public Set getVariableKeySet() { + + return variables.keySet(); + } } diff --git a/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/CommonScriptMessageContext.java b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/CommonScriptMessageContext.java index 8853c27d7c..20df76bb26 100644 --- a/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/CommonScriptMessageContext.java +++ b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/CommonScriptMessageContext.java @@ -1090,4 +1090,34 @@ public void setMessageFlowTracingState(int state) { public int getMessageFlowTracingState() { return SynapseConstants.TRACING_OFF; } + + @Override + public Object getVariable(String key) { + + return mc.getVariable(key); + } + + @Override + public void setVariable(String key, Object value) { + + if (value instanceof XMLObject) { + OMElement omElement = null; + try { + omElement = xmlHelper.toOMElement(value); + } catch (ScriptException e) { + mc.setVariable(key, value); + } + if (omElement != null) { + mc.setVariable(key, omElement); + } + } else { + mc.setVariable(key, value); + } + } + + @Override + public Set getVariableKeySet() { + + return mc.getVariableKeySet(); + } } diff --git a/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/GraalVMJavaScriptMessageContext.java b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/GraalVMJavaScriptMessageContext.java index 92b3e57d49..d7b6a0aa15 100644 --- a/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/GraalVMJavaScriptMessageContext.java +++ b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/GraalVMJavaScriptMessageContext.java @@ -920,4 +920,28 @@ public void setMessageFlowTracingState(int state) { mc.setMessageFlowTracingState(state); } + @Override + public Object getVariable(String key) { + + return mc.getVariable(key); + } + + @Override + public void setVariable(String key, Object value) { + + try { + OMElement omElement = xmlHelper.toOMElement(value); + mc.setVariable(key, omElement); + } catch (ScriptException e) { + // Try to convert the value into OMElement if it fails it means value is not a representation of xml so + // set as key value pair + mc.setVariable(key, value); + } + } + + @Override + public Set getVariableKeySet() { + + return mc.getVariableKeySet(); + } } diff --git a/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/NashornJavaScriptMessageContext.java b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/NashornJavaScriptMessageContext.java index 7141bc3437..9f7029545f 100644 --- a/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/NashornJavaScriptMessageContext.java +++ b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/NashornJavaScriptMessageContext.java @@ -915,5 +915,30 @@ public void setMessageFlowTracingState(int state) { public int getMessageFlowTracingState() { return SynapseConstants.TRACING_OFF; } + + @Override + public Object getVariable(String key) { + + return mc.getVariable(key); + } + + @Override + public void setVariable(String key, Object value) { + + try { + OMElement omElement = xmlHelper.toOMElement(value); + mc.setVariable(key, omElement); + } catch (ScriptException e) { + // Try to convert the value into OMElement if it fails it means value is not a representation of xml so + // set as key value pair + mc.setVariable(key, value); + } + } + + @Override + public Set getVariableKeySet() { + + return mc.getVariableKeySet(); + } } diff --git a/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/OpenJDKNashornJavaScriptMessageContext.java b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/OpenJDKNashornJavaScriptMessageContext.java index a63a36bf77..2c1392fcd6 100644 --- a/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/OpenJDKNashornJavaScriptMessageContext.java +++ b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/OpenJDKNashornJavaScriptMessageContext.java @@ -902,4 +902,29 @@ public int getMessageFlowTracingState() { public void setMessageFlowTracingState(int state) { mc.setMessageFlowTracingState(state); } + + @Override + public Object getVariable(String key) { + + return mc.getVariable(key); + } + + @Override + public void setVariable(String key, Object value) { + + try { + OMElement omElement = xmlHelper.toOMElement(value); + mc.setVariable(key, omElement); + } catch (ScriptException e) { + // Try to convert the value into OMElement if it fails it means value is not a representation of xml so + // set as key value pair + mc.setVariable(key, value); + } + } + + @Override + public Set getVariableKeySet() { + + return mc.getVariableKeySet(); + } } From 2fe8f8051e0e9d814ad33f25f39ac06563022167 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 5 Nov 2024 05:32:52 +0000 Subject: [PATCH 12/14] [WSO2 Release] [Jenkins #7182] [Release 4.0.0-wso2v132] prepare release v4.0.0-wso2v132 --- modules/commons/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/coverage-report/pom.xml | 2 +- modules/distribution/pom.xml | 2 +- modules/experimental/pom.xml | 2 +- modules/extensions/pom.xml | 2 +- modules/features/org.apache.synapse.samples.feature/pom.xml | 2 +- .../features/org.apache.synapse.transport.fix.feature/pom.xml | 2 +- .../org.apache.synapse.transport.nhttp.feature/pom.xml | 2 +- .../features/org.apache.synapse.transport.vfs.feature/pom.xml | 2 +- .../org.apache.synapse.transport.vfs.smb.feature/pom.xml | 2 +- .../org.apache.synapse.transport.vfs.smb2.feature/pom.xml | 2 +- modules/features/org.apache.synapse.wso2.feature/pom.xml | 2 +- modules/features/pom.xml | 2 +- modules/handler/pom.xml | 2 +- modules/integration/pom.xml | 4 ++-- modules/migrator/pom.xml | 2 +- modules/packaging/package-archetype/pom.xml | 2 +- modules/packaging/package-skeleton/pom.xml | 2 +- modules/patches/pom.xml | 2 +- modules/samples/pom.xml | 2 +- modules/securevault/pom.xml | 2 +- modules/tasks/pom.xml | 2 +- modules/transports/core/nhttp/pom.xml | 2 +- modules/transports/core/pipe/pom.xml | 2 +- modules/transports/core/vfs/pom.xml | 2 +- modules/transports/optional/fix/pom.xml | 2 +- modules/transports/pom.xml | 2 +- modules/war/pom.xml | 2 +- modules/xar-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- 31 files changed, 33 insertions(+), 33 deletions(-) diff --git a/modules/commons/pom.xml b/modules/commons/pom.xml index 6a5a43740e..fad0821367 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132-SNAPSHOT + 4.0.0-wso2v132 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 229fd24aad..9c296e4a7c 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132-SNAPSHOT + 4.0.0-wso2v132 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index ac39cb3c2d..bc48c75378 100644 --- a/modules/coverage-report/pom.xml +++ b/modules/coverage-report/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132-SNAPSHOT + 4.0.0-wso2v132 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index e1490d6106..bec2020e5f 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132-SNAPSHOT + 4.0.0-wso2v132 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index d4e32d3028..7c5c2564ef 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132-SNAPSHOT + 4.0.0-wso2v132 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index b5abea7ba3..bcffc19aed 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132-SNAPSHOT + 4.0.0-wso2v132 ../../pom.xml diff --git a/modules/features/org.apache.synapse.samples.feature/pom.xml b/modules/features/org.apache.synapse.samples.feature/pom.xml index 6b7f34fc9f..594354a44a 100644 --- a/modules/features/org.apache.synapse.samples.feature/pom.xml +++ b/modules/features/org.apache.synapse.samples.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v132-SNAPSHOT + 4.0.0-wso2v132 org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.fix.feature/pom.xml b/modules/features/org.apache.synapse.transport.fix.feature/pom.xml index e009080df7..8928b85a84 100644 --- a/modules/features/org.apache.synapse.transport.fix.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.fix.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v132-SNAPSHOT + 4.0.0-wso2v132 org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml b/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml index ae57b1fd75..8f7a231664 100644 --- a/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v132-SNAPSHOT + 4.0.0-wso2v132 org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.vfs.feature/pom.xml b/modules/features/org.apache.synapse.transport.vfs.feature/pom.xml index 9833bbabc6..bfe675e4c8 100644 --- a/modules/features/org.apache.synapse.transport.vfs.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.vfs.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v132-SNAPSHOT + 4.0.0-wso2v132 org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.vfs.smb.feature/pom.xml b/modules/features/org.apache.synapse.transport.vfs.smb.feature/pom.xml index 47d3b25a52..de98ddf161 100644 --- a/modules/features/org.apache.synapse.transport.vfs.smb.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.vfs.smb.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v132-SNAPSHOT + 4.0.0-wso2v132 org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.vfs.smb2.feature/pom.xml b/modules/features/org.apache.synapse.transport.vfs.smb2.feature/pom.xml index 93339ed402..93736b5a8a 100644 --- a/modules/features/org.apache.synapse.transport.vfs.smb2.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.vfs.smb2.feature/pom.xml @@ -20,7 +20,7 @@ synapse-features org.apache.synapse - 4.0.0-wso2v132-SNAPSHOT + 4.0.0-wso2v132 4.0.0 diff --git a/modules/features/org.apache.synapse.wso2.feature/pom.xml b/modules/features/org.apache.synapse.wso2.feature/pom.xml index 7bd24b277d..3d42deac88 100644 --- a/modules/features/org.apache.synapse.wso2.feature/pom.xml +++ b/modules/features/org.apache.synapse.wso2.feature/pom.xml @@ -20,7 +20,7 @@ synapse-features org.apache.synapse - 4.0.0-wso2v132-SNAPSHOT + 4.0.0-wso2v132 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index e5ebf4959f..9cc235b1fb 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132-SNAPSHOT + 4.0.0-wso2v132 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 54ece8bdc2..74bea95405 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132-SNAPSHOT + 4.0.0-wso2v132 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index ba3229f3d4..bcb0caae69 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132-SNAPSHOT + 4.0.0-wso2v132 ../../pom.xml @@ -37,7 +37,7 @@ scm:svn:http://svn.apache.org/repos/asf/synapse/trunk/java/modules/integration scm:svn:https://svn.apache.org/repos/asf/synapse/trunk/java/modules/integration http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration - HEAD + v4.0.0-wso2v132 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index a07eed4316..6c5c404bb4 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132-SNAPSHOT + 4.0.0-wso2v132 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 972ccf9955..55956cea9f 100644 --- a/modules/packaging/package-archetype/pom.xml +++ b/modules/packaging/package-archetype/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132-SNAPSHOT + 4.0.0-wso2v132 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 55a30fd2dc..762e001138 100644 --- a/modules/packaging/package-skeleton/pom.xml +++ b/modules/packaging/package-skeleton/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132-SNAPSHOT + 4.0.0-wso2v132 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index e202487890..931cfc7e23 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132-SNAPSHOT + 4.0.0-wso2v132 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index a9fda8b51b..a666f42dae 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132-SNAPSHOT + 4.0.0-wso2v132 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 6e34aef4bf..364a632ac6 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132-SNAPSHOT + 4.0.0-wso2v132 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 319c9a5347..2f3feb88fe 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132-SNAPSHOT + 4.0.0-wso2v132 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 9b4d3c2bcd..0372510860 100644 --- a/modules/transports/core/nhttp/pom.xml +++ b/modules/transports/core/nhttp/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse synapse-transports - 4.0.0-wso2v132-SNAPSHOT + 4.0.0-wso2v132 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 83d65142f7..4f22c22592 100644 --- a/modules/transports/core/pipe/pom.xml +++ b/modules/transports/core/pipe/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse synapse-transports - 4.0.0-wso2v132-SNAPSHOT + 4.0.0-wso2v132 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index caa0f4193b..6eb6624669 100644 --- a/modules/transports/core/vfs/pom.xml +++ b/modules/transports/core/vfs/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse synapse-transports - 4.0.0-wso2v132-SNAPSHOT + 4.0.0-wso2v132 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 63f381aa74..0c913bfc95 100644 --- a/modules/transports/optional/fix/pom.xml +++ b/modules/transports/optional/fix/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse synapse-transports - 4.0.0-wso2v132-SNAPSHOT + 4.0.0-wso2v132 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 57cf28859d..495853aebd 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132-SNAPSHOT + 4.0.0-wso2v132 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 6a41755bf2..b376ecc558 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132-SNAPSHOT + 4.0.0-wso2v132 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index b763d2d559..e37fbc3baf 100644 --- a/modules/xar-maven-plugin/pom.xml +++ b/modules/xar-maven-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132-SNAPSHOT + 4.0.0-wso2v132 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index f3da908452..1c0d023b37 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132-SNAPSHOT + 4.0.0-wso2v132 Apache Synapse Apache Synapse pom @@ -69,7 +69,7 @@ scm:git:https://github.com/wso2/wso2-synapse.git scm:git:https://github.com/wso2/wso2-synapse.git https://github.com/wso2/wso2-synapse.git/ - HEAD + v4.0.0-wso2v132 Apache Software Foundation From 651cd572d90a945ca145690d8e4726feb7bf1934 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 5 Nov 2024 05:32:53 +0000 Subject: [PATCH 13/14] [WSO2 Release] [Jenkins #7182] [Release 4.0.0-wso2v132] prepare for next development iteration --- modules/commons/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/coverage-report/pom.xml | 2 +- modules/distribution/pom.xml | 2 +- modules/experimental/pom.xml | 2 +- modules/extensions/pom.xml | 2 +- modules/features/org.apache.synapse.samples.feature/pom.xml | 2 +- .../features/org.apache.synapse.transport.fix.feature/pom.xml | 2 +- .../org.apache.synapse.transport.nhttp.feature/pom.xml | 2 +- .../features/org.apache.synapse.transport.vfs.feature/pom.xml | 2 +- .../org.apache.synapse.transport.vfs.smb.feature/pom.xml | 2 +- .../org.apache.synapse.transport.vfs.smb2.feature/pom.xml | 2 +- modules/features/org.apache.synapse.wso2.feature/pom.xml | 2 +- modules/features/pom.xml | 2 +- modules/handler/pom.xml | 2 +- modules/integration/pom.xml | 4 ++-- modules/migrator/pom.xml | 2 +- modules/packaging/package-archetype/pom.xml | 2 +- modules/packaging/package-skeleton/pom.xml | 2 +- modules/patches/pom.xml | 2 +- modules/samples/pom.xml | 2 +- modules/securevault/pom.xml | 2 +- modules/tasks/pom.xml | 2 +- modules/transports/core/nhttp/pom.xml | 2 +- modules/transports/core/pipe/pom.xml | 2 +- modules/transports/core/vfs/pom.xml | 2 +- modules/transports/optional/fix/pom.xml | 2 +- modules/transports/pom.xml | 2 +- modules/war/pom.xml | 2 +- modules/xar-maven-plugin/pom.xml | 2 +- pom.xml | 4 ++-- 31 files changed, 33 insertions(+), 33 deletions(-) diff --git a/modules/commons/pom.xml b/modules/commons/pom.xml index fad0821367..d233298620 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132 + 4.0.0-wso2v133-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 9c296e4a7c..790b1b7618 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132 + 4.0.0-wso2v133-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index bc48c75378..793432ad60 100644 --- a/modules/coverage-report/pom.xml +++ b/modules/coverage-report/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132 + 4.0.0-wso2v133-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index bec2020e5f..011577d8fb 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132 + 4.0.0-wso2v133-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 7c5c2564ef..2557b3c0e8 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132 + 4.0.0-wso2v133-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index bcffc19aed..02f4ca8ef6 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132 + 4.0.0-wso2v133-SNAPSHOT ../../pom.xml diff --git a/modules/features/org.apache.synapse.samples.feature/pom.xml b/modules/features/org.apache.synapse.samples.feature/pom.xml index 594354a44a..b1ea511e8e 100644 --- a/modules/features/org.apache.synapse.samples.feature/pom.xml +++ b/modules/features/org.apache.synapse.samples.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v132 + 4.0.0-wso2v133-SNAPSHOT org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.fix.feature/pom.xml b/modules/features/org.apache.synapse.transport.fix.feature/pom.xml index 8928b85a84..105c0e26f1 100644 --- a/modules/features/org.apache.synapse.transport.fix.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.fix.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v132 + 4.0.0-wso2v133-SNAPSHOT org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml b/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml index 8f7a231664..385e2ca73f 100644 --- a/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v132 + 4.0.0-wso2v133-SNAPSHOT org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.vfs.feature/pom.xml b/modules/features/org.apache.synapse.transport.vfs.feature/pom.xml index bfe675e4c8..ee383d5abc 100644 --- a/modules/features/org.apache.synapse.transport.vfs.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.vfs.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v132 + 4.0.0-wso2v133-SNAPSHOT org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.vfs.smb.feature/pom.xml b/modules/features/org.apache.synapse.transport.vfs.smb.feature/pom.xml index de98ddf161..c18d7fbd41 100644 --- a/modules/features/org.apache.synapse.transport.vfs.smb.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.vfs.smb.feature/pom.xml @@ -19,7 +19,7 @@ synapse-features - 4.0.0-wso2v132 + 4.0.0-wso2v133-SNAPSHOT org.apache.synapse diff --git a/modules/features/org.apache.synapse.transport.vfs.smb2.feature/pom.xml b/modules/features/org.apache.synapse.transport.vfs.smb2.feature/pom.xml index 93736b5a8a..5b6c56f392 100644 --- a/modules/features/org.apache.synapse.transport.vfs.smb2.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.vfs.smb2.feature/pom.xml @@ -20,7 +20,7 @@ synapse-features org.apache.synapse - 4.0.0-wso2v132 + 4.0.0-wso2v133-SNAPSHOT 4.0.0 diff --git a/modules/features/org.apache.synapse.wso2.feature/pom.xml b/modules/features/org.apache.synapse.wso2.feature/pom.xml index 3d42deac88..22940be464 100644 --- a/modules/features/org.apache.synapse.wso2.feature/pom.xml +++ b/modules/features/org.apache.synapse.wso2.feature/pom.xml @@ -20,7 +20,7 @@ synapse-features org.apache.synapse - 4.0.0-wso2v132 + 4.0.0-wso2v133-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 9cc235b1fb..9082cba15b 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132 + 4.0.0-wso2v133-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 74bea95405..dab76e03bc 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132 + 4.0.0-wso2v133-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index bcb0caae69..b7253ae750 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132 + 4.0.0-wso2v133-SNAPSHOT ../../pom.xml @@ -37,7 +37,7 @@ scm:svn:http://svn.apache.org/repos/asf/synapse/trunk/java/modules/integration scm:svn:https://svn.apache.org/repos/asf/synapse/trunk/java/modules/integration http://svn.apache.org/viewvc/synapse/trunk/java/modules/integration - v4.0.0-wso2v132 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 6c5c404bb4..87c4600549 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132 + 4.0.0-wso2v133-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 55956cea9f..0779f52645 100644 --- a/modules/packaging/package-archetype/pom.xml +++ b/modules/packaging/package-archetype/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132 + 4.0.0-wso2v133-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 762e001138..3ad9a542d3 100644 --- a/modules/packaging/package-skeleton/pom.xml +++ b/modules/packaging/package-skeleton/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132 + 4.0.0-wso2v133-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 931cfc7e23..6d7c82b05f 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132 + 4.0.0-wso2v133-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index a666f42dae..8fb659a001 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132 + 4.0.0-wso2v133-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 364a632ac6..72ac05e7e0 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132 + 4.0.0-wso2v133-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 2f3feb88fe..a2893e747c 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132 + 4.0.0-wso2v133-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 0372510860..f7b218caa7 100644 --- a/modules/transports/core/nhttp/pom.xml +++ b/modules/transports/core/nhttp/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse synapse-transports - 4.0.0-wso2v132 + 4.0.0-wso2v133-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 4f22c22592..77874dead7 100644 --- a/modules/transports/core/pipe/pom.xml +++ b/modules/transports/core/pipe/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse synapse-transports - 4.0.0-wso2v132 + 4.0.0-wso2v133-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 6eb6624669..b5f27af751 100644 --- a/modules/transports/core/vfs/pom.xml +++ b/modules/transports/core/vfs/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse synapse-transports - 4.0.0-wso2v132 + 4.0.0-wso2v133-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 0c913bfc95..58186741e2 100644 --- a/modules/transports/optional/fix/pom.xml +++ b/modules/transports/optional/fix/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse synapse-transports - 4.0.0-wso2v132 + 4.0.0-wso2v133-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 495853aebd..fce3004c52 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132 + 4.0.0-wso2v133-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index b376ecc558..6060d8c611 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132 + 4.0.0-wso2v133-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index e37fbc3baf..1d2c443b59 100644 --- a/modules/xar-maven-plugin/pom.xml +++ b/modules/xar-maven-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132 + 4.0.0-wso2v133-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 1c0d023b37..2da5f102b6 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v132 + 4.0.0-wso2v133-SNAPSHOT Apache Synapse Apache Synapse pom @@ -69,7 +69,7 @@ scm:git:https://github.com/wso2/wso2-synapse.git scm:git:https://github.com/wso2/wso2-synapse.git https://github.com/wso2/wso2-synapse.git/ - v4.0.0-wso2v132 + HEAD Apache Software Foundation From b3757b714a1cb4ed40cbdecb8d8cae5c8900f597 Mon Sep 17 00:00:00 2001 From: Sanoj Punchihewa Date: Wed, 6 Nov 2024 07:56:29 +0530 Subject: [PATCH 14/14] Copy variables to cloned messages and callback messages --- .../synapse/core/axis2/SynapseCallbackReceiver.java | 12 +++++++++++- .../java/org/apache/synapse/util/MessageHelper.java | 13 +++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java b/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java index 69fbb3d212..bb9579db7b 100644 --- a/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java +++ b/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseCallbackReceiver.java @@ -576,7 +576,12 @@ private void handleMessage(String messageID ,MessageContext response, synapseInMessageContext.setProperty( (String) key, synapseOutMsgCtx.getProperty((String) key)); } - + + for (Object key : synapseOutMsgCtx.getVariableKeySet()) { + synapseInMessageContext.setVariable( + (String) key, synapseOutMsgCtx.getVariable((String) key)); + } + if(failOver){ //we may required to handle same message for failover cases only other than that //should treat based on the incoming message @@ -615,6 +620,11 @@ private void handleMessage(String messageID ,MessageContext response, (String) key, synapseOutMsgCtx.getProperty((String) key)); } + for (Object key : synapseOutMsgCtx.getVariableKeySet()) { + synapseInMessageContext.setVariable( + (String) key, synapseOutMsgCtx.getVariable((String) key)); + } + if (successfulEndpoint instanceof OAuthConfiguredHTTPEndpoint) { OAuthConfiguredHTTPEndpoint httpEndpoint = (OAuthConfiguredHTTPEndpoint) successfulEndpoint; diff --git a/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java b/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java index 5a64c2233f..9c7530e144 100644 --- a/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java +++ b/modules/core/src/main/java/org/apache/synapse/util/MessageHelper.java @@ -207,6 +207,19 @@ public static MessageContext cloneMessageContext(MessageContext synCtx, boolean } } + // copy all the variables to the newCtx + for (Object o : synCtx.getVariableKeySet()) { + String strkey = (String) o; + Object obj = synCtx.getVariable(strkey); + if (obj instanceof OMElement) { + if (log.isDebugEnabled()) { + log.debug("Deep clone for OMElement"); + } + obj = ((OMElement) obj).cloneOMElement(); + } + newCtx.setVariable(strkey, obj); + } + // Make deep copy of fault stack so that parent will not be lost it's fault stack Stack faultStack = synCtx.getFaultStack(); if (!faultStack.isEmpty()) {