From c27486703e2ee22d4d8247f44916f21be1e569df Mon Sep 17 00:00:00 2001 From: chanikag Date: Mon, 17 Jul 2023 15:50:10 +0530 Subject: [PATCH 001/308] Introduce sequence observers This is to add sequence observers, which gets invoked at the start and end of a sequence execution. Observers can be configured in conf/sequence-observers.xml --- .../apache/synapse/SequenceFlowObserver.java | 40 +++++++ .../org/apache/synapse/SynapseConstants.java | 2 + .../config/SequenceFlowObserversLoader.java | 110 ++++++++++++++++++ .../synapse/core/SynapseEnvironment.java | 15 +++ .../core/axis2/Axis2SynapseEnvironment.java | 24 ++++ .../mediators/AbstractListMediator.java | 16 +++ 6 files changed, 207 insertions(+) create mode 100644 modules/core/src/main/java/org/apache/synapse/SequenceFlowObserver.java create mode 100644 modules/core/src/main/java/org/apache/synapse/config/SequenceFlowObserversLoader.java diff --git a/modules/core/src/main/java/org/apache/synapse/SequenceFlowObserver.java b/modules/core/src/main/java/org/apache/synapse/SequenceFlowObserver.java new file mode 100644 index 0000000000..15e17edd7d --- /dev/null +++ b/modules/core/src/main/java/org/apache/synapse/SequenceFlowObserver.java @@ -0,0 +1,40 @@ +/** + * Copyright (c) 2023, 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; + +public interface SequenceFlowObserver { + + /** + * Set the observer name + * + * @param name handler name + */ + void setName(String name); + + /** + * This method should implement the logic to run at the start of the flow + */ + void start(MessageContext synCtx, String seqName); + + /** + * This method should implement the logic to run at the end of the flow + */ + void complete(MessageContext synCtx, String seqName); + +} diff --git a/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java b/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java index 93f02bf81e..07c061e189 100644 --- a/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java +++ b/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java @@ -171,6 +171,8 @@ public static final class Axis2Param { /** The name of the synapse handlers file */ public static final String SYNAPSE_HANDLER_FILE = "synapse-handlers.xml"; + public static final String SEQUENCE_OBSERVERS_FILE = "sequence-observers.xml"; + /** the name of the property used for synapse library based class loading */ public static final String SYNAPSE_LIB_LOADER = "synapse.lib.classloader"; /** conf directory name **/ diff --git a/modules/core/src/main/java/org/apache/synapse/config/SequenceFlowObserversLoader.java b/modules/core/src/main/java/org/apache/synapse/config/SequenceFlowObserversLoader.java new file mode 100644 index 0000000000..85f775942a --- /dev/null +++ b/modules/core/src/main/java/org/apache/synapse/config/SequenceFlowObserversLoader.java @@ -0,0 +1,110 @@ +/** + * Copyright (c) 2023, 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; + +import org.apache.axiom.om.OMElement; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.synapse.SequenceFlowObserver; +import org.apache.synapse.SynapseConstants; +import org.apache.synapse.SynapseException; +import org.apache.synapse.commons.util.MiscellaneousUtil; + +import javax.xml.namespace.QName; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +public class SequenceFlowObserversLoader { + + private static final QName ROOT_Q = new QName("observers"); + private static final QName OBSERVER_Q = new QName("observer"); + private static final QName CLASS_Q = new QName("class"); + private static final QName NAME_ATT = new QName("name"); + + private static Log log = LogFactory.getLog(SequenceFlowObserversLoader.class); + + public static List loadObservers() { + List handlers = new ArrayList<>(); + OMElement observersConfig = + MiscellaneousUtil.loadXMLConfig(SynapseConstants.SEQUENCE_OBSERVERS_FILE); + if (observersConfig != null) { + + if (!ROOT_Q.equals(observersConfig.getQName())) { + handleException("Invalid handler configuration file"); + } + + Iterator iterator = observersConfig.getChildrenWithName(OBSERVER_Q); + while (iterator.hasNext()) { + OMElement observerElem = (OMElement) iterator.next(); + + String name = null; + if (observerElem.getAttribute(NAME_ATT) != null) { + name = observerElem.getAttributeValue(NAME_ATT); + } else { + handleException("Name not defined in one or more handlers"); + } + + if (observerElem.getAttribute(CLASS_Q) != null) { + String className = observerElem.getAttributeValue(CLASS_Q); + if (!"".equals(className)) { + SequenceFlowObserver observer = createObserver(className); + if (observer != null) { + handlers.add(observer); + observer.setName(name); + } + } else { + handleException("Class name is null for handle name : " + name); + } + } else { + handleException("Class name not defined for handler named : " + name); + } + + } + } + return handlers; + } + + private static SequenceFlowObserver createObserver(String classFQName) { + Object obj = null; + try { + obj = Class.forName(classFQName).newInstance(); + } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) { + handleException("Error creating Handler for class name : " + classFQName, e); + } + + if (obj instanceof SequenceFlowObserver) { + return (SequenceFlowObserver) obj; + } else { + handleException("Error creating Handler. The Handler should be of type " + + "org.apache.synapse.Handler"); + } + return null; + } + + private static void handleException(String msg) { + log.error(msg); + throw new SynapseException(msg); + } + + private static void handleException(String msg, Exception ex) { + log.error(msg, ex); + throw new SynapseException(msg, ex); + } +} diff --git a/modules/core/src/main/java/org/apache/synapse/core/SynapseEnvironment.java b/modules/core/src/main/java/org/apache/synapse/core/SynapseEnvironment.java index e5761fb54c..b2572617a8 100644 --- a/modules/core/src/main/java/org/apache/synapse/core/SynapseEnvironment.java +++ b/modules/core/src/main/java/org/apache/synapse/core/SynapseEnvironment.java @@ -21,6 +21,7 @@ import org.apache.axiom.util.blob.OverflowBlob; import org.apache.synapse.MessageContext; +import org.apache.synapse.SequenceFlowObserver; import org.apache.synapse.ServerContextInformation; import org.apache.synapse.SynapseHandler; import org.apache.synapse.aspects.flow.statistics.store.MessageDataStore; @@ -232,6 +233,20 @@ public interface SynapseEnvironment { */ public void registerSynapseHandler(SynapseHandler handler); + /** + * Get all sequence observers + * + * @return list of sequence observers + */ + public List getSequenceObservers(); + + /** + * Register a sequence observer to the synapse environment + * + * @param observer sequence observer + */ + public void registerSequenceObservers(SequenceFlowObserver observer); + /** * Get the global timeout interval for callbacks * diff --git a/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java b/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java index 00d8dd0ec9..5c63c1efa1 100644 --- a/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java +++ b/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java @@ -33,6 +33,7 @@ import org.apache.synapse.ContinuationState; import org.apache.synapse.Mediator; import org.apache.synapse.MessageContext; +import org.apache.synapse.SequenceFlowObserver; import org.apache.synapse.ServerContextInformation; import org.apache.synapse.SynapseConstants; import org.apache.synapse.SynapseException; @@ -46,6 +47,7 @@ import org.apache.synapse.carbonext.TenantInfoConfigurator; import org.apache.synapse.commons.json.JsonUtil; import org.apache.synapse.commons.util.ext.TenantInfoInitiator; +import org.apache.synapse.config.SequenceFlowObserversLoader; import org.apache.synapse.config.SynapseConfigUtils; import org.apache.synapse.config.SynapseConfiguration; import org.apache.synapse.config.SynapseHandlersLoader; @@ -100,6 +102,7 @@ public class Axis2SynapseEnvironment implements SynapseEnvironment { private SynapseTaskManager taskManager; private RESTRequestHandler restHandler; private List synapseHandlers; + private List sequenceObservers; private long globalTimeout = SynapseConstants.DEFAULT_GLOBAL_TIMEOUT; private SynapseDebugManager synapseDebugManager; @@ -207,6 +210,7 @@ public Axis2SynapseEnvironment(SynapseConfiguration synCfg) { restHandler = new RESTRequestHandler(); synapseHandlers = SynapseHandlersLoader.loadHandlers(); + sequenceObservers = SequenceFlowObserversLoader.loadObservers(); this.globalTimeout = SynapseConfigUtils.getGlobalTimeoutInterval(); @@ -1053,6 +1057,26 @@ public void registerSynapseHandler(SynapseHandler handler) { synapseHandlers.add(handler); } + /** + * Get all sequence observers + * + * @return list of sequence observers + */ + @Override + public List getSequenceObservers() { + return sequenceObservers; + } + + /** + * Register a sequence observer to the synapse environment + * + * @param observer sequence observer + */ + @Override + public void registerSequenceObservers(SequenceFlowObserver observer) { + sequenceObservers.add(observer); + } + @Override public long getGlobalTimeout() { return globalTimeout; 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 9ae14b1951..6eadbbfd24 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 @@ -26,6 +26,7 @@ import org.apache.synapse.ManagedLifecycle; import org.apache.synapse.Mediator; import org.apache.synapse.MessageContext; +import org.apache.synapse.SequenceFlowObserver; import org.apache.synapse.SynapseConstants; import org.apache.synapse.SynapseException; import org.apache.synapse.SynapseLog; @@ -34,6 +35,7 @@ import org.apache.synapse.config.SynapsePropertiesLoader; import org.apache.synapse.core.SynapseEnvironment; import org.apache.synapse.core.axis2.Axis2MessageContext; +import org.apache.synapse.mediators.base.SequenceMediator; import org.apache.synapse.transport.passthru.PassThroughConstants; import org.apache.synapse.transport.passthru.util.RelayUtils; import org.apache.synapse.transport.util.MessageHandlerProvider; @@ -80,6 +82,12 @@ public boolean mediate(MessageContext synCtx, int mediatorPosition) { // to pass it on; else, do nothing -> i.e. let the parents state flow setEffectiveTraceState(synCtx); int myEffectiveTraceState = synCtx.getTracingState(); + if (this instanceof SequenceMediator) { + List observers = synCtx.getEnvironment().getSequenceObservers(); + for (SequenceFlowObserver observer : observers) { + observer.start(synCtx, ((SequenceMediator) this).getName()); + } + } try { SynapseLog synLog = getLog(synCtx); if (synLog.isTraceOrDebugEnabled()) { @@ -109,6 +117,14 @@ public boolean mediate(MessageContext synCtx, int mediatorPosition) { synCtx.setTracingState(myEffectiveTraceState); if (!mediator.mediate(synCtx)) { returnVal = false; + if (i == mediators.size() - 1) { + if (this instanceof SequenceMediator) { + List observers = synCtx.getEnvironment().getSequenceObservers(); + for (SequenceFlowObserver observer : observers) { + observer.complete(synCtx, ((SequenceMediator) this).getName()); + } + } + } break; } } From 7bdef4e7c00b0baca5e4341de61eea78b2d38491 Mon Sep 17 00:00:00 2001 From: hiranyakavishani Date: Tue, 25 Jul 2023 13:21:19 +0530 Subject: [PATCH 002/308] Introducing a new synapse property to enable/disable initialization of endpoint view MBeans --- .../synapse/commons/jmx/JmxConfigurationConstants.java | 2 ++ .../org/apache/synapse/endpoints/AbstractEndpoint.java | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/jmx/JmxConfigurationConstants.java b/modules/commons/src/main/java/org/apache/synapse/commons/jmx/JmxConfigurationConstants.java index ef4b86929e..e0b17f400b 100644 --- a/modules/commons/src/main/java/org/apache/synapse/commons/jmx/JmxConfigurationConstants.java +++ b/modules/commons/src/main/java/org/apache/synapse/commons/jmx/JmxConfigurationConstants.java @@ -42,5 +42,7 @@ public class JmxConfigurationConstants { public static final String PROP_REMOTE_SSL = "remote.ssl"; public static final String PROP_THREAD_JMX_ENABLE = "synapse.jmx.thread.view.enabled"; + + public static final String PROP_ENDPOINT_VIEW_JMX_ENABLE = "synapse.jmx.endpoint.view.enabled"; } diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java b/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java index 922ea61916..2ba5b72fc7 100755 --- a/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java +++ b/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java @@ -37,8 +37,11 @@ import org.apache.synapse.aspects.flow.statistics.collectors.OpenEventCollector; import org.apache.synapse.aspects.flow.statistics.collectors.RuntimeStatisticCollector; import org.apache.synapse.aspects.flow.statistics.data.artifact.ArtifactHolder; +import org.apache.synapse.commons.jmx.JmxConfigurationConstants; import org.apache.synapse.commons.throttle.core.ConcurrentAccessController; import org.apache.synapse.commons.throttle.core.ConcurrentAccessReplicator; +import org.apache.synapse.commons.util.MiscellaneousUtil; +import org.apache.synapse.config.SynapsePropertiesLoader; import org.apache.synapse.transport.util.MessageHandlerProvider; import org.apache.synapse.transport.customlogsetter.CustomLogSetter; import org.apache.synapse.aspects.AspectConfiguration; @@ -71,6 +74,10 @@ public abstract class AbstractEndpoint extends FaultHandler implements Endpoint, protected Log log; protected static final Log trace = LogFactory.getLog(SynapseConstants.TRACE_LOGGER); + private static final boolean jmxEnabled = Boolean.parseBoolean(MiscellaneousUtil.getProperty( + SynapsePropertiesLoader.loadSynapseProperties(), + JmxConfigurationConstants.PROP_ENDPOINT_VIEW_JMX_ENABLE, "true")); + /** Hold the logical name of an endpoint */ private String endpointName = null; @@ -217,7 +224,7 @@ public String toString() { public void setName(String endpointName) { this.endpointName = endpointName; - if (enableMBeanStats) { + if (enableMBeanStats && jmxEnabled) { /*if (endpointName != null && !"".equals(endpointName.trim())){ //we skip stat collection for endpoints with no defined name log.warn("Endpoint Name not found. Skipped JMX statistics collection for this endpoint"); From 5fa76e4d44456d61de7ede8bc9979f55065f510c Mon Sep 17 00:00:00 2001 From: rosensilva Date: Fri, 11 Aug 2023 15:18:50 +0530 Subject: [PATCH 003/308] fix json not correctly work with '@' char in payload fix: https://github.com/wso2/api-manager/issues/2082 --- .../apache/synapse/commons/json/JsonUtil.java | 20 +++++++++++++++++-- .../staxon/core/json/JsonXMLStreamReader.java | 6 ++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/json/JsonUtil.java b/modules/commons/src/main/java/org/apache/synapse/commons/json/JsonUtil.java index d76d359bf2..a8ef3f7f19 100644 --- a/modules/commons/src/main/java/org/apache/synapse/commons/json/JsonUtil.java +++ b/modules/commons/src/main/java/org/apache/synapse/commons/json/JsonUtil.java @@ -657,7 +657,15 @@ public static void transformElement(OMElement element, boolean processAttrbs, } private static void removeIndentations(OMElement elem) { - Iterator children = elem.getChildren(); + Iterator children; + try { + children = elem.getChildren(); + } catch (Exception e) { + if (logger.isDebugEnabled()) { + logger.debug("Error while removing indentations from OMElement. Error>>> " + e.getLocalizedMessage()); + } + return; + } while (children.hasNext()) { OMNode child = (OMNode) children.next(); if (child instanceof OMText) { @@ -678,7 +686,15 @@ private static void removeIndentations(OMElement elem) { * @param properties Required properties */ private static void removeIndentations(OMElement elem, Map properties) { - Iterator children = elem.getChildren(); + Iterator children; + try { + children = elem.getChildren(); + } catch (Exception e) { + if (logger.isDebugEnabled()) { + logger.debug("Error while removing indentations from OMElement. Error>>> " + e.getLocalizedMessage()); + } + return; + } boolean preserveSpaces = properties.get(Constants.PRESERVE_SPACES) != null && Boolean.parseBoolean((String) properties.get(Constants.PRESERVE_SPACES)); diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/staxon/core/json/JsonXMLStreamReader.java b/modules/commons/src/main/java/org/apache/synapse/commons/staxon/core/json/JsonXMLStreamReader.java index 209c9479b8..33b2ad3322 100755 --- a/modules/commons/src/main/java/org/apache/synapse/commons/staxon/core/json/JsonXMLStreamReader.java +++ b/modules/commons/src/main/java/org/apache/synapse/commons/staxon/core/json/JsonXMLStreamReader.java @@ -135,6 +135,12 @@ private void consumeName(ScopeInfo info) throws XMLStreamException, IOException } } source.endObject(); + } else if (source.peek() == JsonStreamToken.START_OBJECT) { + source.startObject(); + while (source.peek() == JsonStreamToken.NAME) { + readAttrNsDecl(source.name(), source.value().text); + } + source.endObject(); } else { throw new IllegalStateException("Expected attribute value"); } From edb9b171016a7f2544be56331b86e3b932322a4f Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 16 Aug 2023 12:17:16 +0000 Subject: [PATCH 004/308] [WSO2 Release] [Jenkins #6620] [Release 4.0.0-wso2v45] prepare release v4.0.0-wso2v45 --- 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 bebd9dc397..a4923a9e2b 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v44-SNAPSHOT + 4.0.0-wso2v45 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index e21a570341..d96d7991c4 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v44-SNAPSHOT + 4.0.0-wso2v45 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 0e5e46bf40..601e191c69 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-wso2v44-SNAPSHOT + 4.0.0-wso2v45 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 3bb7aaa959..8f0281c9d8 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v44-SNAPSHOT + 4.0.0-wso2v45 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index f33845bea3..f26ea9c6a6 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v44-SNAPSHOT + 4.0.0-wso2v45 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index f5bf950850..3a232ee674 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v44-SNAPSHOT + 4.0.0-wso2v45 ../../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 b874284919..afa7492485 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-wso2v44-SNAPSHOT + 4.0.0-wso2v45 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 995d876928..c0cbe27355 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-wso2v44-SNAPSHOT + 4.0.0-wso2v45 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 446925ca39..97a47eb0a6 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-wso2v44-SNAPSHOT + 4.0.0-wso2v45 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 f083bc9c46..c62975f803 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-wso2v44-SNAPSHOT + 4.0.0-wso2v45 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 19097a8671..28c9ea2653 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-wso2v44-SNAPSHOT + 4.0.0-wso2v45 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 06d813c27a..eb291f3071 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-wso2v44-SNAPSHOT + 4.0.0-wso2v45 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 1310728d69..20a9c42946 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-wso2v44-SNAPSHOT + 4.0.0-wso2v45 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 7f1287554c..42f16b0d3b 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v44-SNAPSHOT + 4.0.0-wso2v45 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 2e9b586ee5..f9bb88f47f 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v44-SNAPSHOT + 4.0.0-wso2v45 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 07272c4f29..b000b64d34 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v44-SNAPSHOT + 4.0.0-wso2v45 ../../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-wso2v45 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 6a7408b538..d49e349592 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v44-SNAPSHOT + 4.0.0-wso2v45 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index c94dc57a09..acfc3a280e 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-wso2v44-SNAPSHOT + 4.0.0-wso2v45 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 70419b0bd4..5a3a330716 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-wso2v44-SNAPSHOT + 4.0.0-wso2v45 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index c3a23c1e2a..2c1534545c 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v44-SNAPSHOT + 4.0.0-wso2v45 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 2f5a45fc8c..3fdbba4c2e 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v44-SNAPSHOT + 4.0.0-wso2v45 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 3ebb305ace..eee6404c5e 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v44-SNAPSHOT + 4.0.0-wso2v45 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 19acf13fb2..9e625634bb 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v44-SNAPSHOT + 4.0.0-wso2v45 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index a56c1d6777..8b44634ca5 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-wso2v44-SNAPSHOT + 4.0.0-wso2v45 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 6cf35d1c3c..b91d2d5359 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-wso2v44-SNAPSHOT + 4.0.0-wso2v45 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index cd9f440a40..e8b18af22f 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-wso2v44-SNAPSHOT + 4.0.0-wso2v45 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 33e243bbd8..0fcdc901db 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-wso2v44-SNAPSHOT + 4.0.0-wso2v45 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 8894df6d74..3865cd8271 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v44-SNAPSHOT + 4.0.0-wso2v45 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index f0dadd2325..cf8785bfc2 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v44-SNAPSHOT + 4.0.0-wso2v45 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 859c4c06af..29907a878c 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-wso2v44-SNAPSHOT + 4.0.0-wso2v45 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index aa13dd5238..678f80aea7 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v44-SNAPSHOT + 4.0.0-wso2v45 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-wso2v45 Apache Software Foundation From 9975c5e89ca5142ba39d75ef1c5b4118c61bac2d Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 16 Aug 2023 12:17:18 +0000 Subject: [PATCH 005/308] [WSO2 Release] [Jenkins #6620] [Release 4.0.0-wso2v45] 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 a4923a9e2b..02b88d590e 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v45 + 4.0.0-wso2v46-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index d96d7991c4..4fc2f58609 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v45 + 4.0.0-wso2v46-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 601e191c69..a17e2a1ce5 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-wso2v45 + 4.0.0-wso2v46-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 8f0281c9d8..6802228038 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v45 + 4.0.0-wso2v46-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index f26ea9c6a6..83e83646ec 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v45 + 4.0.0-wso2v46-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 3a232ee674..01a88b20bd 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v45 + 4.0.0-wso2v46-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 afa7492485..873c7e8d8f 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-wso2v45 + 4.0.0-wso2v46-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 c0cbe27355..a426f248f9 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-wso2v45 + 4.0.0-wso2v46-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 97a47eb0a6..891fcd213e 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-wso2v45 + 4.0.0-wso2v46-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 c62975f803..8432a93f28 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-wso2v45 + 4.0.0-wso2v46-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 28c9ea2653..7bddc49845 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-wso2v45 + 4.0.0-wso2v46-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 eb291f3071..5c2cfc1fc0 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-wso2v45 + 4.0.0-wso2v46-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 20a9c42946..34e010aecc 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-wso2v45 + 4.0.0-wso2v46-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 42f16b0d3b..df089f0cbf 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v45 + 4.0.0-wso2v46-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index f9bb88f47f..6c9bcdcc6f 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v45 + 4.0.0-wso2v46-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index b000b64d34..744e105ae9 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v45 + 4.0.0-wso2v46-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-wso2v45 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index d49e349592..df649ebf1e 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v45 + 4.0.0-wso2v46-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index acfc3a280e..3f6763b227 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-wso2v45 + 4.0.0-wso2v46-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 5a3a330716..9dfc5d18c3 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-wso2v45 + 4.0.0-wso2v46-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 2c1534545c..9c0ad831fe 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v45 + 4.0.0-wso2v46-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 3fdbba4c2e..519ffebfce 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v45 + 4.0.0-wso2v46-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index eee6404c5e..28154d1f02 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v45 + 4.0.0-wso2v46-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 9e625634bb..6898dcb090 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v45 + 4.0.0-wso2v46-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 8b44634ca5..e52dc0d362 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-wso2v45 + 4.0.0-wso2v46-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index b91d2d5359..36293cd164 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-wso2v45 + 4.0.0-wso2v46-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index e8b18af22f..ab9466387f 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-wso2v45 + 4.0.0-wso2v46-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 0fcdc901db..262de2ead1 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-wso2v45 + 4.0.0-wso2v46-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 3865cd8271..74b3c9cdd6 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v45 + 4.0.0-wso2v46-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index cf8785bfc2..11294da6ee 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v45 + 4.0.0-wso2v46-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 29907a878c..ddc346f216 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-wso2v45 + 4.0.0-wso2v46-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 678f80aea7..6104971446 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v45 + 4.0.0-wso2v46-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-wso2v45 + HEAD Apache Software Foundation From 83265a8ae1d0bbc854538c769061d5ec23c650c3 Mon Sep 17 00:00:00 2001 From: Thisal Tennakoon Date: Mon, 7 Aug 2023 12:08:13 +0530 Subject: [PATCH 006/308] Initial commit --- .../synapse/config/SynapseConfiguration.java | 102 ++++++++++-------- 1 file changed, 60 insertions(+), 42 deletions(-) diff --git a/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java b/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java index 47ed64af38..341242d5fc 100644 --- a/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java +++ b/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java @@ -194,6 +194,8 @@ public class SynapseConfiguration implements ManagedLifecycle, SynapseArtifact { */ private Map messageProcessors = new ConcurrentHashMap(); + private Map locks = new ConcurrentHashMap(); + /** * Endpoint templates to create actual endpoints */ @@ -1147,6 +1149,20 @@ public Map getDefinedEndpoints() { return definedEndpoints; } + public Object acquireLock(String key) { + Object lock = locks.get(key); + if (lock == null) { + synchronized (this) { + lock = locks.get(key); + if (lock == null) { + lock = new Object(); + locks.put(key, lock); + } + } + } + return lock; + } + /** * Get the definition of the endpoint with the given key * @@ -1155,58 +1171,60 @@ public Map getDefinedEndpoints() { */ public Endpoint getEndpoint(String key) { - Object o = getEntry(key); - if (o != null && o instanceof Endpoint) { - return (Endpoint) o; - } + synchronized (acquireLock(key)) { + Object o = getEntry(key); + if (o != null && o instanceof Endpoint) { + return (Endpoint) o; + } - Entry entry = null; - if (o == null) { - entry = new Entry(key); - entry.setType(Entry.REMOTE_ENTRY); - } else { - Object object = localRegistry.get(key); - if (object instanceof Entry) { - entry = (Entry) object; + Entry entry = null; + if (o == null) { + entry = new Entry(key); + entry.setType(Entry.REMOTE_ENTRY); + } else { + Object object = localRegistry.get(key); + if (object instanceof Entry) { + entry = (Entry) object; + } } - } - assertEntryNull(entry, key); + assertEntryNull(entry, key); - //noinspection ConstantConditions - if (entry.getMapper() == null) { - entry.setMapper(XMLToEndpointMapper.getInstance()); - } + //noinspection ConstantConditions + if (entry.getMapper() == null) { + entry.setMapper(XMLToEndpointMapper.getInstance()); + } - if (entry.getType() == Entry.REMOTE_ENTRY) { - if (registry != null) { - o = registry.getResource(entry, getProperties()); - if (o != null && o instanceof Endpoint) { - localRegistry.put(key, entry); - return (Endpoint) o; - } else if (o instanceof OMNode) { - properties.put(SynapseConstants.SYNAPSE_CONFIGURATION, this); - Endpoint e = (Endpoint) XMLToEndpointMapper.getInstance(). - getObjectFromOMNode((OMNode) o, properties); - if (e != null) { - entry.setValue(e); - return e; + if (entry.getType() == Entry.REMOTE_ENTRY) { + if (registry != null) { + o = registry.getResource(entry, getProperties()); + if (o != null && o instanceof Endpoint) { + localRegistry.put(key, entry); + return (Endpoint) o; + } else if (o instanceof OMNode) { + properties.put(SynapseConstants.SYNAPSE_CONFIGURATION, this); + Endpoint e = (Endpoint) XMLToEndpointMapper.getInstance(). + getObjectFromOMNode((OMNode) o, properties); + if (e != null) { + entry.setValue(e); + return e; + } } } - } - } else { - Object value = entry.getValue(); - if (value instanceof OMNode) { - properties.put(SynapseConstants.SYNAPSE_CONFIGURATION, this); - Object object = entry.getMapper().getObjectFromOMNode( - (OMNode) value, getProperties()); - if (object instanceof Endpoint) { - entry.setValue(object); - return (Endpoint) object; + } else { + Object value = entry.getValue(); + if (value instanceof OMNode) { + properties.put(SynapseConstants.SYNAPSE_CONFIGURATION, this); + Object object = entry.getMapper().getObjectFromOMNode( + (OMNode) value, getProperties()); + if (object instanceof Endpoint) { + entry.setValue(object); + return (Endpoint) object; + } } } + return null; } - return null; } /** From db17d33f07eb19a8ca12109a72d389fb706a9521 Mon Sep 17 00:00:00 2001 From: chanikag Date: Tue, 22 Aug 2023 15:26:09 +0530 Subject: [PATCH 007/308] Rename handler -> sequence observer --- .../config/SequenceFlowObserversLoader.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/core/src/main/java/org/apache/synapse/config/SequenceFlowObserversLoader.java b/modules/core/src/main/java/org/apache/synapse/config/SequenceFlowObserversLoader.java index 85f775942a..e4cff53ae5 100644 --- a/modules/core/src/main/java/org/apache/synapse/config/SequenceFlowObserversLoader.java +++ b/modules/core/src/main/java/org/apache/synapse/config/SequenceFlowObserversLoader.java @@ -41,13 +41,13 @@ public class SequenceFlowObserversLoader { private static Log log = LogFactory.getLog(SequenceFlowObserversLoader.class); public static List loadObservers() { - List handlers = new ArrayList<>(); + List observers = new ArrayList<>(); OMElement observersConfig = MiscellaneousUtil.loadXMLConfig(SynapseConstants.SEQUENCE_OBSERVERS_FILE); if (observersConfig != null) { if (!ROOT_Q.equals(observersConfig.getQName())) { - handleException("Invalid handler configuration file"); + handleException("Invalid sequence observer configuration file"); } Iterator iterator = observersConfig.getChildrenWithName(OBSERVER_Q); @@ -58,7 +58,7 @@ public static List loadObservers() { if (observerElem.getAttribute(NAME_ATT) != null) { name = observerElem.getAttributeValue(NAME_ATT); } else { - handleException("Name not defined in one or more handlers"); + handleException("Name not defined in one or more sequence observer"); } if (observerElem.getAttribute(CLASS_Q) != null) { @@ -66,19 +66,19 @@ public static List loadObservers() { if (!"".equals(className)) { SequenceFlowObserver observer = createObserver(className); if (observer != null) { - handlers.add(observer); + observers.add(observer); observer.setName(name); } } else { - handleException("Class name is null for handle name : " + name); + handleException("Class name is null for sequence observer name : " + name); } } else { - handleException("Class name not defined for handler named : " + name); + handleException("Class name not defined for sequence observer named : " + name); } } } - return handlers; + return observers; } private static SequenceFlowObserver createObserver(String classFQName) { @@ -86,14 +86,14 @@ private static SequenceFlowObserver createObserver(String classFQName) { try { obj = Class.forName(classFQName).newInstance(); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) { - handleException("Error creating Handler for class name : " + classFQName, e); + handleException("Error creating Sequence observer for class name : " + classFQName, e); } if (obj instanceof SequenceFlowObserver) { return (SequenceFlowObserver) obj; } else { - handleException("Error creating Handler. The Handler should be of type " + - "org.apache.synapse.Handler"); + handleException("Error creating Sequence observer. The Sequence observer should be of type " + + "org.apache.synapse.SequenceFlowObserver"); } return null; } From 98d8a1409315cff51a76cc1be7a16b14c8301c99 Mon Sep 17 00:00:00 2001 From: chanikag Date: Wed, 23 Aug 2023 06:20:33 +0530 Subject: [PATCH 008/308] Fix review sugessions --- .../synapse/mediators/AbstractListMediator.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 6eadbbfd24..79ce14b6fb 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 @@ -117,15 +117,15 @@ public boolean mediate(MessageContext synCtx, int mediatorPosition) { synCtx.setTracingState(myEffectiveTraceState); if (!mediator.mediate(synCtx)) { returnVal = false; - if (i == mediators.size() - 1) { - if (this instanceof SequenceMediator) { - List observers = synCtx.getEnvironment().getSequenceObservers(); - for (SequenceFlowObserver observer : observers) { - observer.complete(synCtx, ((SequenceMediator) this).getName()); - } + break; + } + if (i == mediators.size() - 1) { + if (this instanceof SequenceMediator) { + List observers = synCtx.getEnvironment().getSequenceObservers(); + for (SequenceFlowObserver observer : observers) { + observer.complete(synCtx, ((SequenceMediator) this).getName()); } } - break; } } } From 518f56d5402f5d2e28f8595bea9911f734e7d1f2 Mon Sep 17 00:00:00 2001 From: chanikag Date: Wed, 23 Aug 2023 10:00:43 +0530 Subject: [PATCH 009/308] Add review sugessions --- .../synapse/config/SequenceFlowObserversLoader.java | 3 ++- .../apache/synapse/mediators/AbstractListMediator.java | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/core/src/main/java/org/apache/synapse/config/SequenceFlowObserversLoader.java b/modules/core/src/main/java/org/apache/synapse/config/SequenceFlowObserversLoader.java index e4cff53ae5..94ef9cadc1 100644 --- a/modules/core/src/main/java/org/apache/synapse/config/SequenceFlowObserversLoader.java +++ b/modules/core/src/main/java/org/apache/synapse/config/SequenceFlowObserversLoader.java @@ -19,6 +19,7 @@ package org.apache.synapse.config; import org.apache.axiom.om.OMElement; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.synapse.SequenceFlowObserver; @@ -63,7 +64,7 @@ public static List loadObservers() { if (observerElem.getAttribute(CLASS_Q) != null) { String className = observerElem.getAttributeValue(CLASS_Q); - if (!"".equals(className)) { + if (StringUtils.isNotBlank(className)) { SequenceFlowObserver observer = createObserver(className); if (observer != null) { observers.add(observer); 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 79ce14b6fb..ead1f90a90 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 @@ -82,7 +82,7 @@ public boolean mediate(MessageContext synCtx, int mediatorPosition) { // to pass it on; else, do nothing -> i.e. let the parents state flow setEffectiveTraceState(synCtx); int myEffectiveTraceState = synCtx.getTracingState(); - if (this instanceof SequenceMediator) { + if (this instanceof SequenceMediator & mediatorPosition == 0) { List observers = synCtx.getEnvironment().getSequenceObservers(); for (SequenceFlowObserver observer : observers) { observer.start(synCtx, ((SequenceMediator) this).getName()); @@ -112,6 +112,14 @@ public boolean mediate(MessageContext synCtx, int mediatorPosition) { returnVal = false; break; } + if (i == mediators.size() - 1) { + if (this instanceof SequenceMediator) { + List observers = synCtx.getEnvironment().getSequenceObservers(); + for (SequenceFlowObserver observer : observers) { + observer.complete(synCtx, ((SequenceMediator) this).getName()); + } + } + } mediator.reportCloseStatistics(synCtx, statisticReportingIndex); } else { synCtx.setTracingState(myEffectiveTraceState); From 5ff09ecfab0d66becae05fa0db32b3fe678c329f Mon Sep 17 00:00:00 2001 From: rosensilva Date: Tue, 29 Aug 2023 14:59:02 +0530 Subject: [PATCH 010/308] Fix adding redundant quotation marks for enrich Fixes: https://github.com/wso2/micro-integrator/issues/2944 --- .../apache/synapse/util/InlineExpressionUtil.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/synapse/util/InlineExpressionUtil.java b/modules/core/src/main/java/org/apache/synapse/util/InlineExpressionUtil.java index 78157194b8..e340cc87e3 100644 --- a/modules/core/src/main/java/org/apache/synapse/util/InlineExpressionUtil.java +++ b/modules/core/src/main/java/org/apache/synapse/util/InlineExpressionUtil.java @@ -92,6 +92,14 @@ private static String replaceValue(MessageContext messageContext, String text, b Matcher matcher = EXPRESSION_PATTERN.matcher(text); while (matcher.find()) { String matchSeq = matcher.group(); + String surroundedString; + try { + surroundedString = text.substring(text.indexOf(matchSeq) - 1, text.indexOf(matchSeq) + matchSeq + .length() + 1); + } catch (IndexOutOfBoundsException e) { + // catch index out of bound exception when the expression is at the beginning or end of the text + surroundedString = StringUtils.EMPTY; + } String value = getDynamicValue(messageContext, matchSeq.substring(1, matchSeq.length() - 1)); if (value == null) { value = StringUtils.EMPTY; @@ -99,7 +107,7 @@ private static String replaceValue(MessageContext messageContext, String text, b // If the string is neither XML or JSON, it is considered a String and must be wrapped in double quotes // If it is an empty string returned from a json-eval expression it must be wrapped in double quotes if (isInline && ((value.isEmpty() && matchSeq.contains(EXPRESSION_JSON_EVAL)) - || (!isValidXML(value) && !isValidJson(value)))) { + || (!isValidXML(value) && !isValidJson(value) && !isSurroundedByQuotes(surroundedString)))) { value = "\"" + value + "\""; } text = text.replace(matchSeq, value); @@ -107,6 +115,10 @@ private static String replaceValue(MessageContext messageContext, String text, b return text; } + private static boolean isSurroundedByQuotes(String text) { + + return text.startsWith("\"") && text.endsWith("\""); + } /** * Replaces Dynamic Values represented by expressions inside json-eval. * From b77eaa7377310960c6e9dee3e8aae507fce02c4e Mon Sep 17 00:00:00 2001 From: Dulanjali Dilmi Date: Thu, 31 Aug 2023 09:07:50 +0530 Subject: [PATCH 011/308] Improve VFS Error Handling Related issue: wso2/api-manager#1945 --- .../synapse/transport/vfs/PollTableEntry.java | 81 ++++++----- .../vfs/VFSTransportErrorHandler.java | 132 ++++++++++++++++++ .../transport/vfs/VFSTransportListener.java | 87 +++++++----- .../transport/vfs/VFSTransportSender.java | 74 ++++++---- 4 files changed, 272 insertions(+), 102 deletions(-) create mode 100644 modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportErrorHandler.java diff --git a/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/PollTableEntry.java b/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/PollTableEntry.java index 90dd5917f6..84d8d110a8 100644 --- a/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/PollTableEntry.java +++ b/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/PollTableEntry.java @@ -31,6 +31,7 @@ import org.apache.synapse.commons.crypto.CryptoUtil; import org.apache.synapse.commons.vfs.VFSConstants; import org.apache.synapse.commons.vfs.VFSUtils; +import org.apache.synapse.transport.vfs.VFSTransportErrorHandler.LogType; import java.net.UnknownHostException; import java.text.DateFormat; @@ -157,7 +158,9 @@ public String getFileURI() { try { return VFSUtils.resolveUriHost(fileURI); } catch (UnknownHostException | FileSystemException e) { - log.warn("Unable to resolve the hostname of transport.vfs.FileURI : " + VFSUtils.maskURLPassword(fileURI), e); + String message = "Unable to resolve the hostname of transport.vfs.FileURI : " + + VFSUtils.maskURLPassword(fileURI); + VFSTransportErrorHandler.logException(log, LogType.WARN, message, e); } } return fileURI; @@ -168,8 +171,9 @@ public String getReplyFileURI() { try { return VFSUtils.resolveUriHost(replyFileURI); } catch (UnknownHostException | FileSystemException e) { - log.warn("Unable to resolve the hostname of transport.vfs.ReplyFileURI : " + - VFSUtils.maskURLPassword(replyFileURI), e); + String message = "Unable to resolve the hostname of transport.vfs.ReplyFileURI : " + + VFSUtils.maskURLPassword(replyFileURI); + VFSTransportErrorHandler.logException(log, LogType.WARN, message, e); } } return replyFileURI; @@ -204,8 +208,9 @@ public String getMoveAfterProcess() { try { return VFSUtils.resolveUriHost(moveAfterProcess); } catch (UnknownHostException | FileSystemException e) { - log.warn("Unable to resolve the hostname of transport.vfs.MoveAfterProcess: " + - VFSUtils.maskURLPassword(moveAfterProcess), e); + String message = "Unable to resolve the hostname of transport.vfs.MoveAfterProcess: " + + VFSUtils.maskURLPassword(moveAfterProcess); + VFSTransportErrorHandler.logException(log, LogType.WARN, message, e); } } return moveAfterProcess; @@ -216,8 +221,9 @@ public String getMoveAfterMoveFailure() { try { return VFSUtils.resolveUriHost(moveAfterMoveFailure); } catch (UnknownHostException | FileSystemException e) { - log.warn("Unable to resolve the hostname of transport.vfs.MoveAfterFailedMove: " + - VFSUtils.maskURLPassword(moveAfterMoveFailure), e); + String message = "Unable to resolve the hostname of transport.vfs.MoveAfterFailedMove: " + + VFSUtils.maskURLPassword(moveAfterMoveFailure); + VFSTransportErrorHandler.logException(log, LogType.WARN, message, e); } } return moveAfterMoveFailure; @@ -264,8 +270,9 @@ public String getMoveAfterErrors() { try { return VFSUtils.resolveUriHost(moveAfterErrors); } catch (UnknownHostException | FileSystemException e) { - log.warn("Unable to resolve the hostname of transport.vfs.MoveAfterErrors: " + - VFSUtils.maskURLPassword(moveAfterErrors), e); + String message = "Unable to resolve the hostname of transport.vfs.MoveAfterErrors: " + + VFSUtils.maskURLPassword(moveAfterErrors); + VFSTransportErrorHandler.logException(log, LogType.WARN, message, e); } } return moveAfterErrors; @@ -286,8 +293,9 @@ public String getMoveAfterFailure() { try { return VFSUtils.resolveUriHost(moveAfterFailure); } catch (UnknownHostException | FileSystemException e) { - log.warn("Unable to resolve the hostname of transport.vfs.MoveAfterFailure: " + - VFSUtils.maskURLPassword(moveAfterFailure), e); + String message = "Unable to resolve the hostname of transport.vfs.MoveAfterFailure: " + + VFSUtils.maskURLPassword(moveAfterFailure); + VFSTransportErrorHandler.logException(log, LogType.WARN, message, e); } } return moveAfterFailure; @@ -517,7 +525,8 @@ public boolean loadConfiguration(ParameterInclude params) throws AxisFault { protected boolean loadConfigurationsFromService(ParameterInclude params) throws AxisFault { fileURI = ParamUtils.getOptionalParam(params, VFSConstants.TRANSPORT_FILE_FILE_URI); if (fileURI == null) { - log.warn("transport.vfs.FileURI parameter is missing in the proxy service configuration"); + VFSTransportErrorHandler.logException(log, LogType.WARN, + "transport.vfs.FileURI parameter is missing in the proxy service configuration"); return false; } else { @@ -632,8 +641,9 @@ protected boolean loadConfigurationsFromService(ParameterInclude params) throws fileSizeLimit = strFileSizeLimit != null ? Double.parseDouble(strFileSizeLimit) : VFSConstants.DEFAULT_TRANSPORT_FILE_SIZE_LIMIT; } catch (Exception e) { - log.warn("Error parsing specified file size limit - " + strFileSizeLimit + - ", using default - unlimited"); + String message = "Error parsing specified file size limit - " + strFileSizeLimit + + ", using default - unlimited"; + VFSTransportErrorHandler.logException(log, LogType.WARN, message); } moveAfterMoveFailure = ParamUtils.getOptionalParam(params, @@ -674,8 +684,9 @@ protected boolean loadConfigurationsFromService(ParameterInclude params) throws try { fileProcessingInterval = Integer.parseInt(strFileProcessingInterval); } catch (NumberFormatException nfe) { - log.warn("VFS File Processing Interval not set correctly. Current value is : " - + strFileProcessingInterval, nfe); + String message = "VFS File Processing Interval not set correctly. Current value is : " + + strFileProcessingInterval; + VFSTransportErrorHandler.logException(log, LogType.WARN, message, nfe); } } @@ -685,8 +696,9 @@ protected boolean loadConfigurationsFromService(ParameterInclude params) throws try { fileProcessingCount = Integer.parseInt(strFileProcessingCount); } catch (NumberFormatException nfe) { - log.warn("VFS File Processing Count not set correctly. Current value is : " - + strFileProcessingCount, nfe); + String message = "VFS File Processing Count not set correctly. Current value is : " + + strFileProcessingCount; + VFSTransportErrorHandler.logException(log, LogType.WARN, message, nfe); } } @@ -700,8 +712,8 @@ protected boolean loadConfigurationsFromService(ParameterInclude params) throws autoLockRelease = Boolean.parseBoolean(strAutoLock); } catch (Exception e) { autoLockRelease = false; - log.warn("VFS Auto lock removal not set properly. Current value is : " - + strAutoLock, e); + String message = "VFS Auto lock removal not set properly. Current value is : " + strAutoLock; + VFSTransportErrorHandler.logException(log, LogType.WARN, message, e); } if (autoLockRelease) { String strAutoLockInterval = ParamUtils.getOptionalParam(params, @@ -712,9 +724,9 @@ protected boolean loadConfigurationsFromService(ParameterInclude params) throws autoLockReleaseInterval = Long.parseLong(strAutoLockInterval); } catch (Exception e) { autoLockReleaseInterval = null; - log.warn( - "VFS Auto lock removal property not set properly. Current value is : " - + strAutoLockInterval, e); + String message = "VFS Auto lock removal property not set properly. Current value is : " + + strAutoLockInterval; + VFSTransportErrorHandler.logException(log, LogType.WARN, message, e); } } String strAutoLockReleaseSameNode = ParamUtils.getOptionalParam(params, @@ -726,9 +738,9 @@ protected boolean loadConfigurationsFromService(ParameterInclude params) throws .parseBoolean(strAutoLockReleaseSameNode); } catch (Exception e) { autoLockReleaseSameNode = true; - log.warn( - "VFS Auto lock removal property not set properly. Current value is : " - + autoLockReleaseSameNode, e); + String message = "VFS Auto lock removal property not set properly. Current value is : " + + autoLockReleaseSameNode; + VFSTransportErrorHandler.logException(log, LogType.WARN, message, e); } } } @@ -744,7 +756,8 @@ protected boolean loadConfigurationsFromService(ParameterInclude params) throws distributedLock = Boolean.parseBoolean(strDistributedLock); } catch (Exception e) { autoLockRelease = false; - log.warn("VFS Distributed lock not set properly. Current value is : " + strDistributedLock, e); + String message = "VFS Distributed lock not set properly. Current value is : " + strDistributedLock; + VFSTransportErrorHandler.logException(log, LogType.WARN, message, e); } if (distributedLock) { @@ -756,9 +769,9 @@ protected boolean loadConfigurationsFromService(ParameterInclude params) throws distributedLockTimeout = Long.parseLong(strDistributedLockTimeout); } catch (Exception e) { distributedLockTimeout = null; - log.warn( - "VFS Distributed lock timeout property not set properly. Current value is : " - + strDistributedLockTimeout, e); + String message = "VFS Distributed lock timeout property not set properly. Current value is : " + + strDistributedLockTimeout; + VFSTransportErrorHandler.logException(log, LogType.WARN, message, e); } } } @@ -799,15 +812,13 @@ private String resolveHostAtDeployment(String uri) throws AxisFault { String errorMsg = "Unable to decode the malformed URI : " + VFSUtils.maskURLPassword(uri); //log the error since if we only throw AxisFault, we won't get the entire stacktrace in logs to // identify root cause to users - log.error(errorMsg, e); - throw new AxisFault(errorMsg, e); + VFSTransportErrorHandler.handleException(log, errorMsg, e); } catch (UnknownHostException e) { String errorMsg = "Error occurred while resolving hostname of URI : " + VFSUtils.maskURLPassword(uri); //log the error since if we only throw AxisFault, we won't get the entire stacktrace in logs to // identify root cause to users - log.error(errorMsg, e); - throw new AxisFault(errorMsg, e); + VFSTransportErrorHandler.handleException(log, errorMsg, e); } } return uri; @@ -848,7 +859,7 @@ private String decryptIfRequired(String parameter) throws AxisFault { cryptoUtil = new CryptoUtil(secureVaultProperties); } if (!cryptoUtil.isInitialized()) { - throw new AxisFault("Error initialising cryptoutil"); + VFSTransportErrorHandler.handleException(log, "Error initialising cryptoutil"); } String toDecrypt = m.group(1); toDecrypt = new String(cryptoUtil.decrypt(toDecrypt.getBytes())); diff --git a/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportErrorHandler.java b/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportErrorHandler.java new file mode 100644 index 0000000000..9008910e5e --- /dev/null +++ b/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportErrorHandler.java @@ -0,0 +1,132 @@ +/* + * Copyright (c) 2023, WSO2 LLC (http://www.wso2.com). + * + * 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.transport.vfs; + +import org.apache.axis2.AxisFault; +import org.apache.commons.logging.Log; + +/** + * This class is used to handle errors in VFS transport + *

We have not modified the original implementation, but we have included the error handling scenarios + * from {@link VFSTransportListener}, {@link VFSTransportSender} and {@link PollTableEntry} in this class.

+ */ +public class VFSTransportErrorHandler { + + /** + * This method is used to log exceptions with exception + * @param log Log + * @param type {@link LogType} + * @param message String message to be logged + * @param e Exception + */ + public static void logException(Log log, LogType type, String message, Exception e) { + switch (type) { + case INFO: + log.info(message, e); + break; + case DEBUG: + log.debug(message, e); + break; + case WARN: + log.warn(message, e); + break; + case ERROR: + log.error(message, e); + break; + case FATAL: + log.fatal(message, e); + break; + } + } + + /** + * This method is used to log exceptions without exception + * @param log Log + * @param type {@link LogType} + * @param message String message to be logged + */ + public static void logException(Log log, LogType type, String message) { + switch (type) { + case INFO: + log.info(message); + break; + case DEBUG: + log.debug(message); + break; + case WARN: + log.warn(message); + break; + case ERROR: + log.error(message); + break; + case FATAL: + log.fatal(message); + break; + } + } + + /** + * This method is used to handle exceptions. Log error message and throws an AxisFault with the exception + * @param log Log + * @param message String message to be logged + * @param e Exception + * @throws AxisFault + */ + public static void handleException(Log log, String message, Exception e) throws AxisFault { + logException(log, LogType.ERROR, message, e); + throw new AxisFault(message, e); + } + + /** + * This method is used to handle exceptions. Log error message and throws an AxisFault + * @param log Log + * @param message String message to be logged + * @throws AxisFault + */ + public static void handleException(Log log, String message) throws AxisFault { + logException(log, LogType.ERROR, message); + throw new AxisFault(message); + } + + /** + * This method is used to handle print the stack trace + * @param e InterruptedException + */ + public static void printStackTrace(Exception e) { + e.printStackTrace(); + } + + /** + * This method is used to throw a Runtime exception + * @param e Exception + */ + public static void throwException(RuntimeException e) { + throw e; + } + + /** + * This enum is used to define the log type + */ + public enum LogType { + INFO, + DEBUG, + WARN, + ERROR, + FATAL + } +} diff --git a/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java b/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java index 073fa959fe..5e9e6836d7 100644 --- a/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java +++ b/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java @@ -59,6 +59,7 @@ import org.wso2.securevault.SecretResolver; import org.wso2.securevault.SecureVaultException; import org.wso2.securevault.commons.MiscellaneousUtil; +import org.apache.synapse.transport.vfs.VFSTransportErrorHandler.LogType; import java.io.File; import java.io.IOException; @@ -177,7 +178,8 @@ protected void doInit() throws AxisFault { } } } catch (FileSystemException e) { - handleException("Error initializing the file transport : " + e.getMessage(), e); + String message = "Error initializing the file transport : " + e.getMessage(); + VFSTransportErrorHandler.handleException(log, message, e); } } @@ -222,7 +224,8 @@ protected void scanFileOrDirectory(final PollTableEntry entry, String fileURI) { try { fso = VFSUtils.attachFileSystemOptions(entry.getVfsSchemeProperties(), getFsManager()); } catch (Exception e) { - log.error("Error while attaching VFS file system properties. " + e.getMessage()); + VFSTransportErrorHandler.logException(log, LogType.ERROR, + "Error while attaching VFS file system properties. ", e); } FileObject fileObject = null; @@ -261,13 +264,14 @@ protected void scanFileOrDirectory(final PollTableEntry entry, String fileURI) { VFSUtils.maskURLPassword(fileURI), e, entry); return; } else { - log.warn("Failed to resolve the file URI: " + + String message = "Failed to resolve the file URI: " + VFSUtils.maskURLPassword(fileURI) + ", in attempt " + retryCount + ", " + e.getMessage() + " Retrying in " + reconnectionTimeout + - " milliseconds."); + " milliseconds."; + VFSTransportErrorHandler.logException(log, LogType.WARN, message); } } catch (Exception e) { - log.warn("Runtime error may have occurred. ", e); + VFSTransportErrorHandler.logException(log, LogType.WARN, "Runtime error may have occurred. ", e); closeCachedFileSystem(fileURI, fso); } @@ -276,7 +280,8 @@ protected void scanFileOrDirectory(final PollTableEntry entry, String fileURI) { Thread.sleep(reconnectionTimeout); } catch (InterruptedException e2) { Thread.currentThread().interrupt(); - log.error("Thread was interrupted while waiting to reconnect.", e2); + VFSTransportErrorHandler.logException(log, LogType.ERROR, + "Thread was interrupted while waiting to reconnect.", e2); } } } @@ -292,7 +297,7 @@ protected void scanFileOrDirectory(final PollTableEntry entry, String fileURI) { } catch (FileNotFolderException ignored) { } catch (FileSystemException ex) { closeFileSystem(fileObject); - log.error(ex.getMessage(), ex); + VFSTransportErrorHandler.logException(log, LogType.ERROR, ex.getMessage(), ex); } // if this is a file that would translate to a single message @@ -322,13 +327,15 @@ protected void scanFileOrDirectory(final PollTableEntry entry, String fileURI) { } catch (AxisFault e) { if (e.getCause() instanceof FileNotFoundException) { - log.warn("Error processing File URI : " + - VFSUtils.maskURLPassword(fileObject.getName().toString()) + - ". This can be due to file moved from another process."); + String message = "Error processing File URI : " + + VFSUtils.maskURLPassword(fileObject.getName().toString()) + + ". This can be due to file moved from another process."; + VFSTransportErrorHandler.logException(log, LogType.WARN, message); runPostProcess = false; } else { - logException("Error processing File URI : " + - VFSUtils.maskURLPassword(fileObject.getName().getURI()), e); + String message = "Error processing File URI : " + + VFSUtils.maskURLPassword(fileObject.getName().getURI()); + VFSTransportErrorHandler.logException(log, LogType.ERROR, message, e); entry.setLastPollState(PollTableEntry.FAILED); metrics.incrementFaultsReceiving(); } @@ -338,9 +345,10 @@ protected void scanFileOrDirectory(final PollTableEntry entry, String fileURI) { try { moveOrDeleteAfterProcessing(entry, fileObject, fso); } catch (AxisFault axisFault) { - logException( - "File object '" + VFSUtils.maskURLPassword(fileObject.getURL().toString()) + - "' " + "cloud not be moved", axisFault); + String message = "File object '" + + VFSUtils.maskURLPassword(fileObject.getURL().toString()) + + "' " + "cloud not be moved"; + VFSTransportErrorHandler.logException(log, LogType.ERROR, message, axisFault); entry.setLastPollState(PollTableEntry.FAILED); String timeStamp = VFSUtils.getSystemTime(entry.getFailedRecordTimestampFormat()); addFailedRecord(entry, fileObject, timeStamp); @@ -712,7 +720,8 @@ protected void moveOrDeleteAfterProcessing(final PollTableEntry entry, FileObjec destinationFSO = VFSUtils.attachFileSystemOptions( VFSUtils.parseSchemeFileOptions(moveToDirectoryURI, entry.getParams()), getFsManager()); } catch (Exception e) { - log.warn("Unable to set options for processed file location ", e); + VFSTransportErrorHandler.logException(log, LogType.WARN, + "Unable to set options for processed file location ", e); } FileObject moveToDirectory = getFsManager().resolveFile(moveToDirectoryURI, destinationFSO); String prefix; @@ -738,8 +747,9 @@ protected void moveOrDeleteAfterProcessing(final PollTableEntry entry, FileObjec fileObject.moveTo(dest); } catch (FileSystemException e) { closeFileSystem(fileObject); - handleException("Error moving file : " + VFSUtils.maskURLPassword(fileObject.toString()) + " to " + - VFSUtils.maskURLPassword(moveToDirectoryURI), e); + String message = "Error moving file : " + VFSUtils.maskURLPassword(fileObject.toString()) + " to " + + VFSUtils.maskURLPassword(moveToDirectoryURI); + VFSTransportErrorHandler.handleException(log, message, e); }finally{ try { fileObject.close(); @@ -757,8 +767,7 @@ protected void moveOrDeleteAfterProcessing(final PollTableEntry entry, FileObjec if (!fileObject.delete()) { String msg = "Cannot delete file : " + VFSUtils.maskURLPassword(fileObject.toString()); - log.error(msg); - throw new AxisFault(msg); + VFSTransportErrorHandler.handleException(log, msg); } } catch (FileSystemException e) { closeFileSystem(fileObject); @@ -998,7 +1007,7 @@ protected synchronized void addFailedRecord(PollTableEntry pollTableEntry, FileUtils.writeLines(failedRecordFile, content); } } catch (IOException e) { - log.fatal("Failure while writing the failed records!", e); + VFSTransportErrorHandler.logException(log, LogType.FATAL, "Failure while writing the failed records!", e); } } @@ -1069,13 +1078,15 @@ public void run() { } catch (AxisFault axisFault) { removeTaskState = STATE_RUNNING; try { - log.error("Remove attempt '" + (count++) + "' failed for the file '" - + VFSUtils.maskURLPassword(failedFileObject.getURL().toString()) - + "', next re-try will be " +"after '" - + nextRetryDuration + "' milliseconds"); + String message = "Remove attempt '" + (count++) + "' failed for the file '" + + VFSUtils.maskURLPassword(failedFileObject.getURL().toString()) + + "', next re-try will be " +"after '" + + nextRetryDuration + "' milliseconds"; + VFSTransportErrorHandler.logException(log, LogType.ERROR, message); } catch (FileSystemException e) { - log.error("Error while retrying the file url of the file object '" + - VFSUtils.maskURLPassword(failedFileObject.toString()) + "'"); + String message = "Error while retrying the file url of the file object '" + + VFSUtils.maskURLPassword(failedFileObject.toString()) + "'"; + VFSTransportErrorHandler.logException(log, LogType.ERROR, message); } try { Thread.sleep(nextRetryDuration); @@ -1111,14 +1122,16 @@ private synchronized void reTryFailedMove(PollTableEntry entry, FileObject fileO fileObject.moveTo(dest); // FIXME - when an exception occurs here it causes the in folder to vanish } catch (FileSystemException e) { closeFileSystem(fileObject); - handleException("Error moving the failed file : " - + VFSUtils.maskURLPassword(fileObject.toString()) + " to " + moveToDirectoryURI, e); + String message = "Error moving the failed file : " + + VFSUtils.maskURLPassword(fileObject.toString()) + " to " + moveToDirectoryURI; + VFSTransportErrorHandler.handleException(log, message, e); } } catch (FileSystemException e) { - handleException("Cloud not move the failed file object '" - + VFSUtils.maskURLPassword(fileObject.toString()) + "'", e); + String message = "Cloud not move the failed file object '" + + VFSUtils.maskURLPassword(fileObject.toString()) + "'"; + VFSTransportErrorHandler.handleException(log, message, e); } catch (IOException e) { - handleException("Cloud not create the folder", e); + VFSTransportErrorHandler.handleException(log, "Cloud not create the folder", e); } } } @@ -1147,7 +1160,8 @@ public int compare(FileObject o1, FileObject o2) { lDiff = o1.getContent().getLastModifiedTime() - o2.getContent().getLastModifiedTime(); } catch (FileSystemException e) { - log.warn("Unable to compare lastmodified timestamp of the two files.", e); + String message = "Unable to compare lastmodified timestamp of the two files."; + VFSTransportErrorHandler.logException(log, LogType.WARN, message, e); } return lDiff.intValue(); } @@ -1159,7 +1173,7 @@ public int compare(FileObject o1, FileObject o2) { try { lDiff = o1.getContent().getSize() - o2.getContent().getSize(); } catch (FileSystemException e) { - log.warn("Unable to compare size of the two files.", e); + VFSTransportErrorHandler.logException(log, LogType.WARN, "Unable to compare size of the two files.", e); } return lDiff.intValue(); } @@ -1178,7 +1192,8 @@ public int compare(FileObject o1, FileObject o2) { lDiff = o2.getContent().getLastModifiedTime() - o1.getContent().getLastModifiedTime(); } catch (FileSystemException e) { - log.warn("Unable to compare lastmodified timestamp of the two files.", e); + VFSTransportErrorHandler.logException(log, LogType.WARN, + "Unable to compare lastmodified timestamp of the two files.", e); } return lDiff.intValue(); } @@ -1190,7 +1205,7 @@ public int compare(FileObject o1, FileObject o2) { try { lDiff = o2.getContent().getSize() - o1.getContent().getSize(); } catch (FileSystemException e) { - log.warn("Unable to compare size of the two files.", e); + VFSTransportErrorHandler.logException(log, LogType.WARN, "Unable to compare size of the two files.", e); } return lDiff.intValue(); } diff --git a/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java b/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java index ce78b23bd0..f11e9a3291 100644 --- a/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java +++ b/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java @@ -45,6 +45,7 @@ import org.apache.synapse.commons.vfs.VFSOutTransportInfo; import org.apache.synapse.commons.vfs.VFSParamDTO; import org.apache.synapse.commons.vfs.VFSUtils; +import org.apache.synapse.transport.vfs.VFSTransportErrorHandler.LogType; import java.io.IOException; import java.util.concurrent.ConcurrentHashMap; @@ -117,8 +118,9 @@ public void init(ConfigurationContext cfgCtx, TransportOutDescription transportO autoLockRelease = Boolean.parseBoolean(strAutoLock.getValue().toString()); } catch (Exception e) { autoLockRelease = false; - log.warn("VFS Auto lock removal not set properly. Given value is : " - + strAutoLock + ", defaults to - " + autoLockRelease, e); + String message = "VFS Auto lock removal not set properly. Given value is : " + + strAutoLock + ", defaults to - " + autoLockRelease; + VFSTransportErrorHandler.logException(log, LogType.WARN, message, e); } if (autoLockRelease) { Parameter strAutoLockInterval = transportOut @@ -129,9 +131,9 @@ public void init(ConfigurationContext cfgCtx, TransportOutDescription transportO autoLockReleaseInterval = Long.parseLong(strAutoLockInterval.getValue().toString()); } catch (Exception e) { autoLockReleaseInterval = null; - log.warn( - "VFS Auto lock release interval is not set properly. Given value is : " - + strAutoLockInterval + ", defaults to - null", e); + String message = "VFS Auto lock release interval is not set properly. Given value is : " + + strAutoLockInterval + ", defaults to - null"; + VFSTransportErrorHandler.logException(log, LogType.WARN, message, e); } } Parameter strAutoLockReleaseSameNode = transportOut @@ -143,9 +145,9 @@ public void init(ConfigurationContext cfgCtx, TransportOutDescription transportO .parseBoolean(strAutoLockReleaseSameNode.getValue().toString()); } catch (Exception e) { autoLockReleaseSameNode = true; - log.warn( - "VFS Auto lock removal same node property not set properly. Given value is : " - + autoLockReleaseSameNode + ", defaults to - " + autoLockReleaseSameNode, e); + String message = "VFS Auto lock removal same node property not set properly. Given value is : " + + autoLockReleaseSameNode + ", defaults to - " + autoLockReleaseSameNode; + VFSTransportErrorHandler.logException(log, LogType.WARN, message, e); } } } @@ -156,7 +158,8 @@ public void init(ConfigurationContext cfgCtx, TransportOutDescription transportO vfsParamDTO.setAutoLockReleaseInterval(autoLockReleaseInterval); vfsParamDTO.setAutoLockReleaseSameNode(autoLockReleaseSameNode); } catch (FileSystemException e) { - handleException("Error initializing the file transport : " + e.getMessage(), e); + String message = "Error initializing the file transport : " + e.getMessage(); + VFSTransportErrorHandler.handleException(log, message, e); } } @@ -214,7 +217,8 @@ protected void writeFile(MessageContext msgCtx, VFSOutTransportInfo vfsOutInfo) try { fso = VFSUtils.attachFileSystemOptions(vfsOutInfo.getOutFileSystemOptionsMap(), getFsManager()); } catch (Exception e) { - log.error("Error while attaching VFS file system properties. " + e.getMessage()); + VFSTransportErrorHandler.logException(log, LogType.ERROR, + "Error while attaching VFS file system properties. " + e.getMessage()); } if (vfsOutInfo != null) { @@ -234,7 +238,7 @@ protected void writeFile(MessageContext msgCtx, VFSOutTransportInfo vfsOutInfo) retryCount++; replyFile = getFsManager().resolveFile(vfsOutInfo.getOutFileURI(), fso); if (replyFile == null) { - log.error("replyFile is null"); + VFSTransportErrorHandler.logException(log, LogType.ERROR, "replyFile is null"); throw new FileSystemException("replyFile is null"); } // Retry if actual filesystem is corrupted, Otherwise first file after connection reset @@ -243,14 +247,14 @@ protected void writeFile(MessageContext msgCtx, VFSOutTransportInfo vfsOutInfo) wasError = false; } catch (FileSystemException e) { - log.error("cannot resolve replyFile", e); + VFSTransportErrorHandler.logException(log, LogType.ERROR, "cannot resolve replyFile", e); if (replyFile != null) { closeFileSystem(replyFile); } else { closeCachedFileSystem(vfsOutInfo, fso); } if(maxRetryCount <= retryCount) { - handleException("cannot resolve replyFile repeatedly: " + VFSTransportErrorHandler.handleException(log, "cannot resolve replyFile repeatedly: " + e.getMessage(), e); } } @@ -259,7 +263,7 @@ protected void writeFile(MessageContext msgCtx, VFSOutTransportInfo vfsOutInfo) try { Thread.sleep(reconnectionTimeout); } catch (InterruptedException e2) { - e2.printStackTrace(); + VFSTransportErrorHandler.printStackTrace(e2); } } } @@ -310,8 +314,9 @@ protected void writeFile(MessageContext msgCtx, VFSOutTransportInfo vfsOutInfo) } } else { - handleException("Unsupported reply file type : " + replyFile.getType() + - " for file : " + VFSUtils.maskURLPassword(vfsOutInfo.getOutFileURI())); + String message = "Unsupported reply file type : " + replyFile.getType() + + " for file : " + VFSUtils.maskURLPassword(vfsOutInfo.getOutFileURI()); + VFSTransportErrorHandler.handleException(log, message); } } else { // if file locking is not disabled acquire the lock before uploading the file @@ -329,8 +334,9 @@ protected void writeFile(MessageContext msgCtx, VFSOutTransportInfo vfsOutInfo) } else { closeCachedFileSystem(vfsOutInfo, fso); } - handleException("Error resolving reply file : " + - VFSUtils.maskURLPassword(vfsOutInfo.getOutFileURI()), e); + String message = "Error resolving reply file : " + + VFSUtils.maskURLPassword(vfsOutInfo.getOutFileURI()); + VFSTransportErrorHandler.handleException(log, message, e); } finally { if (replyFile != null) { try { @@ -343,12 +349,14 @@ protected void writeFile(MessageContext msgCtx, VFSOutTransportInfo vfsOutInfo) getFsManager().getFilesCache().clear(fileSystem); replyFile.close(); } catch (Exception ex) { - log.warn("Error when closing the reply file", ex); + VFSTransportErrorHandler.logException(log, LogType.WARN, + "Error when closing the reply file", ex); } } } } else { - handleException("Unable to determine out transport information to send message"); + VFSTransportErrorHandler.handleException(log, + "Unable to determine out transport information to send message"); } } @@ -357,9 +365,10 @@ private MessageFormatter getMessageFormatter(MessageContext msgContext){ try { return MessageProcessorSelector.getMessageFormatter(msgContext); } catch (AxisFault axisFault) { - throw new BaseTransportException("Unable to get the message formatter to use"); + VFSTransportErrorHandler.throwException( + new BaseTransportException("Unable to get the message formatter to use")); } - + return null; } protected void populateResponseFile(FileObject responseFile, MessageContext msgContext, @@ -387,7 +396,7 @@ protected void populateResponseFile(FileObject responseFile, MessageContext msgC } responseFile.getContent().setLastModifiedTime(lastModified); } catch (Exception e) { - log.warn("Could not set last modified.", e); + VFSTransportErrorHandler.logException(log, LogType.WARN, "Could not set last modified.", e); } } @@ -402,7 +411,8 @@ protected void populateResponseFile(FileObject responseFile, MessageContext msgC metrics.incrementFaultsSending(); String responseFileURI = responseFile.getName().getURI(); closeFileSystem(responseFile); - handleException("IO Error while creating response file : " + VFSUtils.maskURLPassword(responseFileURI), e); + String message = "IO Error while creating response file : " + VFSUtils.maskURLPassword(responseFileURI); + VFSTransportErrorHandler.handleException(log, message, e); } } @@ -413,14 +423,15 @@ protected void acquireLockForSending(FileObject responseFile, VFSOutTransportInf // wait till we get the lock while (!VFSUtils.acquireLock(getFsManager(), responseFile, fso, false)) { if (vfsOutInfo.getMaxRetryCount() == tryNum++) { - handleException("Couldn't send the message to file : " + String message = "Couldn't send the message to file : " + VFSUtils.maskURLPassword(responseFile.getName().getURI()) + ", unable to acquire the " + - "lock even after " + tryNum + " retries"); + "lock even after " + tryNum + " retries"; + VFSTransportErrorHandler.handleException(log, message); } else { - - log.warn("Couldn't get the lock for the file : " + String message = "Couldn't get the lock for the file : " + VFSUtils.maskURLPassword(responseFile.getName().getURI()) + ", retry : " + tryNum - + " scheduled after : " + vfsOutInfo.getReconnectTimeout()); + + " scheduled after : " + vfsOutInfo.getReconnectTimeout(); + VFSTransportErrorHandler.logException(log, LogType.WARN, message); try { Thread.sleep(vfsOutInfo.getReconnectTimeout()); } catch (InterruptedException ignore) {} @@ -466,7 +477,8 @@ private void closeFileSystem(FileObject fileObject) { } fileObject.close(); } catch (FileSystemException warn) { - log.warn("Error on closing the file: " + fileObject.getName().getPath(), warn); + String message = "Error on closing the file: " + fileObject.getName().getPath(); + VFSTransportErrorHandler.logException(log, LogType.WARN, message, warn); } } @@ -474,7 +486,7 @@ private void closeCachedFileSystem(VFSOutTransportInfo vfsOutInfo, FileSystemOpt try { ((DefaultFileSystemManager) getFsManager()).closeCachedFileSystem(vfsOutInfo.getOutFileURI(), fso); } catch (Exception e1) { - log.debug("Unable to clear file system", e1); + VFSTransportErrorHandler.logException(log, LogType.DEBUG, "Unable to clear file system", e1); } } From 54cb6ebe323e47646d2632646de0eb3accb3ac68 Mon Sep 17 00:00:00 2001 From: Dulanjali Dilmi Date: Thu, 31 Aug 2023 10:31:21 +0530 Subject: [PATCH 012/308] Log config name in VFS error flow Related issue: https://github.com/wso2/api-manager/issues/1945 --- .../synapse/transport/vfs/PollTableEntry.java | 11 ++-- .../vfs/VFSTransportErrorHandler.java | 63 +++++++++++++++++++ .../transport/vfs/VFSTransportListener.java | 47 ++++++++------ .../transport/vfs/VFSTransportSender.java | 62 +++++++++--------- 4 files changed, 130 insertions(+), 53 deletions(-) diff --git a/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/PollTableEntry.java b/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/PollTableEntry.java index 84d8d110a8..8953838fa1 100644 --- a/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/PollTableEntry.java +++ b/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/PollTableEntry.java @@ -160,7 +160,7 @@ public String getFileURI() { } catch (UnknownHostException | FileSystemException e) { String message = "Unable to resolve the hostname of transport.vfs.FileURI : " + VFSUtils.maskURLPassword(fileURI); - VFSTransportErrorHandler.logException(log, LogType.WARN, message, e); + VFSTransportErrorHandler.logException(log, LogType.WARN, message, getServiceName(), e); } } return fileURI; @@ -173,7 +173,7 @@ public String getReplyFileURI() { } catch (UnknownHostException | FileSystemException e) { String message = "Unable to resolve the hostname of transport.vfs.ReplyFileURI : " + VFSUtils.maskURLPassword(replyFileURI); - VFSTransportErrorHandler.logException(log, LogType.WARN, message, e); + VFSTransportErrorHandler.logException(log, LogType.WARN, message, getServiceName(), e); } } return replyFileURI; @@ -210,7 +210,7 @@ public String getMoveAfterProcess() { } catch (UnknownHostException | FileSystemException e) { String message = "Unable to resolve the hostname of transport.vfs.MoveAfterProcess: " + VFSUtils.maskURLPassword(moveAfterProcess); - VFSTransportErrorHandler.logException(log, LogType.WARN, message, e); + VFSTransportErrorHandler.logException(log, LogType.WARN, message, getServiceName(), e); } } return moveAfterProcess; @@ -223,7 +223,7 @@ public String getMoveAfterMoveFailure() { } catch (UnknownHostException | FileSystemException e) { String message = "Unable to resolve the hostname of transport.vfs.MoveAfterFailedMove: " + VFSUtils.maskURLPassword(moveAfterMoveFailure); - VFSTransportErrorHandler.logException(log, LogType.WARN, message, e); + VFSTransportErrorHandler.logException(log, LogType.WARN, message, getServiceName(), e); } } return moveAfterMoveFailure; @@ -295,7 +295,7 @@ public String getMoveAfterFailure() { } catch (UnknownHostException | FileSystemException e) { String message = "Unable to resolve the hostname of transport.vfs.MoveAfterFailure: " + VFSUtils.maskURLPassword(moveAfterFailure); - VFSTransportErrorHandler.logException(log, LogType.WARN, message, e); + VFSTransportErrorHandler.logException(log, LogType.WARN, message, getServiceName(), e); } } return moveAfterFailure; @@ -509,7 +509,6 @@ public void setSubfolderTimestamp(String subfolderTimestamp) { @Override public boolean loadConfiguration(ParameterInclude params) throws AxisFault { - decryptParamsIfRequired(params); this.params = params; resolveHostsDynamically = ParamUtils.getOptionalParamBoolean(params, diff --git a/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportErrorHandler.java b/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportErrorHandler.java index 9008910e5e..7efc5ebfb8 100644 --- a/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportErrorHandler.java +++ b/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportErrorHandler.java @@ -54,6 +54,19 @@ public static void logException(Log log, LogType type, String message, Exception } } + /** + * This method is used to log exceptions with exception + * @param log Log + * @param type {@link LogType} + * @param message String message to be logged + * @param configName String name of the configuration + * @param e Exception + */ + public static void logException(Log log, LogType type, String message, String configName, Exception e) { + message = constructLogMessage(message, configName); + logException(log, type, message, e); + } + /** * This method is used to log exceptions without exception * @param log Log @@ -80,6 +93,18 @@ public static void logException(Log log, LogType type, String message) { } } + /** + * This method is used to log exceptions without exception + * @param log Log + * @param type {@link LogType} + * @param message String message to be logged + * @param configName String name of the configuration + */ + public static void logException(Log log, LogType type, String message, String configName) { + message = constructLogMessage(message, configName); + logException(log, type, message); + } + /** * This method is used to handle exceptions. Log error message and throws an AxisFault with the exception * @param log Log @@ -92,6 +117,19 @@ public static void handleException(Log log, String message, Exception e) throws throw new AxisFault(message, e); } + /** + * This method is used to handle exceptions. Log error message and throws an AxisFault with the exception + * @param log Log + * @param message String message to be logged + * @param configName String name of the configuration + * @param e Exception + * @throws AxisFault + */ + public static void handleException(Log log, String message, String configName, Exception e) throws AxisFault { + logException(log, LogType.ERROR, message, configName, e); + throw new AxisFault(message, e); + } + /** * This method is used to handle exceptions. Log error message and throws an AxisFault * @param log Log @@ -103,6 +141,18 @@ public static void handleException(Log log, String message) throws AxisFault { throw new AxisFault(message); } + /** + * This method is used to handle exceptions. Log error message and throws an AxisFault + * @param log Log + * @param message String message to be logged + * @param configName String name of the configuration + * @throws AxisFault + */ + public static void handleException(Log log, String message, String configName) throws AxisFault { + logException(log, LogType.ERROR, message, configName); + throw new AxisFault(message); + } + /** * This method is used to handle print the stack trace * @param e InterruptedException @@ -129,4 +179,17 @@ public enum LogType { ERROR, FATAL } + + /** + * This method is used to construct the log message + * @param message String message to be logged + * @param configName String name of the configuration + * @return String constructed log message + */ + public static String constructLogMessage(String message, String configName) { + if (null == configName || configName.trim().isEmpty()) { + return message; + } + return "[Service: ".concat(configName).concat("] - ").concat(message); + } } diff --git a/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java b/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java index 5e9e6836d7..74c9b2cc27 100644 --- a/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java +++ b/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java @@ -196,6 +196,7 @@ protected void poll(PollTableEntry entry) { * @param fileURI the file or directory to be scanned */ protected void scanFileOrDirectory(final PollTableEntry entry, String fileURI) { + String serviceName = entry.getServiceName(); if (log.isDebugEnabled()) { log.debug("Polling: " + VFSUtils.maskURLPassword(fileURI)); } @@ -225,7 +226,7 @@ protected void scanFileOrDirectory(final PollTableEntry entry, String fileURI) { fso = VFSUtils.attachFileSystemOptions(entry.getVfsSchemeProperties(), getFsManager()); } catch (Exception e) { VFSTransportErrorHandler.logException(log, LogType.ERROR, - "Error while attaching VFS file system properties. ", e); + "Error while attaching VFS file system properties. ", serviceName, e); } FileObject fileObject = null; @@ -268,10 +269,11 @@ protected void scanFileOrDirectory(final PollTableEntry entry, String fileURI) { VFSUtils.maskURLPassword(fileURI) + ", in attempt " + retryCount + ", " + e.getMessage() + " Retrying in " + reconnectionTimeout + " milliseconds."; - VFSTransportErrorHandler.logException(log, LogType.WARN, message); + VFSTransportErrorHandler.logException(log, LogType.WARN, message, serviceName); } } catch (Exception e) { - VFSTransportErrorHandler.logException(log, LogType.WARN, "Runtime error may have occurred. ", e); + VFSTransportErrorHandler.logException(log, LogType.WARN, "Runtime error may have occurred. ", + serviceName, e); closeCachedFileSystem(fileURI, fso); } @@ -281,7 +283,7 @@ protected void scanFileOrDirectory(final PollTableEntry entry, String fileURI) { } catch (InterruptedException e2) { Thread.currentThread().interrupt(); VFSTransportErrorHandler.logException(log, LogType.ERROR, - "Thread was interrupted while waiting to reconnect.", e2); + "Thread was interrupted while waiting to reconnect.", serviceName, e2); } } } @@ -297,7 +299,7 @@ protected void scanFileOrDirectory(final PollTableEntry entry, String fileURI) { } catch (FileNotFolderException ignored) { } catch (FileSystemException ex) { closeFileSystem(fileObject); - VFSTransportErrorHandler.logException(log, LogType.ERROR, ex.getMessage(), ex); + VFSTransportErrorHandler.logException(log, LogType.ERROR, ex.getMessage(), serviceName, ex); } // if this is a file that would translate to a single message @@ -330,12 +332,12 @@ protected void scanFileOrDirectory(final PollTableEntry entry, String fileURI) { String message = "Error processing File URI : " + VFSUtils.maskURLPassword(fileObject.getName().toString()) + ". This can be due to file moved from another process."; - VFSTransportErrorHandler.logException(log, LogType.WARN, message); + VFSTransportErrorHandler.logException(log, LogType.WARN, message, serviceName); runPostProcess = false; } else { String message = "Error processing File URI : " + VFSUtils.maskURLPassword(fileObject.getName().getURI()); - VFSTransportErrorHandler.logException(log, LogType.ERROR, message, e); + VFSTransportErrorHandler.logException(log, LogType.ERROR, message, serviceName, e); entry.setLastPollState(PollTableEntry.FAILED); metrics.incrementFaultsReceiving(); } @@ -348,7 +350,8 @@ protected void scanFileOrDirectory(final PollTableEntry entry, String fileURI) { String message = "File object '" + VFSUtils.maskURLPassword(fileObject.getURL().toString()) + "' " + "cloud not be moved"; - VFSTransportErrorHandler.logException(log, LogType.ERROR, message, axisFault); + VFSTransportErrorHandler.logException(log, LogType.ERROR, message, serviceName, + axisFault); entry.setLastPollState(PollTableEntry.FAILED); String timeStamp = VFSUtils.getSystemTime(entry.getFailedRecordTimestampFormat()); addFailedRecord(entry, fileObject, timeStamp); @@ -671,6 +674,7 @@ protected boolean acquireLock(FileSystemManager fsManager, FileObject fileObject protected void moveOrDeleteAfterProcessing(final PollTableEntry entry, FileObject fileObject, FileSystemOptions fso) throws AxisFault { + String serviceName = entry.getServiceName(); String moveToDirectoryURI = null; try { switch (entry.getLastPollState()) { @@ -721,7 +725,7 @@ protected void moveOrDeleteAfterProcessing(final PollTableEntry entry, FileObjec VFSUtils.parseSchemeFileOptions(moveToDirectoryURI, entry.getParams()), getFsManager()); } catch (Exception e) { VFSTransportErrorHandler.logException(log, LogType.WARN, - "Unable to set options for processed file location ", e); + "Unable to set options for processed file location ", serviceName, e); } FileObject moveToDirectory = getFsManager().resolveFile(moveToDirectoryURI, destinationFSO); String prefix; @@ -749,7 +753,7 @@ protected void moveOrDeleteAfterProcessing(final PollTableEntry entry, FileObjec closeFileSystem(fileObject); String message = "Error moving file : " + VFSUtils.maskURLPassword(fileObject.toString()) + " to " + VFSUtils.maskURLPassword(moveToDirectoryURI); - VFSTransportErrorHandler.handleException(log, message, e); + VFSTransportErrorHandler.handleException(log, message, serviceName, e); }finally{ try { fileObject.close(); @@ -767,12 +771,13 @@ protected void moveOrDeleteAfterProcessing(final PollTableEntry entry, FileObjec if (!fileObject.delete()) { String msg = "Cannot delete file : " + VFSUtils.maskURLPassword(fileObject.toString()); - VFSTransportErrorHandler.handleException(log, msg); + VFSTransportErrorHandler.handleException(log, msg, serviceName); } } catch (FileSystemException e) { closeFileSystem(fileObject); - log.error("Error deleting file : " - + VFSUtils.maskURLPassword(fileObject.toString()), e); + String msg = "Error deleting file : " + + VFSUtils.maskURLPassword(fileObject.toString()); + VFSTransportErrorHandler.handleException(log, msg, serviceName, e); } } @@ -985,6 +990,7 @@ private Properties generateSecureVaultProperties(TransportInDescription inDescri protected synchronized void addFailedRecord(PollTableEntry pollTableEntry, FileObject failedObject, String timeString) { + String serviceName = pollTableEntry.getServiceName(); try { String record = failedObject.getName().getBaseName() + VFSConstants.FAILED_RECORD_DELIMITER + timeString; @@ -1007,7 +1013,8 @@ protected synchronized void addFailedRecord(PollTableEntry pollTableEntry, FileUtils.writeLines(failedRecordFile, content); } } catch (IOException e) { - VFSTransportErrorHandler.logException(log, LogType.FATAL, "Failure while writing the failed records!", e); + VFSTransportErrorHandler.logException(log, LogType.FATAL, + "Failure while writing the failed records!", serviceName, e); } } @@ -1070,6 +1077,7 @@ public void run() { boolean isDeletionSucceed = false; int nextRetryDuration = pollTableEntry.getNextRetryDuration(); int count = 0; + String serviceName = pollTableEntry.getServiceName(); while (!isDeletionSucceed) { try { reTryFailedMove(pollTableEntry, failedFileObject, fileSystemOptions); @@ -1082,11 +1090,11 @@ public void run() { + VFSUtils.maskURLPassword(failedFileObject.getURL().toString()) + "', next re-try will be " +"after '" + nextRetryDuration + "' milliseconds"; - VFSTransportErrorHandler.logException(log, LogType.ERROR, message); + VFSTransportErrorHandler.logException(log, LogType.ERROR, message, serviceName); } catch (FileSystemException e) { String message = "Error while retrying the file url of the file object '" + VFSUtils.maskURLPassword(failedFileObject.toString()) + "'"; - VFSTransportErrorHandler.logException(log, LogType.ERROR, message); + VFSTransportErrorHandler.logException(log, LogType.ERROR, message, serviceName); } try { Thread.sleep(nextRetryDuration); @@ -1099,6 +1107,7 @@ public void run() { private synchronized void reTryFailedMove(PollTableEntry entry, FileObject fileObject, FileSystemOptions fso) throws AxisFault { + String serviceName = entry.getServiceName(); try { String moveToDirectoryURI = entry.getMoveAfterMoveFailure(); @@ -1124,14 +1133,14 @@ private synchronized void reTryFailedMove(PollTableEntry entry, FileObject fileO closeFileSystem(fileObject); String message = "Error moving the failed file : " + VFSUtils.maskURLPassword(fileObject.toString()) + " to " + moveToDirectoryURI; - VFSTransportErrorHandler.handleException(log, message, e); + VFSTransportErrorHandler.handleException(log, message, serviceName, e); } } catch (FileSystemException e) { String message = "Cloud not move the failed file object '" + VFSUtils.maskURLPassword(fileObject.toString()) + "'"; - VFSTransportErrorHandler.handleException(log, message, e); + VFSTransportErrorHandler.handleException(log, message, serviceName, e); } catch (IOException e) { - VFSTransportErrorHandler.handleException(log, "Cloud not create the folder", e); + VFSTransportErrorHandler.handleException(log, "Cloud not create the folder", serviceName, e); } } } diff --git a/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java b/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java index f11e9a3291..960404a4f4 100644 --- a/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java +++ b/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportSender.java @@ -212,13 +212,13 @@ public void sendMessage(MessageContext msgCtx, String targetAddress, } protected void writeFile(MessageContext msgCtx, VFSOutTransportInfo vfsOutInfo) throws AxisFault { - + String configName = (String) msgCtx.getProperty("_INTERNAL_TRIGGER_NAME"); FileSystemOptions fso = null; try { fso = VFSUtils.attachFileSystemOptions(vfsOutInfo.getOutFileSystemOptionsMap(), getFsManager()); } catch (Exception e) { VFSTransportErrorHandler.logException(log, LogType.ERROR, - "Error while attaching VFS file system properties. " + e.getMessage()); + "Error while attaching VFS file system properties. " + e.getMessage(), configName); } if (vfsOutInfo != null) { @@ -238,7 +238,7 @@ protected void writeFile(MessageContext msgCtx, VFSOutTransportInfo vfsOutInfo) retryCount++; replyFile = getFsManager().resolveFile(vfsOutInfo.getOutFileURI(), fso); if (replyFile == null) { - VFSTransportErrorHandler.logException(log, LogType.ERROR, "replyFile is null"); + VFSTransportErrorHandler.logException(log, LogType.ERROR, "replyFile is null", configName); throw new FileSystemException("replyFile is null"); } // Retry if actual filesystem is corrupted, Otherwise first file after connection reset @@ -247,15 +247,16 @@ protected void writeFile(MessageContext msgCtx, VFSOutTransportInfo vfsOutInfo) wasError = false; } catch (FileSystemException e) { - VFSTransportErrorHandler.logException(log, LogType.ERROR, "cannot resolve replyFile", e); + VFSTransportErrorHandler.logException(log, LogType.ERROR, + "cannot resolve replyFile", configName, e); if (replyFile != null) { - closeFileSystem(replyFile); + closeFileSystem(replyFile, configName); } else { - closeCachedFileSystem(vfsOutInfo, fso); + closeCachedFileSystem(vfsOutInfo, fso, configName); } if(maxRetryCount <= retryCount) { VFSTransportErrorHandler.handleException(log, "cannot resolve replyFile repeatedly: " - + e.getMessage(), e); + + e.getMessage(), configName, e); } } @@ -294,7 +295,7 @@ protected void writeFile(MessageContext msgCtx, VFSOutTransportInfo vfsOutInfo) // if file locking is not disabled acquire the lock // before uploading the file if (vfsOutInfo.isFileLockingEnabled()) { - acquireLockForSending(responseFile, vfsOutInfo, fso); + acquireLockForSending(responseFile, vfsOutInfo, fso, configName); populateResponseFile(responseFile, msgCtx,append, true, updateLastModified, fso); VFSUtils.releaseLock(getFsManager(), responseFile, fso); } else { @@ -306,7 +307,7 @@ protected void writeFile(MessageContext msgCtx, VFSOutTransportInfo vfsOutInfo) // if file locking is not disabled acquire the lock // before uploading the file if (vfsOutInfo.isFileLockingEnabled()) { - acquireLockForSending(replyFile, vfsOutInfo, fso); + acquireLockForSending(replyFile, vfsOutInfo, fso, configName); populateResponseFile(replyFile, msgCtx, append, true, updateLastModified, fso); VFSUtils.releaseLock(getFsManager(), replyFile, fso); } else { @@ -316,12 +317,12 @@ protected void writeFile(MessageContext msgCtx, VFSOutTransportInfo vfsOutInfo) } else { String message = "Unsupported reply file type : " + replyFile.getType() + " for file : " + VFSUtils.maskURLPassword(vfsOutInfo.getOutFileURI()); - VFSTransportErrorHandler.handleException(log, message); + VFSTransportErrorHandler.handleException(log, message, configName); } } else { // if file locking is not disabled acquire the lock before uploading the file if (vfsOutInfo.isFileLockingEnabled()) { - acquireLockForSending(replyFile, vfsOutInfo, fso); + acquireLockForSending(replyFile, vfsOutInfo, fso, configName); populateResponseFile(replyFile, msgCtx, append, true, updateLastModified, fso); VFSUtils.releaseLock(getFsManager(), replyFile, fso); } else { @@ -330,13 +331,13 @@ protected void writeFile(MessageContext msgCtx, VFSOutTransportInfo vfsOutInfo) } } catch (FileSystemException e) { if (replyFile != null) { - closeFileSystem(replyFile); + closeFileSystem(replyFile, configName); } else { - closeCachedFileSystem(vfsOutInfo, fso); + closeCachedFileSystem(vfsOutInfo, fso, configName); } String message = "Error resolving reply file : " + VFSUtils.maskURLPassword(vfsOutInfo.getOutFileURI()); - VFSTransportErrorHandler.handleException(log, message, e); + VFSTransportErrorHandler.handleException(log, message, configName, e); } finally { if (replyFile != null) { try { @@ -350,23 +351,25 @@ protected void writeFile(MessageContext msgCtx, VFSOutTransportInfo vfsOutInfo) replyFile.close(); } catch (Exception ex) { VFSTransportErrorHandler.logException(log, LogType.WARN, - "Error when closing the reply file", ex); + "Error when closing the reply file", configName, ex); } } } } else { VFSTransportErrorHandler.handleException(log, - "Unable to determine out transport information to send message"); + "Unable to determine out transport information to send message", configName); } } private MessageFormatter getMessageFormatter(MessageContext msgContext){ + String configName = (String) msgContext.getProperty("_INTERNAL_TRIGGER_NAME"); try { return MessageProcessorSelector.getMessageFormatter(msgContext); } catch (AxisFault axisFault) { + String message = "Unable to get the message formatter to use"; VFSTransportErrorHandler.throwException( - new BaseTransportException("Unable to get the message formatter to use")); + new BaseTransportException(VFSTransportErrorHandler.constructLogMessage(message, configName))); } return null; } @@ -376,7 +379,8 @@ protected void populateResponseFile(FileObject responseFile, MessageContext msgC FileSystemOptions fso) throws AxisFault { MessageFormatter messageFormatter = getMessageFormatter(msgContext); OMOutputFormat format = BaseUtils.getOMOutputFormat(msgContext); - + String configName = (String) msgContext.getProperty("_INTERNAL_TRIGGER_NAME"); + try { CountingOutputStream os = new CountingOutputStream( responseFile.getContent().getOutputStream(append)); @@ -396,7 +400,8 @@ protected void populateResponseFile(FileObject responseFile, MessageContext msgC } responseFile.getContent().setLastModifiedTime(lastModified); } catch (Exception e) { - VFSTransportErrorHandler.logException(log, LogType.WARN, "Could not set last modified.", e); + VFSTransportErrorHandler.logException(log, LogType.WARN, "Could not set last modified.", + configName, e); } } @@ -410,13 +415,14 @@ protected void populateResponseFile(FileObject responseFile, MessageContext msgC } metrics.incrementFaultsSending(); String responseFileURI = responseFile.getName().getURI(); - closeFileSystem(responseFile); + closeFileSystem(responseFile, configName); String message = "IO Error while creating response file : " + VFSUtils.maskURLPassword(responseFileURI); - VFSTransportErrorHandler.handleException(log, message, e); + VFSTransportErrorHandler.handleException(log, message, configName, e); } } - protected void acquireLockForSending(FileObject responseFile, VFSOutTransportInfo vfsOutInfo, FileSystemOptions fso) + protected void acquireLockForSending(FileObject responseFile, VFSOutTransportInfo vfsOutInfo, + FileSystemOptions fso, String configName) throws AxisFault { int tryNum = 0; @@ -426,12 +432,12 @@ protected void acquireLockForSending(FileObject responseFile, VFSOutTransportInf String message = "Couldn't send the message to file : " + VFSUtils.maskURLPassword(responseFile.getName().getURI()) + ", unable to acquire the " + "lock even after " + tryNum + " retries"; - VFSTransportErrorHandler.handleException(log, message); + VFSTransportErrorHandler.handleException(log, message, configName); } else { String message = "Couldn't get the lock for the file : " + VFSUtils.maskURLPassword(responseFile.getName().getURI()) + ", retry : " + tryNum + " scheduled after : " + vfsOutInfo.getReconnectTimeout(); - VFSTransportErrorHandler.logException(log, LogType.WARN, message); + VFSTransportErrorHandler.logException(log, LogType.WARN, message, configName); try { Thread.sleep(vfsOutInfo.getReconnectTimeout()); } catch (InterruptedException ignore) {} @@ -469,7 +475,7 @@ private void setOutOnlyMep(MessageContext msgCtx) { } } - private void closeFileSystem(FileObject fileObject) { + private void closeFileSystem(FileObject fileObject, String configName) { try { //Close the File system if it is not already closed if (fileObject != null && getFsManager() != null && fileObject.getParent() != null && fileObject.getParent().getFileSystem() != null) { @@ -478,15 +484,15 @@ private void closeFileSystem(FileObject fileObject) { fileObject.close(); } catch (FileSystemException warn) { String message = "Error on closing the file: " + fileObject.getName().getPath(); - VFSTransportErrorHandler.logException(log, LogType.WARN, message, warn); + VFSTransportErrorHandler.logException(log, LogType.WARN, message, configName, warn); } } - private void closeCachedFileSystem(VFSOutTransportInfo vfsOutInfo, FileSystemOptions fso) { + private void closeCachedFileSystem(VFSOutTransportInfo vfsOutInfo, FileSystemOptions fso, String configName) { try { ((DefaultFileSystemManager) getFsManager()).closeCachedFileSystem(vfsOutInfo.getOutFileURI(), fso); } catch (Exception e1) { - VFSTransportErrorHandler.logException(log, LogType.DEBUG, "Unable to clear file system", e1); + VFSTransportErrorHandler.logException(log, LogType.DEBUG, "Unable to clear file system", configName, e1); } } From d8cc1baa9871b69b8ae68aa6b96e4afdcfe4f103 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 31 Aug 2023 16:54:56 +0000 Subject: [PATCH 013/308] [WSO2 Release] [Jenkins #6631] [Release 4.0.0-wso2v46] prepare release v4.0.0-wso2v46 --- 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 02b88d590e..5ac034b1f5 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v46-SNAPSHOT + 4.0.0-wso2v46 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 4fc2f58609..53dcc4639c 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v46-SNAPSHOT + 4.0.0-wso2v46 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index a17e2a1ce5..670a35f77e 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-wso2v46-SNAPSHOT + 4.0.0-wso2v46 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 6802228038..7c3a6de05c 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v46-SNAPSHOT + 4.0.0-wso2v46 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 83e83646ec..86a5aff98d 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v46-SNAPSHOT + 4.0.0-wso2v46 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 01a88b20bd..745f0d6daa 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v46-SNAPSHOT + 4.0.0-wso2v46 ../../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 873c7e8d8f..ea6dc973cc 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-wso2v46-SNAPSHOT + 4.0.0-wso2v46 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 a426f248f9..446bb7f14b 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-wso2v46-SNAPSHOT + 4.0.0-wso2v46 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 891fcd213e..687ee47b35 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-wso2v46-SNAPSHOT + 4.0.0-wso2v46 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 8432a93f28..713d8ee957 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-wso2v46-SNAPSHOT + 4.0.0-wso2v46 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 7bddc49845..54abf27dae 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-wso2v46-SNAPSHOT + 4.0.0-wso2v46 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 5c2cfc1fc0..b8b9ae2f2f 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-wso2v46-SNAPSHOT + 4.0.0-wso2v46 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 34e010aecc..e11eac057c 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-wso2v46-SNAPSHOT + 4.0.0-wso2v46 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index df089f0cbf..2c20e4bdcd 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v46-SNAPSHOT + 4.0.0-wso2v46 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 6c9bcdcc6f..aba5c83069 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v46-SNAPSHOT + 4.0.0-wso2v46 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 744e105ae9..edf4616b77 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v46-SNAPSHOT + 4.0.0-wso2v46 ../../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-wso2v46 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index df649ebf1e..9ba70c1b23 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v46-SNAPSHOT + 4.0.0-wso2v46 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 3f6763b227..01690c069d 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-wso2v46-SNAPSHOT + 4.0.0-wso2v46 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 9dfc5d18c3..7fe64e6f36 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-wso2v46-SNAPSHOT + 4.0.0-wso2v46 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 9c0ad831fe..8ad2815126 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v46-SNAPSHOT + 4.0.0-wso2v46 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 519ffebfce..7c0ed38fee 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v46-SNAPSHOT + 4.0.0-wso2v46 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 28154d1f02..2a52ef04ae 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v46-SNAPSHOT + 4.0.0-wso2v46 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 6898dcb090..773f07cfeb 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v46-SNAPSHOT + 4.0.0-wso2v46 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index e52dc0d362..03aa48ef3c 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-wso2v46-SNAPSHOT + 4.0.0-wso2v46 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 36293cd164..545c44d31c 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-wso2v46-SNAPSHOT + 4.0.0-wso2v46 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index ab9466387f..73406b5878 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-wso2v46-SNAPSHOT + 4.0.0-wso2v46 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 262de2ead1..879fe21136 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-wso2v46-SNAPSHOT + 4.0.0-wso2v46 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 74b3c9cdd6..a0addc9a0e 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v46-SNAPSHOT + 4.0.0-wso2v46 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 11294da6ee..c9c7826454 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v46-SNAPSHOT + 4.0.0-wso2v46 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index ddc346f216..d8ea1f6c5b 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-wso2v46-SNAPSHOT + 4.0.0-wso2v46 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 6104971446..ffdeed7ee1 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v46-SNAPSHOT + 4.0.0-wso2v46 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-wso2v46 Apache Software Foundation From f76f311daf2481d1b963047b1cc8ca50a7407e79 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 31 Aug 2023 16:54:58 +0000 Subject: [PATCH 014/308] [WSO2 Release] [Jenkins #6631] [Release 4.0.0-wso2v46] 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 5ac034b1f5..3f6cfd3105 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v46 + 4.0.0-wso2v47-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 53dcc4639c..33e28d4131 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v46 + 4.0.0-wso2v47-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 670a35f77e..29fa51e1c2 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-wso2v46 + 4.0.0-wso2v47-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 7c3a6de05c..7c2d37054f 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v46 + 4.0.0-wso2v47-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 86a5aff98d..7292af2ce2 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v46 + 4.0.0-wso2v47-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 745f0d6daa..d052c66f33 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v46 + 4.0.0-wso2v47-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 ea6dc973cc..6a0898ad28 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-wso2v46 + 4.0.0-wso2v47-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 446bb7f14b..b73adf8f0f 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-wso2v46 + 4.0.0-wso2v47-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 687ee47b35..2eecc4c0d1 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-wso2v46 + 4.0.0-wso2v47-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 713d8ee957..6b1b0479dc 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-wso2v46 + 4.0.0-wso2v47-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 54abf27dae..97a0711971 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-wso2v46 + 4.0.0-wso2v47-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 b8b9ae2f2f..69bec6837a 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-wso2v46 + 4.0.0-wso2v47-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 e11eac057c..1564d9fb00 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-wso2v46 + 4.0.0-wso2v47-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 2c20e4bdcd..ce6405fef3 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v46 + 4.0.0-wso2v47-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index aba5c83069..9d0fcd6d6b 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v46 + 4.0.0-wso2v47-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index edf4616b77..2b9d18ae94 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v46 + 4.0.0-wso2v47-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-wso2v46 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 9ba70c1b23..945d45b7ad 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v46 + 4.0.0-wso2v47-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 01690c069d..e64769d3a7 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-wso2v46 + 4.0.0-wso2v47-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 7fe64e6f36..02cafb8429 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-wso2v46 + 4.0.0-wso2v47-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 8ad2815126..3669e1d556 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v46 + 4.0.0-wso2v47-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 7c0ed38fee..1e26e93ae4 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v46 + 4.0.0-wso2v47-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 2a52ef04ae..ae1eee48a2 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v46 + 4.0.0-wso2v47-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 773f07cfeb..b693f4ad17 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v46 + 4.0.0-wso2v47-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 03aa48ef3c..53137dc6a6 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-wso2v46 + 4.0.0-wso2v47-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 545c44d31c..aa828ee08e 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-wso2v46 + 4.0.0-wso2v47-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 73406b5878..9177dd1aea 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-wso2v46 + 4.0.0-wso2v47-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 879fe21136..8d7402e4ff 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-wso2v46 + 4.0.0-wso2v47-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index a0addc9a0e..940fbd3e15 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v46 + 4.0.0-wso2v47-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index c9c7826454..f5a0b6f465 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v46 + 4.0.0-wso2v47-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index d8ea1f6c5b..4f00c8c098 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-wso2v46 + 4.0.0-wso2v47-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index ffdeed7ee1..2bb3bea9ee 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v46 + 4.0.0-wso2v47-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-wso2v46 + HEAD Apache Software Foundation From 96e7ce2f6f08698d6c1043bbfb85d8eae5a6cbb6 Mon Sep 17 00:00:00 2001 From: Arunan Sugunakumar Date: Tue, 5 Sep 2023 16:48:40 +0530 Subject: [PATCH 015/308] Properly destroy passthru worker pools during Listener destroy stage --- .../synapse/transport/passthru/PassThroughHttpListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpListener.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpListener.java index 956c0557f9..1d4ddf2a6a 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpListener.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpListener.java @@ -445,7 +445,6 @@ public void stop() throws AxisFault { } } serviceTracker.stop(); - handler.stop(); } catch (IOException e) { handleException("Error shutting down " + namePrefix + " listening IO reactor", e); } catch (InterruptedException e) { @@ -461,6 +460,7 @@ public void destroy() { getAxisConfiguration().getObserversList().remove(axisObserver);*/ // serviceTracker.stop(); sourceConfiguration.getMetrics().destroy(); + handler.stop(); } /** From 68a64ad2a261ac7a1b9c2391a03c3d6c2d0fb646 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 6 Sep 2023 03:29:15 +0000 Subject: [PATCH 016/308] [WSO2 Release] [Jenkins #6639] [Release 4.0.0-wso2v47] prepare release v4.0.0-wso2v47 --- 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 3f6cfd3105..f90e868700 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v47-SNAPSHOT + 4.0.0-wso2v47 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 33e28d4131..5e132df7fb 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v47-SNAPSHOT + 4.0.0-wso2v47 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 29fa51e1c2..d525fffabe 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-wso2v47-SNAPSHOT + 4.0.0-wso2v47 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 7c2d37054f..4dec1e8be3 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v47-SNAPSHOT + 4.0.0-wso2v47 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 7292af2ce2..304c7b6ff0 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v47-SNAPSHOT + 4.0.0-wso2v47 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index d052c66f33..4edd35bc21 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v47-SNAPSHOT + 4.0.0-wso2v47 ../../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 6a0898ad28..ab17aadf76 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-wso2v47-SNAPSHOT + 4.0.0-wso2v47 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 b73adf8f0f..81a04fc997 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-wso2v47-SNAPSHOT + 4.0.0-wso2v47 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 2eecc4c0d1..10914ac566 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-wso2v47-SNAPSHOT + 4.0.0-wso2v47 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 6b1b0479dc..bab046b0ed 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-wso2v47-SNAPSHOT + 4.0.0-wso2v47 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 97a0711971..cdad2612cd 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-wso2v47-SNAPSHOT + 4.0.0-wso2v47 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 69bec6837a..b83d867469 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-wso2v47-SNAPSHOT + 4.0.0-wso2v47 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 1564d9fb00..310ff3cdeb 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-wso2v47-SNAPSHOT + 4.0.0-wso2v47 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index ce6405fef3..d1a421007c 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v47-SNAPSHOT + 4.0.0-wso2v47 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 9d0fcd6d6b..7f1f355e23 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v47-SNAPSHOT + 4.0.0-wso2v47 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 2b9d18ae94..eb99f90164 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v47-SNAPSHOT + 4.0.0-wso2v47 ../../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-wso2v47 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 945d45b7ad..014967643c 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v47-SNAPSHOT + 4.0.0-wso2v47 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index e64769d3a7..fcee2a8295 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-wso2v47-SNAPSHOT + 4.0.0-wso2v47 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 02cafb8429..539b7874b7 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-wso2v47-SNAPSHOT + 4.0.0-wso2v47 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 3669e1d556..a590e70194 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v47-SNAPSHOT + 4.0.0-wso2v47 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 1e26e93ae4..7eeae85725 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v47-SNAPSHOT + 4.0.0-wso2v47 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index ae1eee48a2..90458fa290 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v47-SNAPSHOT + 4.0.0-wso2v47 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index b693f4ad17..a740e20817 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v47-SNAPSHOT + 4.0.0-wso2v47 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 53137dc6a6..e53217fed2 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-wso2v47-SNAPSHOT + 4.0.0-wso2v47 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index aa828ee08e..2ff7ea5f69 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-wso2v47-SNAPSHOT + 4.0.0-wso2v47 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 9177dd1aea..062895ddf7 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-wso2v47-SNAPSHOT + 4.0.0-wso2v47 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 8d7402e4ff..9039f76d7b 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-wso2v47-SNAPSHOT + 4.0.0-wso2v47 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 940fbd3e15..57eae13d9a 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v47-SNAPSHOT + 4.0.0-wso2v47 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index f5a0b6f465..8b9d8546ab 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v47-SNAPSHOT + 4.0.0-wso2v47 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 4f00c8c098..50fb4ab3b4 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-wso2v47-SNAPSHOT + 4.0.0-wso2v47 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 2bb3bea9ee..07ad361235 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v47-SNAPSHOT + 4.0.0-wso2v47 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-wso2v47 Apache Software Foundation From c62fcca81140ea55ce78bde025a6e00ee3704cb6 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 6 Sep 2023 03:29:17 +0000 Subject: [PATCH 017/308] [WSO2 Release] [Jenkins #6639] [Release 4.0.0-wso2v47] 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 f90e868700..ccee2678d3 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v47 + 4.0.0-wso2v48-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 5e132df7fb..c2a93b9139 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v47 + 4.0.0-wso2v48-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index d525fffabe..36d9265d76 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-wso2v47 + 4.0.0-wso2v48-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 4dec1e8be3..f0446699d0 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v47 + 4.0.0-wso2v48-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 304c7b6ff0..1ef31d7de5 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v47 + 4.0.0-wso2v48-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 4edd35bc21..89154bc4e6 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v47 + 4.0.0-wso2v48-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 ab17aadf76..950fe11707 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-wso2v47 + 4.0.0-wso2v48-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 81a04fc997..0da86b5a18 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-wso2v47 + 4.0.0-wso2v48-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 10914ac566..a06efc11b9 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-wso2v47 + 4.0.0-wso2v48-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 bab046b0ed..eb9a93ae63 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-wso2v47 + 4.0.0-wso2v48-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 cdad2612cd..8514de29a2 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-wso2v47 + 4.0.0-wso2v48-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 b83d867469..5d69122eeb 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-wso2v47 + 4.0.0-wso2v48-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 310ff3cdeb..3e5888e8df 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-wso2v47 + 4.0.0-wso2v48-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index d1a421007c..7e358f50eb 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v47 + 4.0.0-wso2v48-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 7f1f355e23..d6957aaacd 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v47 + 4.0.0-wso2v48-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index eb99f90164..ff6e08a18a 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v47 + 4.0.0-wso2v48-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-wso2v47 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 014967643c..4c3b62954d 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v47 + 4.0.0-wso2v48-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index fcee2a8295..3ac34b00b9 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-wso2v47 + 4.0.0-wso2v48-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 539b7874b7..4e6666960d 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-wso2v47 + 4.0.0-wso2v48-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index a590e70194..3d838d608a 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v47 + 4.0.0-wso2v48-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 7eeae85725..8981ec1159 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v47 + 4.0.0-wso2v48-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 90458fa290..3708cf1a51 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v47 + 4.0.0-wso2v48-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index a740e20817..1dca23ceba 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v47 + 4.0.0-wso2v48-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index e53217fed2..7ce96ad535 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-wso2v47 + 4.0.0-wso2v48-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 2ff7ea5f69..d575706341 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-wso2v47 + 4.0.0-wso2v48-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 062895ddf7..474440bd15 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-wso2v47 + 4.0.0-wso2v48-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 9039f76d7b..d9c6f392aa 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-wso2v47 + 4.0.0-wso2v48-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 57eae13d9a..1e650c01b6 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v47 + 4.0.0-wso2v48-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 8b9d8546ab..c47d71d03b 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v47 + 4.0.0-wso2v48-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 50fb4ab3b4..aef7c77180 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-wso2v47 + 4.0.0-wso2v48-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 07ad361235..34bc564a5a 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v47 + 4.0.0-wso2v48-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-wso2v47 + HEAD Apache Software Foundation From 4a9d68b36b57b6c43a05bdb7cb7826c10d50bc46 Mon Sep 17 00:00:00 2001 From: Sajinie Date: Thu, 14 Sep 2023 16:06:12 +0530 Subject: [PATCH 018/308] Fix NPE when Opentelemetry+Statistics are enabled with inbound endpoints --- .../management/handling/span/SpanHandler.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 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 90f8eb4188..7e53367d38 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 @@ -208,7 +208,10 @@ private void startSpan(StatisticDataUnit statisticDataUnit, MessageContext synCt 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 (isOuterLevelSpan(statisticDataUnit, spanStore) && headersMap != null) { + if (headersMap == null) { + headersMap = new HashMap(); + } + if (isOuterLevelSpan(statisticDataUnit, spanStore)) { // Extract span context from headers context = extract(headersMap); } else { @@ -274,9 +277,10 @@ private void bufferSequenceContinuationState(StatisticDataUnit statisticDataUnit * @return Whether the given statistic data unit denotes an outer level span. */ private boolean isOuterLevelSpan(StatisticDataUnit statisticDataUnit, SpanStore spanStore) { - return spanStore.getOuterLevelSpanWrapper() == null && - (statisticDataUnit.getComponentType() == ComponentType.PROXYSERVICE || - statisticDataUnit.getComponentType() == ComponentType.API); + return spanStore.getOuterLevelSpanWrapper() == null + && (statisticDataUnit.getComponentType() == ComponentType.PROXYSERVICE + || statisticDataUnit.getComponentType() == ComponentType.API + || statisticDataUnit.getComponentType() == ComponentType.INBOUNDENDPOINT); } @Override From 39ee7fe78c21d103912072a31cdd7fed8d57793c Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 15 Sep 2023 03:57:36 +0000 Subject: [PATCH 019/308] [WSO2 Release] [Jenkins #6647] [Release 4.0.0-wso2v48] prepare release v4.0.0-wso2v48 --- 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 ccee2678d3..feb5f17c4e 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v48-SNAPSHOT + 4.0.0-wso2v48 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index c2a93b9139..0dfe3c0899 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v48-SNAPSHOT + 4.0.0-wso2v48 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 36d9265d76..51d6976492 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-wso2v48-SNAPSHOT + 4.0.0-wso2v48 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index f0446699d0..d957ba50c0 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v48-SNAPSHOT + 4.0.0-wso2v48 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 1ef31d7de5..6614fd7863 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v48-SNAPSHOT + 4.0.0-wso2v48 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 89154bc4e6..ac283ab959 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v48-SNAPSHOT + 4.0.0-wso2v48 ../../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 950fe11707..0391211bbc 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-wso2v48-SNAPSHOT + 4.0.0-wso2v48 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 0da86b5a18..b491f874c5 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-wso2v48-SNAPSHOT + 4.0.0-wso2v48 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 a06efc11b9..57fafb60b4 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-wso2v48-SNAPSHOT + 4.0.0-wso2v48 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 eb9a93ae63..766b537233 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-wso2v48-SNAPSHOT + 4.0.0-wso2v48 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 8514de29a2..8c7b1c8a36 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-wso2v48-SNAPSHOT + 4.0.0-wso2v48 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 5d69122eeb..215dae97e8 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-wso2v48-SNAPSHOT + 4.0.0-wso2v48 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 3e5888e8df..435801f0d9 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-wso2v48-SNAPSHOT + 4.0.0-wso2v48 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 7e358f50eb..0991757f4b 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v48-SNAPSHOT + 4.0.0-wso2v48 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index d6957aaacd..e3303fc952 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v48-SNAPSHOT + 4.0.0-wso2v48 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index ff6e08a18a..b4f928df09 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v48-SNAPSHOT + 4.0.0-wso2v48 ../../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-wso2v48 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 4c3b62954d..2961a3cf1d 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v48-SNAPSHOT + 4.0.0-wso2v48 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 3ac34b00b9..88a8bd1896 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-wso2v48-SNAPSHOT + 4.0.0-wso2v48 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 4e6666960d..c532c3d2f8 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-wso2v48-SNAPSHOT + 4.0.0-wso2v48 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 3d838d608a..3c3888cfb9 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v48-SNAPSHOT + 4.0.0-wso2v48 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 8981ec1159..1f69386d9c 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v48-SNAPSHOT + 4.0.0-wso2v48 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 3708cf1a51..f7149f5b0d 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v48-SNAPSHOT + 4.0.0-wso2v48 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 1dca23ceba..01738f7d20 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v48-SNAPSHOT + 4.0.0-wso2v48 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 7ce96ad535..873c22cb9d 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-wso2v48-SNAPSHOT + 4.0.0-wso2v48 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index d575706341..73cc51f52c 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-wso2v48-SNAPSHOT + 4.0.0-wso2v48 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 474440bd15..4fd789ec92 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-wso2v48-SNAPSHOT + 4.0.0-wso2v48 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index d9c6f392aa..fa2806b4ee 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-wso2v48-SNAPSHOT + 4.0.0-wso2v48 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 1e650c01b6..8c041ca88b 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v48-SNAPSHOT + 4.0.0-wso2v48 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index c47d71d03b..81c42856b9 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v48-SNAPSHOT + 4.0.0-wso2v48 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index aef7c77180..5b3385b084 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-wso2v48-SNAPSHOT + 4.0.0-wso2v48 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 34bc564a5a..bbbc7ad2c4 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v48-SNAPSHOT + 4.0.0-wso2v48 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-wso2v48 Apache Software Foundation From 6099014ad63a2d6aa3d066104a63f353e1f71d56 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 15 Sep 2023 03:57:38 +0000 Subject: [PATCH 020/308] [WSO2 Release] [Jenkins #6647] [Release 4.0.0-wso2v48] 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 feb5f17c4e..0c95573080 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v48 + 4.0.0-wso2v49-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 0dfe3c0899..718250add7 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v48 + 4.0.0-wso2v49-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 51d6976492..63f6b13d59 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-wso2v48 + 4.0.0-wso2v49-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index d957ba50c0..0f3276033a 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v48 + 4.0.0-wso2v49-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 6614fd7863..62bcbf0463 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v48 + 4.0.0-wso2v49-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index ac283ab959..92008b9d3f 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v48 + 4.0.0-wso2v49-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 0391211bbc..0012e2c9df 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-wso2v48 + 4.0.0-wso2v49-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 b491f874c5..a06149e343 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-wso2v48 + 4.0.0-wso2v49-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 57fafb60b4..ec78dbd439 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-wso2v48 + 4.0.0-wso2v49-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 766b537233..60fd114437 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-wso2v48 + 4.0.0-wso2v49-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 8c7b1c8a36..5b887f8055 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-wso2v48 + 4.0.0-wso2v49-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 215dae97e8..11159ae256 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-wso2v48 + 4.0.0-wso2v49-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 435801f0d9..7b86ab2f10 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-wso2v48 + 4.0.0-wso2v49-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 0991757f4b..559b1033b9 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v48 + 4.0.0-wso2v49-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index e3303fc952..2cb6b70991 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v48 + 4.0.0-wso2v49-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index b4f928df09..fdfe6074a8 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v48 + 4.0.0-wso2v49-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-wso2v48 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 2961a3cf1d..ac32088d89 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v48 + 4.0.0-wso2v49-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 88a8bd1896..e61bd32926 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-wso2v48 + 4.0.0-wso2v49-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index c532c3d2f8..bbd66e466b 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-wso2v48 + 4.0.0-wso2v49-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 3c3888cfb9..96fcdfc171 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v48 + 4.0.0-wso2v49-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 1f69386d9c..1088cd457d 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v48 + 4.0.0-wso2v49-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index f7149f5b0d..bda9de0890 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v48 + 4.0.0-wso2v49-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 01738f7d20..396f038cf5 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v48 + 4.0.0-wso2v49-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 873c22cb9d..1615d99eac 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-wso2v48 + 4.0.0-wso2v49-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 73cc51f52c..daf814774c 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-wso2v48 + 4.0.0-wso2v49-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 4fd789ec92..4a1f1d13c3 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-wso2v48 + 4.0.0-wso2v49-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index fa2806b4ee..7ccc7a0656 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-wso2v48 + 4.0.0-wso2v49-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 8c041ca88b..bfe2c3ecc2 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v48 + 4.0.0-wso2v49-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 81c42856b9..210be50d0b 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v48 + 4.0.0-wso2v49-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 5b3385b084..d0e6ecba46 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-wso2v48 + 4.0.0-wso2v49-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index bbbc7ad2c4..8e554ae52b 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v48 + 4.0.0-wso2v49-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-wso2v48 + HEAD Apache Software Foundation From 32f9325440fdb8178e24e720f54220d7b63858e6 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 15 Sep 2023 04:32:05 +0000 Subject: [PATCH 021/308] [WSO2 Release] [Jenkins #6648] [Release 4.0.0-wso2v49] prepare release v4.0.0-wso2v49 --- 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 0c95573080..67c3cd5597 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v49-SNAPSHOT + 4.0.0-wso2v49 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 718250add7..562d93f515 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v49-SNAPSHOT + 4.0.0-wso2v49 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 63f6b13d59..f15c58a439 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-wso2v49-SNAPSHOT + 4.0.0-wso2v49 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 0f3276033a..f1ea970505 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v49-SNAPSHOT + 4.0.0-wso2v49 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 62bcbf0463..a2f8b16b5b 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v49-SNAPSHOT + 4.0.0-wso2v49 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 92008b9d3f..5f57b52c92 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v49-SNAPSHOT + 4.0.0-wso2v49 ../../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 0012e2c9df..2cf07564e8 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-wso2v49-SNAPSHOT + 4.0.0-wso2v49 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 a06149e343..79b1d5c724 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-wso2v49-SNAPSHOT + 4.0.0-wso2v49 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 ec78dbd439..d619d31eeb 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-wso2v49-SNAPSHOT + 4.0.0-wso2v49 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 60fd114437..66a9f3e4c7 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-wso2v49-SNAPSHOT + 4.0.0-wso2v49 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 5b887f8055..95c8c31123 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-wso2v49-SNAPSHOT + 4.0.0-wso2v49 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 11159ae256..9b505188b8 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-wso2v49-SNAPSHOT + 4.0.0-wso2v49 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 7b86ab2f10..ee76959faa 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-wso2v49-SNAPSHOT + 4.0.0-wso2v49 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 559b1033b9..2b6dbe888a 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v49-SNAPSHOT + 4.0.0-wso2v49 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 2cb6b70991..1da27cf32c 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v49-SNAPSHOT + 4.0.0-wso2v49 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index fdfe6074a8..c1b9ec2647 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v49-SNAPSHOT + 4.0.0-wso2v49 ../../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-wso2v49 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index ac32088d89..c6662f591f 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v49-SNAPSHOT + 4.0.0-wso2v49 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index e61bd32926..41598f0c90 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-wso2v49-SNAPSHOT + 4.0.0-wso2v49 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index bbd66e466b..996990c304 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-wso2v49-SNAPSHOT + 4.0.0-wso2v49 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 96fcdfc171..0f3cd5f8a8 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v49-SNAPSHOT + 4.0.0-wso2v49 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 1088cd457d..9f6ada58b4 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v49-SNAPSHOT + 4.0.0-wso2v49 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index bda9de0890..de1174f347 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v49-SNAPSHOT + 4.0.0-wso2v49 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 396f038cf5..3f1e525633 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v49-SNAPSHOT + 4.0.0-wso2v49 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 1615d99eac..fbdcf8d671 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-wso2v49-SNAPSHOT + 4.0.0-wso2v49 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index daf814774c..972b92e59e 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-wso2v49-SNAPSHOT + 4.0.0-wso2v49 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 4a1f1d13c3..b6e657bf87 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-wso2v49-SNAPSHOT + 4.0.0-wso2v49 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 7ccc7a0656..763d17a427 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-wso2v49-SNAPSHOT + 4.0.0-wso2v49 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index bfe2c3ecc2..5d5abb3fd2 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v49-SNAPSHOT + 4.0.0-wso2v49 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 210be50d0b..24dbf891cc 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v49-SNAPSHOT + 4.0.0-wso2v49 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index d0e6ecba46..feda8d6b10 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-wso2v49-SNAPSHOT + 4.0.0-wso2v49 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 8e554ae52b..dec7098e64 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v49-SNAPSHOT + 4.0.0-wso2v49 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-wso2v49 Apache Software Foundation From b0677022e87bb68040a35bee30bb3ec5ea884e6b Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 15 Sep 2023 04:32:07 +0000 Subject: [PATCH 022/308] [WSO2 Release] [Jenkins #6648] [Release 4.0.0-wso2v49] 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 67c3cd5597..a0f176a3a8 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v49 + 4.0.0-wso2v50-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 562d93f515..fabff22cbc 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v49 + 4.0.0-wso2v50-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index f15c58a439..c5e4ef1b38 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-wso2v49 + 4.0.0-wso2v50-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index f1ea970505..f8fd2927e3 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v49 + 4.0.0-wso2v50-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index a2f8b16b5b..ca6367c042 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v49 + 4.0.0-wso2v50-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 5f57b52c92..155ecd9e62 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v49 + 4.0.0-wso2v50-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 2cf07564e8..77c4fa6941 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-wso2v49 + 4.0.0-wso2v50-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 79b1d5c724..a53b797a5b 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-wso2v49 + 4.0.0-wso2v50-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 d619d31eeb..092c294473 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-wso2v49 + 4.0.0-wso2v50-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 66a9f3e4c7..9a021ab7ab 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-wso2v49 + 4.0.0-wso2v50-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 95c8c31123..ec731e4712 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-wso2v49 + 4.0.0-wso2v50-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 9b505188b8..a9c1e1a235 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-wso2v49 + 4.0.0-wso2v50-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 ee76959faa..8903684308 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-wso2v49 + 4.0.0-wso2v50-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 2b6dbe888a..588fa85611 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v49 + 4.0.0-wso2v50-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 1da27cf32c..5d85f00aef 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v49 + 4.0.0-wso2v50-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index c1b9ec2647..035ef9421b 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v49 + 4.0.0-wso2v50-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-wso2v49 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index c6662f591f..143dc22423 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v49 + 4.0.0-wso2v50-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 41598f0c90..e1ce6bfdfb 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-wso2v49 + 4.0.0-wso2v50-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 996990c304..fea547f715 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-wso2v49 + 4.0.0-wso2v50-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 0f3cd5f8a8..25714577e6 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v49 + 4.0.0-wso2v50-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 9f6ada58b4..e681c900ab 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v49 + 4.0.0-wso2v50-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index de1174f347..660fb2c87d 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v49 + 4.0.0-wso2v50-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 3f1e525633..b53c7abfd2 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v49 + 4.0.0-wso2v50-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index fbdcf8d671..2134940e52 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-wso2v49 + 4.0.0-wso2v50-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 972b92e59e..137e88d17f 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-wso2v49 + 4.0.0-wso2v50-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index b6e657bf87..abad54f57c 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-wso2v49 + 4.0.0-wso2v50-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 763d17a427..0ae387e5c1 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-wso2v49 + 4.0.0-wso2v50-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 5d5abb3fd2..80b2d36f52 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v49 + 4.0.0-wso2v50-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 24dbf891cc..1a7ce61fad 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v49 + 4.0.0-wso2v50-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index feda8d6b10..6ee91c7687 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-wso2v49 + 4.0.0-wso2v50-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index dec7098e64..3462247d39 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v49 + 4.0.0-wso2v50-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-wso2v49 + HEAD Apache Software Foundation From 7a6ad06cf85cb03f902b9b50c1d43fe54e8298ea Mon Sep 17 00:00:00 2001 From: Samitha Chathuranga Date: Tue, 19 Sep 2023 14:20:10 +0530 Subject: [PATCH 023/308] Porting redis throttling improvement related changes --- .../commons/throttle/core/CallerContext.java | 92 ++++++++++-- .../core/DistributedCounterManager.java | 54 ++++++- .../commons/throttle/core/RequestContext.java | 35 +++++ .../throttle/core/SharedParamManager.java | 136 +++++++++++++++++- .../throttle/core/ThrottleConstants.java | 5 +- .../throttle/core/ThrottleContext.java | 22 ++- .../throttle/core/ThrottleProperties.java | 38 +++++ .../throttle/core/ThrottleReplicator.java | 11 +- .../commons/throttle/core/ThrottleUtil.java | 22 ++- .../core/ThrottleWindowReplicator.java | 8 ++ .../DistributedThrottleProcessor.java | 45 ++++++ .../internal/ThrottleServiceComponent.java | 15 ++ .../internal/ThrottleServiceDataHolder.java | 17 +++ 13 files changed, 477 insertions(+), 23 deletions(-) create mode 100644 modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/RequestContext.java create mode 100644 modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/internal/DistributedThrottleProcessor.java diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/CallerContext.java b/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/CallerContext.java index 79fe7d5f4a..9d5d04a37e 100644 --- a/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/CallerContext.java +++ b/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/CallerContext.java @@ -20,6 +20,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.synapse.commons.throttle.core.internal.DistributedThrottleProcessor; +import org.apache.synapse.commons.throttle.core.internal.ThrottleServiceDataHolder; import java.io.Serializable; import java.util.UUID; @@ -43,13 +45,22 @@ public abstract class CallerContext implements Serializable, Cloneable { private long nextTimeWindow = 0; /* The globalCount to keep track number of request */ private AtomicLong globalCount = new AtomicLong(0); - + private long localQuota; private String roleId; private long unitTime; + /* + This is specific for each API EP + if this is true, then syncing of throttle parameter with global redis counters be synced will be done in sync mode + */ + private boolean isThrottleParamSyncingModeSync; + private ThrottleProperties throttleProperties; + + /** * Count to keep track of local (specific to this node) number of requests */ private AtomicLong localCount = new AtomicLong(0); + private AtomicLong localHits = new AtomicLong(0); /** * Used for debugging purposes. * @@ -83,6 +94,10 @@ public CallerContext(String ID) { throw new InstantiationError("Couldn't create a CallContext for an empty " + "remote caller ID"); } + if (throttleProperties == null) { + throttleProperties = ThrottleServiceDataHolder.getInstance().getThrottleProperties(); + } + this.id = ID.trim(); } @@ -111,7 +126,10 @@ private void initAccess(CallerConfiguration configuration, ThrottleContext throt this.roleId = configuration.getID(); //Also we need to pick counter value associated with time window. throttleContext.addCallerContext(this, this.id); - throttleContext.replicateTimeWindow(this.id); + + if (!ThrottleServiceDataHolder.getInstance().getThrottleProperties().isThrottleSyncAsyncHybridModeEnabled()) { + throttleContext.replicateTimeWindow(this.id); + } } /** @@ -140,7 +158,6 @@ private boolean canAccessIfUnitTimeNotOver(CallerConfiguration configuration, // Send the current state to others (clustered env) throttleContext.flushCallerContext(this, id); // can complete access - } else { //else , if caller has not already prohibit if (this.nextAccessTime == 0) { @@ -190,7 +207,7 @@ private boolean canAccessIfUnitTimeNotOver(CallerConfiguration configuration, throttleContext.replicateTimeWindow(this.id); throttleContext.addAndFlushCallerContext(this, this.id); - if(log.isDebugEnabled()) { + if (log.isDebugEnabled()) { log.debug("Caller=" + this.getId() + " has reset counters and added for replication when unit " + "time is not over"); } @@ -356,6 +373,7 @@ public void cleanUpCallers(CallerConfiguration configuration, */ public boolean canAccess(ThrottleContext throttleContext, CallerConfiguration configuration, long currentTime) throws ThrottleException { + RequestContext requestContext = new RequestContext(currentTime); boolean canAccess; if (configuration == null) { if (log.isDebugEnabled()) { @@ -374,16 +392,35 @@ public boolean canAccess(ThrottleContext throttleContext, CallerConfiguration co initAccess(configuration, throttleContext, currentTime); } // if unit time period (session time) is not over - if (this.nextTimeWindow > currentTime) { - canAccess = canAccessIfUnitTimeNotOver(configuration, throttleContext, currentTime); - } else { - canAccess = canAccessIfUnitTimeOver(configuration, throttleContext, currentTime); + if (log.isDebugEnabled()) { + log.debug("### NEW REQUEST RECEIVED ! - currentTime: " + currentTime); } + DistributedThrottleProcessor distributedThrottleProcessor = ThrottleServiceDataHolder.getInstance() + .getDistributedThrottleProcessor(); + if (distributedThrottleProcessor != null && distributedThrottleProcessor.isEnable()) { + long startTime = System.currentTimeMillis(); + canAccess = distributedThrottleProcessor.canAccessBasedOnUnitTime(this, configuration, throttleContext, + requestContext); + long duration = System.currentTimeMillis() - startTime; + if (log.isDebugEnabled()) { + log.debug("LATENCY FOR THROTTLE PROCESSING: " + duration + " ms"); + } + } else { + canAccess = canAccessBasedOnUnitTime(configuration, throttleContext, currentTime); + } return canAccess; + } + private boolean canAccessBasedOnUnitTime(CallerConfiguration configuration, ThrottleContext throttleContext, long currentTime) { + if (this.nextTimeWindow > currentTime) { + return canAccessIfUnitTimeNotOver(configuration, throttleContext, currentTime); + } else { + return canAccessIfUnitTimeOver(configuration, throttleContext, currentTime); + } } + /** * Returns the next time window * @@ -410,6 +447,9 @@ public void setGlobalCounter(long counter) { } public void setLocalCounter(long counter) { + if (log.isTraceEnabled()) { + log.trace("changing local counter from:" + localCount.get() + " to:" + counter); + } localCount.set(counter); } @@ -417,6 +457,18 @@ public long getLocalCounter() { return localCount.get(); } + public void setLocalHits(long counter) { + localHits.set(counter); + } + + public long getLocalHits() { + return localHits.get(); + } + + public void incrementLocalHits() { + localHits.incrementAndGet(); + } + public void resetLocalCounter() { localCount.set(0); } @@ -459,4 +511,28 @@ public String getRoleId() { public void setRoleId(String roleId) { this.roleId = roleId; } + + public void setIsThrottleParamSyncingModeSync(boolean isThrottleParamSyncingModeSync) { + this.isThrottleParamSyncingModeSync = isThrottleParamSyncingModeSync; + } + + public boolean isThrottleParamSyncingModeSync() { + return isThrottleParamSyncingModeSync; + } + + public long getLocalQuota() { + return localQuota; + } + + public void setLocalQuota(long localQuota) { + this.localQuota = localQuota; + } + + public long getNextAccessTime() { + return nextAccessTime; + } + + public void setNextAccessTime(long nextAccessTime) { + this.nextAccessTime = nextAccessTime; + } } diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/DistributedCounterManager.java b/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/DistributedCounterManager.java index c237a91f92..2212634602 100644 --- a/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/DistributedCounterManager.java +++ b/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/DistributedCounterManager.java @@ -38,6 +38,14 @@ public interface DistributedCounterManager { */ public void setCounter(String key, long value); + /** + * Sets the Distributed counter with the given value while setting expiry time too. + * + * @param key counter key name + * @param value counter value + * @param expiryTime expiry time in milliseconds + */ + public void setCounterWithExpiry(String key, long value, long expiryTime); /** * This method used to add and return the distributed counter value. * @@ -55,7 +63,7 @@ public interface DistributedCounterManager { public void removeCounter(String key); /** - * This method used to update distributed counter asynchronously. + * This method is used to get and then increment distributed counter asynchronously. * * @param key key to check in distributed map. * @param value value to add to distributed counter. @@ -63,6 +71,15 @@ public interface DistributedCounterManager { */ public long asyncGetAndAddCounter(String key, long value); + /** + * This method is used to increment distributed counter asynchronously. + * + * @param key key to update in distributed map. + * @param value value to increment + * @return the updated distributed counter value. + */ + public long asyncAddCounter(String key, long value); + /** * This method used to alter the DistributedCounter. * @@ -73,11 +90,21 @@ public interface DistributedCounterManager { public long asyncGetAndAlterCounter(String key, long value); /** - * This method returns shared TimeStamp of distributed Key. + * This method is used to get and then alter and then set expiry time of the DistributedCounter. * - * @param key key to check in distributed map. - * @return timestamp value of key. + * @param key key to alter in distributed counter. + * @param value value to alter in distributed counter. + * @param expiryTimeStamp expiry time to set. + * @return the original distributed counter value. */ + public long asyncGetAlterAndSetExpiryOfCounter(String key, long value, long expiryTimeStamp); + + /** + * This method returns shared TimeStamp of distributed Key. + * + * @param key key to check in distributed map. + * @return timestamp value of key. + */ public long getTimestamp(String key); /** @@ -88,6 +115,15 @@ public interface DistributedCounterManager { */ public void setTimestamp(String key, long timeStamp); + /** + * This method set the Timestamp to distributed map with an expiry time. + * + * @param key key to add in distributed map. + * @param timeStamp timestamp to add. + * @param expiryTimeStamp expiry timestamp to set + */ + public void setTimestampWithExpiry(String key, long timeStamp, long expiryTimeStamp); + /** * This method removes the timestamp relevant to key. * @@ -100,4 +136,14 @@ public interface DistributedCounterManager { public String getType(); void setExpiry(String key, long expiryTimeStamp); + + public long getTtl(String key); + + public long setLock(String key, String value); + + public boolean setLockWithExpiry(String key, String value, long expiryTimeStamp); + + public long getKeyLockRetrievalTimeout(); + + public void removeLock(String key); } diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/RequestContext.java b/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/RequestContext.java new file mode 100644 index 0000000000..161fc53e6c --- /dev/null +++ b/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/RequestContext.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2023, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. 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.commons.throttle.core; + +public class RequestContext { + private long requestTime; + + public RequestContext(long requestTime) { + this.requestTime = System.currentTimeMillis(); + } + + public long getRequestTime() { + return requestTime; + } + + public void setRequestTime(long requestTime) { + this.requestTime = requestTime; + } +} diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/SharedParamManager.java b/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/SharedParamManager.java index f8e168c4d8..d940c11fec 100644 --- a/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/SharedParamManager.java +++ b/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/SharedParamManager.java @@ -13,6 +13,9 @@ public class SharedParamManager { private static Map timestamps = new ConcurrentHashMap();//Locally managed time stamps map for non clustered environment private static Log log = LogFactory.getLog(SharedParamManager.class.getName()); + private SharedParamManager() { + } + /** * Return distributed shared counter for this caller context with given id. If it's not distributed will get from the * local counter @@ -61,6 +64,50 @@ public static void setDistributedCounter(String id, long value) { } } + /** + * Set the distributed counter with the given id key with an expiry time + * + * @param id key id + * @param value value to set + * @param expiryTime expiry time in milliseconds + */ + public static void setDistributedCounterWithExpiry(String id, long value, long expiryTime) { + if (log.isDebugEnabled()) { + log.debug("SETTING COUNTER WITH ID " + id); + } + id = ThrottleConstants.THROTTLE_SHARED_COUNTER_KEY + id; + DistributedCounterManager distributedCounterManager = + ThrottleServiceDataHolder.getInstance().getDistributedCounterManager(); + if (distributedCounterManager != null && distributedCounterManager.isEnable()) { + //distributedCounterManager.setCounter(id, value); + distributedCounterManager.setCounterWithExpiry(id, value, expiryTime); + } else { + counters.put(id, value); + } + } + + /** + * Set the shared timestamp with the given id key with an expiry time + * + * @param id key id + * @param timestamp timestamp value to set + * @param expiryTime expiry time in milliseconds + */ + public static void setSharedTimestampWithExpiry(String id, long timestamp, long expiryTime) { + if (log.isDebugEnabled()) { + log.debug("Setting the shared timestamp of key " + id + " with value " + timestamp + " with an expiry " + + "time of " + expiryTime); + } + String key = ThrottleConstants.THROTTLE_TIMESTAMP_KEY + id; + DistributedCounterManager distributedCounterManager = + ThrottleServiceDataHolder.getInstance().getDistributedCounterManager(); + if (distributedCounterManager != null && distributedCounterManager.isEnable()) { + distributedCounterManager.setTimestampWithExpiry(key, timestamp, expiryTime); + } else { + timestamps.put(id, timestamp); + } + } + /** * Add given value to the distribute counter of caller context of given id. If it's not * distributed return local counter @@ -186,7 +233,7 @@ public static long getSharedTimestamp(String id) { * Set distribute timestamp of caller context of given id to the provided value. If it's not distributed do the same for * local counter * - * @param id of the caller context + * @param id of the caller context * @param timestamp to set to the global counter */ public static void setSharedTimestamp(String id, long timestamp) { @@ -234,11 +281,98 @@ public static void setExpiryTime(String id, long expiryTimeStamp) { DistributedCounterManager distributedCounterManager = ThrottleServiceDataHolder.getInstance().getDistributedCounterManager(); if (distributedCounterManager != null && distributedCounterManager.isEnable()) { + if (log.isTraceEnabled()) { + log.trace("Setting expiry time for key:" + sharedCounterKey + " value: " + expiryTimeStamp); + } distributedCounterManager.setExpiry(sharedCounterKey, expiryTimeStamp); + if (log.isTraceEnabled()) { + log.trace("Setting expiry time for key:" + sharedTimeStampKey + " value: " + expiryTimeStamp); + } distributedCounterManager.setExpiry(sharedTimeStampKey, expiryTimeStamp); } } + /** + * Get the time-to-live value for the given key + * + * @param key name key of the key + * @return time-to-live value + */ + public static long getTtl(String key) { + long ttl = 0; + DistributedCounterManager distributedCounterManager = + ThrottleServiceDataHolder.getInstance().getDistributedCounterManager(); + if (distributedCounterManager != null && distributedCounterManager.isEnable()) { + ttl = distributedCounterManager.getTtl(key); + } + return ttl; + } + + /** + * Acquire lock for the given callerContext (with the given value), so that another process cannot acquire the same + * lock + * + * @return true if lock acquired, false if lock is not acquired within the configured timeout period + */ + public static boolean lockSharedKeys(String callerContextId, String lockValue) { + DistributedCounterManager distributedCounterManager = + ThrottleServiceDataHolder.getInstance().getDistributedCounterManager(); + + if (distributedCounterManager != null && distributedCounterManager.isEnable()) { + boolean lockAcquired; + // key of the lock tried to acquire. i.e. "lock-/pizzashack/1.0.0:1.0.0:PRODUCTION" + String lockKey = ThrottleConstants.THROTTLE_LOCK_KEY_PREFIX + callerContextId; + long startTime = System.currentTimeMillis(); + do { + lockAcquired = distributedCounterManager.setLockWithExpiry(lockKey, lockValue, System.currentTimeMillis() + + distributedCounterManager.getKeyLockRetrievalTimeout() * 2); + + if (lockAcquired) { + // lock acquired + if (log.isTraceEnabled()) { + long timeNow = System.currentTimeMillis(); + log.trace( + "current time:" + timeNow + "Lock acquired for key: " + lockKey + " within " + (timeNow + - startTime) + " ms"); + } + return true; + } else { + long time = System.currentTimeMillis(); + long timeElapsed = time - startTime; + if (timeElapsed > distributedCounterManager.getKeyLockRetrievalTimeout()) { + log.warn("current time:" + time + " Unable to" + " acquire lock for key: " + lockKey + + " within the configured " + "timeout period. Elapsed time: " + timeElapsed + " ms"); + return false; + } + + try { + Thread.sleep(5); + if (log.isTraceEnabled()) { + log.trace("current time:" + time + "Retrying to get lock for key: " + lockKey); + } + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + } + } while (true); + } + return true; + } + + /** + * Release the lock of the given callerContext + */ + public static void releaseSharedKeys(String callerContextId) { + DistributedCounterManager distributedCounterManager = ThrottleServiceDataHolder.getInstance() + .getDistributedCounterManager(); + + if (distributedCounterManager != null && distributedCounterManager.isEnable()) { + distributedCounterManager.removeLock(callerContextId); + if (log.isTraceEnabled()) { + log.trace("Current time:" + System.currentTimeMillis() + "Lock released for key: " + callerContextId); + } + } + } } diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/ThrottleConstants.java b/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/ThrottleConstants.java index 0534915e93..b14a91405a 100644 --- a/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/ThrottleConstants.java +++ b/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/ThrottleConstants.java @@ -168,6 +168,7 @@ private ThrottleConstants() { public static final String THROTTLE_TIMESTAMP_KEY = "startedTime-"; public static final String THROTTLE_SHARED_COUNTER_KEY = "sharedCounter-"; + public static final String THROTTLE_LOCK_KEY_PREFIX = "lock-"; public static final String THROTTLE_CONTEXT_CLEANUP_TASK_FREQUENCY = "throttling.context.cleanup.frequency"; public static final String THROTTLE_CONTEXT_DISTRIBUTED_CLEANUP_TASK_FREQUENCY = "throttling.context.distributed.cleanup.frequency"; @@ -186,5 +187,7 @@ private ThrottleConstants() { public static final String WINDOW_REPLICATOR_FREQUENCY = "throttlingWindowReplicator.replication.frequency"; public static final String DISTRIBUTED_COUNTER_TYPE = "throttling.distributed.counter.type"; public static final String DISTRIBUTED_COUNTER_CONFIGURATIONS = "throttling.distributed.counter.configurations."; - + public static final String THROTTLE_SYNC_ASYNC_HYBRID_MODE_ENABLED = "throttling.sync-async_hybrid_mode.enable"; + public static final String HYBRID_THROTTLE_PROCESSOR_WINDOW_TYPE = "throttling.hybrid_throttle_processor_window.type"; + public static final String LOCAL_QUOTA_BUFFER_PERCENTAGE = "throttling.local_quota_buffer_percentage"; } diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/ThrottleContext.java b/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/ThrottleContext.java index 8c5bf820e8..0d2a399ef0 100644 --- a/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/ThrottleContext.java +++ b/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/ThrottleContext.java @@ -22,6 +22,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.synapse.commons.throttle.core.factory.ThrottleContextFactory; +import org.apache.synapse.commons.throttle.core.internal.ThrottleServiceDataHolder; import java.util.*; import java.util.concurrent.ConcurrentHashMap; @@ -336,7 +337,10 @@ private void initDataHolder() { public void addAndFlushCallerContext(CallerContext callerContext, String id) { if (callerContext != null && id != null) { addCaller(callerContext, id); - replicateCaller(id); + if (!ThrottleServiceDataHolder.getInstance().getThrottleProperties() + .isThrottleSyncAsyncHybridModeEnabled()) { + replicateCaller(id); + } } } @@ -350,7 +354,10 @@ public void flushCallerContext(CallerContext callerContext, String id) { if (dataHolder != null && callerContext != null && id != null) { dataHolder.addCallerContext(id, callerContext); // have to do, because we always get // any property as non-replicable - replicateCaller(id); + if (!ThrottleServiceDataHolder.getInstance().getThrottleProperties() + .isThrottleSyncAsyncHybridModeEnabled()) { + replicateCaller(id); + } } } @@ -361,11 +368,14 @@ public void flushCallerContext(CallerContext callerContext, String id) { */ public void removeAndFlushCaller(String id) { if (id != null) { - if(log.isDebugEnabled()) { + if (log.isDebugEnabled()) { log.debug("REMOVING AND FLUSHING CALLER CONTEXT WITH ID " + id); } removeCaller(id); - replicateCaller(id); + if (!ThrottleServiceDataHolder.getInstance().getThrottleProperties() + .isThrottleSyncAsyncHybridModeEnabled()) { + replicateCaller(id); + } } } @@ -376,8 +386,8 @@ public void removeAndFlushCaller(String id) { */ public void removeAndDestroyShareParamsOfCaller(String id) { if (id != null) { - if(log.isDebugEnabled()) { - log.info("REMOVE AND DESTROY OF SHARED PARAM OF CALLER WITH ID " + id); + if (log.isDebugEnabled()) { + log.debug("REMOVE AND DESTROY OF SHARED PARAM OF CALLER WITH ID " + id); } removeCaller(id); SharedParamManager.removeTimestamp(id); diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/ThrottleProperties.java b/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/ThrottleProperties.java index 48f97ad1d3..b3bc0d8c22 100644 --- a/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/ThrottleProperties.java +++ b/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/ThrottleProperties.java @@ -35,6 +35,11 @@ public class ThrottleProperties implements Serializable { private String throttlingKeysToReplicates = "25000"; private Map distributedCounterConfigurations = new HashMap<>(); private String distributedCounterType = ThrottleConstants.HAZELCAST; + private boolean throttleSyncAsyncHybridModeEnabled = false; + private String distributedThrottleProcessorType = "hybrid"; + private String hybridThrottleProcessorWindowType = "start_time_based"; + private String localQuotaBufferPercentage = "20"; + public String getWindowReplicatorPoolSize() { return windowReplicatorPoolSize; } @@ -155,4 +160,37 @@ public void setDistributedCounterType(String distributedCounterType) { this.distributedCounterType = distributedCounterType; } + + public String getDistributedThrottleProcessorType() { + return distributedThrottleProcessorType; + } + + public void setDistributedThrottleProcessorType(String distributedThrottleProcessorType) { + this.distributedThrottleProcessorType = distributedThrottleProcessorType; + } + + public void setThrottleSyncAsyncHybridModeEnabled(boolean throttleSyncAsyncHybridModeEnabled) { + this.throttleSyncAsyncHybridModeEnabled = throttleSyncAsyncHybridModeEnabled; + } + + public boolean isThrottleSyncAsyncHybridModeEnabled() { + return throttleSyncAsyncHybridModeEnabled; + } + + public void setHybridThrottleProcessorWindowType( + String hybridThrottleProcessorWindowType) { + this.hybridThrottleProcessorWindowType = hybridThrottleProcessorWindowType; + } + + public String getHybridThrottleProcessorWindowType() { + return hybridThrottleProcessorWindowType; + } + + public void setLocalQuotaBufferPercentage(String localQuotaBufferPercentage) { + this.localQuotaBufferPercentage = localQuotaBufferPercentage; + } + + public String getLocalQuotaBufferPercentage() { + return localQuotaBufferPercentage; + } } diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/ThrottleReplicator.java b/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/ThrottleReplicator.java index 0de40c4ed7..b4666dd32a 100644 --- a/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/ThrottleReplicator.java +++ b/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/ThrottleReplicator.java @@ -47,7 +47,16 @@ public ThrottleReplicator() { throttleProperties = ThrottleServiceDataHolder.getInstance().getThrottleProperties(); replicatorPoolSize = Integer.parseInt(throttleProperties.getThrottlingPoolSize()); - log.debug("Replicator pool size set to " + replicatorPoolSize); + if (log.isDebugEnabled()) { + log.debug("Replicator pool size set to " + replicatorPoolSize); + } + if (ThrottleServiceDataHolder.getInstance().getThrottleProperties().isThrottleSyncAsyncHybridModeEnabled()) { + if (log.isDebugEnabled()) { + log.debug( + "Throttle Sync Async Hybrid Mode is enabled. So throttle replicator task will not be scheduled."); + } + return; + } ScheduledExecutorService executor = Executors.newScheduledThreadPool(replicatorPoolSize, new ThreadFactory() { @Override diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/ThrottleUtil.java b/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/ThrottleUtil.java index 365f70bb83..9853988a8f 100644 --- a/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/ThrottleUtil.java +++ b/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/ThrottleUtil.java @@ -30,7 +30,6 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; -import java.util.Map; import java.util.Properties; import java.util.Set; @@ -160,6 +159,25 @@ public static ThrottleProperties loadThrottlePropertiesFromConfigurations() { getResolvedValue(secretResolver, distributedConfiguration)); } } + if (key.contains(ThrottleConstants.THROTTLE_SYNC_ASYNC_HYBRID_MODE_ENABLED)) { + String throttleSyncAsyncHybridModeEnabled = properties.getProperty(key); + if (StringUtils.isNotEmpty(throttleSyncAsyncHybridModeEnabled)) { + throttleProperties.setThrottleSyncAsyncHybridModeEnabled( + Boolean.parseBoolean(throttleSyncAsyncHybridModeEnabled)); + } + } + if (key.contains(ThrottleConstants.HYBRID_THROTTLE_PROCESSOR_WINDOW_TYPE)) { + String hybridThrottleProcessorWindowType = properties.getProperty(key); + if (StringUtils.isNotEmpty(hybridThrottleProcessorWindowType)) { + throttleProperties.setHybridThrottleProcessorWindowType(hybridThrottleProcessorWindowType); + } + } + if (key.contains(ThrottleConstants.LOCAL_QUOTA_BUFFER_PERCENTAGE)) { + String localQuotaBufferPercentage = properties.getProperty(key); + if (StringUtils.isNotEmpty(localQuotaBufferPercentage)) { + throttleProperties.setLocalQuotaBufferPercentage(localQuotaBufferPercentage); + } + } } } catch (IOException e) { log.debug("Setting the Default Throttle Properties"); @@ -194,4 +212,4 @@ public static Cache getThrottleCache () { } return cache; } - } +} diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/ThrottleWindowReplicator.java b/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/ThrottleWindowReplicator.java index daba028287..02efd58309 100644 --- a/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/ThrottleWindowReplicator.java +++ b/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/ThrottleWindowReplicator.java @@ -54,6 +54,14 @@ public ThrottleWindowReplicator() { log.debug("Throttle window replicator pool size set to " + replicatorPoolSize); } + if (ThrottleServiceDataHolder.getInstance().getThrottleProperties().isThrottleSyncAsyncHybridModeEnabled()) { + if (log.isDebugEnabled()) { + log.debug("Throttle Sync Async Hybrid Mode is enabled. So throttle window replicator task will not be " + + "scheduled."); + } + return; + } + ScheduledExecutorService executor = Executors.newScheduledThreadPool(replicatorPoolSize, new ThreadFactory() { public Thread newThread(Runnable r) { diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/internal/DistributedThrottleProcessor.java b/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/internal/DistributedThrottleProcessor.java new file mode 100644 index 0000000000..bc80e5c9d7 --- /dev/null +++ b/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/internal/DistributedThrottleProcessor.java @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2023, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. 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.commons.throttle.core.internal; + +import org.apache.synapse.commons.throttle.core.CallerConfiguration; +import org.apache.synapse.commons.throttle.core.CallerContext; +import org.apache.synapse.commons.throttle.core.RequestContext; +import org.apache.synapse.commons.throttle.core.ThrottleContext; + +public interface DistributedThrottleProcessor { + + public boolean canAccessBasedOnUnitTime(CallerContext callerContext, CallerConfiguration configuration, + ThrottleContext throttleContext, RequestContext requestContext); + + public boolean canAccessIfUnitTimeNotOver(CallerContext callerContext, CallerConfiguration configuration, + ThrottleContext throttleContext, RequestContext requestContext); + + public boolean canAccessIfUnitTimeOver(CallerContext callerContext, CallerConfiguration configuration, + ThrottleContext throttleContext, RequestContext requestContext); + + public void syncThrottleCounterParams(CallerContext callerContext, boolean incrementLocalCounter, + RequestContext requestContext); + + public void syncThrottleWindowParams(CallerContext callerContext, boolean isInvocationFlow); + + public String getType(); + + public boolean isEnable(); +} diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/internal/ThrottleServiceComponent.java b/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/internal/ThrottleServiceComponent.java index 1ecc1438b7..9a9af0bf2a 100644 --- a/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/internal/ThrottleServiceComponent.java +++ b/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/internal/ThrottleServiceComponent.java @@ -69,4 +69,19 @@ protected void addDistributedCounterManagerInstance(DistributedCounterManager di protected void removeDistributedCounterManagerInstance(DistributedCounterManager distributedCounterManager) { ThrottleServiceDataHolder.getInstance().removeDistributedCounterManager(distributedCounterManager); } + + @Reference( + name = "distributedThrottleProcessor.instance.service", + service = DistributedThrottleProcessor.class, + cardinality = ReferenceCardinality.MULTIPLE, + policy = ReferencePolicy.DYNAMIC, + unbind = "removeDistributedThrottleProcessorInstance" + ) + protected void addDistributedThrottleProcessorInstance(DistributedThrottleProcessor distributedThrottleProcessor) { + ThrottleServiceDataHolder.getInstance().addDistributedThrottleProcessor(distributedThrottleProcessor); + } + + protected void removeDistributedThrottleProcessorInstance(DistributedThrottleProcessor distributedThrottleProcessor) { + ThrottleServiceDataHolder.getInstance().removeDistributedThrottleProcessor(distributedThrottleProcessor); + } } diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/internal/ThrottleServiceDataHolder.java b/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/internal/ThrottleServiceDataHolder.java index 6cca902fd6..56c903ee5b 100644 --- a/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/internal/ThrottleServiceDataHolder.java +++ b/modules/commons/src/main/java/org/apache/synapse/commons/throttle/core/internal/ThrottleServiceDataHolder.java @@ -29,6 +29,7 @@ public class ThrottleServiceDataHolder { private static final Log log = LogFactory.getLog(ThrottleServiceDataHolder.class.getName()); private Map distributedCounterManagerMap = new HashMap<>(); + private Map distributedThrottleProcessorMap = new HashMap<>(); private ThrottleServiceDataHolder() { @@ -67,4 +68,20 @@ public DistributedCounterManager getDistributedCounterManager() { String distributedCounterType = throttleProperties.getDistributedCounterType(); return distributedCounterManagerMap.get(distributedCounterType); } + + public void addDistributedThrottleProcessor(DistributedThrottleProcessor distributedThrottleProcessor) { + distributedThrottleProcessorMap.put(distributedThrottleProcessor.getType(), distributedThrottleProcessor); + } + + public void removeDistributedThrottleProcessor(DistributedThrottleProcessor distributedThrottleProcessor) { + if (distributedThrottleProcessor != null) { + distributedThrottleProcessorMap.remove(distributedThrottleProcessor.getType()); + } + } + + public DistributedThrottleProcessor getDistributedThrottleProcessor() { + String distributedThrottleProcessorType = throttleProperties.getDistributedThrottleProcessorType(); + return distributedThrottleProcessorMap.get(distributedThrottleProcessorType); + } + } From 99c9a9b822424724594f323fbcdd137360f99ae0 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 20 Sep 2023 05:02:59 +0000 Subject: [PATCH 024/308] [WSO2 Release] [Jenkins #6653] [Release 4.0.0-wso2v50] prepare release v4.0.0-wso2v50 --- 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 a0f176a3a8..49e462b9ee 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v50-SNAPSHOT + 4.0.0-wso2v50 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index fabff22cbc..dec8e7948e 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v50-SNAPSHOT + 4.0.0-wso2v50 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index c5e4ef1b38..186af94b7c 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-wso2v50-SNAPSHOT + 4.0.0-wso2v50 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index f8fd2927e3..7a657d18dd 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v50-SNAPSHOT + 4.0.0-wso2v50 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index ca6367c042..4bd1ef6a6d 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v50-SNAPSHOT + 4.0.0-wso2v50 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 155ecd9e62..19e52a48ab 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v50-SNAPSHOT + 4.0.0-wso2v50 ../../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 77c4fa6941..85af2ae753 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-wso2v50-SNAPSHOT + 4.0.0-wso2v50 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 a53b797a5b..5269321d0a 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-wso2v50-SNAPSHOT + 4.0.0-wso2v50 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 092c294473..0a5785fd68 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-wso2v50-SNAPSHOT + 4.0.0-wso2v50 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 9a021ab7ab..d361dd8505 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-wso2v50-SNAPSHOT + 4.0.0-wso2v50 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 ec731e4712..2c08a6518e 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-wso2v50-SNAPSHOT + 4.0.0-wso2v50 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 a9c1e1a235..b928f7b4a0 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-wso2v50-SNAPSHOT + 4.0.0-wso2v50 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 8903684308..56eabd13d8 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-wso2v50-SNAPSHOT + 4.0.0-wso2v50 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 588fa85611..1354fd9365 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v50-SNAPSHOT + 4.0.0-wso2v50 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 5d85f00aef..941914b519 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v50-SNAPSHOT + 4.0.0-wso2v50 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 035ef9421b..698cae21db 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v50-SNAPSHOT + 4.0.0-wso2v50 ../../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-wso2v50 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 143dc22423..e6d79f03a9 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v50-SNAPSHOT + 4.0.0-wso2v50 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index e1ce6bfdfb..62c55efde3 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-wso2v50-SNAPSHOT + 4.0.0-wso2v50 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index fea547f715..1d0d3238c1 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-wso2v50-SNAPSHOT + 4.0.0-wso2v50 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 25714577e6..0c1080e9d6 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v50-SNAPSHOT + 4.0.0-wso2v50 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index e681c900ab..02f379bbed 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v50-SNAPSHOT + 4.0.0-wso2v50 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 660fb2c87d..d72657315e 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v50-SNAPSHOT + 4.0.0-wso2v50 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index b53c7abfd2..0001d3a2cd 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v50-SNAPSHOT + 4.0.0-wso2v50 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 2134940e52..922c1aa707 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-wso2v50-SNAPSHOT + 4.0.0-wso2v50 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 137e88d17f..133f02710e 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-wso2v50-SNAPSHOT + 4.0.0-wso2v50 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index abad54f57c..0c17add7bf 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-wso2v50-SNAPSHOT + 4.0.0-wso2v50 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 0ae387e5c1..4f9896a8f7 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-wso2v50-SNAPSHOT + 4.0.0-wso2v50 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 80b2d36f52..2dd594bd26 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v50-SNAPSHOT + 4.0.0-wso2v50 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 1a7ce61fad..ae523d2686 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v50-SNAPSHOT + 4.0.0-wso2v50 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 6ee91c7687..c9d6aa7707 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-wso2v50-SNAPSHOT + 4.0.0-wso2v50 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 3462247d39..f603be05d3 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v50-SNAPSHOT + 4.0.0-wso2v50 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-wso2v50 Apache Software Foundation From 14f7ddb93d1303611fb417fdc0361d712d2326ec Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 20 Sep 2023 05:03:01 +0000 Subject: [PATCH 025/308] [WSO2 Release] [Jenkins #6653] [Release 4.0.0-wso2v50] 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 49e462b9ee..ac5e7c7c7c 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v50 + 4.0.0-wso2v51-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index dec8e7948e..21983365f3 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v50 + 4.0.0-wso2v51-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 186af94b7c..0ef791fd0e 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-wso2v50 + 4.0.0-wso2v51-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 7a657d18dd..8993c4eebf 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v50 + 4.0.0-wso2v51-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 4bd1ef6a6d..40ef1dd188 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v50 + 4.0.0-wso2v51-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 19e52a48ab..50401db359 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v50 + 4.0.0-wso2v51-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 85af2ae753..e557b27a4b 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-wso2v50 + 4.0.0-wso2v51-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 5269321d0a..e9868e606b 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-wso2v50 + 4.0.0-wso2v51-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 0a5785fd68..a5f4d29112 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-wso2v50 + 4.0.0-wso2v51-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 d361dd8505..ddc72b1514 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-wso2v50 + 4.0.0-wso2v51-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 2c08a6518e..8df7f7c0da 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-wso2v50 + 4.0.0-wso2v51-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 b928f7b4a0..0848a6562e 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-wso2v50 + 4.0.0-wso2v51-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 56eabd13d8..fadeb385a9 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-wso2v50 + 4.0.0-wso2v51-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 1354fd9365..73ca4a277d 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v50 + 4.0.0-wso2v51-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 941914b519..79d7daecf0 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v50 + 4.0.0-wso2v51-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 698cae21db..99c9f6d344 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v50 + 4.0.0-wso2v51-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-wso2v50 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index e6d79f03a9..1fb736b0d8 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v50 + 4.0.0-wso2v51-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 62c55efde3..c25714a934 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-wso2v50 + 4.0.0-wso2v51-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 1d0d3238c1..cdd62963e0 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-wso2v50 + 4.0.0-wso2v51-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 0c1080e9d6..ad96cd2d88 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v50 + 4.0.0-wso2v51-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 02f379bbed..fa27b9e648 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v50 + 4.0.0-wso2v51-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index d72657315e..d768fe6183 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v50 + 4.0.0-wso2v51-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 0001d3a2cd..225c124808 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v50 + 4.0.0-wso2v51-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 922c1aa707..e904c7888d 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-wso2v50 + 4.0.0-wso2v51-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 133f02710e..0d102e35e7 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-wso2v50 + 4.0.0-wso2v51-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 0c17add7bf..3b198f645b 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-wso2v50 + 4.0.0-wso2v51-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 4f9896a8f7..482a502d8b 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-wso2v50 + 4.0.0-wso2v51-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 2dd594bd26..faa6bc7ecd 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v50 + 4.0.0-wso2v51-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index ae523d2686..17c25de05e 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v50 + 4.0.0-wso2v51-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index c9d6aa7707..406c0b52d4 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-wso2v50 + 4.0.0-wso2v51-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index f603be05d3..0617b6cc3b 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v50 + 4.0.0-wso2v51-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-wso2v50 + HEAD Apache Software Foundation From c81cfe737f9ff1b0cb54558431faeadf1f35aac6 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 21 Sep 2023 10:27:54 +0000 Subject: [PATCH 026/308] [WSO2 Release] [Jenkins #6657] [Release 4.0.0-wso2v51] prepare release v4.0.0-wso2v51 --- 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 ac5e7c7c7c..7968c49d9d 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v51-SNAPSHOT + 4.0.0-wso2v51 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 21983365f3..8777d92342 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v51-SNAPSHOT + 4.0.0-wso2v51 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 0ef791fd0e..2ccdd5b40a 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-wso2v51-SNAPSHOT + 4.0.0-wso2v51 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 8993c4eebf..cfa2f59330 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v51-SNAPSHOT + 4.0.0-wso2v51 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 40ef1dd188..595f75c025 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v51-SNAPSHOT + 4.0.0-wso2v51 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 50401db359..7dc46a06e9 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v51-SNAPSHOT + 4.0.0-wso2v51 ../../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 e557b27a4b..c030649592 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-wso2v51-SNAPSHOT + 4.0.0-wso2v51 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 e9868e606b..8f1bcca9a1 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-wso2v51-SNAPSHOT + 4.0.0-wso2v51 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 a5f4d29112..931186fe03 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-wso2v51-SNAPSHOT + 4.0.0-wso2v51 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 ddc72b1514..509c0b4771 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-wso2v51-SNAPSHOT + 4.0.0-wso2v51 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 8df7f7c0da..430167841d 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-wso2v51-SNAPSHOT + 4.0.0-wso2v51 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 0848a6562e..817189c705 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-wso2v51-SNAPSHOT + 4.0.0-wso2v51 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 fadeb385a9..377b7beb9d 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-wso2v51-SNAPSHOT + 4.0.0-wso2v51 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 73ca4a277d..a49bf64461 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v51-SNAPSHOT + 4.0.0-wso2v51 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 79d7daecf0..fbeccb5ee2 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v51-SNAPSHOT + 4.0.0-wso2v51 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 99c9f6d344..43d206db80 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v51-SNAPSHOT + 4.0.0-wso2v51 ../../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-wso2v51 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 1fb736b0d8..7e67039e91 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v51-SNAPSHOT + 4.0.0-wso2v51 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index c25714a934..843da4ee7d 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-wso2v51-SNAPSHOT + 4.0.0-wso2v51 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index cdd62963e0..0f945c65b0 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-wso2v51-SNAPSHOT + 4.0.0-wso2v51 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index ad96cd2d88..328eb5bdbb 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v51-SNAPSHOT + 4.0.0-wso2v51 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index fa27b9e648..bd87520afe 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v51-SNAPSHOT + 4.0.0-wso2v51 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index d768fe6183..4bea7409db 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v51-SNAPSHOT + 4.0.0-wso2v51 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 225c124808..ddbb2791f3 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v51-SNAPSHOT + 4.0.0-wso2v51 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index e904c7888d..7a5eb7f860 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-wso2v51-SNAPSHOT + 4.0.0-wso2v51 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 0d102e35e7..c2ef7ea6e2 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-wso2v51-SNAPSHOT + 4.0.0-wso2v51 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 3b198f645b..4b02b71a16 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-wso2v51-SNAPSHOT + 4.0.0-wso2v51 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 482a502d8b..709a4fa18a 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-wso2v51-SNAPSHOT + 4.0.0-wso2v51 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index faa6bc7ecd..bca84735c6 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v51-SNAPSHOT + 4.0.0-wso2v51 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 17c25de05e..7e02ccb98c 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v51-SNAPSHOT + 4.0.0-wso2v51 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 406c0b52d4..9e13b65b73 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-wso2v51-SNAPSHOT + 4.0.0-wso2v51 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 0617b6cc3b..94c88809dc 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v51-SNAPSHOT + 4.0.0-wso2v51 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-wso2v51 Apache Software Foundation From 06953260421d0c6a82cbe79e49270cc3d41084a9 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 21 Sep 2023 10:27:56 +0000 Subject: [PATCH 027/308] [WSO2 Release] [Jenkins #6657] [Release 4.0.0-wso2v51] 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 7968c49d9d..d4e8244bab 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v51 + 4.0.0-wso2v52-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 8777d92342..7f82f0d00a 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v51 + 4.0.0-wso2v52-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 2ccdd5b40a..2296e4f0f0 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-wso2v51 + 4.0.0-wso2v52-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index cfa2f59330..f65152be83 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v51 + 4.0.0-wso2v52-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 595f75c025..98ab8186b0 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v51 + 4.0.0-wso2v52-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 7dc46a06e9..2cac1e16e2 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v51 + 4.0.0-wso2v52-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 c030649592..fdc4317dd1 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-wso2v51 + 4.0.0-wso2v52-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 8f1bcca9a1..2ba00593d6 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-wso2v51 + 4.0.0-wso2v52-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 931186fe03..9827d134cc 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-wso2v51 + 4.0.0-wso2v52-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 509c0b4771..c074494734 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-wso2v51 + 4.0.0-wso2v52-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 430167841d..043a157411 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-wso2v51 + 4.0.0-wso2v52-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 817189c705..696b4cfa47 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-wso2v51 + 4.0.0-wso2v52-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 377b7beb9d..f372f7a4ff 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-wso2v51 + 4.0.0-wso2v52-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index a49bf64461..af49a1087a 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v51 + 4.0.0-wso2v52-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index fbeccb5ee2..ad668ffda8 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v51 + 4.0.0-wso2v52-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 43d206db80..f46b05b907 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v51 + 4.0.0-wso2v52-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-wso2v51 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 7e67039e91..9e1e08c25e 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v51 + 4.0.0-wso2v52-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 843da4ee7d..aa6f04e9c2 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-wso2v51 + 4.0.0-wso2v52-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 0f945c65b0..1712be4f42 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-wso2v51 + 4.0.0-wso2v52-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 328eb5bdbb..4efa8d8827 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v51 + 4.0.0-wso2v52-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index bd87520afe..65c3278242 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v51 + 4.0.0-wso2v52-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 4bea7409db..60b1d83cf3 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v51 + 4.0.0-wso2v52-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index ddbb2791f3..e935fb7db3 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v51 + 4.0.0-wso2v52-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 7a5eb7f860..cdcd23ee37 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-wso2v51 + 4.0.0-wso2v52-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index c2ef7ea6e2..c6675aff96 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-wso2v51 + 4.0.0-wso2v52-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 4b02b71a16..28f1673cc8 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-wso2v51 + 4.0.0-wso2v52-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 709a4fa18a..c9e400b548 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-wso2v51 + 4.0.0-wso2v52-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index bca84735c6..8ab056a8e0 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v51 + 4.0.0-wso2v52-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 7e02ccb98c..fbdea56330 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v51 + 4.0.0-wso2v52-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 9e13b65b73..407f906a76 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-wso2v51 + 4.0.0-wso2v52-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 94c88809dc..294671c1f0 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v51 + 4.0.0-wso2v52-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-wso2v51 + HEAD Apache Software Foundation From 663e5f2e33951f9dc96f16333f6a88eab968662c Mon Sep 17 00:00:00 2001 From: Arunan Sugunakumar Date: Mon, 25 Sep 2023 15:14:59 +0530 Subject: [PATCH 028/308] Update the URL pattern regex to correctly mask the SMB2 passwords --- .../main/java/org/apache/synapse/commons/vfs/VFSUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/vfs/VFSUtils.java b/modules/commons/src/main/java/org/apache/synapse/commons/vfs/VFSUtils.java index 9025114ec6..c28af296cb 100644 --- a/modules/commons/src/main/java/org/apache/synapse/commons/vfs/VFSUtils.java +++ b/modules/commons/src/main/java/org/apache/synapse/commons/vfs/VFSUtils.java @@ -67,7 +67,7 @@ public class VFSUtils { /** * URL pattern */ - private static final Pattern URL_PATTERN = Pattern.compile("[a-z]+://.*"); + private static final Pattern URL_PATTERN = Pattern.compile("[a-zA-Z0-9]+://.*"); /** * Password pattern @@ -350,7 +350,7 @@ public static String maskURLPassword(String url) { String maskUrl; if (urlMatcher.find()) { final Matcher pwdMatcher = PASSWORD_PATTERN.matcher(url); - maskUrl = pwdMatcher.replaceFirst("\":***@\""); + maskUrl = pwdMatcher.replaceFirst(":***@"); return maskUrl; } return url; From c67ff84723a4266718b886cf2a580d215ae9fc35 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 26 Sep 2023 11:48:12 +0000 Subject: [PATCH 029/308] [WSO2 Release] [Jenkins #6664] [Release 4.0.0-wso2v52] prepare release v4.0.0-wso2v52 --- 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 d4e8244bab..f4a39017d0 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v52-SNAPSHOT + 4.0.0-wso2v52 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 7f82f0d00a..11beede224 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v52-SNAPSHOT + 4.0.0-wso2v52 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 2296e4f0f0..cba7866e30 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-wso2v52-SNAPSHOT + 4.0.0-wso2v52 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index f65152be83..da060d33de 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v52-SNAPSHOT + 4.0.0-wso2v52 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 98ab8186b0..458fca5abc 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v52-SNAPSHOT + 4.0.0-wso2v52 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 2cac1e16e2..484a3bb345 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v52-SNAPSHOT + 4.0.0-wso2v52 ../../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 fdc4317dd1..1051dbf1ae 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-wso2v52-SNAPSHOT + 4.0.0-wso2v52 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 2ba00593d6..28e2e91bcc 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-wso2v52-SNAPSHOT + 4.0.0-wso2v52 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 9827d134cc..eb1637405d 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-wso2v52-SNAPSHOT + 4.0.0-wso2v52 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 c074494734..18de1fda81 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-wso2v52-SNAPSHOT + 4.0.0-wso2v52 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 043a157411..70cd7d0b5b 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-wso2v52-SNAPSHOT + 4.0.0-wso2v52 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 696b4cfa47..cd5ca2912f 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-wso2v52-SNAPSHOT + 4.0.0-wso2v52 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 f372f7a4ff..bbce08af20 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-wso2v52-SNAPSHOT + 4.0.0-wso2v52 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index af49a1087a..58559458c1 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v52-SNAPSHOT + 4.0.0-wso2v52 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index ad668ffda8..872819c8e8 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v52-SNAPSHOT + 4.0.0-wso2v52 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index f46b05b907..156a45f77e 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v52-SNAPSHOT + 4.0.0-wso2v52 ../../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-wso2v52 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 9e1e08c25e..3f06183b3e 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v52-SNAPSHOT + 4.0.0-wso2v52 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index aa6f04e9c2..07e5c44fca 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-wso2v52-SNAPSHOT + 4.0.0-wso2v52 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 1712be4f42..a3f3f7076f 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-wso2v52-SNAPSHOT + 4.0.0-wso2v52 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 4efa8d8827..92bfd67c25 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v52-SNAPSHOT + 4.0.0-wso2v52 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 65c3278242..417dcf3390 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v52-SNAPSHOT + 4.0.0-wso2v52 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 60b1d83cf3..7460f4b126 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v52-SNAPSHOT + 4.0.0-wso2v52 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index e935fb7db3..ba6c7831a2 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v52-SNAPSHOT + 4.0.0-wso2v52 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index cdcd23ee37..a7674ef00c 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-wso2v52-SNAPSHOT + 4.0.0-wso2v52 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index c6675aff96..21354d5309 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-wso2v52-SNAPSHOT + 4.0.0-wso2v52 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 28f1673cc8..0a11e4dca3 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-wso2v52-SNAPSHOT + 4.0.0-wso2v52 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index c9e400b548..c7571c54b1 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-wso2v52-SNAPSHOT + 4.0.0-wso2v52 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 8ab056a8e0..771bc02c63 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v52-SNAPSHOT + 4.0.0-wso2v52 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index fbdea56330..5578abd3fc 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v52-SNAPSHOT + 4.0.0-wso2v52 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 407f906a76..72db7032f6 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-wso2v52-SNAPSHOT + 4.0.0-wso2v52 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 294671c1f0..0e7dedba1c 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v52-SNAPSHOT + 4.0.0-wso2v52 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-wso2v52 Apache Software Foundation From 8de852e6749a870026f1bf6fff4044e12ad1d203 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 26 Sep 2023 11:48:14 +0000 Subject: [PATCH 030/308] [WSO2 Release] [Jenkins #6664] [Release 4.0.0-wso2v52] 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 f4a39017d0..ce357f794a 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v52 + 4.0.0-wso2v53-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 11beede224..d2ceaa8e77 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v52 + 4.0.0-wso2v53-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index cba7866e30..0f3d56f599 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-wso2v52 + 4.0.0-wso2v53-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index da060d33de..e8ef28ab1a 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v52 + 4.0.0-wso2v53-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 458fca5abc..589c698e6e 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v52 + 4.0.0-wso2v53-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 484a3bb345..c2250d2638 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v52 + 4.0.0-wso2v53-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 1051dbf1ae..5d71227b62 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-wso2v52 + 4.0.0-wso2v53-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 28e2e91bcc..063a196b41 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-wso2v52 + 4.0.0-wso2v53-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 eb1637405d..d981330d99 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-wso2v52 + 4.0.0-wso2v53-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 18de1fda81..424beeb8ba 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-wso2v52 + 4.0.0-wso2v53-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 70cd7d0b5b..6f5df6ff53 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-wso2v52 + 4.0.0-wso2v53-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 cd5ca2912f..61cbea964b 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-wso2v52 + 4.0.0-wso2v53-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 bbce08af20..acffb871a6 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-wso2v52 + 4.0.0-wso2v53-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 58559458c1..2a680378e3 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v52 + 4.0.0-wso2v53-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 872819c8e8..75eddc30b5 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v52 + 4.0.0-wso2v53-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 156a45f77e..a2c74b7f70 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v52 + 4.0.0-wso2v53-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-wso2v52 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 3f06183b3e..0814a3ad0c 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v52 + 4.0.0-wso2v53-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 07e5c44fca..c389f0fc03 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-wso2v52 + 4.0.0-wso2v53-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index a3f3f7076f..f1f0617786 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-wso2v52 + 4.0.0-wso2v53-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 92bfd67c25..fa39fea26e 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v52 + 4.0.0-wso2v53-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 417dcf3390..a50a0843ee 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v52 + 4.0.0-wso2v53-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 7460f4b126..abd0b4873a 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v52 + 4.0.0-wso2v53-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index ba6c7831a2..aed84659f2 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v52 + 4.0.0-wso2v53-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index a7674ef00c..33f5a90a20 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-wso2v52 + 4.0.0-wso2v53-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 21354d5309..ad73d6e055 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-wso2v52 + 4.0.0-wso2v53-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 0a11e4dca3..e4c81605ab 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-wso2v52 + 4.0.0-wso2v53-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index c7571c54b1..89c5a53937 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-wso2v52 + 4.0.0-wso2v53-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 771bc02c63..c3adddb269 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v52 + 4.0.0-wso2v53-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 5578abd3fc..b7ef6c0e8e 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v52 + 4.0.0-wso2v53-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 72db7032f6..97dfb66871 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-wso2v52 + 4.0.0-wso2v53-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 0e7dedba1c..1eea6e4e81 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v52 + 4.0.0-wso2v53-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-wso2v52 + HEAD Apache Software Foundation From 273c1e4c81826151017bc98e4e4d10245995cf8c Mon Sep 17 00:00:00 2001 From: malakaganga Date: Tue, 3 Oct 2023 15:16:08 +0530 Subject: [PATCH 031/308] Fix mismatch in axis service and proxy(synapse) service state For MI we have introduced this feature using a DeploymentInterceptor. But to enable that we have to add the following service parameter to the proxy true But there is an issue with MI where it does not properly propagate this state since be due to a mismatch in axis service and proxy(synapse) service state. Fixes: https://github.com/wso2/micro-integrator/issues/2981 --- .../main/java/org/apache/synapse/core/axis2/ProxyService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java b/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java index 645ac58efa..5b1967b01d 100644 --- a/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java +++ b/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java @@ -798,7 +798,7 @@ public AxisService buildAxisService(SynapseConfiguration synCfg, AxisConfigurati axisCfg.addServiceToExistingServiceGroup(axisService, serviceGroup); } } - this.setRunning(true); + this.setRunning(axisService.isActive()); } catch (AxisFault axisFault) { try { if (axisCfg.getService(axisService.getName()) != null) { From 56fde8d0db213a7c4e1f1fe0cb0a5f995e6461d4 Mon Sep 17 00:00:00 2001 From: GDLMadushanka Date: Thu, 5 Oct 2023 11:49:28 +0530 Subject: [PATCH 032/308] Avoid cloning the message envelope when iterating In iterate mediator json message flow, we don't need to clone the entire envelope since we are replacing it with iterated message later. Adding an empty envelope instead improves the performance. Fixes wso2/api-manager/issues/2196 --- .../eip/splitter/IterateMediator.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/IterateMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/IterateMediator.java index 642833086f..ae76b3dda1 100644 --- a/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/IterateMediator.java +++ b/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/IterateMediator.java @@ -23,9 +23,12 @@ import com.google.gson.JsonElement; import com.google.gson.JsonParser; import com.jayway.jsonpath.JsonPath; +import org.apache.axiom.om.OMAbstractFactory; import org.apache.axiom.om.OMElement; import org.apache.axiom.om.OMNode; +import org.apache.axiom.soap.SOAP11Constants; import org.apache.axiom.soap.SOAPEnvelope; +import org.apache.axiom.soap.SOAPFactory; import org.apache.axis2.AxisFault; import org.apache.axis2.Constants; import org.apache.axis2.context.OperationContext; @@ -372,10 +375,17 @@ private MessageContext getIteratedMessage(MessageContext synCtx, int msgNumber, throws AxisFault, JaxenException { // clone the message for the mediation in iteration - MessageContext newCtx = MessageHelper.cloneMessageContext(synCtx); - - //Remove the original jsonstream from the context - JsonUtil.removeJsonPayload(((Axis2MessageContext) newCtx).getAxis2MessageContext()); + MessageContext newCtx = MessageHelper.cloneMessageContext(synCtx, false, false); + // Adding an empty envelope since JsonUtil.getNewJsonPayload requires an envelope + SOAPFactory fac; + if (SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI + .equals(synCtx.getEnvelope().getBody().getNamespace().getNamespaceURI())) { + fac = OMAbstractFactory.getSOAP11Factory(); + } else { + fac = OMAbstractFactory.getSOAP12Factory(); + } + SOAPEnvelope newEnvelope = fac.getDefaultEnvelope(); + newCtx.setEnvelope(newEnvelope); if (id != null) { // set the parent correlation details to the cloned MC - From 79e13913a8b0dc6b18b258a2f5609a361cac47f0 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 9 Oct 2023 04:47:26 +0000 Subject: [PATCH 033/308] [WSO2 Release] [Jenkins #6673] [Release 4.0.0-wso2v53] prepare release v4.0.0-wso2v53 --- 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 ce357f794a..e0d1ba5e96 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v53-SNAPSHOT + 4.0.0-wso2v53 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index d2ceaa8e77..feead2e456 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v53-SNAPSHOT + 4.0.0-wso2v53 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 0f3d56f599..f9ae374dbb 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-wso2v53-SNAPSHOT + 4.0.0-wso2v53 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index e8ef28ab1a..0ce75678ab 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v53-SNAPSHOT + 4.0.0-wso2v53 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 589c698e6e..d1f02999d6 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v53-SNAPSHOT + 4.0.0-wso2v53 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index c2250d2638..6b02b515a3 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v53-SNAPSHOT + 4.0.0-wso2v53 ../../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 5d71227b62..59993a6d6c 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-wso2v53-SNAPSHOT + 4.0.0-wso2v53 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 063a196b41..c7636f249e 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-wso2v53-SNAPSHOT + 4.0.0-wso2v53 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 d981330d99..84a3d7fccd 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-wso2v53-SNAPSHOT + 4.0.0-wso2v53 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 424beeb8ba..96f9157343 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-wso2v53-SNAPSHOT + 4.0.0-wso2v53 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 6f5df6ff53..56ab787c41 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-wso2v53-SNAPSHOT + 4.0.0-wso2v53 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 61cbea964b..014e809ef4 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-wso2v53-SNAPSHOT + 4.0.0-wso2v53 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 acffb871a6..e069816ba9 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-wso2v53-SNAPSHOT + 4.0.0-wso2v53 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 2a680378e3..0f0fa6be11 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v53-SNAPSHOT + 4.0.0-wso2v53 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 75eddc30b5..d64cdb64fa 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v53-SNAPSHOT + 4.0.0-wso2v53 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index a2c74b7f70..ed84cb8003 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v53-SNAPSHOT + 4.0.0-wso2v53 ../../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-wso2v53 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 0814a3ad0c..cb412118b5 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v53-SNAPSHOT + 4.0.0-wso2v53 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index c389f0fc03..70e6e5abd3 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-wso2v53-SNAPSHOT + 4.0.0-wso2v53 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index f1f0617786..2c61920266 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-wso2v53-SNAPSHOT + 4.0.0-wso2v53 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index fa39fea26e..6e5632fd47 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v53-SNAPSHOT + 4.0.0-wso2v53 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index a50a0843ee..37aa0e8277 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v53-SNAPSHOT + 4.0.0-wso2v53 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index abd0b4873a..fbf5260f20 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v53-SNAPSHOT + 4.0.0-wso2v53 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index aed84659f2..30ed144de6 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v53-SNAPSHOT + 4.0.0-wso2v53 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 33f5a90a20..6e222a69fc 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-wso2v53-SNAPSHOT + 4.0.0-wso2v53 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index ad73d6e055..6f454a300f 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-wso2v53-SNAPSHOT + 4.0.0-wso2v53 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index e4c81605ab..de63f80d71 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-wso2v53-SNAPSHOT + 4.0.0-wso2v53 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 89c5a53937..8bdbe774d4 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-wso2v53-SNAPSHOT + 4.0.0-wso2v53 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index c3adddb269..fe5081e68d 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v53-SNAPSHOT + 4.0.0-wso2v53 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index b7ef6c0e8e..a921aee818 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v53-SNAPSHOT + 4.0.0-wso2v53 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 97dfb66871..a5e16b415f 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-wso2v53-SNAPSHOT + 4.0.0-wso2v53 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 1eea6e4e81..bfcf95f4be 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v53-SNAPSHOT + 4.0.0-wso2v53 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-wso2v53 Apache Software Foundation From 9d3d43d017fd25e6834e9f1ef1e437a65056ab70 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 9 Oct 2023 04:47:28 +0000 Subject: [PATCH 034/308] [WSO2 Release] [Jenkins #6673] [Release 4.0.0-wso2v53] 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 e0d1ba5e96..f21176b2ce 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v53 + 4.0.0-wso2v54-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index feead2e456..cb1f8668f9 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v53 + 4.0.0-wso2v54-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index f9ae374dbb..6811667c72 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-wso2v53 + 4.0.0-wso2v54-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 0ce75678ab..61565fd681 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v53 + 4.0.0-wso2v54-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index d1f02999d6..a812cfa895 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v53 + 4.0.0-wso2v54-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 6b02b515a3..8e8fa0dba1 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v53 + 4.0.0-wso2v54-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 59993a6d6c..8578648eac 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-wso2v53 + 4.0.0-wso2v54-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 c7636f249e..c5efa121da 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-wso2v53 + 4.0.0-wso2v54-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 84a3d7fccd..1b9d4a822a 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-wso2v53 + 4.0.0-wso2v54-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 96f9157343..9d8eef5763 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-wso2v53 + 4.0.0-wso2v54-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 56ab787c41..9f59cb5de9 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-wso2v53 + 4.0.0-wso2v54-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 014e809ef4..774ec31dca 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-wso2v53 + 4.0.0-wso2v54-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 e069816ba9..ec9f2315b8 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-wso2v53 + 4.0.0-wso2v54-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 0f0fa6be11..ab900cbbe0 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v53 + 4.0.0-wso2v54-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index d64cdb64fa..a7b4ba9fc6 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v53 + 4.0.0-wso2v54-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index ed84cb8003..ece4e7f58d 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v53 + 4.0.0-wso2v54-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-wso2v53 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index cb412118b5..a45bfe19d3 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v53 + 4.0.0-wso2v54-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 70e6e5abd3..11d601d0a9 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-wso2v53 + 4.0.0-wso2v54-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 2c61920266..58d3cf3141 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-wso2v53 + 4.0.0-wso2v54-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 6e5632fd47..29e0df6886 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v53 + 4.0.0-wso2v54-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 37aa0e8277..e62fdc8cc9 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v53 + 4.0.0-wso2v54-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index fbf5260f20..737e5464de 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v53 + 4.0.0-wso2v54-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 30ed144de6..7f343846d3 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v53 + 4.0.0-wso2v54-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 6e222a69fc..9f30c59941 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-wso2v53 + 4.0.0-wso2v54-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 6f454a300f..ee31356564 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-wso2v53 + 4.0.0-wso2v54-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index de63f80d71..08dd0a8176 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-wso2v53 + 4.0.0-wso2v54-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 8bdbe774d4..d9b14e2617 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-wso2v53 + 4.0.0-wso2v54-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index fe5081e68d..0331ffb056 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v53 + 4.0.0-wso2v54-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index a921aee818..0fe0fa1b09 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v53 + 4.0.0-wso2v54-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index a5e16b415f..576fb5bb15 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-wso2v53 + 4.0.0-wso2v54-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index bfcf95f4be..886a886fff 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v53 + 4.0.0-wso2v54-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-wso2v53 + HEAD Apache Software Foundation From 3f5761c076d907402e38b6ee6f13f226488cc0cd Mon Sep 17 00:00:00 2001 From: layani Date: Mon, 16 Oct 2023 19:37:38 +0530 Subject: [PATCH 035/308] improve correlation logs --- .../main/java/org/apache/synapse/core/axis2/TimeoutHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/synapse/core/axis2/TimeoutHandler.java b/modules/core/src/main/java/org/apache/synapse/core/axis2/TimeoutHandler.java index 202960960e..afa6982932 100644 --- a/modules/core/src/main/java/org/apache/synapse/core/axis2/TimeoutHandler.java +++ b/modules/core/src/main/java/org/apache/synapse/core/axis2/TimeoutHandler.java @@ -150,7 +150,7 @@ private void processCallbacks() { + getEndpointLogMessage(callback.getSynapseOutMsgCtx(), callback.getAxis2OutMsgCtx()) + ", " + getServiceLogMessage(callback.getSynapseOutMsgCtx()) - + "Correlation ID : " + callback.getAxis2OutMsgCtx().getProperty( + + ", Correlation ID : " + callback.getAxis2OutMsgCtx().getProperty( CorrelationConstants.CORRELATION_ID)); } From 49377987a7fbdc4d07963cc0eb7665814e29a93b Mon Sep 17 00:00:00 2001 From: Rosen Silva Date: Wed, 18 Oct 2023 07:38:10 +0530 Subject: [PATCH 036/308] Add parameter to ignore case sensitive headers Related Issue: https://github.com/wso2/api-manager/issues/2219 --- .../synapse/transport/passthru/ClientWorker.java | 2 +- .../passthru/config/PassThroughConfigPNames.java | 5 +++++ .../passthru/config/PassThroughConfiguration.java | 10 ++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/ClientWorker.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/ClientWorker.java index 4c0a841ae5..a5e8d59ecd 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/ClientWorker.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/ClientWorker.java @@ -181,7 +181,7 @@ public int compare(String o1, String o2) { }); for (Map.Entry headerEntry : headerEntries) { - if (headerMap.containsKey(headerEntry.getKey())) { + if (headerMap.containsKey(headerEntry.getKey()) && !conf.isIgnoreCaseSensitiveHeaders()) { excessHeaders.put(headerEntry.getKey(), headerMap.get(headerEntry.getKey())); } headerMap.put(headerEntry.getKey(), headerEntry.getValue()); diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/config/PassThroughConfigPNames.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/config/PassThroughConfigPNames.java index 931e1d32e4..57f65026d4 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/config/PassThroughConfigPNames.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/config/PassThroughConfigPNames.java @@ -177,4 +177,9 @@ public interface PassThroughConfigPNames { * Defines whether viewing services are enabled or not */ public String BLOCK_SERVICE_LIST = "http.block_service_list"; + + /** + * Defines whether to ignore case-sensitive headers from excess headers map + */ + public String IGNORE_CASE_SENSITIVE_HEADERS = "ignore_case_sensitive_headers"; } diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/config/PassThroughConfiguration.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/config/PassThroughConfiguration.java index d1268e6fdd..6d739ec433 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/config/PassThroughConfiguration.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/config/PassThroughConfiguration.java @@ -387,4 +387,14 @@ public String getPassThroughDefaultServiceName() { } return passThroughDefaultServiceName; } + + /** + * Get the value of the property to ignore case-sensitive headers from excess headers + * + * @return Value of the property + */ + public boolean isIgnoreCaseSensitiveHeaders() { + return ConfigurationBuilderUtil.getBooleanProperty(PassThroughConfigPNames.IGNORE_CASE_SENSITIVE_HEADERS, + false, props); + } } From 1488835e7895610e18e00be920c6a1f984616b08 Mon Sep 17 00:00:00 2001 From: Isuru Udana Loku Narangoda Date: Wed, 18 Oct 2023 13:22:54 +0530 Subject: [PATCH 037/308] Fix build url --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2416f84c41..c78c076552 100644 --- a/README.md +++ b/README.md @@ -30,4 +30,4 @@ WSO2 developers can be contacted via the mailing lists: | Branch | Build Status | | :------------ |:------------- -| wso2-synapse master | [![Build Status](https://wso2.org/jenkins/view/wso2-dependencies/job/forked-dependencies/job/wso2-synapse/badge/icon)](https://wso2.org/jenkins/view/wso2-dependencies/job/forked-dependencies/job/wso2-synapse) +| wso2-synapse master | [![Build Status](https://wso2.org/jenkins/job/forked-dependencies/job/wso2-synapse/badge/icon)](https://wso2.org/jenkins/job/forked-dependencies/job/wso2-synapse/) From 1e1ecedcbf244e89a93688b4bc4f104ce0deea71 Mon Sep 17 00:00:00 2001 From: Isuru Wijesiri Date: Wed, 18 Oct 2023 13:26:45 +0530 Subject: [PATCH 038/308] Bump transport-http version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 886a886fff..3199668efd 100644 --- a/pom.xml +++ b/pom.xml @@ -1586,7 +1586,7 @@ 1.5.2 1.17.0 4.1.80.Final - 6.3.42 + 6.3.49 1.1.1.wso2v3 5.8.0 1.11.0.wso2v3 From 1121c24a2fdafe48187ffc10e1cac3f0a14c4e40 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 18 Oct 2023 08:15:13 +0000 Subject: [PATCH 039/308] [WSO2 Release] [Jenkins #6684] [Release 4.0.0-wso2v54] prepare release v4.0.0-wso2v54 --- 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 f21176b2ce..0e47e04682 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v54-SNAPSHOT + 4.0.0-wso2v54 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index cb1f8668f9..cd77d23538 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v54-SNAPSHOT + 4.0.0-wso2v54 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 6811667c72..d396a7ac90 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-wso2v54-SNAPSHOT + 4.0.0-wso2v54 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 61565fd681..e9efe1f534 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v54-SNAPSHOT + 4.0.0-wso2v54 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index a812cfa895..7629d53e2e 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v54-SNAPSHOT + 4.0.0-wso2v54 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 8e8fa0dba1..1767f30a26 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v54-SNAPSHOT + 4.0.0-wso2v54 ../../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 8578648eac..18f9d2b8b8 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-wso2v54-SNAPSHOT + 4.0.0-wso2v54 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 c5efa121da..880d1fa9f1 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-wso2v54-SNAPSHOT + 4.0.0-wso2v54 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 1b9d4a822a..5f12d341fc 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-wso2v54-SNAPSHOT + 4.0.0-wso2v54 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 9d8eef5763..2098455747 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-wso2v54-SNAPSHOT + 4.0.0-wso2v54 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 9f59cb5de9..c128f34e8b 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-wso2v54-SNAPSHOT + 4.0.0-wso2v54 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 774ec31dca..77267e5de6 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-wso2v54-SNAPSHOT + 4.0.0-wso2v54 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 ec9f2315b8..1d2947e3e5 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-wso2v54-SNAPSHOT + 4.0.0-wso2v54 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index ab900cbbe0..95c9f00468 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v54-SNAPSHOT + 4.0.0-wso2v54 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index a7b4ba9fc6..bd428ecd77 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v54-SNAPSHOT + 4.0.0-wso2v54 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index ece4e7f58d..13e3cfccfc 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v54-SNAPSHOT + 4.0.0-wso2v54 ../../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-wso2v54 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index a45bfe19d3..bda224e16b 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v54-SNAPSHOT + 4.0.0-wso2v54 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 11d601d0a9..f9fe9262da 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-wso2v54-SNAPSHOT + 4.0.0-wso2v54 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 58d3cf3141..1b19260ef2 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-wso2v54-SNAPSHOT + 4.0.0-wso2v54 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 29e0df6886..468ad81d71 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v54-SNAPSHOT + 4.0.0-wso2v54 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index e62fdc8cc9..a9676a11c2 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v54-SNAPSHOT + 4.0.0-wso2v54 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 737e5464de..b5173df7bb 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v54-SNAPSHOT + 4.0.0-wso2v54 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 7f343846d3..0b942109ca 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v54-SNAPSHOT + 4.0.0-wso2v54 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 9f30c59941..4b1982f3b0 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-wso2v54-SNAPSHOT + 4.0.0-wso2v54 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index ee31356564..b931c8d09e 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-wso2v54-SNAPSHOT + 4.0.0-wso2v54 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 08dd0a8176..ecad65eab2 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-wso2v54-SNAPSHOT + 4.0.0-wso2v54 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index d9b14e2617..23010a7bc3 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-wso2v54-SNAPSHOT + 4.0.0-wso2v54 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 0331ffb056..a173669377 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v54-SNAPSHOT + 4.0.0-wso2v54 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 0fe0fa1b09..b39b482261 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v54-SNAPSHOT + 4.0.0-wso2v54 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 576fb5bb15..59d93fb7d5 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-wso2v54-SNAPSHOT + 4.0.0-wso2v54 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 886a886fff..2c146c8330 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v54-SNAPSHOT + 4.0.0-wso2v54 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-wso2v54 Apache Software Foundation From 22506ce369d003dc76ef0dc60056dffde1d5da7a Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 18 Oct 2023 08:15:15 +0000 Subject: [PATCH 040/308] [WSO2 Release] [Jenkins #6684] [Release 4.0.0-wso2v54] 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 0e47e04682..c95850bfdf 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v54 + 4.0.0-wso2v55-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index cd77d23538..7e2cb72d61 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v54 + 4.0.0-wso2v55-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index d396a7ac90..577aea6b46 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-wso2v54 + 4.0.0-wso2v55-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index e9efe1f534..88673c044a 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v54 + 4.0.0-wso2v55-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 7629d53e2e..631c691680 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v54 + 4.0.0-wso2v55-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 1767f30a26..694d932d22 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v54 + 4.0.0-wso2v55-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 18f9d2b8b8..fb3f7dfebd 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-wso2v54 + 4.0.0-wso2v55-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 880d1fa9f1..7e2b8c28a1 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-wso2v54 + 4.0.0-wso2v55-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 5f12d341fc..9612f6128b 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-wso2v54 + 4.0.0-wso2v55-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 2098455747..834c4e62ec 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-wso2v54 + 4.0.0-wso2v55-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 c128f34e8b..9669bbfeae 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-wso2v54 + 4.0.0-wso2v55-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 77267e5de6..037b19478a 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-wso2v54 + 4.0.0-wso2v55-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 1d2947e3e5..79d7544d56 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-wso2v54 + 4.0.0-wso2v55-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 95c9f00468..d0273cacca 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v54 + 4.0.0-wso2v55-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index bd428ecd77..936ae5e80a 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v54 + 4.0.0-wso2v55-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 13e3cfccfc..747503d013 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v54 + 4.0.0-wso2v55-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-wso2v54 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index bda224e16b..fa6f01f6de 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v54 + 4.0.0-wso2v55-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index f9fe9262da..ce65da4b98 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-wso2v54 + 4.0.0-wso2v55-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 1b19260ef2..5ab4a73a97 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-wso2v54 + 4.0.0-wso2v55-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 468ad81d71..684357277d 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v54 + 4.0.0-wso2v55-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index a9676a11c2..1699d38654 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v54 + 4.0.0-wso2v55-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index b5173df7bb..f4811a1930 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v54 + 4.0.0-wso2v55-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 0b942109ca..3f39a21d3c 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v54 + 4.0.0-wso2v55-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 4b1982f3b0..ff5b6bf659 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-wso2v54 + 4.0.0-wso2v55-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index b931c8d09e..e0aeeb31bd 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-wso2v54 + 4.0.0-wso2v55-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index ecad65eab2..c297aae487 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-wso2v54 + 4.0.0-wso2v55-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 23010a7bc3..8d4a9a0f49 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-wso2v54 + 4.0.0-wso2v55-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index a173669377..f9c61f3625 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v54 + 4.0.0-wso2v55-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index b39b482261..7df4c6b150 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v54 + 4.0.0-wso2v55-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 59d93fb7d5..e4735e1f82 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-wso2v54 + 4.0.0-wso2v55-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 2c146c8330..f44fc81560 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v54 + 4.0.0-wso2v55-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-wso2v54 + HEAD Apache Software Foundation From b40016a3f37e62c6fddd606f9ac6cdf9cf1d63bf Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 24 Oct 2023 05:59:38 +0000 Subject: [PATCH 041/308] [WSO2 Release] [Jenkins #6692] [Release 4.0.0-wso2v55] prepare release v4.0.0-wso2v55 --- 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 c95850bfdf..5373cc9d15 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v55-SNAPSHOT + 4.0.0-wso2v55 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 7e2cb72d61..642e52a2f6 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v55-SNAPSHOT + 4.0.0-wso2v55 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 577aea6b46..d5da914bbe 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-wso2v55-SNAPSHOT + 4.0.0-wso2v55 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 88673c044a..d839a0d474 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v55-SNAPSHOT + 4.0.0-wso2v55 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 631c691680..f2c6f23719 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v55-SNAPSHOT + 4.0.0-wso2v55 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 694d932d22..c2f6757345 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v55-SNAPSHOT + 4.0.0-wso2v55 ../../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 fb3f7dfebd..0a58eec146 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-wso2v55-SNAPSHOT + 4.0.0-wso2v55 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 7e2b8c28a1..6c96429a54 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-wso2v55-SNAPSHOT + 4.0.0-wso2v55 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 9612f6128b..b88c51da0d 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-wso2v55-SNAPSHOT + 4.0.0-wso2v55 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 834c4e62ec..5fc9f0912f 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-wso2v55-SNAPSHOT + 4.0.0-wso2v55 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 9669bbfeae..8c98586cc2 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-wso2v55-SNAPSHOT + 4.0.0-wso2v55 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 037b19478a..5a119a27fb 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-wso2v55-SNAPSHOT + 4.0.0-wso2v55 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 79d7544d56..8341f67922 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-wso2v55-SNAPSHOT + 4.0.0-wso2v55 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index d0273cacca..a226d26758 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v55-SNAPSHOT + 4.0.0-wso2v55 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 936ae5e80a..2f23c246e0 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v55-SNAPSHOT + 4.0.0-wso2v55 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 747503d013..eddbeb70f0 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v55-SNAPSHOT + 4.0.0-wso2v55 ../../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-wso2v55 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index fa6f01f6de..eb89a6ee56 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v55-SNAPSHOT + 4.0.0-wso2v55 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index ce65da4b98..9a6625f5d5 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-wso2v55-SNAPSHOT + 4.0.0-wso2v55 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 5ab4a73a97..a5882ee9a7 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-wso2v55-SNAPSHOT + 4.0.0-wso2v55 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 684357277d..b321784b47 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v55-SNAPSHOT + 4.0.0-wso2v55 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 1699d38654..6ddc6c4aa4 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v55-SNAPSHOT + 4.0.0-wso2v55 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index f4811a1930..960af8eb59 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v55-SNAPSHOT + 4.0.0-wso2v55 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 3f39a21d3c..76b98c6679 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v55-SNAPSHOT + 4.0.0-wso2v55 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index ff5b6bf659..42896da4d0 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-wso2v55-SNAPSHOT + 4.0.0-wso2v55 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index e0aeeb31bd..efe76db234 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-wso2v55-SNAPSHOT + 4.0.0-wso2v55 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index c297aae487..9305d671fe 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-wso2v55-SNAPSHOT + 4.0.0-wso2v55 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 8d4a9a0f49..6152f8bd11 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-wso2v55-SNAPSHOT + 4.0.0-wso2v55 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index f9c61f3625..9ef3d0bca0 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v55-SNAPSHOT + 4.0.0-wso2v55 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 7df4c6b150..47d13efa28 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v55-SNAPSHOT + 4.0.0-wso2v55 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index e4735e1f82..5051801987 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-wso2v55-SNAPSHOT + 4.0.0-wso2v55 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 41da8468ec..76c6ce10fb 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v55-SNAPSHOT + 4.0.0-wso2v55 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-wso2v55 Apache Software Foundation From e17be30257abcb656583ae4c2ec1c232f8d30f50 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 24 Oct 2023 05:59:40 +0000 Subject: [PATCH 042/308] [WSO2 Release] [Jenkins #6692] [Release 4.0.0-wso2v55] 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 5373cc9d15..aa56a02820 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v55 + 4.0.0-wso2v56-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 642e52a2f6..4dfc3cde84 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v55 + 4.0.0-wso2v56-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index d5da914bbe..2ce6110fb7 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-wso2v55 + 4.0.0-wso2v56-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index d839a0d474..0377caa518 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v55 + 4.0.0-wso2v56-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index f2c6f23719..acf372361f 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v55 + 4.0.0-wso2v56-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index c2f6757345..194ec31b4b 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v55 + 4.0.0-wso2v56-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 0a58eec146..c549c2157c 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-wso2v55 + 4.0.0-wso2v56-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 6c96429a54..bf8c233794 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-wso2v55 + 4.0.0-wso2v56-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 b88c51da0d..2b34d7b2f6 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-wso2v55 + 4.0.0-wso2v56-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 5fc9f0912f..6dde1a530a 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-wso2v55 + 4.0.0-wso2v56-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 8c98586cc2..5ca865b72f 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-wso2v55 + 4.0.0-wso2v56-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 5a119a27fb..2ea69baade 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-wso2v55 + 4.0.0-wso2v56-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 8341f67922..286bf21bf9 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-wso2v55 + 4.0.0-wso2v56-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index a226d26758..34d4fa8cb5 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v55 + 4.0.0-wso2v56-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 2f23c246e0..fdb07fbf47 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v55 + 4.0.0-wso2v56-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index eddbeb70f0..b3f403db27 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v55 + 4.0.0-wso2v56-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-wso2v55 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index eb89a6ee56..0665bbcf9d 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v55 + 4.0.0-wso2v56-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 9a6625f5d5..8e0efd807c 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-wso2v55 + 4.0.0-wso2v56-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index a5882ee9a7..80371f20c2 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-wso2v55 + 4.0.0-wso2v56-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index b321784b47..466af785d2 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v55 + 4.0.0-wso2v56-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 6ddc6c4aa4..fb4d3cf046 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v55 + 4.0.0-wso2v56-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 960af8eb59..416117e1de 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v55 + 4.0.0-wso2v56-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 76b98c6679..88e71a448a 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v55 + 4.0.0-wso2v56-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 42896da4d0..46cd3e0b9f 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-wso2v55 + 4.0.0-wso2v56-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index efe76db234..49196b3030 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-wso2v55 + 4.0.0-wso2v56-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 9305d671fe..683673a8ee 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-wso2v55 + 4.0.0-wso2v56-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 6152f8bd11..c440ba2de4 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-wso2v55 + 4.0.0-wso2v56-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 9ef3d0bca0..9a285a2ab0 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v55 + 4.0.0-wso2v56-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 47d13efa28..a0b1c997bb 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v55 + 4.0.0-wso2v56-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 5051801987..b1118b52fc 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-wso2v55 + 4.0.0-wso2v56-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 76c6ce10fb..c131fbae7e 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v55 + 4.0.0-wso2v56-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-wso2v55 + HEAD Apache Software Foundation From 6654519bd506db93cb45b47bccaf993d56d08338 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 24 Oct 2023 06:55:36 +0000 Subject: [PATCH 043/308] [WSO2 Release] [Jenkins #6694] [Release 4.0.0-wso2v56] prepare release v4.0.0-wso2v56 --- 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 aa56a02820..2f1fbc4e79 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v56-SNAPSHOT + 4.0.0-wso2v56 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 4dfc3cde84..3f232f2de8 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v56-SNAPSHOT + 4.0.0-wso2v56 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 2ce6110fb7..f073e3712e 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-wso2v56-SNAPSHOT + 4.0.0-wso2v56 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 0377caa518..afb1112ce0 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v56-SNAPSHOT + 4.0.0-wso2v56 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index acf372361f..42e6a00074 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v56-SNAPSHOT + 4.0.0-wso2v56 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 194ec31b4b..3ade551357 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v56-SNAPSHOT + 4.0.0-wso2v56 ../../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 c549c2157c..cf6bb895e2 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-wso2v56-SNAPSHOT + 4.0.0-wso2v56 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 bf8c233794..9c0d9d9ba1 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-wso2v56-SNAPSHOT + 4.0.0-wso2v56 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 2b34d7b2f6..2bd7fcbc53 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-wso2v56-SNAPSHOT + 4.0.0-wso2v56 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 6dde1a530a..839a33b28f 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-wso2v56-SNAPSHOT + 4.0.0-wso2v56 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 5ca865b72f..086e2fcc13 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-wso2v56-SNAPSHOT + 4.0.0-wso2v56 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 2ea69baade..1fad96655e 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-wso2v56-SNAPSHOT + 4.0.0-wso2v56 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 286bf21bf9..011bef4b60 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-wso2v56-SNAPSHOT + 4.0.0-wso2v56 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 34d4fa8cb5..b87a82e68c 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v56-SNAPSHOT + 4.0.0-wso2v56 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index fdb07fbf47..e65b9ee754 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v56-SNAPSHOT + 4.0.0-wso2v56 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index b3f403db27..8a31bb3d84 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v56-SNAPSHOT + 4.0.0-wso2v56 ../../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-wso2v56 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 0665bbcf9d..b4afa6bb96 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v56-SNAPSHOT + 4.0.0-wso2v56 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 8e0efd807c..3f9d9505b4 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-wso2v56-SNAPSHOT + 4.0.0-wso2v56 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 80371f20c2..d13354b9e2 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-wso2v56-SNAPSHOT + 4.0.0-wso2v56 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 466af785d2..c3da836c0e 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v56-SNAPSHOT + 4.0.0-wso2v56 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index fb4d3cf046..811a3b86ae 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v56-SNAPSHOT + 4.0.0-wso2v56 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 416117e1de..6470001eb8 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v56-SNAPSHOT + 4.0.0-wso2v56 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 88e71a448a..0aac2653ed 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v56-SNAPSHOT + 4.0.0-wso2v56 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 46cd3e0b9f..0be8514f81 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-wso2v56-SNAPSHOT + 4.0.0-wso2v56 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 49196b3030..32e7c08a5a 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-wso2v56-SNAPSHOT + 4.0.0-wso2v56 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 683673a8ee..bc21e6a1e5 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-wso2v56-SNAPSHOT + 4.0.0-wso2v56 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index c440ba2de4..35be6bd09c 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-wso2v56-SNAPSHOT + 4.0.0-wso2v56 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 9a285a2ab0..3176a059ce 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v56-SNAPSHOT + 4.0.0-wso2v56 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index a0b1c997bb..da1c58f46d 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v56-SNAPSHOT + 4.0.0-wso2v56 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index b1118b52fc..cff527b054 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-wso2v56-SNAPSHOT + 4.0.0-wso2v56 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index c131fbae7e..80c4cf580d 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v56-SNAPSHOT + 4.0.0-wso2v56 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-wso2v56 Apache Software Foundation From a3c46cb6f858051de640cedbeca3ae8f591c052c Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 24 Oct 2023 06:55:38 +0000 Subject: [PATCH 044/308] [WSO2 Release] [Jenkins #6694] [Release 4.0.0-wso2v56] 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 2f1fbc4e79..7ae72e23ea 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v56 + 4.0.0-wso2v57-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 3f232f2de8..7a572e3dea 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v56 + 4.0.0-wso2v57-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index f073e3712e..6529f8de55 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-wso2v56 + 4.0.0-wso2v57-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index afb1112ce0..0ed91cd3a2 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v56 + 4.0.0-wso2v57-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 42e6a00074..4acd725061 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v56 + 4.0.0-wso2v57-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 3ade551357..0a151d4111 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v56 + 4.0.0-wso2v57-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 cf6bb895e2..0f4bd451e1 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-wso2v56 + 4.0.0-wso2v57-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 9c0d9d9ba1..ae2726cbb8 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-wso2v56 + 4.0.0-wso2v57-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 2bd7fcbc53..61353a14ba 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-wso2v56 + 4.0.0-wso2v57-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 839a33b28f..ccbcd15895 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-wso2v56 + 4.0.0-wso2v57-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 086e2fcc13..fc081b67f8 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-wso2v56 + 4.0.0-wso2v57-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 1fad96655e..a35d4a0698 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-wso2v56 + 4.0.0-wso2v57-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 011bef4b60..19198b238d 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-wso2v56 + 4.0.0-wso2v57-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index b87a82e68c..354e872cc4 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v56 + 4.0.0-wso2v57-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index e65b9ee754..38b9ee92f8 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v56 + 4.0.0-wso2v57-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 8a31bb3d84..96c74a1552 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v56 + 4.0.0-wso2v57-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-wso2v56 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index b4afa6bb96..9a6fd5ae49 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v56 + 4.0.0-wso2v57-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 3f9d9505b4..a891c73b17 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-wso2v56 + 4.0.0-wso2v57-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index d13354b9e2..774f546a22 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-wso2v56 + 4.0.0-wso2v57-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index c3da836c0e..a20b709f27 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v56 + 4.0.0-wso2v57-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 811a3b86ae..4984ab3464 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v56 + 4.0.0-wso2v57-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 6470001eb8..97cecec9b0 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v56 + 4.0.0-wso2v57-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 0aac2653ed..f65972cccd 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v56 + 4.0.0-wso2v57-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 0be8514f81..044c3d9cad 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-wso2v56 + 4.0.0-wso2v57-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 32e7c08a5a..04d42c3767 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-wso2v56 + 4.0.0-wso2v57-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index bc21e6a1e5..eecf042ee7 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-wso2v56 + 4.0.0-wso2v57-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 35be6bd09c..d466846cf5 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-wso2v56 + 4.0.0-wso2v57-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 3176a059ce..70207aa0c4 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v56 + 4.0.0-wso2v57-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index da1c58f46d..0413f259fe 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v56 + 4.0.0-wso2v57-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index cff527b054..1fbedbc9e6 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-wso2v56 + 4.0.0-wso2v57-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 80c4cf580d..3ae84432bb 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v56 + 4.0.0-wso2v57-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-wso2v56 + HEAD Apache Software Foundation From 4e1b668d80a9cfd776d975f8e595993c171acbba Mon Sep 17 00:00:00 2001 From: chanikag Date: Tue, 24 Oct 2023 13:49:12 +0530 Subject: [PATCH 045/308] Exclude net.minidev:asm to fix Testcase failure Testcases are failing with following error, as asm package is getting duplicated with two bundles: testAutoprimitiveCustomRegexProperty Do XML to JSON transformation with overridden autoprimitive custom regext synapse property java.lang.IncompatibleClassChangeError: class org.jacoco.core.internal.flow.ClassProbesVisitor has interface org.objectweb.asm.ClassVisitor as super class --- modules/core/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 7a572e3dea..f97cc0f1dc 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -297,6 +297,12 @@ org.wso2.orbit.com.jayway.jsonpath json-path + + + net.minidev + asm + + org.wso2.eventing From f74fb75a124805f99f81b0bab4f5d7d704a7f357 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 24 Oct 2023 08:51:21 +0000 Subject: [PATCH 046/308] [WSO2 Release] [Jenkins #6696] [Release 4.0.0-wso2v57] prepare release v4.0.0-wso2v57 --- 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 7ae72e23ea..48852db0d9 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v57-SNAPSHOT + 4.0.0-wso2v57 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index f97cc0f1dc..05e0df3a35 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v57-SNAPSHOT + 4.0.0-wso2v57 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 6529f8de55..b91b213983 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-wso2v57-SNAPSHOT + 4.0.0-wso2v57 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 0ed91cd3a2..94d0d2d966 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v57-SNAPSHOT + 4.0.0-wso2v57 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 4acd725061..adc4429c09 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v57-SNAPSHOT + 4.0.0-wso2v57 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 0a151d4111..b01ca8ffa4 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v57-SNAPSHOT + 4.0.0-wso2v57 ../../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 0f4bd451e1..26ad911795 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-wso2v57-SNAPSHOT + 4.0.0-wso2v57 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 ae2726cbb8..a8a7cac82b 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-wso2v57-SNAPSHOT + 4.0.0-wso2v57 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 61353a14ba..71bb0217cc 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-wso2v57-SNAPSHOT + 4.0.0-wso2v57 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 ccbcd15895..4fe3e3ef0b 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-wso2v57-SNAPSHOT + 4.0.0-wso2v57 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 fc081b67f8..131dd9cf2b 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-wso2v57-SNAPSHOT + 4.0.0-wso2v57 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 a35d4a0698..e9686c597b 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-wso2v57-SNAPSHOT + 4.0.0-wso2v57 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 19198b238d..8a1db267fe 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-wso2v57-SNAPSHOT + 4.0.0-wso2v57 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 354e872cc4..39ef96d1e5 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v57-SNAPSHOT + 4.0.0-wso2v57 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 38b9ee92f8..b9c8356cee 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v57-SNAPSHOT + 4.0.0-wso2v57 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 96c74a1552..f4f5ee9cda 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v57-SNAPSHOT + 4.0.0-wso2v57 ../../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-wso2v57 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 9a6fd5ae49..ae00046c29 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v57-SNAPSHOT + 4.0.0-wso2v57 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index a891c73b17..ec4054c0a8 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-wso2v57-SNAPSHOT + 4.0.0-wso2v57 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 774f546a22..e8ca6a5ddf 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-wso2v57-SNAPSHOT + 4.0.0-wso2v57 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index a20b709f27..d1f71766d8 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v57-SNAPSHOT + 4.0.0-wso2v57 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 4984ab3464..9f1eb64cde 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v57-SNAPSHOT + 4.0.0-wso2v57 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 97cecec9b0..98c5400bf7 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v57-SNAPSHOT + 4.0.0-wso2v57 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index f65972cccd..49e8af8e5a 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v57-SNAPSHOT + 4.0.0-wso2v57 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 044c3d9cad..02fc34f111 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-wso2v57-SNAPSHOT + 4.0.0-wso2v57 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 04d42c3767..1f5d24993a 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-wso2v57-SNAPSHOT + 4.0.0-wso2v57 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index eecf042ee7..4dfb30795b 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-wso2v57-SNAPSHOT + 4.0.0-wso2v57 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index d466846cf5..cf111b1afe 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-wso2v57-SNAPSHOT + 4.0.0-wso2v57 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 70207aa0c4..1bc4acccab 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v57-SNAPSHOT + 4.0.0-wso2v57 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 0413f259fe..789edd47dd 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v57-SNAPSHOT + 4.0.0-wso2v57 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 1fbedbc9e6..c4c0a7b51b 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-wso2v57-SNAPSHOT + 4.0.0-wso2v57 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 3ae84432bb..0feb53c956 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v57-SNAPSHOT + 4.0.0-wso2v57 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-wso2v57 Apache Software Foundation From edfc74f515b97f5e4f3e3a8e599961ae986a57dc Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 24 Oct 2023 08:51:22 +0000 Subject: [PATCH 047/308] [WSO2 Release] [Jenkins #6696] [Release 4.0.0-wso2v57] 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 48852db0d9..4d715b4f58 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v57 + 4.0.0-wso2v58-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 05e0df3a35..9d1fce24ae 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v57 + 4.0.0-wso2v58-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index b91b213983..de6d7f457c 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-wso2v57 + 4.0.0-wso2v58-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 94d0d2d966..2d7d77adcf 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v57 + 4.0.0-wso2v58-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index adc4429c09..67e801fb9e 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v57 + 4.0.0-wso2v58-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index b01ca8ffa4..961388ea9d 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v57 + 4.0.0-wso2v58-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 26ad911795..07b4856891 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-wso2v57 + 4.0.0-wso2v58-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 a8a7cac82b..f4062d23e8 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-wso2v57 + 4.0.0-wso2v58-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 71bb0217cc..ef7c86d0e4 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-wso2v57 + 4.0.0-wso2v58-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 4fe3e3ef0b..7dd2680ccd 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-wso2v57 + 4.0.0-wso2v58-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 131dd9cf2b..12d6fc7a46 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-wso2v57 + 4.0.0-wso2v58-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 e9686c597b..27cd117fbe 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-wso2v57 + 4.0.0-wso2v58-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 8a1db267fe..319bca9b05 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-wso2v57 + 4.0.0-wso2v58-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 39ef96d1e5..37a43efe3c 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v57 + 4.0.0-wso2v58-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index b9c8356cee..be5a57b488 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v57 + 4.0.0-wso2v58-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index f4f5ee9cda..9e49c371bf 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v57 + 4.0.0-wso2v58-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-wso2v57 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index ae00046c29..ee3bd60345 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v57 + 4.0.0-wso2v58-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index ec4054c0a8..04e1c23e35 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-wso2v57 + 4.0.0-wso2v58-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index e8ca6a5ddf..82a2a3325b 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-wso2v57 + 4.0.0-wso2v58-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index d1f71766d8..6c3368897e 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v57 + 4.0.0-wso2v58-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 9f1eb64cde..114e24366f 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v57 + 4.0.0-wso2v58-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 98c5400bf7..1c12ac058d 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v57 + 4.0.0-wso2v58-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 49e8af8e5a..5a8ee10963 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v57 + 4.0.0-wso2v58-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 02fc34f111..c01a14e55d 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-wso2v57 + 4.0.0-wso2v58-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 1f5d24993a..c6c6d55825 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-wso2v57 + 4.0.0-wso2v58-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 4dfb30795b..f00cd32fdb 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-wso2v57 + 4.0.0-wso2v58-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index cf111b1afe..668a566cd9 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-wso2v57 + 4.0.0-wso2v58-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 1bc4acccab..3b5ff35c4f 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v57 + 4.0.0-wso2v58-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 789edd47dd..4475118c1b 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v57 + 4.0.0-wso2v58-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index c4c0a7b51b..8c6b5c8801 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-wso2v57 + 4.0.0-wso2v58-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 0feb53c956..a74af5b449 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v57 + 4.0.0-wso2v58-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-wso2v57 + HEAD Apache Software Foundation From d0499573469c636fbf2294ba6a87dd77857e381c Mon Sep 17 00:00:00 2001 From: Arunan Sugunakumar Date: Tue, 31 Oct 2023 13:42:07 +0530 Subject: [PATCH 048/308] Remove obsolete implementation from VFSTransportListener --- .../transport/vfs/VFSTransportListener.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java b/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java index 74c9b2cc27..e73a52ae09 100644 --- a/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java +++ b/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java @@ -201,23 +201,8 @@ protected void scanFileOrDirectory(final PollTableEntry entry, String fileURI) { log.debug("Polling: " + VFSUtils.maskURLPassword(fileURI)); } if (entry.isClusterAware()) { - boolean leader = true; - ClusteringAgent agent = getConfigurationContext().getAxisConfiguration().getClusteringAgent(); - log.warn("Although proxy is cluster aware, clustering config are not present, hence running the" + - " the polling task in this node"); - if (!leader) { - if (log.isDebugEnabled()) { - log.debug("This Member is not the leader"); - } - entry.setLastPollState(PollTableEntry.NONE); - long now = System.currentTimeMillis(); - entry.setLastPollTime(now); - entry.setNextPollTime(now + entry.getPollInterval()); - onPollCompletion(entry); - return; - } if (log.isDebugEnabled()) { - log.debug("This Member is the leader"); + log.debug("Cluster aware flag is enabled."); } } FileSystemOptions fso = null; From 990ff6d9128ed6a8badf9f7cb609889ad774449a Mon Sep 17 00:00:00 2001 From: GDLMadushanka Date: Thu, 2 Nov 2023 08:34:58 +0530 Subject: [PATCH 049/308] Introduce base error code and protocol state Introduce base error code and protocol state to fault message context. fixes wso2/micro-integrator/issues/3014 --- .../core/src/main/java/org/apache/synapse/FaultHandler.java | 4 ++++ .../src/main/java/org/apache/synapse/SynapseConstants.java | 5 +++++ .../apache/synapse/core/axis2/SynapseCallbackReceiver.java | 4 ++++ .../synapse/transport/passthru/PassThroughConstants.java | 5 +++++ .../synapse/transport/passthru/TargetErrorHandler.java | 4 ++++ 5 files changed, 22 insertions(+) diff --git a/modules/core/src/main/java/org/apache/synapse/FaultHandler.java b/modules/core/src/main/java/org/apache/synapse/FaultHandler.java index 8bdb309e70..743f9bc86a 100644 --- a/modules/core/src/main/java/org/apache/synapse/FaultHandler.java +++ b/modules/core/src/main/java/org/apache/synapse/FaultHandler.java @@ -90,6 +90,10 @@ public void handleFault(MessageContext synCtx, Exception e) { if (traceOrDebugOn) { traceOrDebugWarn(traceOn, "ERROR_CODE : " + synCtx.getProperty(SynapseConstants.ERROR_CODE)); + traceOrDebugWarn(traceOn,"BASE_ERROR_CODE : " + + synCtx.getProperty(SynapseConstants.BASE_ERROR_CODE)); + traceOrDebugWarn(traceOn,"PROTOCOL_STATE_ON_FAILURE : " + + synCtx.getProperty(SynapseConstants.PROTOCOL_STATE_ON_FAILURE)); traceOrDebugWarn(traceOn, "ERROR_MESSAGE : " + synCtx.getProperty(SynapseConstants.ERROR_MESSAGE)); traceOrDebugWarn(traceOn, "ERROR_DETAIL : " + diff --git a/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java b/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java index 07c061e189..7568257aac 100644 --- a/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java +++ b/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java @@ -227,6 +227,11 @@ public static final class Axis2Param { public static final String SENDING_FAULT = "SENDING_FAULT"; /** The message context property name which holds the error code for the last encountered exception */ public static final String ERROR_CODE = "ERROR_CODE"; + /** The message context property name which holds the error code for the last encountered exception + * without any protocol state specific alterations*/ + public static final String BASE_ERROR_CODE = "BASE_ERROR_CODE"; + /** The message context property name which holds the http protocol state upon a failure*/ + public static final String PROTOCOL_STATE_ON_FAILURE = "PROTOCOL_STATE_ON_FAILURE"; /** The MC property name which holds the error message for the last encountered exception */ public static final String ERROR_MESSAGE = "ERROR_MESSAGE"; /** The message context property name which holds the error detail (stack trace) for the last encountered exception */ 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 a0882554a3..77f234583a 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 @@ -320,6 +320,10 @@ private void handleMessage(String messageID ,MessageContext response, synapseOutMsgCtx.setProperty(SynapseConstants.SENDING_FAULT, Boolean.TRUE); synapseOutMsgCtx.setProperty(SynapseConstants.ERROR_CODE, response.getProperty(SynapseConstants.ERROR_CODE)); + synapseOutMsgCtx.setProperty(SynapseConstants.BASE_ERROR_CODE, + response.getProperty(SynapseConstants.BASE_ERROR_CODE)); + synapseOutMsgCtx.setProperty(SynapseConstants.PROTOCOL_STATE_ON_FAILURE, + response.getProperty(SynapseConstants.PROTOCOL_STATE_ON_FAILURE)); synapseOutMsgCtx.setProperty(SynapseConstants.ERROR_MESSAGE, response.getProperty(SynapseConstants.ERROR_MESSAGE)); synapseOutMsgCtx.setProperty(SynapseConstants.ERROR_DETAIL, diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughConstants.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughConstants.java index 6497fa51fd..3770b963b2 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughConstants.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughConstants.java @@ -75,6 +75,11 @@ public class PassThroughConstants { public static final String SENDING_FAULT = "SENDING_FAULT"; /** The message context property name which holds the error code for the last encountered exception */ public static final String ERROR_CODE = "ERROR_CODE"; + /** The message context property name which holds the error code for the last encountered exception + * without any protocol state specific alterations*/ + public static final String BASE_ERROR_CODE = "BASE_ERROR_CODE"; + /** The message context property name which holds the http protocol state upon a failure*/ + public static final String PROTOCOL_STATE_ON_FAILURE = "PROTOCOL_STATE_ON_FAILURE"; /** The MC property name which holds the error message for the last encountered exception */ public static final String ERROR_MESSAGE = "ERROR_MESSAGE"; /** The message context property name which holds the error detail (stack trace) for the last encountered exception */ diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetErrorHandler.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetErrorHandler.java index 765ebe6862..381d5537eb 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetErrorHandler.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetErrorHandler.java @@ -135,6 +135,10 @@ public void run() { if (errorCode != -1) { faultMessageContext.setProperty( PassThroughConstants.ERROR_CODE, getErrorCode(errorCode, state)); + faultMessageContext.setProperty( + PassThroughConstants.BASE_ERROR_CODE, errorCode); + faultMessageContext.setProperty( + PassThroughConstants.PROTOCOL_STATE_ON_FAILURE, state.ordinal()); } if (exceptionToRaise != null) { faultMessageContext.setProperty( From acde4a12732b7154963952152832a86841e95597 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 2 Nov 2023 03:38:05 +0000 Subject: [PATCH 050/308] [WSO2 Release] [Jenkins #6707] [Release 4.0.0-wso2v58] prepare release v4.0.0-wso2v58 --- 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 4d715b4f58..5039433881 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v58-SNAPSHOT + 4.0.0-wso2v58 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 9d1fce24ae..6bdd3572cc 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v58-SNAPSHOT + 4.0.0-wso2v58 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index de6d7f457c..2db2886fc7 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-wso2v58-SNAPSHOT + 4.0.0-wso2v58 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 2d7d77adcf..b2d309593c 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v58-SNAPSHOT + 4.0.0-wso2v58 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 67e801fb9e..02fb5f0dae 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v58-SNAPSHOT + 4.0.0-wso2v58 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 961388ea9d..e58f42f6f0 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v58-SNAPSHOT + 4.0.0-wso2v58 ../../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 07b4856891..dc24000faa 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-wso2v58-SNAPSHOT + 4.0.0-wso2v58 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 f4062d23e8..14d86eeac0 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-wso2v58-SNAPSHOT + 4.0.0-wso2v58 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 ef7c86d0e4..50f8cc5b22 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-wso2v58-SNAPSHOT + 4.0.0-wso2v58 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 7dd2680ccd..f470ca8167 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-wso2v58-SNAPSHOT + 4.0.0-wso2v58 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 12d6fc7a46..7d07a8209b 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-wso2v58-SNAPSHOT + 4.0.0-wso2v58 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 27cd117fbe..52a669e7bc 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-wso2v58-SNAPSHOT + 4.0.0-wso2v58 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 319bca9b05..32c58c5eb9 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-wso2v58-SNAPSHOT + 4.0.0-wso2v58 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 37a43efe3c..aeb5ab43d4 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v58-SNAPSHOT + 4.0.0-wso2v58 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index be5a57b488..70494e9aac 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v58-SNAPSHOT + 4.0.0-wso2v58 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 9e49c371bf..0cd9e1339a 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v58-SNAPSHOT + 4.0.0-wso2v58 ../../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-wso2v58 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index ee3bd60345..d13357207a 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v58-SNAPSHOT + 4.0.0-wso2v58 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 04e1c23e35..4ff240675b 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-wso2v58-SNAPSHOT + 4.0.0-wso2v58 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 82a2a3325b..c632703211 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-wso2v58-SNAPSHOT + 4.0.0-wso2v58 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 6c3368897e..a0bfc05fa4 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v58-SNAPSHOT + 4.0.0-wso2v58 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 114e24366f..f123183b7e 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v58-SNAPSHOT + 4.0.0-wso2v58 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 1c12ac058d..61b89af596 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v58-SNAPSHOT + 4.0.0-wso2v58 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 5a8ee10963..6054032834 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v58-SNAPSHOT + 4.0.0-wso2v58 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index c01a14e55d..f40738834f 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-wso2v58-SNAPSHOT + 4.0.0-wso2v58 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index c6c6d55825..29d19ca79c 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-wso2v58-SNAPSHOT + 4.0.0-wso2v58 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index f00cd32fdb..a500ff9856 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-wso2v58-SNAPSHOT + 4.0.0-wso2v58 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 668a566cd9..ec2854ed20 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-wso2v58-SNAPSHOT + 4.0.0-wso2v58 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 3b5ff35c4f..c858c3ce35 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v58-SNAPSHOT + 4.0.0-wso2v58 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 4475118c1b..1eafbc27b0 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v58-SNAPSHOT + 4.0.0-wso2v58 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 8c6b5c8801..bf677c0648 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-wso2v58-SNAPSHOT + 4.0.0-wso2v58 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index a74af5b449..5d176801f6 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v58-SNAPSHOT + 4.0.0-wso2v58 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-wso2v58 Apache Software Foundation From b00d235e45fc9b9f3b164888bbb84d024effd8c8 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 2 Nov 2023 03:38:06 +0000 Subject: [PATCH 051/308] [WSO2 Release] [Jenkins #6707] [Release 4.0.0-wso2v58] 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 5039433881..d77f1fdc9d 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v58 + 4.0.0-wso2v59-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 6bdd3572cc..b3ec7f1ea8 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v58 + 4.0.0-wso2v59-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 2db2886fc7..0055eb210a 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-wso2v58 + 4.0.0-wso2v59-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index b2d309593c..6069a48ff7 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v58 + 4.0.0-wso2v59-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 02fb5f0dae..224da5c1ad 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v58 + 4.0.0-wso2v59-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index e58f42f6f0..075fc84981 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v58 + 4.0.0-wso2v59-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 dc24000faa..f28d0734f8 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-wso2v58 + 4.0.0-wso2v59-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 14d86eeac0..9927e968db 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-wso2v58 + 4.0.0-wso2v59-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 50f8cc5b22..53f95e8754 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-wso2v58 + 4.0.0-wso2v59-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 f470ca8167..47f2596f8c 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-wso2v58 + 4.0.0-wso2v59-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 7d07a8209b..7453040e8b 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-wso2v58 + 4.0.0-wso2v59-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 52a669e7bc..5f1d85d3ac 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-wso2v58 + 4.0.0-wso2v59-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 32c58c5eb9..bb56bc45fa 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-wso2v58 + 4.0.0-wso2v59-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index aeb5ab43d4..f5d234dfce 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v58 + 4.0.0-wso2v59-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 70494e9aac..dab897060f 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v58 + 4.0.0-wso2v59-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 0cd9e1339a..004f1ad544 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v58 + 4.0.0-wso2v59-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-wso2v58 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index d13357207a..a19af7c0b0 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v58 + 4.0.0-wso2v59-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 4ff240675b..60d4b2af40 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-wso2v58 + 4.0.0-wso2v59-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index c632703211..bd0e9f175c 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-wso2v58 + 4.0.0-wso2v59-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index a0bfc05fa4..b297e9f2a9 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v58 + 4.0.0-wso2v59-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index f123183b7e..9d463eacb9 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v58 + 4.0.0-wso2v59-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 61b89af596..e165051fe1 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v58 + 4.0.0-wso2v59-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 6054032834..8e1f4ddb2f 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v58 + 4.0.0-wso2v59-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index f40738834f..4be3048efb 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-wso2v58 + 4.0.0-wso2v59-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 29d19ca79c..a7c0e632e6 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-wso2v58 + 4.0.0-wso2v59-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index a500ff9856..4f346c2887 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-wso2v58 + 4.0.0-wso2v59-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index ec2854ed20..7cd25bb5e1 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-wso2v58 + 4.0.0-wso2v59-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index c858c3ce35..1d8120d1ea 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v58 + 4.0.0-wso2v59-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 1eafbc27b0..c31c9d2cd9 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v58 + 4.0.0-wso2v59-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index bf677c0648..9e4a9a389e 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-wso2v58 + 4.0.0-wso2v59-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 5d176801f6..dc909ab47d 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v58 + 4.0.0-wso2v59-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-wso2v58 + HEAD Apache Software Foundation From c2f3d0dd47d2a9dc479c26c8ef7ca32ee287abe5 Mon Sep 17 00:00:00 2001 From: GDLMadushanka Date: Thu, 2 Nov 2023 09:24:29 +0530 Subject: [PATCH 052/308] Upgrade guava and schema validator versions Upgrade guava and json-schema-validator version --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a74af5b449..b8882f2319 100644 --- a/pom.xml +++ b/pom.xml @@ -1565,10 +1565,10 @@ 3.0.1 2.0.9 3.0.0 - 2.2.6.wso2v8 + 2.2.6.wso2v9 2.13.4 2.13.4.2 - 31.0.1-jre + 32.1.3-jre 1.0.1 2.9.4.wso2v1 7.4.2.wso2v1 From 4b2bdaebd5ba7fc6792c8e945724b67a210fba57 Mon Sep 17 00:00:00 2001 From: Kannan Kirishikesan Date: Thu, 2 Nov 2023 12:38:49 +0530 Subject: [PATCH 053/308] Fix for https://github.com/wso2/api-manager/issues/2226 --- .../main/java/org/apache/synapse/api/API.java | 44 ++++++++++++------- .../java/org/apache/synapse/api/Resource.java | 8 +--- 2 files changed, 29 insertions(+), 23 deletions(-) diff --git a/modules/core/src/main/java/org/apache/synapse/api/API.java b/modules/core/src/main/java/org/apache/synapse/api/API.java index d7e6d23c64..78cfb298c6 100644 --- a/modules/core/src/main/java/org/apache/synapse/api/API.java +++ b/modules/core/src/main/java/org/apache/synapse/api/API.java @@ -457,22 +457,8 @@ public void process(MessageContext synCtx) { if (resource != null) { if (synCtx.getEnvironment().isDebuggerEnabled()) { if (!synCtx.isResponse()) { - SynapseWireLogHolder wireLogHolder = (SynapseWireLogHolder) ((Axis2MessageContext) synCtx).getAxis2MessageContext() - .getProperty(SynapseDebugInfoHolder.SYNAPSE_WIRE_LOG_HOLDER_PROPERTY); - if (wireLogHolder == null) { - wireLogHolder = new SynapseWireLogHolder(); - } - if (synCtx.getProperty(RESTConstants.SYNAPSE_REST_API) != null && !synCtx.getProperty(RESTConstants.SYNAPSE_REST_API).toString().isEmpty()) { - wireLogHolder.setApiName(synCtx.getProperty(RESTConstants.SYNAPSE_REST_API).toString()); - if (resource.getDispatcherHelper() != null) { - if (resource.getDispatcherHelper().getString() != null && !resource.getDispatcherHelper().getString().isEmpty()) { - wireLogHolder.setResourceUrlString(resource.getDispatcherHelper().getString()); - } - } - } - ((Axis2MessageContext) synCtx).getAxis2MessageContext().setProperty(SynapseDebugInfoHolder.SYNAPSE_WIRE_LOG_HOLDER_PROPERTY, wireLogHolder); + initWirelogHolder(synCtx, resource); } - } resource.process(synCtx); return; @@ -483,8 +469,9 @@ public void process(MessageContext synCtx) { //This will get executed only in unhappy path. So ok to have the iterator. boolean resourceFound = false; boolean matchingMethodFound = false; + Resource resource = null; for (RESTDispatcher dispatcher : ApiUtils.getDispatchers()) { - Resource resource = dispatcher.findResource(synCtx, resources.values()); + resource = dispatcher.findResource(synCtx, resources.values()); if (resource != null) { resourceFound = true; String method = (String) msgCtx.getProperty(Constants.Configuration.HTTP_METHOD); @@ -495,7 +482,13 @@ public void process(MessageContext synCtx) { if (!resourceFound) { handleResourceNotFound(synCtx); } else if (!matchingMethodFound) { - handleMethodNotAllowed(synCtx); + String method = (String) synCtx.getProperty(RESTConstants.REST_METHOD); + if (RESTConstants.METHOD_OPTIONS.equals(method)) { + initWirelogHolder(synCtx, resource); + resource.process(synCtx); + } else { + handleMethodNotAllowed(synCtx); + } } else { //Resource found, and matching method also found, which means request is BAD_REQUEST(400) msgCtx.setProperty(SynapseConstants.HTTP_SC, HttpStatus.SC_BAD_REQUEST); @@ -504,6 +497,23 @@ public void process(MessageContext synCtx) { } } + private static void initWirelogHolder(MessageContext synCtx, Resource resource) { + SynapseWireLogHolder wireLogHolder = (SynapseWireLogHolder) ((Axis2MessageContext) synCtx).getAxis2MessageContext() + .getProperty(SynapseDebugInfoHolder.SYNAPSE_WIRE_LOG_HOLDER_PROPERTY); + if (wireLogHolder == null) { + wireLogHolder = new SynapseWireLogHolder(); + } + if (synCtx.getProperty(RESTConstants.SYNAPSE_REST_API) != null && !synCtx.getProperty(RESTConstants.SYNAPSE_REST_API).toString().isEmpty()) { + wireLogHolder.setApiName(synCtx.getProperty(RESTConstants.SYNAPSE_REST_API).toString()); + if (resource.getDispatcherHelper() != null) { + if (resource.getDispatcherHelper().getString() != null && !resource.getDispatcherHelper().getString().isEmpty()) { + wireLogHolder.setResourceUrlString(resource.getDispatcherHelper().getString()); + } + } + } + ((Axis2MessageContext) synCtx).getAxis2MessageContext().setProperty(SynapseDebugInfoHolder.SYNAPSE_WIRE_LOG_HOLDER_PROPERTY, wireLogHolder); + } + private void handleMethodNotAllowed(MessageContext synCtx) { auditDebug("Method not allowed for the request: " + synCtx.getMessageID()); diff --git a/modules/core/src/main/java/org/apache/synapse/api/Resource.java b/modules/core/src/main/java/org/apache/synapse/api/Resource.java index 96c7806214..74c2f72279 100644 --- a/modules/core/src/main/java/org/apache/synapse/api/Resource.java +++ b/modules/core/src/main/java/org/apache/synapse/api/Resource.java @@ -168,9 +168,7 @@ public String[] getMethods() { * @return true if support false otherwise. */ public boolean hasMatchingMethod(String method) { - if (RESTConstants.METHOD_OPTIONS.equals(method)) { - return true; // OPTIONS requests are always welcome - } else if (!methods.isEmpty()) { + if (!methods.isEmpty()) { if (!methods.contains(method)) { if (log.isDebugEnabled()) { log.debug("HTTP method does not match"); @@ -251,9 +249,7 @@ boolean canProcess(MessageContext synCtx) { String method = (String) msgCtx.getProperty(Constants.Configuration.HTTP_METHOD); synCtx.setProperty(RESTConstants.REST_METHOD, method); - if (RESTConstants.METHOD_OPTIONS.equals(method)) { - return true; // OPTIONS requests are always welcome - } else if (!methods.isEmpty()) { + if (!methods.isEmpty()) { if (!methods.contains(method)) { if (log.isDebugEnabled()) { log.debug("HTTP method does not match"); From 243f6a5bd28b566b7e3226cbf87f315add1c4d72 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 2 Nov 2023 09:50:13 +0000 Subject: [PATCH 054/308] [WSO2 Release] [Jenkins #6709] [Release 4.0.0-wso2v59] prepare release v4.0.0-wso2v59 --- 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 d77f1fdc9d..c0b1847553 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v59-SNAPSHOT + 4.0.0-wso2v59 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index b3ec7f1ea8..fd6978c80f 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v59-SNAPSHOT + 4.0.0-wso2v59 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 0055eb210a..2ec9af81d7 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-wso2v59-SNAPSHOT + 4.0.0-wso2v59 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 6069a48ff7..1660b9dba3 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v59-SNAPSHOT + 4.0.0-wso2v59 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 224da5c1ad..fbcc9e5372 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v59-SNAPSHOT + 4.0.0-wso2v59 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 075fc84981..14bb198298 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v59-SNAPSHOT + 4.0.0-wso2v59 ../../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 f28d0734f8..d19d18ca95 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-wso2v59-SNAPSHOT + 4.0.0-wso2v59 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 9927e968db..5547aef058 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-wso2v59-SNAPSHOT + 4.0.0-wso2v59 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 53f95e8754..1ff7a2b187 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-wso2v59-SNAPSHOT + 4.0.0-wso2v59 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 47f2596f8c..fd69abc9f2 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-wso2v59-SNAPSHOT + 4.0.0-wso2v59 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 7453040e8b..3a332e2f31 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-wso2v59-SNAPSHOT + 4.0.0-wso2v59 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 5f1d85d3ac..f42825a200 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-wso2v59-SNAPSHOT + 4.0.0-wso2v59 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 bb56bc45fa..6041c58570 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-wso2v59-SNAPSHOT + 4.0.0-wso2v59 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index f5d234dfce..8444ea36df 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v59-SNAPSHOT + 4.0.0-wso2v59 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index dab897060f..c34b07d364 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v59-SNAPSHOT + 4.0.0-wso2v59 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 004f1ad544..0ceaf2b283 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v59-SNAPSHOT + 4.0.0-wso2v59 ../../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-wso2v59 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index a19af7c0b0..043fa27944 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v59-SNAPSHOT + 4.0.0-wso2v59 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 60d4b2af40..b54137ae59 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-wso2v59-SNAPSHOT + 4.0.0-wso2v59 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index bd0e9f175c..e6277b6d74 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-wso2v59-SNAPSHOT + 4.0.0-wso2v59 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index b297e9f2a9..99e0c1329b 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v59-SNAPSHOT + 4.0.0-wso2v59 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 9d463eacb9..3c3c63e8f9 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v59-SNAPSHOT + 4.0.0-wso2v59 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index e165051fe1..472a2fb7c9 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v59-SNAPSHOT + 4.0.0-wso2v59 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 8e1f4ddb2f..7f09ef59cf 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v59-SNAPSHOT + 4.0.0-wso2v59 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 4be3048efb..c34749d2f3 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-wso2v59-SNAPSHOT + 4.0.0-wso2v59 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index a7c0e632e6..177ea48eb2 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-wso2v59-SNAPSHOT + 4.0.0-wso2v59 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 4f346c2887..04fd757cb8 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-wso2v59-SNAPSHOT + 4.0.0-wso2v59 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 7cd25bb5e1..9dc76e3d2c 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-wso2v59-SNAPSHOT + 4.0.0-wso2v59 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 1d8120d1ea..13b0a4db57 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v59-SNAPSHOT + 4.0.0-wso2v59 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index c31c9d2cd9..ca7819c63b 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v59-SNAPSHOT + 4.0.0-wso2v59 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 9e4a9a389e..0cdbc5768e 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-wso2v59-SNAPSHOT + 4.0.0-wso2v59 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index dc909ab47d..c24df14a33 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v59-SNAPSHOT + 4.0.0-wso2v59 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-wso2v59 Apache Software Foundation From c45dee0d7ea4aa069ca1f3f564d7f7d7920d15f2 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 2 Nov 2023 09:50:15 +0000 Subject: [PATCH 055/308] [WSO2 Release] [Jenkins #6709] [Release 4.0.0-wso2v59] 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 c0b1847553..3a1fe1db6a 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v59 + 4.0.0-wso2v60-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index fd6978c80f..eed42064e9 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v59 + 4.0.0-wso2v60-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 2ec9af81d7..d3560b98f6 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-wso2v59 + 4.0.0-wso2v60-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 1660b9dba3..f4f5ef7632 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v59 + 4.0.0-wso2v60-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index fbcc9e5372..001d3f53a7 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v59 + 4.0.0-wso2v60-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 14bb198298..16b76abadb 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v59 + 4.0.0-wso2v60-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 d19d18ca95..22bca09137 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-wso2v59 + 4.0.0-wso2v60-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 5547aef058..b16017c71b 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-wso2v59 + 4.0.0-wso2v60-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 1ff7a2b187..5f534c0713 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-wso2v59 + 4.0.0-wso2v60-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 fd69abc9f2..96cadb3f7b 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-wso2v59 + 4.0.0-wso2v60-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 3a332e2f31..489bd08ad3 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-wso2v59 + 4.0.0-wso2v60-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 f42825a200..7600bf1483 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-wso2v59 + 4.0.0-wso2v60-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 6041c58570..dd90cfa957 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-wso2v59 + 4.0.0-wso2v60-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 8444ea36df..e568a38601 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v59 + 4.0.0-wso2v60-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index c34b07d364..958e8a58c8 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v59 + 4.0.0-wso2v60-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 0ceaf2b283..81fb404e97 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v59 + 4.0.0-wso2v60-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-wso2v59 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 043fa27944..651df07663 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v59 + 4.0.0-wso2v60-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index b54137ae59..703f40d047 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-wso2v59 + 4.0.0-wso2v60-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index e6277b6d74..3a58fa0376 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-wso2v59 + 4.0.0-wso2v60-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 99e0c1329b..69880adc6b 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v59 + 4.0.0-wso2v60-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 3c3c63e8f9..11338ac4c3 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v59 + 4.0.0-wso2v60-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 472a2fb7c9..6b6ef2d422 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v59 + 4.0.0-wso2v60-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 7f09ef59cf..eaa45181ea 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v59 + 4.0.0-wso2v60-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index c34749d2f3..4df1808ef6 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-wso2v59 + 4.0.0-wso2v60-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 177ea48eb2..4a79ff8a89 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-wso2v59 + 4.0.0-wso2v60-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 04fd757cb8..3d52960d24 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-wso2v59 + 4.0.0-wso2v60-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 9dc76e3d2c..acca7fe810 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-wso2v59 + 4.0.0-wso2v60-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 13b0a4db57..773e6e17bd 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v59 + 4.0.0-wso2v60-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index ca7819c63b..d678908f32 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v59 + 4.0.0-wso2v60-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 0cdbc5768e..afeeb3de93 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-wso2v59 + 4.0.0-wso2v60-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index c24df14a33..f4951cf751 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v59 + 4.0.0-wso2v60-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-wso2v59 + HEAD Apache Software Foundation From 3531be49749f9bcc666778abc20714fe33350304 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 2 Nov 2023 10:23:48 +0000 Subject: [PATCH 056/308] [WSO2 Release] [Jenkins #6710] [Release 4.0.0-wso2v60] prepare release v4.0.0-wso2v60 --- 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 3a1fe1db6a..d1bd01dbfe 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v60-SNAPSHOT + 4.0.0-wso2v60 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index eed42064e9..c8b7850bb8 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v60-SNAPSHOT + 4.0.0-wso2v60 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index d3560b98f6..3d1d093c4e 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-wso2v60-SNAPSHOT + 4.0.0-wso2v60 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index f4f5ef7632..138fac7c94 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v60-SNAPSHOT + 4.0.0-wso2v60 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 001d3f53a7..2924cb06cf 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v60-SNAPSHOT + 4.0.0-wso2v60 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 16b76abadb..4ad4f4e5c0 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v60-SNAPSHOT + 4.0.0-wso2v60 ../../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 22bca09137..f2fdd1c5b8 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-wso2v60-SNAPSHOT + 4.0.0-wso2v60 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 b16017c71b..980667e4aa 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-wso2v60-SNAPSHOT + 4.0.0-wso2v60 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 5f534c0713..0af0ff14b2 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-wso2v60-SNAPSHOT + 4.0.0-wso2v60 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 96cadb3f7b..7f3a015bc5 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-wso2v60-SNAPSHOT + 4.0.0-wso2v60 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 489bd08ad3..43d93933f2 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-wso2v60-SNAPSHOT + 4.0.0-wso2v60 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 7600bf1483..72952298c6 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-wso2v60-SNAPSHOT + 4.0.0-wso2v60 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 dd90cfa957..63f9e9539c 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-wso2v60-SNAPSHOT + 4.0.0-wso2v60 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index e568a38601..9ac8e485e4 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v60-SNAPSHOT + 4.0.0-wso2v60 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 958e8a58c8..0712b02823 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v60-SNAPSHOT + 4.0.0-wso2v60 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 81fb404e97..21d999f322 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v60-SNAPSHOT + 4.0.0-wso2v60 ../../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-wso2v60 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 651df07663..75adb94504 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v60-SNAPSHOT + 4.0.0-wso2v60 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 703f40d047..56f82113fe 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-wso2v60-SNAPSHOT + 4.0.0-wso2v60 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 3a58fa0376..46465549d4 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-wso2v60-SNAPSHOT + 4.0.0-wso2v60 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 69880adc6b..84ed9b7111 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v60-SNAPSHOT + 4.0.0-wso2v60 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 11338ac4c3..ef1a1d803f 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v60-SNAPSHOT + 4.0.0-wso2v60 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 6b6ef2d422..f4b4d5e350 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v60-SNAPSHOT + 4.0.0-wso2v60 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index eaa45181ea..e2fd253a54 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v60-SNAPSHOT + 4.0.0-wso2v60 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 4df1808ef6..4e40861a23 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-wso2v60-SNAPSHOT + 4.0.0-wso2v60 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 4a79ff8a89..a18aa4adfd 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-wso2v60-SNAPSHOT + 4.0.0-wso2v60 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 3d52960d24..7e4d0441f6 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-wso2v60-SNAPSHOT + 4.0.0-wso2v60 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index acca7fe810..5c56891e57 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-wso2v60-SNAPSHOT + 4.0.0-wso2v60 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 773e6e17bd..be7ee4e529 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v60-SNAPSHOT + 4.0.0-wso2v60 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index d678908f32..3411b9e502 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v60-SNAPSHOT + 4.0.0-wso2v60 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index afeeb3de93..8e5b794655 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-wso2v60-SNAPSHOT + 4.0.0-wso2v60 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 6d9969a951..3ae8d37ae0 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v60-SNAPSHOT + 4.0.0-wso2v60 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-wso2v60 Apache Software Foundation From 2806d2fab4c0a6c10f5e6e7be49a9d7279203095 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 2 Nov 2023 10:23:50 +0000 Subject: [PATCH 057/308] [WSO2 Release] [Jenkins #6710] [Release 4.0.0-wso2v60] 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 d1bd01dbfe..1a5c0a2987 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v60 + 4.0.0-wso2v61-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index c8b7850bb8..9a8e9d0011 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v60 + 4.0.0-wso2v61-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 3d1d093c4e..525573f523 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-wso2v60 + 4.0.0-wso2v61-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 138fac7c94..ba75ab1f6b 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v60 + 4.0.0-wso2v61-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 2924cb06cf..ecdf6c7e58 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v60 + 4.0.0-wso2v61-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 4ad4f4e5c0..6c69d55fb5 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v60 + 4.0.0-wso2v61-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 f2fdd1c5b8..5a0c1e85f5 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-wso2v60 + 4.0.0-wso2v61-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 980667e4aa..9b267223a0 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-wso2v60 + 4.0.0-wso2v61-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 0af0ff14b2..89be8884d1 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-wso2v60 + 4.0.0-wso2v61-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 7f3a015bc5..d6f90ba993 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-wso2v60 + 4.0.0-wso2v61-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 43d93933f2..472a07ad1a 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-wso2v60 + 4.0.0-wso2v61-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 72952298c6..c7bcb2e963 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-wso2v60 + 4.0.0-wso2v61-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 63f9e9539c..21c12106a7 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-wso2v60 + 4.0.0-wso2v61-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 9ac8e485e4..f851646060 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v60 + 4.0.0-wso2v61-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 0712b02823..fe275407fd 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v60 + 4.0.0-wso2v61-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 21d999f322..cad34612fe 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v60 + 4.0.0-wso2v61-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-wso2v60 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 75adb94504..453d3e1a04 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v60 + 4.0.0-wso2v61-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 56f82113fe..1ff6035928 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-wso2v60 + 4.0.0-wso2v61-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 46465549d4..3afa5d99e2 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-wso2v60 + 4.0.0-wso2v61-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 84ed9b7111..ccd77f6d46 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v60 + 4.0.0-wso2v61-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index ef1a1d803f..7603972c69 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v60 + 4.0.0-wso2v61-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index f4b4d5e350..a5c28a6924 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v60 + 4.0.0-wso2v61-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index e2fd253a54..36979640c8 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v60 + 4.0.0-wso2v61-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 4e40861a23..e3e1f30c23 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-wso2v60 + 4.0.0-wso2v61-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index a18aa4adfd..1c50b6c902 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-wso2v60 + 4.0.0-wso2v61-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 7e4d0441f6..78fc9bdb07 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-wso2v60 + 4.0.0-wso2v61-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 5c56891e57..2dde469f41 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-wso2v60 + 4.0.0-wso2v61-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index be7ee4e529..91db594549 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v60 + 4.0.0-wso2v61-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 3411b9e502..50a57fab01 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v60 + 4.0.0-wso2v61-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 8e5b794655..16dfa98f59 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-wso2v60 + 4.0.0-wso2v61-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 3ae8d37ae0..2d8e00f8a0 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v60 + 4.0.0-wso2v61-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-wso2v60 + HEAD Apache Software Foundation From 9147e4670878b10c54778f347b98bca0180fa738 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 9 Nov 2023 05:16:43 +0000 Subject: [PATCH 058/308] [maven-release-plugin] prepare release v4.0.0-wso2v61 --- 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 1a5c0a2987..1263162208 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v61-SNAPSHOT + 4.0.0-wso2v61 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 9a8e9d0011..220015cf83 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v61-SNAPSHOT + 4.0.0-wso2v61 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 525573f523..f786c96f1c 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-wso2v61-SNAPSHOT + 4.0.0-wso2v61 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index ba75ab1f6b..eeb4ef34e1 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v61-SNAPSHOT + 4.0.0-wso2v61 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index ecdf6c7e58..7f11a6f0b2 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v61-SNAPSHOT + 4.0.0-wso2v61 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 6c69d55fb5..313ff81da5 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v61-SNAPSHOT + 4.0.0-wso2v61 ../../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 5a0c1e85f5..d96c15cdad 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-wso2v61-SNAPSHOT + 4.0.0-wso2v61 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 9b267223a0..b87c4b1f84 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-wso2v61-SNAPSHOT + 4.0.0-wso2v61 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 89be8884d1..69e8355f96 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-wso2v61-SNAPSHOT + 4.0.0-wso2v61 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 d6f90ba993..af8c0340d9 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-wso2v61-SNAPSHOT + 4.0.0-wso2v61 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 472a07ad1a..0e2e24c797 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-wso2v61-SNAPSHOT + 4.0.0-wso2v61 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 c7bcb2e963..c292012255 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-wso2v61-SNAPSHOT + 4.0.0-wso2v61 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 21c12106a7..a878c283da 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-wso2v61-SNAPSHOT + 4.0.0-wso2v61 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index f851646060..e9d99ae3cd 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v61-SNAPSHOT + 4.0.0-wso2v61 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index fe275407fd..b2e4af6f91 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v61-SNAPSHOT + 4.0.0-wso2v61 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index cad34612fe..9ade36d545 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v61-SNAPSHOT + 4.0.0-wso2v61 ../../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-wso2v61 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 453d3e1a04..9323374e0b 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v61-SNAPSHOT + 4.0.0-wso2v61 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 1ff6035928..16740473db 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-wso2v61-SNAPSHOT + 4.0.0-wso2v61 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 3afa5d99e2..207674cccf 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-wso2v61-SNAPSHOT + 4.0.0-wso2v61 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index ccd77f6d46..cfd7b9d7e4 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v61-SNAPSHOT + 4.0.0-wso2v61 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 7603972c69..152c784e47 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v61-SNAPSHOT + 4.0.0-wso2v61 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index a5c28a6924..6951f6afee 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v61-SNAPSHOT + 4.0.0-wso2v61 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 36979640c8..15e4543f2b 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v61-SNAPSHOT + 4.0.0-wso2v61 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index e3e1f30c23..89556cb90b 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-wso2v61-SNAPSHOT + 4.0.0-wso2v61 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 1c50b6c902..767e1963ad 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-wso2v61-SNAPSHOT + 4.0.0-wso2v61 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 78fc9bdb07..7662d7885d 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-wso2v61-SNAPSHOT + 4.0.0-wso2v61 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 2dde469f41..f3712eae22 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-wso2v61-SNAPSHOT + 4.0.0-wso2v61 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 91db594549..503866344d 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v61-SNAPSHOT + 4.0.0-wso2v61 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 50a57fab01..f5a473892d 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v61-SNAPSHOT + 4.0.0-wso2v61 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 16dfa98f59..04c97414bb 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-wso2v61-SNAPSHOT + 4.0.0-wso2v61 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 2d8e00f8a0..0fbfd2f16a 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v61-SNAPSHOT + 4.0.0-wso2v61 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-wso2v61 Apache Software Foundation From 41ccbee1df72e090e7f3bf514ed12987c9799cd0 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 9 Nov 2023 05:16:45 +0000 Subject: [PATCH 059/308] [maven-release-plugin] 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 1263162208..5acb67c533 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v61 + 4.0.0-wso2v62-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 220015cf83..7163bc991d 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v61 + 4.0.0-wso2v62-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index f786c96f1c..d75966cf5d 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-wso2v61 + 4.0.0-wso2v62-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index eeb4ef34e1..9130dc0604 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v61 + 4.0.0-wso2v62-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 7f11a6f0b2..2606559791 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v61 + 4.0.0-wso2v62-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 313ff81da5..8c277b99bb 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v61 + 4.0.0-wso2v62-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 d96c15cdad..4a700ce8f4 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-wso2v61 + 4.0.0-wso2v62-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 b87c4b1f84..3a6bed75ab 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-wso2v61 + 4.0.0-wso2v62-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 69e8355f96..a2ef0b4bf3 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-wso2v61 + 4.0.0-wso2v62-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 af8c0340d9..ce263a5ac4 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-wso2v61 + 4.0.0-wso2v62-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 0e2e24c797..617b396fb0 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-wso2v61 + 4.0.0-wso2v62-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 c292012255..4ff1a323ca 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-wso2v61 + 4.0.0-wso2v62-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 a878c283da..53b09be176 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-wso2v61 + 4.0.0-wso2v62-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index e9d99ae3cd..6f56fb0911 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v61 + 4.0.0-wso2v62-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index b2e4af6f91..930c268692 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v61 + 4.0.0-wso2v62-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 9ade36d545..9c9a34f895 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v61 + 4.0.0-wso2v62-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-wso2v61 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 9323374e0b..a1184944b4 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v61 + 4.0.0-wso2v62-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 16740473db..b0f1a58026 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-wso2v61 + 4.0.0-wso2v62-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 207674cccf..4efd679fe2 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-wso2v61 + 4.0.0-wso2v62-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index cfd7b9d7e4..cfc1b00066 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v61 + 4.0.0-wso2v62-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 152c784e47..5bd44ca125 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v61 + 4.0.0-wso2v62-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 6951f6afee..cfc8ec6d6b 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v61 + 4.0.0-wso2v62-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 15e4543f2b..04c2f9a1d5 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v61 + 4.0.0-wso2v62-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 89556cb90b..420ca70635 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-wso2v61 + 4.0.0-wso2v62-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 767e1963ad..109ecafa71 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-wso2v61 + 4.0.0-wso2v62-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 7662d7885d..a27a7b2ce2 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-wso2v61 + 4.0.0-wso2v62-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index f3712eae22..d8d3c1f5e5 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-wso2v61 + 4.0.0-wso2v62-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 503866344d..b0f114017d 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v61 + 4.0.0-wso2v62-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index f5a473892d..10bed45d4c 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v61 + 4.0.0-wso2v62-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 04c97414bb..9485ede70a 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-wso2v61 + 4.0.0-wso2v62-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 0fbfd2f16a..e16324d865 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v61 + 4.0.0-wso2v62-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-wso2v61 + HEAD Apache Software Foundation From 42f4101f7d2f78cac28eb64430a482f13a342e69 Mon Sep 17 00:00:00 2001 From: malakaganga Date: Wed, 1 Nov 2023 11:33:45 +0530 Subject: [PATCH 060/308] Support invalidating connections when related local entry changed I introduced an enhancement to the way we handle connections in relation to local entries.A mechanism was established where the key associated with a localEntry is passed from the InvokeMediator to the TemplateMediator then further propagated to the TemplateContext, ensuring that the specific localEntry is accessible from connection handling code. With the availability of the localEntry key, each active connection(dynamic/static) has been bound to its respective localEntry in a map. So when a localEntry is undeployed or removed, this change is detected by the Synapse Observer, and the connections associated with that specific localEntry are invalidated. Fixes: https://github.com/wso2/micro-integrator/issues/3002 --- .../org/apache/synapse/SynapseConstants.java | 2 ++ .../mediators/template/InvokeMediator.java | 24 +++++++++++++++---- .../mediators/template/TemplateContext.java | 16 +++++++++++++ .../mediators/template/TemplateMediator.java | 14 +++++++++++ 4 files changed, 52 insertions(+), 4 deletions(-) diff --git a/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java b/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java index 7568257aac..4893f3e7c9 100644 --- a/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java +++ b/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java @@ -155,6 +155,8 @@ public static final class Axis2Param { /** The name of the Parameter set on the Axis2Configuration to hold the Synapse Configuration */ public static final String SYNAPSE_CONFIG = "synapse.config"; + /** EIP pattern name */ + public static final String INIT_EIP_PATTERN = "init"; /** The name of the Parameter set on the Axis2Configuration to hold the Synapse Environment */ public static final String SYNAPSE_ENV = "synapse.env"; /** The name of the Parameter set on AxisConfiguration to hold the ServerContextInformation */ diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/template/InvokeMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/template/InvokeMediator.java index 65e416fb7f..5e93d02abb 100644 --- a/modules/core/src/main/java/org/apache/synapse/mediators/template/InvokeMediator.java +++ b/modules/core/src/main/java/org/apache/synapse/mediators/template/InvokeMediator.java @@ -76,12 +76,15 @@ public class InvokeMediator extends AbstractMediator implements private Map pName2ExpressionMap; private boolean dynamicMediator = false; - - /** The local registry key which is used to pick a sequence definition */ + private Value key = null; - /** Reference to the synapse environment */ - private SynapseEnvironment synapseEnv; + private String localEntryKey = null; + + /** + * Reference to the synapse environment + */ + private SynapseEnvironment synapseEnv; public InvokeMediator() { // LinkedHashMap is used to preserve tag order @@ -129,6 +132,10 @@ private boolean mediate(MessageContext synCtx, boolean executePreFetchingSequenc if (executePreFetchingSequence && key != null) { String defaultConfiguration = key.evaluateValue(synCtx); Mediator m = synCtx.getDefaultConfiguration(defaultConfiguration); + if (m instanceof InvokeMediator) { + InvokeMediator invokeMediator = (InvokeMediator) m; + invokeMediator.setLocalEntryKey(defaultConfiguration); + } if (m == null) { handleException("Sequence named " + key + " cannot be found", synCtx); @@ -149,6 +156,9 @@ private boolean mediate(MessageContext synCtx, boolean executePreFetchingSequenc } if (mediator != null && mediator instanceof TemplateMediator) { + if (localEntryKey != null) { + ((TemplateMediator) mediator).setLocalEntryKey(localEntryKey); + } populateParameters(synCtx, ((TemplateMediator) mediator).getName()); if (executePreFetchingSequence) { ContinuationStackManager.addReliantContinuationState(synCtx, @@ -319,6 +329,12 @@ public Value getKey() { public void setKey(Value key) { this.key = key; } + public void setLocalEntryKey(String localEntryKey) { + this.localEntryKey = localEntryKey; + } + public String getLocalEntryKey() { + return localEntryKey; + } public String getPackageName() { return packageName; diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/template/TemplateContext.java b/modules/core/src/main/java/org/apache/synapse/mediators/template/TemplateContext.java index fa27398e5c..9a7b73d24e 100644 --- a/modules/core/src/main/java/org/apache/synapse/mediators/template/TemplateContext.java +++ b/modules/core/src/main/java/org/apache/synapse/mediators/template/TemplateContext.java @@ -51,10 +51,15 @@ public class TemplateContext { * refers to the parameters of the function */ private Collection parameters; + private final String INIT_CONFIG_KEY = "INIT_CONFIG_KEY"; /** * contains a map for parameterNames to evaluated values */ private Map mappedValues; + /** + * The local entry key name + */ + private String localEntryKey = null; public TemplateContext(String name, Collection parameters) { this.fName = name; @@ -68,6 +73,9 @@ public TemplateContext(String name, Collection parameters) { * @param synCtxt Synapse MessageContext */ public void setupParams(MessageContext synCtxt) { + if (SynapseConstants.INIT_EIP_PATTERN.equals(fName) && getLocalEntryKey() != null) { + mappedValues.put(INIT_CONFIG_KEY, getLocalEntryKey()); + } Iterator paramNames = parameters.iterator(); while (paramNames.hasNext()) { TemplateParam parameter = paramNames.next(); @@ -182,6 +190,14 @@ public Map getMappedValues() { return mappedValues; } + public String getLocalEntryKey() { + return localEntryKey; + } + + public void setLocalEntryKey(String localEntryKey) { + this.localEntryKey = localEntryKey; + } + public void setMappedValues(Map map) { this.mappedValues = map; } diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/template/TemplateMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/template/TemplateMediator.java index 801fcc2e3e..a79351b29f 100644 --- a/modules/core/src/main/java/org/apache/synapse/mediators/template/TemplateMediator.java +++ b/modules/core/src/main/java/org/apache/synapse/mediators/template/TemplateMediator.java @@ -55,6 +55,17 @@ public class TemplateMediator extends AbstractListMediator { private String errorHandler = null; + /** The local entry key name */ + private String localEntryKey = null; + + public String getLocalEntryKey() { + return localEntryKey; + } + + public void setLocalEntryKey(String localEntryKey) { + this.localEntryKey = localEntryKey; + } + public void setParameters(Collection paramNames) { this.templateParams = paramNames; } @@ -161,6 +172,9 @@ public boolean mediate(MessageContext synCtx) { */ private void pushFuncContextTo(MessageContext synCtx) { TemplateContext funcContext = new TemplateContext(eipPatternName, templateParams); + if (localEntryKey != null) { + funcContext.setLocalEntryKey(localEntryKey); + } //process the raw parameters parsed in funcContext.setupParams(synCtx); From ad54ec7ff043b5928bc50d619da64f34aeb8797f Mon Sep 17 00:00:00 2001 From: Arunan Sugunakumar Date: Fri, 10 Nov 2023 14:01:57 +0530 Subject: [PATCH 061/308] Upgrade dependencies --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e16324d865..f6074e7fc4 100644 --- a/pom.xml +++ b/pom.xml @@ -1486,7 +1486,7 @@ UTF-8 ${project.version} - 9.0.58 + 9.0.82 ${version.tomcat}.wso2v1 1.3 1.5.0.wso2v1 @@ -1585,7 +1585,7 @@ 5.9.1 1.5.2 1.17.0 - 4.1.80.Final + 4.1.100.Final 6.3.49 1.1.1.wso2v3 5.8.0 From 143fb6eb39d6f72c5f334ba9c62435e02e763b0f Mon Sep 17 00:00:00 2001 From: GDLMadushanka Date: Fri, 10 Nov 2023 14:45:35 +0530 Subject: [PATCH 062/308] Upgrade opentelemetry version Upgrade opentelemetry version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2d8e00f8a0..15e799820a 100644 --- a/pom.xml +++ b/pom.xml @@ -1589,7 +1589,7 @@ 6.3.49 1.1.1.wso2v3 5.8.0 - 1.11.0.wso2v3 + 1.11.0.wso2v5 4.9.3.wso2v2 2.8.0.wso2v2 2.16.3 From bc843a91a3b5b60b4c3106b49b486bcf6bc5bcb7 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 10 Nov 2023 09:41:30 +0000 Subject: [PATCH 063/308] [WSO2 Release] [Jenkins #6718] [Release 4.0.0-wso2v62] prepare release v4.0.0-wso2v62 --- 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 5acb67c533..8ff160b78f 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v62-SNAPSHOT + 4.0.0-wso2v62 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 7163bc991d..aabd5a8e53 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v62-SNAPSHOT + 4.0.0-wso2v62 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index d75966cf5d..7c111c186f 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-wso2v62-SNAPSHOT + 4.0.0-wso2v62 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 9130dc0604..566fe8fc57 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v62-SNAPSHOT + 4.0.0-wso2v62 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 2606559791..f26f0ba0c4 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v62-SNAPSHOT + 4.0.0-wso2v62 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 8c277b99bb..164c4f9ef4 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v62-SNAPSHOT + 4.0.0-wso2v62 ../../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 4a700ce8f4..51ae043a65 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-wso2v62-SNAPSHOT + 4.0.0-wso2v62 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 3a6bed75ab..7416e070af 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-wso2v62-SNAPSHOT + 4.0.0-wso2v62 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 a2ef0b4bf3..4da1119d89 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-wso2v62-SNAPSHOT + 4.0.0-wso2v62 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 ce263a5ac4..e965c5f15b 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-wso2v62-SNAPSHOT + 4.0.0-wso2v62 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 617b396fb0..1602e20e1a 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-wso2v62-SNAPSHOT + 4.0.0-wso2v62 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 4ff1a323ca..2fe2303fed 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-wso2v62-SNAPSHOT + 4.0.0-wso2v62 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 53b09be176..9a67180f5d 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-wso2v62-SNAPSHOT + 4.0.0-wso2v62 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 6f56fb0911..d95aeba0b5 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v62-SNAPSHOT + 4.0.0-wso2v62 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 930c268692..c9298f3b71 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v62-SNAPSHOT + 4.0.0-wso2v62 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 9c9a34f895..c12d81d287 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v62-SNAPSHOT + 4.0.0-wso2v62 ../../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-wso2v62 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index a1184944b4..a62a63c584 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v62-SNAPSHOT + 4.0.0-wso2v62 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index b0f1a58026..b249c2c35e 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-wso2v62-SNAPSHOT + 4.0.0-wso2v62 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 4efd679fe2..8d08559b39 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-wso2v62-SNAPSHOT + 4.0.0-wso2v62 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index cfc1b00066..70f08f4470 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v62-SNAPSHOT + 4.0.0-wso2v62 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 5bd44ca125..bb74d04fad 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v62-SNAPSHOT + 4.0.0-wso2v62 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index cfc8ec6d6b..4e4b54a8c1 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v62-SNAPSHOT + 4.0.0-wso2v62 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 04c2f9a1d5..85f2b9d456 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v62-SNAPSHOT + 4.0.0-wso2v62 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 420ca70635..09da569b9a 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-wso2v62-SNAPSHOT + 4.0.0-wso2v62 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 109ecafa71..54b3ab1133 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-wso2v62-SNAPSHOT + 4.0.0-wso2v62 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index a27a7b2ce2..858e3725d7 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-wso2v62-SNAPSHOT + 4.0.0-wso2v62 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index d8d3c1f5e5..5f4d297e18 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-wso2v62-SNAPSHOT + 4.0.0-wso2v62 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index b0f114017d..bc51e66c5d 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v62-SNAPSHOT + 4.0.0-wso2v62 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 10bed45d4c..4c54f6cf60 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v62-SNAPSHOT + 4.0.0-wso2v62 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 9485ede70a..8e63fa9b85 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-wso2v62-SNAPSHOT + 4.0.0-wso2v62 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 0d3e5e0722..b1054591c8 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v62-SNAPSHOT + 4.0.0-wso2v62 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-wso2v62 Apache Software Foundation From ce6c782165c47cb98233696816ba83c48799b6a2 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 10 Nov 2023 09:41:32 +0000 Subject: [PATCH 064/308] [WSO2 Release] [Jenkins #6718] [Release 4.0.0-wso2v62] 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 8ff160b78f..4805e2064a 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v62 + 4.0.0-wso2v63-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index aabd5a8e53..8c43e45bbd 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v62 + 4.0.0-wso2v63-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 7c111c186f..3df5fda08c 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-wso2v62 + 4.0.0-wso2v63-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 566fe8fc57..994c6e23b3 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v62 + 4.0.0-wso2v63-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index f26f0ba0c4..f61d78ea83 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v62 + 4.0.0-wso2v63-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 164c4f9ef4..4138be6804 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v62 + 4.0.0-wso2v63-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 51ae043a65..b65b001fcf 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-wso2v62 + 4.0.0-wso2v63-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 7416e070af..881249941f 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-wso2v62 + 4.0.0-wso2v63-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 4da1119d89..66623be68a 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-wso2v62 + 4.0.0-wso2v63-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 e965c5f15b..cb9930f7bd 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-wso2v62 + 4.0.0-wso2v63-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 1602e20e1a..a86881e806 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-wso2v62 + 4.0.0-wso2v63-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 2fe2303fed..989a88447c 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-wso2v62 + 4.0.0-wso2v63-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 9a67180f5d..5b5cd98a97 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-wso2v62 + 4.0.0-wso2v63-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index d95aeba0b5..d6f785cb95 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v62 + 4.0.0-wso2v63-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index c9298f3b71..4496be36d7 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v62 + 4.0.0-wso2v63-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index c12d81d287..766b513b3d 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v62 + 4.0.0-wso2v63-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-wso2v62 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index a62a63c584..2a45af6149 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v62 + 4.0.0-wso2v63-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index b249c2c35e..c8a7577e09 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-wso2v62 + 4.0.0-wso2v63-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 8d08559b39..7261e871c4 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-wso2v62 + 4.0.0-wso2v63-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 70f08f4470..3db733d312 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v62 + 4.0.0-wso2v63-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index bb74d04fad..8ba99112a2 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v62 + 4.0.0-wso2v63-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 4e4b54a8c1..d49a188de9 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v62 + 4.0.0-wso2v63-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 85f2b9d456..b55bc2ff5c 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v62 + 4.0.0-wso2v63-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 09da569b9a..f4c5bc76c7 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-wso2v62 + 4.0.0-wso2v63-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 54b3ab1133..d7a4f26464 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-wso2v62 + 4.0.0-wso2v63-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 858e3725d7..3cd33b770f 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-wso2v62 + 4.0.0-wso2v63-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 5f4d297e18..36a92e3ab8 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-wso2v62 + 4.0.0-wso2v63-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index bc51e66c5d..7f65021f60 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v62 + 4.0.0-wso2v63-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 4c54f6cf60..846e2ecf6d 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v62 + 4.0.0-wso2v63-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 8e63fa9b85..3159ba9e82 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-wso2v62 + 4.0.0-wso2v63-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index b1054591c8..a957514c18 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v62 + 4.0.0-wso2v63-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-wso2v62 + HEAD Apache Software Foundation From e142b189e0fbf978bd99c1ec41e8ea3f4cd5b94b Mon Sep 17 00:00:00 2001 From: Chinthaka Jayatilake <37581983+ChinthakaJ98@users.noreply.github.com> Date: Thu, 30 Nov 2023 10:17:52 +0530 Subject: [PATCH 065/308] Adding support to read from env variables --- .../synapse/config/xml/ProxyServiceFactory.java | 8 ++++++-- .../xml/endpoints/TemplateEndpointFactory.java | 4 +++- .../config/xml/endpoints/WSDLEndpointFactory.java | 14 ++++++++------ 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceFactory.java index bb996ffaf2..cc61e4e7e6 100644 --- a/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceFactory.java +++ b/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceFactory.java @@ -237,9 +237,13 @@ public static ProxyService createProxy(OMElement elem, Properties properties) { proxy.setPreservePolicy(preservePolicy.getAttributeValue()); } if (wsdlEndpoint != null) { - proxy.setPublishWSDLEndpoint(wsdlEndpoint.getAttributeValue()); + String resolvedWsdlEndpoint = ResolverFactory.getInstance() + .getResolver(wsdlEndpoint.getAttributeValue()).resolve(); + proxy.setPublishWSDLEndpoint(resolvedWsdlEndpoint); } else if (wsdlKey != null) { - proxy.setWSDLKey(wsdlKey.getAttributeValue()); + String resolvedWsdlKey = ResolverFactory.getInstance() + .getResolver(wsdlKey.getAttributeValue()).resolve(); + proxy.setWSDLKey(resolvedWsdlKey); } else { OMAttribute wsdlURI = wsdl.getAttribute( new QName(XMLConfigConstants.NULL_NAMESPACE, "uri")); diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/TemplateEndpointFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/TemplateEndpointFactory.java index 88c83e1502..e42abf9c71 100644 --- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/TemplateEndpointFactory.java +++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/TemplateEndpointFactory.java @@ -59,7 +59,9 @@ public Endpoint createEndpoint(OMElement endpointElement, boolean a, Properties OMAttribute endpointTemplateAttribute = endpointElement.getAttribute( new QName(XMLConfigConstants.NULL_NAMESPACE, "template")); if (endpointTemplateAttribute != null) { - templateEndpoint.setTemplate(endpointTemplateAttribute.getAttributeValue()); + String resolvedTemplate = ResolverFactory.getInstance() + .getResolver(endpointTemplateAttribute.getAttributeValue()).resolve(); + templateEndpoint.setTemplate(resolvedTemplate); } else { handleException("Error loading the configuration from endpoint group, " + templateEndpoint.getName() + diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java index 7cd5967605..f0d0529b68 100644 --- a/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java +++ b/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/WSDLEndpointFactory.java @@ -114,14 +114,16 @@ protected Endpoint createEndpoint(OMElement epConfig, boolean anonymousEndpoint, // get the service name and port name. at this point we should not worry about // the presence of those parameters. they are handled by corresponding WSDL builders. - String serviceName = wsdlElement.getAttributeValue(new QName("service")); - String portName = wsdlElement.getAttributeValue(new QName("port")); + String resolvedServiceName = ResolverFactory.getInstance() + .getResolver(wsdlElement.getAttributeValue(new QName("service"))).resolve();; + String resolvedPortName = ResolverFactory.getInstance() + .getResolver(wsdlElement.getAttributeValue(new QName("port"))).resolve(); // check if wsdl is supplied as a URI String wsdlURI = wsdlElement.getAttributeValue(new QName("uri")); // set serviceName and portName in the endpoint. it does not matter if these are // null at this point. we are setting them only for serialization purpose. - wsdlEndpoint.setServiceName(serviceName); - wsdlEndpoint.setPortName(portName); + wsdlEndpoint.setServiceName(resolvedServiceName); + wsdlEndpoint.setPortName(resolvedPortName); String noParsing = properties.getProperty(SKIP_WSDL_PARSING); @@ -142,7 +144,7 @@ protected Endpoint createEndpoint(OMElement epConfig, boolean anonymousEndpoint, new WSDL11EndpointBuilder(). populateEndpointDefinitionFromWSDL(endpoint, - wsdlURI.trim(), omElement, serviceName, portName); + wsdlURI.trim(), omElement, resolvedServiceName, resolvedPortName); } else if (WSDL2Constants.WSDL_NAMESPACE.equals(nsUri)) { //endpoint = new WSDL20EndpointBuilder(). @@ -181,7 +183,7 @@ protected Endpoint createEndpoint(OMElement epConfig, boolean anonymousEndpoint, baseUri = baseUri + File.separator; } new WSDL11EndpointBuilder().populateEndpointDefinitionFromWSDL(endpoint, - baseUri, definitionElement, serviceName, portName); + baseUri, definitionElement, resolvedServiceName, resolvedPortName); } else { endpoint = new EndpointDefinition(); } From 17b5cce23334bfedd88ce2e48052e5c556040b88 Mon Sep 17 00:00:00 2001 From: Chinthaka Jayatilake <37581983+ChinthakaJ98@users.noreply.github.com> Date: Thu, 30 Nov 2023 14:24:49 +0530 Subject: [PATCH 066/308] Adding support to read from env variables --- .../synapse/config/xml/AbstractDBMediatorFactory.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorFactory.java index 740b220abf..5e1bf797da 100644 --- a/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorFactory.java +++ b/modules/core/src/main/java/org/apache/synapse/config/xml/AbstractDBMediatorFactory.java @@ -136,13 +136,15 @@ protected void buildDataSource(OMElement elem, AbstractDBMediator mediator) { } private void readLookupConfig(AbstractDBMediator mediator, OMElement pool) { - String dataSourceName = getValue(pool, DSNAME_Q); - mediator.setDataSourceName(dataSourceName); + String resolvedDataSourceName = ResolverFactory.getInstance().getResolver(getValue(pool, DSNAME_Q)).resolve(); + mediator.setDataSourceName(resolvedDataSourceName); saveElementConfig(pool, DSNAME_Q, mediator); if (pool.getFirstChildWithName(ICCLASS_Q) != null) { + String resolvedInitialContextClass = ResolverFactory.getInstance() + .getResolver(getValue(pool, ICCLASS_Q)).resolve(); Properties props = new Properties(); - props.put(Context.INITIAL_CONTEXT_FACTORY, getValue(pool, ICCLASS_Q)); + props.put(Context.INITIAL_CONTEXT_FACTORY, resolvedInitialContextClass); props.put(Context.PROVIDER_URL, getValue(pool, URL_Q)); props.put(Context.SECURITY_PRINCIPAL, getValue(pool, USER_Q)); props.put(Context.SECURITY_CREDENTIALS, getValue(pool, PASS_Q)); From 4f9884fc2d502e44d9a3c86abc1df37731da14a0 Mon Sep 17 00:00:00 2001 From: Chinthaka Jayatilake <37581983+ChinthakaJ98@users.noreply.github.com> Date: Thu, 30 Nov 2023 22:37:34 +0530 Subject: [PATCH 067/308] Add env support for properties in scheduled tasks --- .../java/org/apache/synapse/task/TaskDescriptionFactory.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionFactory.java b/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionFactory.java index a058969b5a..0188ae7cfe 100644 --- a/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionFactory.java +++ b/modules/tasks/src/main/java/org/apache/synapse/task/TaskDescriptionFactory.java @@ -115,6 +115,11 @@ public static TaskDescription createTaskDescription(OMElement el, OMNamespace ta while (it.hasNext()) { OMElement prop = (OMElement) it.next(); if (PropertyHelper.isStaticProperty(prop)) { + String value = prop.getAttributeValue(new QName("value")); + if (value != null) { + String resolvedValue = ResolverFactory.getInstance().getResolver(value).resolve(); + prop.getAttribute(new QName("value")).setAttributeValue(resolvedValue); + } taskDescription.setXmlProperty(prop); } else { handleException("Tasks does not support dynamic properties"); From d3a4270fb11478cd68ae809d9855a3bfb63185b7 Mon Sep 17 00:00:00 2001 From: Lahiru Madushanka Date: Tue, 5 Dec 2023 11:11:21 +0530 Subject: [PATCH 068/308] Add changes to read XMLInputFactory.properties Read XMLInputFactory.properties in both regex and freemarker template processors. --- .../transform/PayloadFactoryMediator.java | 10 ---------- .../pfutils/FreeMarkerTemplateProcessor.java | 1 + .../pfutils/RegexTemplateProcessor.java | 2 +- .../transform/pfutils/TemplateProcessor.java | 16 ++++++++++++++++ 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/transform/PayloadFactoryMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/transform/PayloadFactoryMediator.java index ef87351660..8f4b00e2fa 100644 --- a/modules/core/src/main/java/org/apache/synapse/mediators/transform/PayloadFactoryMediator.java +++ b/modules/core/src/main/java/org/apache/synapse/mediators/transform/PayloadFactoryMediator.java @@ -84,16 +84,6 @@ public class PayloadFactoryMediator extends AbstractMediator { private static final Log log = LogFactory.getLog(PayloadFactoryMediator.class); public PayloadFactoryMediator() { - //ignore DTDs for XML Input - inputFactory.setProperty(XMLInputFactory.SUPPORT_DTD, Boolean.FALSE); - inputFactory.setProperty(XMLInputFactory.IS_COALESCING, true); - Map props = StAXUtils.loadFactoryProperties("XMLInputFactory.properties"); - if (props != null) { - for (Object o : props.entrySet()) { - Map.Entry entry = (Map.Entry) o; - inputFactory.setProperty((String) entry.getKey(), entry.getValue()); - } - } } /** diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/transform/pfutils/FreeMarkerTemplateProcessor.java b/modules/core/src/main/java/org/apache/synapse/mediators/transform/pfutils/FreeMarkerTemplateProcessor.java index a12acb4c00..cdf99473d9 100644 --- a/modules/core/src/main/java/org/apache/synapse/mediators/transform/pfutils/FreeMarkerTemplateProcessor.java +++ b/modules/core/src/main/java/org/apache/synapse/mediators/transform/pfutils/FreeMarkerTemplateProcessor.java @@ -119,6 +119,7 @@ public void init() { compileFreeMarkerTemplate(format, getMediaType()); templateLoaded = true; } + this.readInputFactoryProperties(); } @Override diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/transform/pfutils/RegexTemplateProcessor.java b/modules/core/src/main/java/org/apache/synapse/mediators/transform/pfutils/RegexTemplateProcessor.java index d96889408e..1a6ba8958c 100644 --- a/modules/core/src/main/java/org/apache/synapse/mediators/transform/pfutils/RegexTemplateProcessor.java +++ b/modules/core/src/main/java/org/apache/synapse/mediators/transform/pfutils/RegexTemplateProcessor.java @@ -47,7 +47,7 @@ public String processTemplate(String template, String mediaType, MessageContext @Override public void init() { - // nothing to do since no pre processing is needed + this.readInputFactoryProperties(); } /** diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/transform/pfutils/TemplateProcessor.java b/modules/core/src/main/java/org/apache/synapse/mediators/transform/pfutils/TemplateProcessor.java index c225954ccb..d7d5f65e5e 100644 --- a/modules/core/src/main/java/org/apache/synapse/mediators/transform/pfutils/TemplateProcessor.java +++ b/modules/core/src/main/java/org/apache/synapse/mediators/transform/pfutils/TemplateProcessor.java @@ -23,6 +23,7 @@ import org.apache.axiom.om.OMException; import org.apache.axiom.om.impl.builder.StAXBuilder; import org.apache.axiom.om.impl.builder.StAXOMBuilder; +import org.apache.axiom.om.util.StAXUtils; import org.apache.axis2.AxisFault; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; @@ -526,4 +527,19 @@ protected void handleException(String msg) { public abstract boolean getTemplateStatus(); + /** + * Read XMLInputFactory properties from XMLInputFactory.properties file. + */ + public void readInputFactoryProperties() { + //ignore DTDs for XML Input + inputFactory.setProperty(XMLInputFactory.SUPPORT_DTD, Boolean.FALSE); + inputFactory.setProperty(XMLInputFactory.IS_COALESCING, true); + Map props = StAXUtils.loadFactoryProperties("XMLInputFactory.properties"); + if (props != null) { + for (Object o : props.entrySet()) { + Map.Entry entry = (Map.Entry) o; + inputFactory.setProperty((String) entry.getKey(), entry.getValue()); + } + } + } } From 7f8dbcae2370495832709c368b586c4a8173657c Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 5 Dec 2023 06:46:48 +0000 Subject: [PATCH 069/308] [WSO2 Release] [Jenkins #6738] [Release 4.0.0-wso2v63] prepare release v4.0.0-wso2v63 --- 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 4805e2064a..af8b8ed06b 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v63-SNAPSHOT + 4.0.0-wso2v63 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 8c43e45bbd..f17b1418c4 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v63-SNAPSHOT + 4.0.0-wso2v63 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 3df5fda08c..7de75d97d3 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-wso2v63-SNAPSHOT + 4.0.0-wso2v63 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 994c6e23b3..45206af226 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v63-SNAPSHOT + 4.0.0-wso2v63 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index f61d78ea83..eb94e8bce3 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v63-SNAPSHOT + 4.0.0-wso2v63 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 4138be6804..7466ea4186 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v63-SNAPSHOT + 4.0.0-wso2v63 ../../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 b65b001fcf..7a2c5ef7ad 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-wso2v63-SNAPSHOT + 4.0.0-wso2v63 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 881249941f..aa75e11313 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-wso2v63-SNAPSHOT + 4.0.0-wso2v63 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 66623be68a..190101c220 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-wso2v63-SNAPSHOT + 4.0.0-wso2v63 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 cb9930f7bd..4b933f7723 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-wso2v63-SNAPSHOT + 4.0.0-wso2v63 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 a86881e806..696b53a53b 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-wso2v63-SNAPSHOT + 4.0.0-wso2v63 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 989a88447c..efba00fb0c 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-wso2v63-SNAPSHOT + 4.0.0-wso2v63 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 5b5cd98a97..24f026dac3 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-wso2v63-SNAPSHOT + 4.0.0-wso2v63 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index d6f785cb95..c01ca6f151 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v63-SNAPSHOT + 4.0.0-wso2v63 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 4496be36d7..608951adff 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v63-SNAPSHOT + 4.0.0-wso2v63 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 766b513b3d..e54ad66122 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v63-SNAPSHOT + 4.0.0-wso2v63 ../../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-wso2v63 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 2a45af6149..b2840490d6 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v63-SNAPSHOT + 4.0.0-wso2v63 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index c8a7577e09..063a270817 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-wso2v63-SNAPSHOT + 4.0.0-wso2v63 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 7261e871c4..5755f92d59 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-wso2v63-SNAPSHOT + 4.0.0-wso2v63 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 3db733d312..58cafede0f 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v63-SNAPSHOT + 4.0.0-wso2v63 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 8ba99112a2..8e0c38a44e 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v63-SNAPSHOT + 4.0.0-wso2v63 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index d49a188de9..1d3d551e6b 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v63-SNAPSHOT + 4.0.0-wso2v63 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index b55bc2ff5c..f92d7526f6 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v63-SNAPSHOT + 4.0.0-wso2v63 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index f4c5bc76c7..e3f032d4ac 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-wso2v63-SNAPSHOT + 4.0.0-wso2v63 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index d7a4f26464..db1f905998 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-wso2v63-SNAPSHOT + 4.0.0-wso2v63 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 3cd33b770f..da2f0147ce 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-wso2v63-SNAPSHOT + 4.0.0-wso2v63 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 36a92e3ab8..023519b02e 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-wso2v63-SNAPSHOT + 4.0.0-wso2v63 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 7f65021f60..90e038d32c 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v63-SNAPSHOT + 4.0.0-wso2v63 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 846e2ecf6d..9cc9c20bc9 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v63-SNAPSHOT + 4.0.0-wso2v63 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 3159ba9e82..79f1785f84 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-wso2v63-SNAPSHOT + 4.0.0-wso2v63 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index a957514c18..f5e574a974 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v63-SNAPSHOT + 4.0.0-wso2v63 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-wso2v63 Apache Software Foundation From 47cf14fe7d6f816bb26cbb452a81abb27bed3f2f Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 5 Dec 2023 06:46:50 +0000 Subject: [PATCH 070/308] [WSO2 Release] [Jenkins #6738] [Release 4.0.0-wso2v63] 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 af8b8ed06b..7e565352cb 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v63 + 4.0.0-wso2v64-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index f17b1418c4..d96a1cf7cb 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v63 + 4.0.0-wso2v64-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 7de75d97d3..da401bb71e 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-wso2v63 + 4.0.0-wso2v64-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 45206af226..3b7e4ecf45 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v63 + 4.0.0-wso2v64-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index eb94e8bce3..a84b32e0ff 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v63 + 4.0.0-wso2v64-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 7466ea4186..df2861e0f0 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v63 + 4.0.0-wso2v64-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 7a2c5ef7ad..fcaea0d292 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-wso2v63 + 4.0.0-wso2v64-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 aa75e11313..c5bdef182c 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-wso2v63 + 4.0.0-wso2v64-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 190101c220..a771bf8136 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-wso2v63 + 4.0.0-wso2v64-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 4b933f7723..580a5d5aea 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-wso2v63 + 4.0.0-wso2v64-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 696b53a53b..e84002979b 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-wso2v63 + 4.0.0-wso2v64-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 efba00fb0c..493b826e41 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-wso2v63 + 4.0.0-wso2v64-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 24f026dac3..c49a578aa1 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-wso2v63 + 4.0.0-wso2v64-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index c01ca6f151..f06fc11c0a 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v63 + 4.0.0-wso2v64-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 608951adff..9b54635dc5 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v63 + 4.0.0-wso2v64-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index e54ad66122..c876f081ab 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v63 + 4.0.0-wso2v64-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-wso2v63 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index b2840490d6..8ae3304fe4 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v63 + 4.0.0-wso2v64-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 063a270817..4449fef6d3 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-wso2v63 + 4.0.0-wso2v64-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 5755f92d59..7744d69e1d 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-wso2v63 + 4.0.0-wso2v64-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 58cafede0f..00c76e47a7 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v63 + 4.0.0-wso2v64-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 8e0c38a44e..b62ff365b6 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v63 + 4.0.0-wso2v64-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 1d3d551e6b..6ff5b1b13f 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v63 + 4.0.0-wso2v64-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index f92d7526f6..4d732e2869 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v63 + 4.0.0-wso2v64-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index e3f032d4ac..0b353c5b1a 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-wso2v63 + 4.0.0-wso2v64-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index db1f905998..1af2b51893 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-wso2v63 + 4.0.0-wso2v64-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index da2f0147ce..275e8c9560 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-wso2v63 + 4.0.0-wso2v64-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 023519b02e..6db996035e 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-wso2v63 + 4.0.0-wso2v64-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 90e038d32c..bcbf35ecb9 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v63 + 4.0.0-wso2v64-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 9cc9c20bc9..fb3a169ee2 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v63 + 4.0.0-wso2v64-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 79f1785f84..f7c9a19681 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-wso2v63 + 4.0.0-wso2v64-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index f5e574a974..0170726732 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v63 + 4.0.0-wso2v64-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-wso2v63 + HEAD Apache Software Foundation From 8dd245981f3d6971fee2ccb29301420d650cd9dd Mon Sep 17 00:00:00 2001 From: Lahiru Madushanka Date: Fri, 8 Dec 2023 10:05:19 +0530 Subject: [PATCH 071/308] Disable external entity support in javax.xml Disable external entity support in javax.xml refer https://security.docs.wso2.com/en/latest/security-guidelines/secure-engineering-guidelines/secure-coding-guidlines/general-recommendations-for-secure-coding/#xmlinputfactory-stax-parser --- .../synapse/mediators/transform/pfutils/TemplateProcessor.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/transform/pfutils/TemplateProcessor.java b/modules/core/src/main/java/org/apache/synapse/mediators/transform/pfutils/TemplateProcessor.java index d7d5f65e5e..097063a4f1 100644 --- a/modules/core/src/main/java/org/apache/synapse/mediators/transform/pfutils/TemplateProcessor.java +++ b/modules/core/src/main/java/org/apache/synapse/mediators/transform/pfutils/TemplateProcessor.java @@ -533,6 +533,7 @@ protected void handleException(String msg) { public void readInputFactoryProperties() { //ignore DTDs for XML Input inputFactory.setProperty(XMLInputFactory.SUPPORT_DTD, Boolean.FALSE); + inputFactory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, Boolean.FALSE); inputFactory.setProperty(XMLInputFactory.IS_COALESCING, true); Map props = StAXUtils.loadFactoryProperties("XMLInputFactory.properties"); if (props != null) { From 72521f968e9618481fbbf608376678a24c774d82 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 8 Dec 2023 05:01:43 +0000 Subject: [PATCH 072/308] [WSO2 Release] [Jenkins #6743] [Release 4.0.0-wso2v64] prepare release v4.0.0-wso2v64 --- 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 7e565352cb..46f9b111c0 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v64-SNAPSHOT + 4.0.0-wso2v64 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index d96a1cf7cb..c5f406d0b4 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v64-SNAPSHOT + 4.0.0-wso2v64 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index da401bb71e..bb9511b5f9 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-wso2v64-SNAPSHOT + 4.0.0-wso2v64 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 3b7e4ecf45..d7f70a99bd 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v64-SNAPSHOT + 4.0.0-wso2v64 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index a84b32e0ff..f50526cede 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v64-SNAPSHOT + 4.0.0-wso2v64 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index df2861e0f0..486d408b18 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v64-SNAPSHOT + 4.0.0-wso2v64 ../../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 fcaea0d292..680561ce44 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-wso2v64-SNAPSHOT + 4.0.0-wso2v64 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 c5bdef182c..d631b28254 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-wso2v64-SNAPSHOT + 4.0.0-wso2v64 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 a771bf8136..5aeaae183b 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-wso2v64-SNAPSHOT + 4.0.0-wso2v64 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 580a5d5aea..65d8bb788a 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-wso2v64-SNAPSHOT + 4.0.0-wso2v64 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 e84002979b..182f76c6e3 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-wso2v64-SNAPSHOT + 4.0.0-wso2v64 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 493b826e41..ebfdabe8b4 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-wso2v64-SNAPSHOT + 4.0.0-wso2v64 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 c49a578aa1..78c72215d1 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-wso2v64-SNAPSHOT + 4.0.0-wso2v64 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index f06fc11c0a..d44e8c49a1 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v64-SNAPSHOT + 4.0.0-wso2v64 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 9b54635dc5..a7a2633b54 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v64-SNAPSHOT + 4.0.0-wso2v64 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index c876f081ab..ca6316e4c8 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v64-SNAPSHOT + 4.0.0-wso2v64 ../../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-wso2v64 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 8ae3304fe4..79fb3aa1b8 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v64-SNAPSHOT + 4.0.0-wso2v64 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 4449fef6d3..b441f85c82 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-wso2v64-SNAPSHOT + 4.0.0-wso2v64 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 7744d69e1d..ac945cf730 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-wso2v64-SNAPSHOT + 4.0.0-wso2v64 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 00c76e47a7..f273ee8f29 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v64-SNAPSHOT + 4.0.0-wso2v64 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index b62ff365b6..21439b98b7 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v64-SNAPSHOT + 4.0.0-wso2v64 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 6ff5b1b13f..60280293cc 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v64-SNAPSHOT + 4.0.0-wso2v64 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 4d732e2869..5a7db62933 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v64-SNAPSHOT + 4.0.0-wso2v64 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 0b353c5b1a..8e6803efb7 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-wso2v64-SNAPSHOT + 4.0.0-wso2v64 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 1af2b51893..667a5d19d0 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-wso2v64-SNAPSHOT + 4.0.0-wso2v64 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 275e8c9560..6680485ee7 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-wso2v64-SNAPSHOT + 4.0.0-wso2v64 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 6db996035e..59ca58f556 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-wso2v64-SNAPSHOT + 4.0.0-wso2v64 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index bcbf35ecb9..7e528ed893 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v64-SNAPSHOT + 4.0.0-wso2v64 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index fb3a169ee2..7d9d50f5e1 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v64-SNAPSHOT + 4.0.0-wso2v64 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index f7c9a19681..5e750c4f08 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-wso2v64-SNAPSHOT + 4.0.0-wso2v64 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 0170726732..2517654b3e 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v64-SNAPSHOT + 4.0.0-wso2v64 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-wso2v64 Apache Software Foundation From ff547af543f7454b55a0745eddf56029b8efeb6c Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 8 Dec 2023 05:01:44 +0000 Subject: [PATCH 073/308] [WSO2 Release] [Jenkins #6743] [Release 4.0.0-wso2v64] 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 46f9b111c0..3d3d3e0a3b 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v64 + 4.0.0-wso2v65-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index c5f406d0b4..6d18edf3f6 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v64 + 4.0.0-wso2v65-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index bb9511b5f9..856192bd2f 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-wso2v64 + 4.0.0-wso2v65-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index d7f70a99bd..7db70bfe06 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v64 + 4.0.0-wso2v65-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index f50526cede..463f9c4cb2 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v64 + 4.0.0-wso2v65-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 486d408b18..00463896c5 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v64 + 4.0.0-wso2v65-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 680561ce44..b9052a42cf 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-wso2v64 + 4.0.0-wso2v65-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 d631b28254..fad522af6d 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-wso2v64 + 4.0.0-wso2v65-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 5aeaae183b..3a37e56d0a 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-wso2v64 + 4.0.0-wso2v65-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 65d8bb788a..6faaed8de9 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-wso2v64 + 4.0.0-wso2v65-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 182f76c6e3..5510739523 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-wso2v64 + 4.0.0-wso2v65-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 ebfdabe8b4..a88f55db54 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-wso2v64 + 4.0.0-wso2v65-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 78c72215d1..29cb185111 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-wso2v64 + 4.0.0-wso2v65-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index d44e8c49a1..9934c0fcfa 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v64 + 4.0.0-wso2v65-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index a7a2633b54..36ec4253d3 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v64 + 4.0.0-wso2v65-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index ca6316e4c8..77aaea11fd 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v64 + 4.0.0-wso2v65-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-wso2v64 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 79fb3aa1b8..2214c786f3 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v64 + 4.0.0-wso2v65-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index b441f85c82..5d72f6f1ab 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-wso2v64 + 4.0.0-wso2v65-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index ac945cf730..95429787f7 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-wso2v64 + 4.0.0-wso2v65-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index f273ee8f29..e6f5d88a80 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v64 + 4.0.0-wso2v65-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 21439b98b7..9795fd43ec 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v64 + 4.0.0-wso2v65-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 60280293cc..a3a303dbd7 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v64 + 4.0.0-wso2v65-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 5a7db62933..45b0bef96f 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v64 + 4.0.0-wso2v65-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 8e6803efb7..62ffc3ff32 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-wso2v64 + 4.0.0-wso2v65-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 667a5d19d0..045a197c96 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-wso2v64 + 4.0.0-wso2v65-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 6680485ee7..b63a35b15e 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-wso2v64 + 4.0.0-wso2v65-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 59ca58f556..bdfe415949 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-wso2v64 + 4.0.0-wso2v65-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 7e528ed893..b1a8e52df0 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v64 + 4.0.0-wso2v65-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 7d9d50f5e1..0539ca138b 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v64 + 4.0.0-wso2v65-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 5e750c4f08..cbcf19dede 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-wso2v64 + 4.0.0-wso2v65-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 2517654b3e..6932ab5c8b 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v64 + 4.0.0-wso2v65-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-wso2v64 + HEAD Apache Software Foundation From 949cf3abbbcdc771276b1c3729c35a45f56e09fa Mon Sep 17 00:00:00 2001 From: Thuvarakan Sritharan Date: Wed, 13 Dec 2023 12:24:08 +0530 Subject: [PATCH 074/308] Add new attributes to ConnectionsView bean --- .../passthru/jmx/ConnectionsView.java | 93 ++++++++++++++++++- .../passthru/jmx/ConnectionsViewMBean.java | 6 ++ 2 files changed, 97 insertions(+), 2 deletions(-) diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/jmx/ConnectionsView.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/jmx/ConnectionsView.java index adfe95e96a..0c988c17ad 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/jmx/ConnectionsView.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/jmx/ConnectionsView.java @@ -53,10 +53,13 @@ public class ConnectionsView implements ConnectionsViewMBean { private static final int LONG_DATA_COLLECTION_PERIOD = 60 * 5; private static final int SAMPLES_PER_HOUR = (60 * 60)/LONG_DATA_COLLECTION_PERIOD; - + private Queue lastSecondRequestQueue = new LinkedList(); + private Queue openedConnectionsDataQueue = new LinkedList(); private Queue shortTermDataQueue = new LinkedList(); private Queue longTermDataQueue = new LinkedList(); + private AtomicInteger requestsReceived = new AtomicInteger(0); + private AtomicInteger openedConnections = new AtomicInteger(0); private AtomicInteger activeConnections = new AtomicInteger(0); private AtomicInteger shortTermOpenedConnections = new AtomicInteger(0); private AtomicInteger longTermOpenedConnections = new AtomicInteger(0); @@ -79,6 +82,34 @@ public ConnectionsView(String name) throws AxisFault { initCounters(requestSizeCounters); initCounters(responseSizeCounters); + Runnable requestTask = new Runnable() { + public void run() { + // We only need historical data for the last 1 minutes + // Therefore no need to keep data older than that... + if (lastSecondRequestQueue.size() == 60) { + lastSecondRequestQueue.remove(); + } + lastSecondRequestQueue.offer(requestsReceived.getAndSet(0)); + } + }; + // Delay the timer by 1 minute to prevent the task from starting immediately + scheduler.scheduleAtFixedRate(requestTask, 1, + 1, TimeUnit.SECONDS); + + Runnable secondsTask = new Runnable() { + public void run() { + // We only need historical data for the last 1 minutes + // Therefore no need to keep data older than that... + if (openedConnectionsDataQueue.size() == 60) { + openedConnectionsDataQueue.remove(); + } + openedConnectionsDataQueue.offer(openedConnections.getAndSet(0)); + } + }; + // Delay the timer by 1 minute to prevent the task from starting immediately + scheduler.scheduleAtFixedRate(secondsTask, 1, + 1, TimeUnit.SECONDS); + Runnable task = new Runnable() { public void run() { // We only need historical data for the last 15 minutes @@ -127,6 +158,7 @@ private void initCounters(AtomicInteger[] counters) { protected void connected() { activeConnections.incrementAndGet(); + openedConnections.incrementAndGet(); shortTermOpenedConnections.incrementAndGet(); longTermOpenedConnections.incrementAndGet(); } @@ -136,6 +168,8 @@ protected void disconnected() { } protected void requestReceived() { + + requestsReceived.incrementAndGet(); unservedRequests.incrementAndGet(); } @@ -183,6 +217,41 @@ public int getActiveConnections() { return activeConnections.get(); } + public int getLastSecondRequests() { + + return getTotalRequests(1); + } + + public int getLast15SecondRequests() { + + return getTotalRequests(15); + } + + public int getLastMinuteRequests() { + + return getTotalRequests(60); + } + + public int getLastSecondConnections() { + + return getSecondConnections(1); + } + + public int getLast5SecondConnections() { + + return getSecondConnections(5); + } + + public int getLast15SecondConnections() { + + return getSecondConnections(15); + } + + public int getLast30SecondConnections() { + + return getSecondConnections(30); + } + public int getLastMinuteConnections() { return getTotalConnections(1); } @@ -248,9 +317,29 @@ public void reset() { * @return The number of connections opened */ private int getTotalConnections(int n) { - int sum = 0; + Integer[] array = shortTermDataQueue.toArray(new Integer[shortTermDataQueue.size()]); + int sum = getTotal(array, n); + return sum; + } + + private int getTotalRequests(int n) { + + Integer[] array = lastSecondRequestQueue.toArray(new Integer[lastSecondRequestQueue.size()]); + int sum = getTotal(array, n); + return sum; + } + private int getSecondConnections(int n) { + + Integer[] array = openedConnectionsDataQueue.toArray(new Integer[openedConnectionsDataQueue.size()]); + int sum = getTotal(array, n); + return sum; + } + + private int getTotal(Integer[] array, int n) { + + int sum = 0; if (n > array.length) { for (int i = 0; i < array.length; i++) { sum += array[i]; diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/jmx/ConnectionsViewMBean.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/jmx/ConnectionsViewMBean.java index d1df57e1e6..48810a60f1 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/jmx/ConnectionsViewMBean.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/jmx/ConnectionsViewMBean.java @@ -25,6 +25,12 @@ public interface ConnectionsViewMBean { public int getActiveConnections(); + public int getLastSecondRequests(); + public int getLast15SecondRequests(); + public int getLastMinuteRequests(); + public int getLastSecondConnections(); + public int getLast5SecondConnections(); + public int getLast15SecondConnections(); public int getLastMinuteConnections(); public int getLast5MinuteConnections(); public int getLast15MinuteConnections(); From 905bf5d8be98c13a24348daccf967f19f75f37f6 Mon Sep 17 00:00:00 2001 From: RakhithaRR Date: Tue, 2 Jan 2024 15:09:59 +0530 Subject: [PATCH 075/308] Add a null check for response message context to skip engaging interceptors --- .../org/apache/synapse/transport/passthru/TargetHandler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetHandler.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetHandler.java index 1480e49f44..76f5694006 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetHandler.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetHandler.java @@ -624,7 +624,8 @@ public void inputReady(NHttpClientConnection conn, ContentDecoder decoder) { int responseRead = -1; boolean interceptionEnabled = false; Boolean[] interceptorResults = new Boolean[noOfInterceptors]; - if (interceptStream) { + if (conn.getContext().getAttribute(PassThroughConstants.RESPONSE_MESSAGE_CONTEXT) != null + && interceptStream) { int index = 0; for (StreamInterceptor interceptor : streamInterceptors) { interceptorResults[index] = interceptor.interceptTargetResponse( From 8567e67bce73e7cc7f89b2a44260adf4672b866e Mon Sep 17 00:00:00 2001 From: Arunan Sugunakumar Date: Wed, 3 Jan 2024 15:18:51 +0530 Subject: [PATCH 076/308] Serialize OMNode after replace dynamic Inline expressions Fixes https://github.com/wso2/micro-integrator/issues/3070 --- .../apache/synapse/mediators/elementary/EnrichMediator.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/elementary/EnrichMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/elementary/EnrichMediator.java index dbe2dd07b1..94e74ddc21 100644 --- a/modules/core/src/main/java/org/apache/synapse/mediators/elementary/EnrichMediator.java +++ b/modules/core/src/main/java/org/apache/synapse/mediators/elementary/EnrichMediator.java @@ -287,7 +287,10 @@ private boolean setDynamicValuesInNode(MessageContext messageContext, String inl try { // After the expressions in the inline text is replaced with the value, the string must be parsed // again to identify whether it has changed to a XML - source.setInlineOMNode(AXIOMUtil.stringToOM(inlineString)); + OMNode inlineOMNode = AXIOMUtil.stringToOM(inlineString); + // serialize inlineOMNode + inlineOMNode.buildWithAttachments(); + source.setInlineOMNode(inlineOMNode); isInlineTextXML = true; } catch (XMLStreamException | OMException e) { // The string is considered as a text / JSON From 2123e36f41b4c4fe3c91886139698bdb94a4744f Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 3 Jan 2024 10:28:31 +0000 Subject: [PATCH 077/308] [WSO2 Release] [Jenkins #6771] [Release 4.0.0-wso2v65] prepare release v4.0.0-wso2v65 --- 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 3d3d3e0a3b..70ea76bad3 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v65-SNAPSHOT + 4.0.0-wso2v65 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 6d18edf3f6..8902089844 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v65-SNAPSHOT + 4.0.0-wso2v65 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 856192bd2f..a6d6c9e095 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-wso2v65-SNAPSHOT + 4.0.0-wso2v65 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 7db70bfe06..4481f6095b 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v65-SNAPSHOT + 4.0.0-wso2v65 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 463f9c4cb2..b7babbc894 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v65-SNAPSHOT + 4.0.0-wso2v65 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 00463896c5..579b0cb7a0 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v65-SNAPSHOT + 4.0.0-wso2v65 ../../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 b9052a42cf..813939c8bb 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-wso2v65-SNAPSHOT + 4.0.0-wso2v65 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 fad522af6d..6f36c160e2 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-wso2v65-SNAPSHOT + 4.0.0-wso2v65 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 3a37e56d0a..906e8d8b98 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-wso2v65-SNAPSHOT + 4.0.0-wso2v65 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 6faaed8de9..6722c2486b 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-wso2v65-SNAPSHOT + 4.0.0-wso2v65 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 5510739523..e48b41f7d6 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-wso2v65-SNAPSHOT + 4.0.0-wso2v65 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 a88f55db54..50ad246e4d 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-wso2v65-SNAPSHOT + 4.0.0-wso2v65 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 29cb185111..03fa93eaae 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-wso2v65-SNAPSHOT + 4.0.0-wso2v65 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 9934c0fcfa..24338ca92a 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v65-SNAPSHOT + 4.0.0-wso2v65 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 36ec4253d3..9125f97324 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v65-SNAPSHOT + 4.0.0-wso2v65 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 77aaea11fd..9941d9f920 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v65-SNAPSHOT + 4.0.0-wso2v65 ../../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-wso2v65 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 2214c786f3..0f175e3cdb 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v65-SNAPSHOT + 4.0.0-wso2v65 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 5d72f6f1ab..155ff6ec5e 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-wso2v65-SNAPSHOT + 4.0.0-wso2v65 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 95429787f7..3096e5951b 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-wso2v65-SNAPSHOT + 4.0.0-wso2v65 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index e6f5d88a80..4a053d9307 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v65-SNAPSHOT + 4.0.0-wso2v65 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 9795fd43ec..701e084d57 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v65-SNAPSHOT + 4.0.0-wso2v65 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index a3a303dbd7..fba063e68c 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v65-SNAPSHOT + 4.0.0-wso2v65 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 45b0bef96f..cf6a3d7e3c 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v65-SNAPSHOT + 4.0.0-wso2v65 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 62ffc3ff32..0fb9b4a02a 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-wso2v65-SNAPSHOT + 4.0.0-wso2v65 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 045a197c96..ff9c093b0d 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-wso2v65-SNAPSHOT + 4.0.0-wso2v65 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index b63a35b15e..bae24713eb 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-wso2v65-SNAPSHOT + 4.0.0-wso2v65 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index bdfe415949..294270b099 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-wso2v65-SNAPSHOT + 4.0.0-wso2v65 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index b1a8e52df0..bd48ab5f82 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v65-SNAPSHOT + 4.0.0-wso2v65 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 0539ca138b..cc1c93f6c7 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v65-SNAPSHOT + 4.0.0-wso2v65 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index cbcf19dede..ea4797d19b 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-wso2v65-SNAPSHOT + 4.0.0-wso2v65 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 6932ab5c8b..314a537ff2 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v65-SNAPSHOT + 4.0.0-wso2v65 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-wso2v65 Apache Software Foundation From 50f74e741a0a8951f2722c084758dd31f2a68537 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 3 Jan 2024 10:28:33 +0000 Subject: [PATCH 078/308] [WSO2 Release] [Jenkins #6771] [Release 4.0.0-wso2v65] 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 70ea76bad3..041575fbf8 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v65 + 4.0.0-wso2v66-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 8902089844..1dccfaabe7 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v65 + 4.0.0-wso2v66-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index a6d6c9e095..37441aa39d 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-wso2v65 + 4.0.0-wso2v66-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 4481f6095b..c27db305c9 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v65 + 4.0.0-wso2v66-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index b7babbc894..f43eae3722 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v65 + 4.0.0-wso2v66-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 579b0cb7a0..98035aa77d 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v65 + 4.0.0-wso2v66-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 813939c8bb..0d6f92e1fa 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-wso2v65 + 4.0.0-wso2v66-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 6f36c160e2..b85c33f054 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-wso2v65 + 4.0.0-wso2v66-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 906e8d8b98..9d96a0cebd 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-wso2v65 + 4.0.0-wso2v66-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 6722c2486b..5136b871ed 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-wso2v65 + 4.0.0-wso2v66-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 e48b41f7d6..28664094f3 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-wso2v65 + 4.0.0-wso2v66-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 50ad246e4d..13fd6ba680 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-wso2v65 + 4.0.0-wso2v66-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 03fa93eaae..ff66a14fb3 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-wso2v65 + 4.0.0-wso2v66-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 24338ca92a..5e79339e9b 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v65 + 4.0.0-wso2v66-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 9125f97324..3d6a6e91ea 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v65 + 4.0.0-wso2v66-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 9941d9f920..74d4d36b98 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v65 + 4.0.0-wso2v66-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-wso2v65 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 0f175e3cdb..b4b4067435 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v65 + 4.0.0-wso2v66-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 155ff6ec5e..7071e49f48 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-wso2v65 + 4.0.0-wso2v66-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 3096e5951b..0e5a6b0386 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-wso2v65 + 4.0.0-wso2v66-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 4a053d9307..12a5974694 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v65 + 4.0.0-wso2v66-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 701e084d57..2de5cca11e 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v65 + 4.0.0-wso2v66-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index fba063e68c..857607d789 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v65 + 4.0.0-wso2v66-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index cf6a3d7e3c..d010b4fd1e 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v65 + 4.0.0-wso2v66-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 0fb9b4a02a..8415549a89 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-wso2v65 + 4.0.0-wso2v66-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index ff9c093b0d..d9f3b859bd 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-wso2v65 + 4.0.0-wso2v66-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index bae24713eb..810d969d0c 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-wso2v65 + 4.0.0-wso2v66-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 294270b099..74bbe44e66 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-wso2v65 + 4.0.0-wso2v66-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index bd48ab5f82..2e1ec1db98 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v65 + 4.0.0-wso2v66-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index cc1c93f6c7..7f06a43b3c 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v65 + 4.0.0-wso2v66-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index ea4797d19b..4827d428b6 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-wso2v65 + 4.0.0-wso2v66-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 314a537ff2..07d87134d0 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v65 + 4.0.0-wso2v66-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-wso2v65 + HEAD Apache Software Foundation From da23a810196856d37bb234f1f372abe606276902 Mon Sep 17 00:00:00 2001 From: RakhithaRR Date: Fri, 5 Jan 2024 10:19:59 +0530 Subject: [PATCH 079/308] Add a synapse property to handle exclusing payload details in error logs --- .../src/main/java/org/apache/synapse/SynapseConstants.java | 1 + .../main/java/org/apache/synapse/core/axis2/Axis2Sender.java | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java b/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java index 4893f3e7c9..47647ee066 100644 --- a/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java +++ b/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java @@ -613,6 +613,7 @@ public enum ENDPOINT_TIMEOUT_TYPE { ENDPOINT_TIMEOUT, GLOBAL_TIMEOUT, HTTP_CONNE public static final String MAX_FAILOVER_RECUSIVE_RETRIES_CONFIG = "maximum.failover.recursive.retries"; public static final String SUSPEND_DURATION_ON_MAX_RECURSIVE_FAILOVER_CONFIG = "suspend.duration.on.maximum.recursive.failover"; + public static final String EXCLUDE_PAYLOAD_DETAILS_FROM_ERROR = "exclude.payload.details.from.error"; /** * Synapse Configuration holder property name, used for handling synapse import deployments diff --git a/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java b/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java index eb4d81e3c2..4a637687db 100644 --- a/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java +++ b/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java @@ -38,6 +38,7 @@ import org.apache.synapse.SynapseHandler; import org.apache.synapse.commons.throttle.core.ConcurrentAccessController; import org.apache.synapse.commons.throttle.core.ConcurrentAccessReplicator; +import org.apache.synapse.config.SynapsePropertiesLoader; import org.apache.synapse.endpoints.EndpointDefinition; import org.apache.synapse.inbound.InboundEndpointConstants; import org.apache.synapse.inbound.InboundResponseSender; @@ -61,6 +62,8 @@ public class Axis2Sender { * Content type header name. */ private static final String CONTENT_TYPE_STRING = "Content-Type"; + private static final boolean removeHeaders = SynapsePropertiesLoader + .getBooleanProperty(SynapseConstants.EXCLUDE_PAYLOAD_DETAILS_FROM_ERROR, false); /** * Send a message out from the Synapse engine to an external service @@ -299,7 +302,7 @@ private static String getResponseMessage(MessageContext msgContext) { } Map mHeader = (Map) msgContext.getProperty (org.apache.axis2.context.MessageContext.TRANSPORT_HEADERS); - if (mHeader != null) { + if (!removeHeaders && mHeader != null) { for (String strKey : mHeader.keySet()) { sb.append(strKey + ":" + mHeader.get(strKey).toString() + ","); } From e97e8f1e84220625fdc66cb6fd0d6be2d3f93290 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 10 Jan 2024 04:51:35 +0000 Subject: [PATCH 080/308] [WSO2 Release] [Jenkins #6780] [Release 4.0.0-wso2v66] prepare release v4.0.0-wso2v66 --- 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 041575fbf8..65dc373a14 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v66-SNAPSHOT + 4.0.0-wso2v66 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 1dccfaabe7..d3e2b01334 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v66-SNAPSHOT + 4.0.0-wso2v66 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 37441aa39d..a0e5f9b54d 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-wso2v66-SNAPSHOT + 4.0.0-wso2v66 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index c27db305c9..7029be1c67 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v66-SNAPSHOT + 4.0.0-wso2v66 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index f43eae3722..20064d2cb8 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v66-SNAPSHOT + 4.0.0-wso2v66 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 98035aa77d..49a43f3868 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v66-SNAPSHOT + 4.0.0-wso2v66 ../../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 0d6f92e1fa..4231105456 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-wso2v66-SNAPSHOT + 4.0.0-wso2v66 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 b85c33f054..4e81e7bcff 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-wso2v66-SNAPSHOT + 4.0.0-wso2v66 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 9d96a0cebd..92dd76fbd0 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-wso2v66-SNAPSHOT + 4.0.0-wso2v66 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 5136b871ed..0d9c5d3d3d 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-wso2v66-SNAPSHOT + 4.0.0-wso2v66 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 28664094f3..50fe8b4a06 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-wso2v66-SNAPSHOT + 4.0.0-wso2v66 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 13fd6ba680..5343382dba 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-wso2v66-SNAPSHOT + 4.0.0-wso2v66 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 ff66a14fb3..fe9e8ac63f 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-wso2v66-SNAPSHOT + 4.0.0-wso2v66 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 5e79339e9b..b3d4848d2c 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v66-SNAPSHOT + 4.0.0-wso2v66 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 3d6a6e91ea..62c4d7a0b7 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v66-SNAPSHOT + 4.0.0-wso2v66 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 74d4d36b98..b5c5ffd7c8 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v66-SNAPSHOT + 4.0.0-wso2v66 ../../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-wso2v66 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index b4b4067435..a37a8ba5c9 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v66-SNAPSHOT + 4.0.0-wso2v66 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 7071e49f48..d78d256376 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-wso2v66-SNAPSHOT + 4.0.0-wso2v66 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 0e5a6b0386..0fd0184ec7 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-wso2v66-SNAPSHOT + 4.0.0-wso2v66 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 12a5974694..2fc4da4a9e 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v66-SNAPSHOT + 4.0.0-wso2v66 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 2de5cca11e..e38d3449d1 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v66-SNAPSHOT + 4.0.0-wso2v66 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 857607d789..047eb2fa86 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v66-SNAPSHOT + 4.0.0-wso2v66 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index d010b4fd1e..c37938222b 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v66-SNAPSHOT + 4.0.0-wso2v66 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 8415549a89..efeac6a8af 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-wso2v66-SNAPSHOT + 4.0.0-wso2v66 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index d9f3b859bd..4bd888e755 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-wso2v66-SNAPSHOT + 4.0.0-wso2v66 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 810d969d0c..3c7362e27b 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-wso2v66-SNAPSHOT + 4.0.0-wso2v66 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 74bbe44e66..eaff5fe15b 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-wso2v66-SNAPSHOT + 4.0.0-wso2v66 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 2e1ec1db98..cf1d993676 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v66-SNAPSHOT + 4.0.0-wso2v66 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 7f06a43b3c..77370889f8 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v66-SNAPSHOT + 4.0.0-wso2v66 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 4827d428b6..06d88e3986 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-wso2v66-SNAPSHOT + 4.0.0-wso2v66 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 07d87134d0..f274cab367 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v66-SNAPSHOT + 4.0.0-wso2v66 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-wso2v66 Apache Software Foundation From fbbe72a63afb6edcc0ec42cf7f8baf26dd42af08 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 10 Jan 2024 04:51:36 +0000 Subject: [PATCH 081/308] [WSO2 Release] [Jenkins #6780] [Release 4.0.0-wso2v66] 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 65dc373a14..d0d22bbfa8 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v66 + 4.0.0-wso2v67-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index d3e2b01334..49729be219 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v66 + 4.0.0-wso2v67-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index a0e5f9b54d..e480a69585 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-wso2v66 + 4.0.0-wso2v67-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 7029be1c67..1460d4db0f 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v66 + 4.0.0-wso2v67-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 20064d2cb8..0e73097ff1 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v66 + 4.0.0-wso2v67-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 49a43f3868..94193eeb8e 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v66 + 4.0.0-wso2v67-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 4231105456..efaaa99c6e 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-wso2v66 + 4.0.0-wso2v67-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 4e81e7bcff..c046193fbe 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-wso2v66 + 4.0.0-wso2v67-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 92dd76fbd0..10f8bf7d6e 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-wso2v66 + 4.0.0-wso2v67-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 0d9c5d3d3d..49c191d664 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-wso2v66 + 4.0.0-wso2v67-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 50fe8b4a06..ab888e8489 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-wso2v66 + 4.0.0-wso2v67-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 5343382dba..604e19ae38 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-wso2v66 + 4.0.0-wso2v67-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 fe9e8ac63f..ca66c76b0e 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-wso2v66 + 4.0.0-wso2v67-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index b3d4848d2c..beb629b84c 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v66 + 4.0.0-wso2v67-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 62c4d7a0b7..bf9c0a9b2b 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v66 + 4.0.0-wso2v67-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index b5c5ffd7c8..2005d2cfdf 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v66 + 4.0.0-wso2v67-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-wso2v66 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index a37a8ba5c9..7530d3700d 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v66 + 4.0.0-wso2v67-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index d78d256376..43390c9dda 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-wso2v66 + 4.0.0-wso2v67-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 0fd0184ec7..738b3b92e4 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-wso2v66 + 4.0.0-wso2v67-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 2fc4da4a9e..3bb4ef3238 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v66 + 4.0.0-wso2v67-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index e38d3449d1..f42ea126bd 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v66 + 4.0.0-wso2v67-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 047eb2fa86..f2a1b286ac 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v66 + 4.0.0-wso2v67-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index c37938222b..fcdf9cd142 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v66 + 4.0.0-wso2v67-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index efeac6a8af..0f15fccf3c 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-wso2v66 + 4.0.0-wso2v67-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 4bd888e755..e94536c809 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-wso2v66 + 4.0.0-wso2v67-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 3c7362e27b..559ee8a61e 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-wso2v66 + 4.0.0-wso2v67-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index eaff5fe15b..cd437a844f 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-wso2v66 + 4.0.0-wso2v67-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index cf1d993676..63e3ac79bc 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v66 + 4.0.0-wso2v67-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 77370889f8..edd7cb1d22 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v66 + 4.0.0-wso2v67-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 06d88e3986..8bc027a1cc 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-wso2v66 + 4.0.0-wso2v67-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index f274cab367..fcd47285ce 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v66 + 4.0.0-wso2v67-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-wso2v66 + HEAD Apache Software Foundation From 9b7aa86f6586c1b188d4d2e50269bbff68924e2e Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 10 Jan 2024 10:15:07 +0000 Subject: [PATCH 082/308] [WSO2 Release] [Jenkins #6782] [Release 4.0.0-wso2v67] prepare release v4.0.0-wso2v67 --- 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 d0d22bbfa8..1593f37847 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v67-SNAPSHOT + 4.0.0-wso2v67 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 49729be219..1598361038 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v67-SNAPSHOT + 4.0.0-wso2v67 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index e480a69585..bd22664309 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-wso2v67-SNAPSHOT + 4.0.0-wso2v67 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 1460d4db0f..8b441360e5 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v67-SNAPSHOT + 4.0.0-wso2v67 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 0e73097ff1..468ccf6f3d 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v67-SNAPSHOT + 4.0.0-wso2v67 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 94193eeb8e..3ffc0bdf56 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v67-SNAPSHOT + 4.0.0-wso2v67 ../../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 efaaa99c6e..f5b40ab076 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-wso2v67-SNAPSHOT + 4.0.0-wso2v67 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 c046193fbe..aa4fef7f75 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-wso2v67-SNAPSHOT + 4.0.0-wso2v67 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 10f8bf7d6e..1090313d02 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-wso2v67-SNAPSHOT + 4.0.0-wso2v67 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 49c191d664..64342855f0 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-wso2v67-SNAPSHOT + 4.0.0-wso2v67 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 ab888e8489..3b36be2e03 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-wso2v67-SNAPSHOT + 4.0.0-wso2v67 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 604e19ae38..a0160844ea 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-wso2v67-SNAPSHOT + 4.0.0-wso2v67 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 ca66c76b0e..f4296aae8b 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-wso2v67-SNAPSHOT + 4.0.0-wso2v67 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index beb629b84c..eaf7ac8173 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v67-SNAPSHOT + 4.0.0-wso2v67 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index bf9c0a9b2b..f53d7ec1dc 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v67-SNAPSHOT + 4.0.0-wso2v67 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 2005d2cfdf..e36fb61eed 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v67-SNAPSHOT + 4.0.0-wso2v67 ../../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-wso2v67 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 7530d3700d..0abbf01262 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v67-SNAPSHOT + 4.0.0-wso2v67 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 43390c9dda..04288c8a76 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-wso2v67-SNAPSHOT + 4.0.0-wso2v67 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 738b3b92e4..3b6d3a206c 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-wso2v67-SNAPSHOT + 4.0.0-wso2v67 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 3bb4ef3238..9de2a84f24 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v67-SNAPSHOT + 4.0.0-wso2v67 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index f42ea126bd..a9e57fd508 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v67-SNAPSHOT + 4.0.0-wso2v67 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index f2a1b286ac..96e4979182 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v67-SNAPSHOT + 4.0.0-wso2v67 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index fcdf9cd142..a6c007b532 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v67-SNAPSHOT + 4.0.0-wso2v67 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 0f15fccf3c..aa280a4add 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-wso2v67-SNAPSHOT + 4.0.0-wso2v67 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index e94536c809..2dd0f1eff5 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-wso2v67-SNAPSHOT + 4.0.0-wso2v67 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 559ee8a61e..2aa00b62f9 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-wso2v67-SNAPSHOT + 4.0.0-wso2v67 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index cd437a844f..4c9d48d8e6 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-wso2v67-SNAPSHOT + 4.0.0-wso2v67 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 63e3ac79bc..9ae44ba405 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v67-SNAPSHOT + 4.0.0-wso2v67 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index edd7cb1d22..dba70a6689 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v67-SNAPSHOT + 4.0.0-wso2v67 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 8bc027a1cc..c299685f6b 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-wso2v67-SNAPSHOT + 4.0.0-wso2v67 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index fcd47285ce..1d2db67d3f 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v67-SNAPSHOT + 4.0.0-wso2v67 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-wso2v67 Apache Software Foundation From 088d191c1426c6eaac427d431b5a8216127fecff Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 10 Jan 2024 10:15:09 +0000 Subject: [PATCH 083/308] [WSO2 Release] [Jenkins #6782] [Release 4.0.0-wso2v67] 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 1593f37847..8e40a098aa 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v67 + 4.0.0-wso2v68-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 1598361038..436c8e8160 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v67 + 4.0.0-wso2v68-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index bd22664309..a80c731371 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-wso2v67 + 4.0.0-wso2v68-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 8b441360e5..e34f37f226 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v67 + 4.0.0-wso2v68-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 468ccf6f3d..dd63a8f86d 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v67 + 4.0.0-wso2v68-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 3ffc0bdf56..ee92d3970f 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v67 + 4.0.0-wso2v68-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 f5b40ab076..05ab148a92 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-wso2v67 + 4.0.0-wso2v68-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 aa4fef7f75..d82aea41e7 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-wso2v67 + 4.0.0-wso2v68-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 1090313d02..fbd0930435 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-wso2v67 + 4.0.0-wso2v68-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 64342855f0..dc15dcb743 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-wso2v67 + 4.0.0-wso2v68-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 3b36be2e03..1cc10bb6d5 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-wso2v67 + 4.0.0-wso2v68-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 a0160844ea..742e1ad824 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-wso2v67 + 4.0.0-wso2v68-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 f4296aae8b..27b9011a8a 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-wso2v67 + 4.0.0-wso2v68-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index eaf7ac8173..e7ec07cb2f 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v67 + 4.0.0-wso2v68-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index f53d7ec1dc..c0969a3e7a 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v67 + 4.0.0-wso2v68-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index e36fb61eed..4d8c9bded0 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v67 + 4.0.0-wso2v68-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-wso2v67 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 0abbf01262..84a77c4b53 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v67 + 4.0.0-wso2v68-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 04288c8a76..4189375f07 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-wso2v67 + 4.0.0-wso2v68-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 3b6d3a206c..7c720ffbcb 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-wso2v67 + 4.0.0-wso2v68-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 9de2a84f24..752142c63c 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v67 + 4.0.0-wso2v68-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index a9e57fd508..8f885137e0 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v67 + 4.0.0-wso2v68-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 96e4979182..c7cdee0b11 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v67 + 4.0.0-wso2v68-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index a6c007b532..9fa5bcdf06 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v67 + 4.0.0-wso2v68-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index aa280a4add..29b799c592 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-wso2v67 + 4.0.0-wso2v68-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 2dd0f1eff5..ad94e4816d 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-wso2v67 + 4.0.0-wso2v68-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 2aa00b62f9..5030a8f825 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-wso2v67 + 4.0.0-wso2v68-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 4c9d48d8e6..620cf4b510 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-wso2v67 + 4.0.0-wso2v68-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 9ae44ba405..0a811fe478 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v67 + 4.0.0-wso2v68-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index dba70a6689..2d639dcad8 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v67 + 4.0.0-wso2v68-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index c299685f6b..1861614884 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-wso2v67 + 4.0.0-wso2v68-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 1d2db67d3f..0e6e06b680 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v67 + 4.0.0-wso2v68-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-wso2v67 + HEAD Apache Software Foundation From a1bf8bb25b23c817d4b7afecc1b251aa194acc22 Mon Sep 17 00:00:00 2001 From: Savindu Dimal Date: Wed, 10 Jan 2024 10:55:59 +0530 Subject: [PATCH 084/308] Add access_log_enable configuration --- .../apache/synapse/transport/http/access/Access.java | 8 ++++++-- .../transport/http/access/AccessConstants.java | 2 ++ .../synapse/transport/http/access/AccessLogger.java | 11 ++++++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/access/Access.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/access/Access.java index 0cc3ee469d..cf277f5d4a 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/access/Access.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/access/Access.java @@ -149,7 +149,9 @@ public void log(HttpRequest request, HttpResponse response) { } String logString = result.toString(); log.debug(logString); //log to the console - accessLogger.log(logString); //log to the file + if (accessLogger.isLoggingEnabled) { + accessLogger.log(logString); //log to the file + } } /** @@ -873,6 +875,8 @@ public void log(HttpRequestWrapper request, HttpResponseWrapper response) { } String logString = result.toString(); log.debug(logString); //log to the console - accessLogger.log(logString); //log to the file + if (accessLogger.isLoggingEnabled) { + accessLogger.log(logString); //log to the file + } } } diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/access/AccessConstants.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/access/AccessConstants.java index 19971c437a..2748da1000 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/access/AccessConstants.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/access/AccessConstants.java @@ -75,6 +75,8 @@ public class AccessConstants { public static final String CONFIG_FILE_DATE_FORMAT = "access_log_file_date_format"; + public static final String CONFIG_ENABLE_LOGGING = "access_log_enable"; + public static String getLogPattern() { return AccessConfiguration.getInstance().getStringProperty(CONFIG_PATTERN, LOG_PATTERN); diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/access/AccessLogger.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/access/AccessLogger.java index 9f97b84ad5..46d525d9bb 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/access/AccessLogger.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/access/AccessLogger.java @@ -41,6 +41,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import static org.apache.synapse.transport.http.access.AccessConstants.CONFIG_ENABLE_LOGGING; + /** * Class that logs the Http Accesses to the access log files. Code segment borrowed from * Apache Tomcat's org.apache.catalina.valves.AccessLogValve with thanks. @@ -64,7 +66,9 @@ public class AccessLogger { public AccessLogger(final Log log) { super(); - this.initOpen(); + if (isLoggingEnabled) { + this.initOpen(); + } AccessLogger.log = log; buffered = true; checkExists = false; @@ -114,6 +118,11 @@ public AccessLogger(final Log log) { */ private boolean isRotatable = getBooleanValue(IS_LOG_ROTATABLE, true); + /** + * Enable logging. + */ + public boolean isLoggingEnabled = getBooleanValue(CONFIG_ENABLE_LOGGING, true); + /** * Log the specified message to the log file, switching files if the date * has changed since the previous log call. From 17531002b8c44446f7ffbf510057c7848d1fa895 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 16 Jan 2024 11:23:41 +0000 Subject: [PATCH 085/308] [WSO2 Release] [Jenkins #6789] [Release 4.0.0-wso2v68] prepare release v4.0.0-wso2v68 --- 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 8e40a098aa..e56d956974 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v68-SNAPSHOT + 4.0.0-wso2v68 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 436c8e8160..8c3836dd77 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v68-SNAPSHOT + 4.0.0-wso2v68 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index a80c731371..8dcaa1f44d 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-wso2v68-SNAPSHOT + 4.0.0-wso2v68 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index e34f37f226..47f24f0334 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v68-SNAPSHOT + 4.0.0-wso2v68 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index dd63a8f86d..e8411b3816 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v68-SNAPSHOT + 4.0.0-wso2v68 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index ee92d3970f..84574804fe 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v68-SNAPSHOT + 4.0.0-wso2v68 ../../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 05ab148a92..2b9814a092 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-wso2v68-SNAPSHOT + 4.0.0-wso2v68 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 d82aea41e7..69699b1b75 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-wso2v68-SNAPSHOT + 4.0.0-wso2v68 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 fbd0930435..73031e5a87 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-wso2v68-SNAPSHOT + 4.0.0-wso2v68 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 dc15dcb743..0e744a846d 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-wso2v68-SNAPSHOT + 4.0.0-wso2v68 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 1cc10bb6d5..0483ae6e0d 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-wso2v68-SNAPSHOT + 4.0.0-wso2v68 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 742e1ad824..2bba91f24b 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-wso2v68-SNAPSHOT + 4.0.0-wso2v68 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 27b9011a8a..d6f0944dd9 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-wso2v68-SNAPSHOT + 4.0.0-wso2v68 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index e7ec07cb2f..4d09c33375 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v68-SNAPSHOT + 4.0.0-wso2v68 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index c0969a3e7a..3f96c1e3f3 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v68-SNAPSHOT + 4.0.0-wso2v68 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 4d8c9bded0..47dbff958f 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v68-SNAPSHOT + 4.0.0-wso2v68 ../../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-wso2v68 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 84a77c4b53..aefc97e9db 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v68-SNAPSHOT + 4.0.0-wso2v68 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 4189375f07..014dc4a2e8 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-wso2v68-SNAPSHOT + 4.0.0-wso2v68 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 7c720ffbcb..caef77ef94 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-wso2v68-SNAPSHOT + 4.0.0-wso2v68 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 752142c63c..cf8bfe1a5f 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v68-SNAPSHOT + 4.0.0-wso2v68 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 8f885137e0..ddee0abf18 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v68-SNAPSHOT + 4.0.0-wso2v68 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index c7cdee0b11..372d266a18 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v68-SNAPSHOT + 4.0.0-wso2v68 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 9fa5bcdf06..2705d93583 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v68-SNAPSHOT + 4.0.0-wso2v68 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 29b799c592..a98be9c676 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-wso2v68-SNAPSHOT + 4.0.0-wso2v68 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index ad94e4816d..74e5ba9ed8 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-wso2v68-SNAPSHOT + 4.0.0-wso2v68 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 5030a8f825..0dbc2780b9 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-wso2v68-SNAPSHOT + 4.0.0-wso2v68 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 620cf4b510..2cb381f73c 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-wso2v68-SNAPSHOT + 4.0.0-wso2v68 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 0a811fe478..b8fe7c3bde 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v68-SNAPSHOT + 4.0.0-wso2v68 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 2d639dcad8..2e8b6927a4 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v68-SNAPSHOT + 4.0.0-wso2v68 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 1861614884..e887d96a24 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-wso2v68-SNAPSHOT + 4.0.0-wso2v68 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 0e6e06b680..653261a38d 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v68-SNAPSHOT + 4.0.0-wso2v68 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-wso2v68 Apache Software Foundation From 835e814ef52c18f1a6a6da85d47563178769ae47 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 16 Jan 2024 11:23:43 +0000 Subject: [PATCH 086/308] [WSO2 Release] [Jenkins #6789] [Release 4.0.0-wso2v68] 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 e56d956974..d874fd9071 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v68 + 4.0.0-wso2v69-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 8c3836dd77..1cbe61bbd8 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v68 + 4.0.0-wso2v69-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 8dcaa1f44d..2e6d7e9aea 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-wso2v68 + 4.0.0-wso2v69-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 47f24f0334..1891ac2006 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v68 + 4.0.0-wso2v69-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index e8411b3816..2d5eb6175c 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v68 + 4.0.0-wso2v69-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 84574804fe..3069ce1f64 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v68 + 4.0.0-wso2v69-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 2b9814a092..b20a7b7021 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-wso2v68 + 4.0.0-wso2v69-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 69699b1b75..2b39edf487 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-wso2v68 + 4.0.0-wso2v69-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 73031e5a87..6b72caaed2 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-wso2v68 + 4.0.0-wso2v69-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 0e744a846d..a08309bdd2 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-wso2v68 + 4.0.0-wso2v69-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 0483ae6e0d..27d36da759 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-wso2v68 + 4.0.0-wso2v69-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 2bba91f24b..3193930afd 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-wso2v68 + 4.0.0-wso2v69-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 d6f0944dd9..e305c133f1 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-wso2v68 + 4.0.0-wso2v69-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 4d09c33375..931a20496a 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v68 + 4.0.0-wso2v69-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 3f96c1e3f3..b6e9d0a355 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v68 + 4.0.0-wso2v69-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 47dbff958f..cc033e3c87 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v68 + 4.0.0-wso2v69-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-wso2v68 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index aefc97e9db..85da9657fa 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v68 + 4.0.0-wso2v69-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 014dc4a2e8..6c217a6182 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-wso2v68 + 4.0.0-wso2v69-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index caef77ef94..60665e1b25 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-wso2v68 + 4.0.0-wso2v69-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index cf8bfe1a5f..07d846e0a2 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v68 + 4.0.0-wso2v69-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index ddee0abf18..80652d8479 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v68 + 4.0.0-wso2v69-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 372d266a18..cb14e703b6 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v68 + 4.0.0-wso2v69-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 2705d93583..e84e549e74 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v68 + 4.0.0-wso2v69-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index a98be9c676..2b19cf571d 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-wso2v68 + 4.0.0-wso2v69-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 74e5ba9ed8..eff4664ffd 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-wso2v68 + 4.0.0-wso2v69-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 0dbc2780b9..c4d50c823a 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-wso2v68 + 4.0.0-wso2v69-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 2cb381f73c..c45cea1d92 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-wso2v68 + 4.0.0-wso2v69-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index b8fe7c3bde..7d4f067fa1 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v68 + 4.0.0-wso2v69-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 2e8b6927a4..46558ca5f1 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v68 + 4.0.0-wso2v69-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index e887d96a24..02400fe03e 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-wso2v68 + 4.0.0-wso2v69-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 653261a38d..e4eec39bb5 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v68 + 4.0.0-wso2v69-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-wso2v68 + HEAD Apache Software Foundation From 7ee086066ac183c30a1ca26e46903300a7afbd15 Mon Sep 17 00:00:00 2001 From: yasasrangika Date: Wed, 17 Jan 2024 15:45:30 +0530 Subject: [PATCH 087/308] Upgrade netty version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e4eec39bb5..bee26ef61c 100644 --- a/pom.xml +++ b/pom.xml @@ -1585,7 +1585,7 @@ 5.9.1 1.5.2 1.17.0 - 4.1.100.Final + 4.1.104.Final 6.3.49 1.1.1.wso2v3 5.8.0 From 1aeede7bf2b6aa61850db9f88c42b69cda593719 Mon Sep 17 00:00:00 2001 From: Dinith Herath <41161459+DinithHerath@users.noreply.github.com> Date: Wed, 17 Jan 2024 20:21:46 +0530 Subject: [PATCH 088/308] Add fix for content-type getting empty when backend having header "Content-Length : 0" --- .../apache/synapse/api/cors/CORSHelper.java | 4 +-- .../passthru/util/SourceResponseFactory.java | 29 +++---------------- 2 files changed, 6 insertions(+), 27 deletions(-) diff --git a/modules/core/src/main/java/org/apache/synapse/api/cors/CORSHelper.java b/modules/core/src/main/java/org/apache/synapse/api/cors/CORSHelper.java index eb761e9bfb..3fc1e9b69d 100644 --- a/modules/core/src/main/java/org/apache/synapse/api/cors/CORSHelper.java +++ b/modules/core/src/main/java/org/apache/synapse/api/cors/CORSHelper.java @@ -50,7 +50,7 @@ public static String getAllowedOrigins(String origin, Set allowedOrigins } else if (allowedOrigins.contains(origin)) { return origin; } else { - return null; + return ""; } } @@ -86,7 +86,7 @@ public static void handleCORSHeaders(CORSConfiguration corsConfiguration, Messag transportHeaders.get(RESTConstants.CORS_HEADER_ORIGIN)); // If the request origin is not allowed, set the status code to 403 - if (isOptionsRequest(synCtx) && allowedOrigin == null) { + if (isOptionsRequest(synCtx) && allowedOrigin.isEmpty()) { ((Axis2MessageContext) synCtx).getAxis2MessageContext() .setProperty(PassThroughConstants.HTTP_SC, HttpStatus.SC_FORBIDDEN); } diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/util/SourceResponseFactory.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/util/SourceResponseFactory.java index 2c6162bf1d..2c1ef923ba 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/util/SourceResponseFactory.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/util/SourceResponseFactory.java @@ -153,34 +153,13 @@ public static SourceResponse create(MessageContext msgContext, private static void addResponseHeader(SourceResponse sourceResponse, Map transportHeaders) { for (Object entryObj : transportHeaders.entrySet()) { Map.Entry entry = (Map.Entry) entryObj; - String headerValue = getHeaderValueAsString(entry.getValue()); - if (entry.getKey() instanceof String && headerValue != null) { - sourceResponse.addHeader((String) entry.getKey(), headerValue); - } + if (entry.getValue() != null && entry.getKey() instanceof String && + entry.getValue() instanceof String) { + sourceResponse.addHeader((String) entry.getKey(), (String) entry.getValue()); + } } } - /** - * Get the header value as a string. - *

- * If the header value is a string, return it - * If the header value is null, return empty string. otherwise the header will get dropped - * Else return null to drop the header - *

- * - * @param value the header value - * @return the header value as a string - */ - private static String getHeaderValueAsString(Object value) { - - if (value instanceof String) { - return (String) value; - } else if (value == null) { - return ""; - } - return null; - } - private static boolean isPayloadOptionalMethod(String httpMethod) { return (PassThroughConstants.HTTP_GET.equals(httpMethod) || PassThroughConstants.HTTP_HEAD.equals(httpMethod) || From 05ac420314669f8d9fd1b362b4b1d92a5dd1ef44 Mon Sep 17 00:00:00 2001 From: Sanoj Punchihewa Date: Tue, 16 Jan 2024 10:39:47 +0530 Subject: [PATCH 089/308] Use endpoint URL and OAuth credentials when caching token Since the cached token was mapped to the synapse endpoint instance previously, the same token was shared even we change the endpoint URL dynamically. With this improvement, we use the endpoint URL and OAuth credentials as the key when caching the token. Git issue: https://github.com/wso2/api-manager/issues/2381 --- .../synapse/endpoints/HTTPEndpoint.java | 32 +++++++++-------- .../OAuthConfiguredHTTPEndpoint.java | 35 ++++++++++++++++--- .../auth/oauth/AuthorizationCodeHandler.java | 11 ++++++ .../auth/oauth/ClientCredentialsHandler.java | 10 ++++++ .../endpoints/auth/oauth/OAuthHandler.java | 22 +++++++++--- .../oauth/PasswordCredentialsHandler.java | 12 +++++++ .../endpoints/auth/oauth/TokenCache.java | 10 +++++- 7 files changed, 107 insertions(+), 25 deletions(-) diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/HTTPEndpoint.java b/modules/core/src/main/java/org/apache/synapse/endpoints/HTTPEndpoint.java index 6ff090c09c..ab5387f98b 100644 --- a/modules/core/src/main/java/org/apache/synapse/endpoints/HTTPEndpoint.java +++ b/modules/core/src/main/java/org/apache/synapse/endpoints/HTTPEndpoint.java @@ -140,7 +140,18 @@ private String decodeString(String value) { } } - private void processUrlTemplate(MessageContext synCtx) throws VariableExpansionException { + protected void processUrlTemplate(MessageContext synCtx) throws VariableExpansionException { + + String evaluatedUri = resolveUrlTemplate(synCtx); + if (evaluatedUri != null) { + synCtx.setTo(new EndpointReference(evaluatedUri)); + if (super.getDefinition() != null) { + synCtx.setProperty(EndpointDefinition.DYNAMIC_URL_VALUE, evaluatedUri); + } + } + } + + protected String resolveUrlTemplate(MessageContext synCtx) throws VariableExpansionException { Map variables = new HashMap(); /*The properties with uri.var.* are only considered for Outbound REST Endpoints*/ @@ -162,10 +173,10 @@ private void processUrlTemplate(MessageContext synCtx) throws VariableExpansionE if (objProperty != null) { if (objProperty instanceof String) { variables.put(propertyKey.toString(), - decodeString((String) synCtx.getProperty(propertyKey.toString()))); + decodeString((String) synCtx.getProperty(propertyKey.toString()))); } else { variables.put(propertyKey.toString(), - decodeString(String.valueOf(synCtx.getProperty(propertyKey.toString())))); + decodeString(String.valueOf(synCtx.getProperty(propertyKey.toString())))); } } } @@ -224,14 +235,14 @@ private void processUrlTemplate(MessageContext synCtx) throws VariableExpansionE (propertyKey.toString().startsWith(RESTConstants.REST_URI_VARIABLE_PREFIX) || propertyKey.toString().startsWith(RESTConstants.REST_QUERY_PARAM_PREFIX))) { Object objProperty = - synCtx.getProperty(propertyKey.toString()); + synCtx.getProperty(propertyKey.toString()); if (objProperty != null) { if (objProperty instanceof String) { variables.put(propertyKey.toString(), - (String) synCtx.getProperty(propertyKey.toString())); + (String) synCtx.getProperty(propertyKey.toString())); } else { variables.put(propertyKey.toString(), - (String) String.valueOf(synCtx.getProperty(propertyKey.toString()))); + (String) String.valueOf(synCtx.getProperty(propertyKey.toString()))); } } } @@ -282,14 +293,7 @@ private void processUrlTemplate(MessageContext synCtx) throws VariableExpansionE } } } - - - if (evaluatedUri != null) { - synCtx.setTo(new EndpointReference(evaluatedUri)); - if (super.getDefinition() != null) { - synCtx.setProperty(EndpointDefinition.DYNAMIC_URL_VALUE, evaluatedUri); - } - } + return evaluatedUri; } /** diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/OAuthConfiguredHTTPEndpoint.java b/modules/core/src/main/java/org/apache/synapse/endpoints/OAuthConfiguredHTTPEndpoint.java index adac33de58..2e218b2983 100644 --- a/modules/core/src/main/java/org/apache/synapse/endpoints/OAuthConfiguredHTTPEndpoint.java +++ b/modules/core/src/main/java/org/apache/synapse/endpoints/OAuthConfiguredHTTPEndpoint.java @@ -18,7 +18,9 @@ package org.apache.synapse.endpoints; +import com.damnhandy.uri.template.VariableExpansionException; import org.apache.axis2.AxisFault; +import org.apache.axis2.addressing.EndpointReference; import org.apache.synapse.MessageContext; import org.apache.synapse.SynapseConstants; import org.apache.synapse.endpoints.auth.AuthHandler; @@ -46,6 +48,7 @@ public OAuthConfiguredHTTPEndpoint(AuthHandler authHandler) { public void send(MessageContext synCtx) { try { + setResolvedUrlTemplate(synCtx); oAuthHandler.setAuthHeader(synCtx); // If this a blocking call, add 401 as a non error http status code @@ -77,17 +80,22 @@ public void send(MessageContext synCtx) { */ public MessageContext retryCallWithNewToken(MessageContext synCtx) { // remove the existing token from the cache so that a new token is generated - oAuthHandler.removeTokenFromCache(); - // set RETRIED_ON_OAUTH_FAILURE property to true - synCtx.setProperty(AuthConstants.RETRIED_ON_OAUTH_FAILURE, true); - send(synCtx); + try { + // set RETRIED_ON_OAUTH_FAILURE property to true + synCtx.setProperty(AuthConstants.RETRIED_ON_OAUTH_FAILURE, true); + oAuthHandler.removeTokenFromCache(synCtx); + send(synCtx); + } catch (AuthException e) { + handleError(synCtx, + "Error removing access token for oauth configured http endpoint " + this.getName(), e); + } return synCtx; } @Override public void destroy() { - oAuthHandler.removeTokenFromCache(); + oAuthHandler.removeTokensFromCache(); super.destroy(); } @@ -109,4 +117,21 @@ private void handleError(MessageContext synCtx, String message, Exception except log.error(errorMsg); informFailure(synCtx, SynapseConstants.ENDPOINT_AUTH_FAILURE, errorMsg); } + + private void setResolvedUrlTemplate(MessageContext messageContext) { + String resolvedUrl = resolveUrlTemplate(messageContext); + if (resolvedUrl != null) { + messageContext.setTo(new EndpointReference(resolvedUrl)); + if (super.getDefinition() != null) { + messageContext.setProperty(EndpointDefinition.DYNAMIC_URL_VALUE, resolvedUrl); + } + } + } + + @Override + protected void processUrlTemplate(MessageContext synCtx) throws VariableExpansionException { + // Since we set the resolved URL in the OAuthConfiguredHTTPEndpoint.send method + // return the processUrlTemplate to skip re-resolving at HTTPEndpoint. + return; + } } diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/auth/oauth/AuthorizationCodeHandler.java b/modules/core/src/main/java/org/apache/synapse/endpoints/auth/oauth/AuthorizationCodeHandler.java index 7d6c4a5800..dc3432e41a 100644 --- a/modules/core/src/main/java/org/apache/synapse/endpoints/auth/oauth/AuthorizationCodeHandler.java +++ b/modules/core/src/main/java/org/apache/synapse/endpoints/auth/oauth/AuthorizationCodeHandler.java @@ -26,6 +26,8 @@ import org.apache.synapse.endpoints.auth.AuthConstants; import org.apache.synapse.endpoints.auth.AuthException; +import java.util.Objects; + /** * This class is used to handle Authorization code grant oauth. */ @@ -74,6 +76,15 @@ protected OMElement serializeSpecificOAuthConfigs(OMFactory omFactory) { return authCode; } + @Override + protected int getHash(MessageContext messageContext) throws AuthException { + return Objects.hash(messageContext.getTo().getAddress(), OAuthUtils.resolveExpression(getTokenUrl(), messageContext), + OAuthUtils.resolveExpression(getClientId(), messageContext), OAuthUtils.resolveExpression(getClientSecret(), + messageContext), OAuthUtils.resolveExpression(getRefreshToken(), messageContext), + getRequestParametersAsString(messageContext), getResolvedCustomHeadersMap(getCustomHeadersMap(), + messageContext)); + } + /** * Return the refresh token secret relevant to the Authorization Code Handler. * diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/auth/oauth/ClientCredentialsHandler.java b/modules/core/src/main/java/org/apache/synapse/endpoints/auth/oauth/ClientCredentialsHandler.java index 2a1d21831e..df95cf1e81 100644 --- a/modules/core/src/main/java/org/apache/synapse/endpoints/auth/oauth/ClientCredentialsHandler.java +++ b/modules/core/src/main/java/org/apache/synapse/endpoints/auth/oauth/ClientCredentialsHandler.java @@ -26,6 +26,8 @@ import org.apache.synapse.endpoints.auth.AuthConstants; import org.apache.synapse.endpoints.auth.AuthException; +import java.util.Objects; + /** * This class is used to handle Client Credentials grant oauth. */ @@ -60,4 +62,12 @@ protected OMElement serializeSpecificOAuthConfigs(OMFactory omFactory) { return omFactory.createOMElement(AuthConstants.CLIENT_CREDENTIALS, SynapseConstants.SYNAPSE_OMNAMESPACE); } + + @Override + protected int getHash(MessageContext messageContext) throws AuthException { + return Objects.hash(messageContext.getTo().getAddress(), OAuthUtils.resolveExpression(getTokenUrl(), messageContext), + OAuthUtils.resolveExpression(getClientId(), messageContext), OAuthUtils.resolveExpression(getClientSecret(), + messageContext), getRequestParametersAsString(messageContext), + getResolvedCustomHeadersMap(getCustomHeadersMap(), messageContext)); + } } diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/auth/oauth/OAuthHandler.java b/modules/core/src/main/java/org/apache/synapse/endpoints/auth/oauth/OAuthHandler.java index 83ddf7ca21..b9d8f957da 100644 --- a/modules/core/src/main/java/org/apache/synapse/endpoints/auth/oauth/OAuthHandler.java +++ b/modules/core/src/main/java/org/apache/synapse/endpoints/auth/oauth/OAuthHandler.java @@ -46,7 +46,6 @@ public abstract class OAuthHandler implements AuthHandler { private final String id; - private final String tokenApiUrl; private final String clientId; private final String clientSecret; @@ -89,7 +88,7 @@ public void setAuthHeader(MessageContext messageContext) throws AuthException { private String getToken(final MessageContext messageContext) throws AuthException { try { - return TokenCache.getInstance().getToken(id, new Callable() { + return TokenCache.getInstance().getToken(getId(messageContext), new Callable() { @Override public String call() throws AuthException, IOException { return OAuthClient.generateToken(OAuthUtils.resolveExpression(tokenApiUrl, messageContext), @@ -129,12 +128,20 @@ public int compare(String o1, String o2) { } } + /** + * Method to remove the token from the cache when the token is invalid. + */ + public void removeTokenFromCache(MessageContext messageContext) throws AuthException { + + TokenCache.getInstance().removeToken(getId(messageContext)); + } + /** * Method to remove the token from the cache when the endpoint is destroyed. */ - public void removeTokenFromCache() { + public void removeTokensFromCache() { - TokenCache.getInstance().removeToken(id); + TokenCache.getInstance().removeTokens(id.concat("_")); } /** @@ -313,7 +320,7 @@ public void setCustomHeaders(Map customHeadersMap) { * @param messageContext Message Context of the request which will be used to resolve dynamic expressions * @return Map Resolved custom headers */ - private Map getResolvedCustomHeadersMap(Map customHeadersMap, + protected Map getResolvedCustomHeadersMap(Map customHeadersMap, MessageContext messageContext) throws AuthException { Map resolvedCustomHeadersMap = null; @@ -339,4 +346,9 @@ public int getSocketTimeout() { return socketTimeout; } + protected abstract int getHash(MessageContext messageContext) throws AuthException; + + private String getId(MessageContext messageContext) throws AuthException { + return id.concat("_").concat(String.valueOf(getHash(messageContext))); + } } diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/auth/oauth/PasswordCredentialsHandler.java b/modules/core/src/main/java/org/apache/synapse/endpoints/auth/oauth/PasswordCredentialsHandler.java index 928fce7d5c..07f48e2916 100644 --- a/modules/core/src/main/java/org/apache/synapse/endpoints/auth/oauth/PasswordCredentialsHandler.java +++ b/modules/core/src/main/java/org/apache/synapse/endpoints/auth/oauth/PasswordCredentialsHandler.java @@ -26,6 +26,8 @@ import org.apache.synapse.endpoints.auth.AuthConstants; import org.apache.synapse.endpoints.auth.AuthException; +import java.util.Objects; + /** * This class is used to handle Password Credentials grant oauth. */ @@ -78,6 +80,16 @@ protected OMElement serializeSpecificOAuthConfigs(OMFactory omFactory) { return passwordCredentials; } + @Override + protected int getHash(MessageContext messageContext) throws AuthException { + return Objects.hash(messageContext.getTo().getAddress(), OAuthUtils.resolveExpression(getTokenUrl(), messageContext), + OAuthUtils.resolveExpression(getClientId(), messageContext), OAuthUtils.resolveExpression(getClientSecret(), + messageContext), OAuthUtils.resolveExpression(getUsername(), messageContext), + OAuthUtils.resolveExpression(getPassword(), messageContext), + getRequestParametersAsString(messageContext), getResolvedCustomHeadersMap(getCustomHeadersMap(), + messageContext)); + } + public String getUsername() { return username; diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/auth/oauth/TokenCache.java b/modules/core/src/main/java/org/apache/synapse/endpoints/auth/oauth/TokenCache.java index 61fc973d60..6537c11db3 100644 --- a/modules/core/src/main/java/org/apache/synapse/endpoints/auth/oauth/TokenCache.java +++ b/modules/core/src/main/java/org/apache/synapse/endpoints/auth/oauth/TokenCache.java @@ -82,7 +82,7 @@ public String getToken(String id, Callable callable) throws ExecutionExc } /** - * This method is called to remove the token from the cache when the endpoint is destroyed + * This method is called to remove the token from the cache when the token is invalid * * @param id id of the endpoint */ @@ -91,4 +91,12 @@ public void removeToken(String id) { tokenMap.invalidate(id); } + /** + * This method is called to remove the tokens from the cache when the endpoint is destroyed + * + * @param oauthHandlerId id of the OAuth handler bounded to the endpoint + */ + public void removeTokens(String oauthHandlerId) { + tokenMap.asMap().entrySet().removeIf(entry -> entry.getKey().startsWith(oauthHandlerId)); + } } From c06f4f7327c6b8d4735b9b5d2d7095999c18dc5f Mon Sep 17 00:00:00 2001 From: Sanoj Punchihewa Date: Fri, 19 Jan 2024 10:44:31 +0530 Subject: [PATCH 090/308] Add test cases for OAuth endpoints with dynamic URLs --- .../framework/tests/endpoint/Sample63.java | 23 +++++++++ .../samples/jaxrs/foodsample/Constants.java | 1 + .../samples/jaxrs/foodsample/FoodService.java | 49 +++++++++++++++++++ repository/conf/sample/synapse_sample_63.xml | 28 +++++++++++ 4 files changed, 101 insertions(+) diff --git a/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample63.java b/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample63.java index caede6b321..5ef71a4029 100644 --- a/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample63.java +++ b/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/endpoint/Sample63.java @@ -100,4 +100,27 @@ public void testOAuthConfiguredEPWithDynamicValues() throws Exception { HttpResponse response = client.doGet("http://127.0.0.1:8280/foodapi/list/dynamicValues"); assertEquals(HttpStatus.SC_OK, response.getStatus()); } + + public void testOAuthConfiguredDynamicURLEP() throws Exception { + + String payload1 = "\n" + + "\thttp://localhost:9000/foodservice/food\n" + + "\thttp://localhost:9000/foodservice/token1\n" + + ""; + + String payload2 = "\n" + + "\thttp://localhost:9000/foodservice/apple\n" + + "\thttp://localhost:9000/foodservice/token2\n" + + ""; + + BasicHttpClient client = new BasicHttpClient(); + HttpResponse response = client.doPost("http://127.0.0.1:8280/foodapi/list/dynamicURL", payload1.getBytes(), + "text/xml"); + assertEquals(HttpStatus.SC_OK, response.getStatus()); + + HttpResponse response2 = client.doPost("http://127.0.0.1:8280/foodapi/list/dynamicURL", payload2.getBytes(), + "text/xml"); + assertEquals(HttpStatus.SC_OK, response2.getStatus()); + assertEquals("1", response2.getBodyAsString()); + } } diff --git a/modules/samples/src/main/java/org/wso2/synapse/samples/jaxrs/foodsample/Constants.java b/modules/samples/src/main/java/org/wso2/synapse/samples/jaxrs/foodsample/Constants.java index cf2b5d7920..ca30a72085 100644 --- a/modules/samples/src/main/java/org/wso2/synapse/samples/jaxrs/foodsample/Constants.java +++ b/modules/samples/src/main/java/org/wso2/synapse/samples/jaxrs/foodsample/Constants.java @@ -22,6 +22,7 @@ public class Constants { static final String refreshToken = "wxyz#9876"; static final String accessToken = "abcd@1234"; + static final String accessToken2 = "jklm#6789"; static final String expiresIn = "3600"; static final String tokenType = "Bearer"; static final String clientId = "my_client_id"; diff --git a/modules/samples/src/main/java/org/wso2/synapse/samples/jaxrs/foodsample/FoodService.java b/modules/samples/src/main/java/org/wso2/synapse/samples/jaxrs/foodsample/FoodService.java index 6a2826e6e6..e95167e85b 100644 --- a/modules/samples/src/main/java/org/wso2/synapse/samples/jaxrs/foodsample/FoodService.java +++ b/modules/samples/src/main/java/org/wso2/synapse/samples/jaxrs/foodsample/FoodService.java @@ -38,6 +38,7 @@ public class FoodService { private int unauthorizedReqCount = 0; private int tokenReqCount = 0; + private int appleServiceRequests = 0; @POST @Path("/token") @@ -57,6 +58,38 @@ public Response getAccessToken(@Context HttpHeaders httpHeaders, return Response.status(Response.Status.UNAUTHORIZED).entity("Invalid Credentials").build(); } + @POST + @Path("/token1") + @Consumes(MediaType.APPLICATION_FORM_URLENCODED) + @Produces(MediaType.APPLICATION_JSON) + public Response getAccessToken1(@Context HttpHeaders httpHeaders, + MultivaluedMap tokenRequestParams) { + + String basicHeader = httpHeaders.getHeaderString("Authorization"); + + if (validateBasicAuthHeader(basicHeader)) { + return Response.status(Response.Status.OK).entity(new Token(Constants.accessToken, Constants.expiresIn, + Constants.tokenType)).build(); + } + return Response.status(Response.Status.UNAUTHORIZED).entity("Invalid Credentials").build(); + } + + @POST + @Path("/token2") + @Consumes(MediaType.APPLICATION_FORM_URLENCODED) + @Produces(MediaType.APPLICATION_JSON) + public Response getAccessToken2(@Context HttpHeaders httpHeaders, + MultivaluedMap tokenRequestParams) { + + String basicHeader = httpHeaders.getHeaderString("Authorization"); + + if (validateBasicAuthHeader(basicHeader)) { + return Response.status(Response.Status.OK).entity(new Token(Constants.accessToken2, Constants.expiresIn, + Constants.tokenType)).build(); + } + return Response.status(Response.Status.UNAUTHORIZED).entity("Invalid Credentials").build(); + } + @POST @Path("/custom-token") @Consumes(MediaType.APPLICATION_FORM_URLENCODED) @@ -105,6 +138,22 @@ public Response getFoodItem(@Context HttpHeaders httpHeaders) { return Response.status(Response.Status.UNAUTHORIZED).build(); } + @GET + @Path("/apple") + @Produces(MediaType.APPLICATION_JSON) + public Response getFoodItem2(@Context HttpHeaders httpHeaders) { + + appleServiceRequests++; + String authorizationHeader = httpHeaders.getHeaderString("Authorization"); + if (authorizationHeader != null) { + String token = authorizationHeader.split(" ")[1]; + if (token.equals(Constants.accessToken2)) { + return Response.status(Response.Status.OK).entity(appleServiceRequests).build(); + } + } + return Response.status(Response.Status.UNAUTHORIZED).build(); + } + @GET @Path("/unauthorized") @Produces(MediaType.APPLICATION_JSON) diff --git a/repository/conf/sample/synapse_sample_63.xml b/repository/conf/sample/synapse_sample_63.xml index fbc676bfda..8e1d7d1e74 100644 --- a/repository/conf/sample/synapse_sample_63.xml +++ b/repository/conf/sample/synapse_sample_63.xml @@ -211,5 +211,33 @@ + + + + + + + + + + + my_client_id + my_client_secret + {$ctx:token_ep} + + + + + + + + + + + + + + + From 0a175ec67c4ee5c73e55674fd4ebafd659e865aa Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 19 Jan 2024 14:42:34 +0000 Subject: [PATCH 091/308] [WSO2 Release] [Jenkins #6794] [Release 4.0.0-wso2v69] prepare release v4.0.0-wso2v69 --- 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 d874fd9071..cf3acbc183 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v69-SNAPSHOT + 4.0.0-wso2v69 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 1cbe61bbd8..97429433ff 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v69-SNAPSHOT + 4.0.0-wso2v69 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 2e6d7e9aea..56ae56eb24 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-wso2v69-SNAPSHOT + 4.0.0-wso2v69 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 1891ac2006..34514a7819 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v69-SNAPSHOT + 4.0.0-wso2v69 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 2d5eb6175c..63fc07ada1 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v69-SNAPSHOT + 4.0.0-wso2v69 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 3069ce1f64..e1acf9653c 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v69-SNAPSHOT + 4.0.0-wso2v69 ../../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 b20a7b7021..3a923d9159 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-wso2v69-SNAPSHOT + 4.0.0-wso2v69 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 2b39edf487..1b43f8fc77 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-wso2v69-SNAPSHOT + 4.0.0-wso2v69 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 6b72caaed2..84e4761e4d 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-wso2v69-SNAPSHOT + 4.0.0-wso2v69 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 a08309bdd2..324ccab6d7 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-wso2v69-SNAPSHOT + 4.0.0-wso2v69 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 27d36da759..562069e8ba 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-wso2v69-SNAPSHOT + 4.0.0-wso2v69 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 3193930afd..eaf25d78e3 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-wso2v69-SNAPSHOT + 4.0.0-wso2v69 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 e305c133f1..d10430d144 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-wso2v69-SNAPSHOT + 4.0.0-wso2v69 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 931a20496a..8bb1d0baf0 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v69-SNAPSHOT + 4.0.0-wso2v69 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index b6e9d0a355..c8b64de478 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v69-SNAPSHOT + 4.0.0-wso2v69 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index cc033e3c87..ef3720f338 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v69-SNAPSHOT + 4.0.0-wso2v69 ../../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-wso2v69 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 85da9657fa..437c8419a8 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v69-SNAPSHOT + 4.0.0-wso2v69 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 6c217a6182..5e9dcbe10d 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-wso2v69-SNAPSHOT + 4.0.0-wso2v69 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 60665e1b25..19100b0a7c 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-wso2v69-SNAPSHOT + 4.0.0-wso2v69 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 07d846e0a2..7aac5d746a 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v69-SNAPSHOT + 4.0.0-wso2v69 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 80652d8479..b66ed15e0f 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v69-SNAPSHOT + 4.0.0-wso2v69 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index cb14e703b6..cd2952c5f8 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v69-SNAPSHOT + 4.0.0-wso2v69 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index e84e549e74..6173b1083e 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v69-SNAPSHOT + 4.0.0-wso2v69 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 2b19cf571d..75a015cbe9 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-wso2v69-SNAPSHOT + 4.0.0-wso2v69 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index eff4664ffd..f24c51f0a0 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-wso2v69-SNAPSHOT + 4.0.0-wso2v69 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index c4d50c823a..7fd8b41971 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-wso2v69-SNAPSHOT + 4.0.0-wso2v69 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index c45cea1d92..4b420ff3b7 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-wso2v69-SNAPSHOT + 4.0.0-wso2v69 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 7d4f067fa1..138f5f4721 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v69-SNAPSHOT + 4.0.0-wso2v69 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 46558ca5f1..648e331682 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v69-SNAPSHOT + 4.0.0-wso2v69 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 02400fe03e..d09ddb7ccc 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-wso2v69-SNAPSHOT + 4.0.0-wso2v69 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index e4eec39bb5..1591271cc7 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v69-SNAPSHOT + 4.0.0-wso2v69 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-wso2v69 Apache Software Foundation From 5581aa99c9384f50e098cc5b29f0256bc7da84a6 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 19 Jan 2024 14:42:36 +0000 Subject: [PATCH 092/308] [WSO2 Release] [Jenkins #6794] [Release 4.0.0-wso2v69] 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 cf3acbc183..aed4ece0ba 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v69 + 4.0.0-wso2v70-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 97429433ff..e58015b7c2 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v69 + 4.0.0-wso2v70-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 56ae56eb24..b2497642aa 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-wso2v69 + 4.0.0-wso2v70-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 34514a7819..a8d15cd9e1 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v69 + 4.0.0-wso2v70-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 63fc07ada1..f81c79856b 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v69 + 4.0.0-wso2v70-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index e1acf9653c..e1f50a7b13 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v69 + 4.0.0-wso2v70-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 3a923d9159..2b1a5734df 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-wso2v69 + 4.0.0-wso2v70-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 1b43f8fc77..40d9f68368 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-wso2v69 + 4.0.0-wso2v70-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 84e4761e4d..8eb7e0b402 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-wso2v69 + 4.0.0-wso2v70-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 324ccab6d7..24866842ed 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-wso2v69 + 4.0.0-wso2v70-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 562069e8ba..d0ce72bc9b 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-wso2v69 + 4.0.0-wso2v70-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 eaf25d78e3..15d0b775fc 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-wso2v69 + 4.0.0-wso2v70-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 d10430d144..39114e0084 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-wso2v69 + 4.0.0-wso2v70-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 8bb1d0baf0..3d6c6a01b6 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v69 + 4.0.0-wso2v70-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index c8b64de478..09e3652a94 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v69 + 4.0.0-wso2v70-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index ef3720f338..e7d2e3f50e 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v69 + 4.0.0-wso2v70-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-wso2v69 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 437c8419a8..5c2a69b700 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v69 + 4.0.0-wso2v70-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 5e9dcbe10d..60709084d8 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-wso2v69 + 4.0.0-wso2v70-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 19100b0a7c..ddf06a6564 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-wso2v69 + 4.0.0-wso2v70-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 7aac5d746a..2ad4136705 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v69 + 4.0.0-wso2v70-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index b66ed15e0f..bc3d00159b 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v69 + 4.0.0-wso2v70-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index cd2952c5f8..648bb9b7af 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v69 + 4.0.0-wso2v70-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 6173b1083e..58137b5678 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v69 + 4.0.0-wso2v70-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 75a015cbe9..b90dead376 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-wso2v69 + 4.0.0-wso2v70-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index f24c51f0a0..c856e6cadd 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-wso2v69 + 4.0.0-wso2v70-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 7fd8b41971..8b38188f4a 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-wso2v69 + 4.0.0-wso2v70-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 4b420ff3b7..d50a2d54ed 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-wso2v69 + 4.0.0-wso2v70-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 138f5f4721..2f8eebe7ab 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v69 + 4.0.0-wso2v70-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 648e331682..fef3e1095f 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v69 + 4.0.0-wso2v70-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index d09ddb7ccc..0b0e8bc768 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-wso2v69 + 4.0.0-wso2v70-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 1591271cc7..b171487e6d 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v69 + 4.0.0-wso2v70-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-wso2v69 + HEAD Apache Software Foundation From 3d264e88986400199724f958fee2f2a2ce61a0db Mon Sep 17 00:00:00 2001 From: yasasrangika Date: Tue, 23 Jan 2024 10:12:59 +0530 Subject: [PATCH 093/308] Upgrade jackson and guava versions --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index bee26ef61c..523ee812d3 100644 --- a/pom.xml +++ b/pom.xml @@ -1566,9 +1566,9 @@ 2.0.9 3.0.0 2.2.6.wso2v9 - 2.13.4 - 2.13.4.2 - 32.1.3-jre + 2.16.1 + 2.16.1 + 33.0.0-jre 1.0.1 2.9.4.wso2v1 7.4.2.wso2v1 From 1140de7dcfcdb2e4220a25d494bb5c154cd81a24 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 23 Jan 2024 05:01:01 +0000 Subject: [PATCH 094/308] [WSO2 Release] [Jenkins #6800] [Release 4.0.0-wso2v70] prepare release v4.0.0-wso2v70 --- 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 aed4ece0ba..c78a963519 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v70-SNAPSHOT + 4.0.0-wso2v70 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index e58015b7c2..5236e766d5 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v70-SNAPSHOT + 4.0.0-wso2v70 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index b2497642aa..a7af28742c 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-wso2v70-SNAPSHOT + 4.0.0-wso2v70 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index a8d15cd9e1..11e8683952 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v70-SNAPSHOT + 4.0.0-wso2v70 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index f81c79856b..109029fd59 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v70-SNAPSHOT + 4.0.0-wso2v70 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index e1f50a7b13..327bd6a93a 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v70-SNAPSHOT + 4.0.0-wso2v70 ../../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 2b1a5734df..189b280474 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-wso2v70-SNAPSHOT + 4.0.0-wso2v70 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 40d9f68368..4f87d2e988 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-wso2v70-SNAPSHOT + 4.0.0-wso2v70 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 8eb7e0b402..d3ba0d91ac 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-wso2v70-SNAPSHOT + 4.0.0-wso2v70 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 24866842ed..0f54376f24 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-wso2v70-SNAPSHOT + 4.0.0-wso2v70 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 d0ce72bc9b..543ebc27d7 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-wso2v70-SNAPSHOT + 4.0.0-wso2v70 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 15d0b775fc..d2ef346e83 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-wso2v70-SNAPSHOT + 4.0.0-wso2v70 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 39114e0084..9f564b2480 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-wso2v70-SNAPSHOT + 4.0.0-wso2v70 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 3d6c6a01b6..a842e5d40f 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v70-SNAPSHOT + 4.0.0-wso2v70 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 09e3652a94..af43a160af 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v70-SNAPSHOT + 4.0.0-wso2v70 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index e7d2e3f50e..c0e85e68d9 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v70-SNAPSHOT + 4.0.0-wso2v70 ../../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-wso2v70 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 5c2a69b700..195134062a 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v70-SNAPSHOT + 4.0.0-wso2v70 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 60709084d8..51d607568e 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-wso2v70-SNAPSHOT + 4.0.0-wso2v70 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index ddf06a6564..a48361e099 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-wso2v70-SNAPSHOT + 4.0.0-wso2v70 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 2ad4136705..fa8279c74e 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v70-SNAPSHOT + 4.0.0-wso2v70 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index bc3d00159b..d4a7c5c806 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v70-SNAPSHOT + 4.0.0-wso2v70 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 648bb9b7af..99fa717556 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v70-SNAPSHOT + 4.0.0-wso2v70 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 58137b5678..0ecd479a0c 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v70-SNAPSHOT + 4.0.0-wso2v70 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index b90dead376..b54dcb99ef 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-wso2v70-SNAPSHOT + 4.0.0-wso2v70 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index c856e6cadd..2b17b2e1ee 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-wso2v70-SNAPSHOT + 4.0.0-wso2v70 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 8b38188f4a..927a22e602 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-wso2v70-SNAPSHOT + 4.0.0-wso2v70 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index d50a2d54ed..23eba9db7f 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-wso2v70-SNAPSHOT + 4.0.0-wso2v70 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 2f8eebe7ab..5af6b0a879 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v70-SNAPSHOT + 4.0.0-wso2v70 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index fef3e1095f..27eac94fde 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v70-SNAPSHOT + 4.0.0-wso2v70 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 0b0e8bc768..1e019dce22 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-wso2v70-SNAPSHOT + 4.0.0-wso2v70 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index b171487e6d..027de18538 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v70-SNAPSHOT + 4.0.0-wso2v70 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-wso2v70 Apache Software Foundation From a07c3af5c6cc2cd2cd2ae4957788c43c3f526653 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 23 Jan 2024 05:01:03 +0000 Subject: [PATCH 095/308] [WSO2 Release] [Jenkins #6800] [Release 4.0.0-wso2v70] 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 c78a963519..e85f645732 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v70 + 4.0.0-wso2v71-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 5236e766d5..04cbcece08 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v70 + 4.0.0-wso2v71-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index a7af28742c..af2a79066d 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-wso2v70 + 4.0.0-wso2v71-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 11e8683952..21fc3db023 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v70 + 4.0.0-wso2v71-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 109029fd59..251c931b45 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v70 + 4.0.0-wso2v71-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 327bd6a93a..a6972d7b94 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v70 + 4.0.0-wso2v71-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 189b280474..8c219c1b72 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-wso2v70 + 4.0.0-wso2v71-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 4f87d2e988..87e9447a26 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-wso2v70 + 4.0.0-wso2v71-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 d3ba0d91ac..82d76793d8 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-wso2v70 + 4.0.0-wso2v71-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 0f54376f24..230b8dd3ec 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-wso2v70 + 4.0.0-wso2v71-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 543ebc27d7..d415a9899f 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-wso2v70 + 4.0.0-wso2v71-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 d2ef346e83..85a400b139 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-wso2v70 + 4.0.0-wso2v71-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 9f564b2480..99af51484f 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-wso2v70 + 4.0.0-wso2v71-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index a842e5d40f..efa493e2b6 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v70 + 4.0.0-wso2v71-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index af43a160af..6979a3d103 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v70 + 4.0.0-wso2v71-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index c0e85e68d9..5f5a705b38 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v70 + 4.0.0-wso2v71-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-wso2v70 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 195134062a..b26a177bb9 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v70 + 4.0.0-wso2v71-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 51d607568e..1a263c1d7c 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-wso2v70 + 4.0.0-wso2v71-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index a48361e099..f7e22f2efb 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-wso2v70 + 4.0.0-wso2v71-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index fa8279c74e..4019d35842 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v70 + 4.0.0-wso2v71-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index d4a7c5c806..705114f673 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v70 + 4.0.0-wso2v71-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 99fa717556..2e96f274db 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v70 + 4.0.0-wso2v71-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 0ecd479a0c..29bf16e69e 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v70 + 4.0.0-wso2v71-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index b54dcb99ef..1fb7b76890 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-wso2v70 + 4.0.0-wso2v71-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 2b17b2e1ee..83b375f11b 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-wso2v70 + 4.0.0-wso2v71-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 927a22e602..a00522c701 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-wso2v70 + 4.0.0-wso2v71-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 23eba9db7f..313989cd5a 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-wso2v70 + 4.0.0-wso2v71-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 5af6b0a879..c13c620825 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v70 + 4.0.0-wso2v71-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 27eac94fde..9fb0b76443 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v70 + 4.0.0-wso2v71-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 1e019dce22..5f10bee805 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-wso2v70 + 4.0.0-wso2v71-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 027de18538..d858824cd0 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v70 + 4.0.0-wso2v71-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-wso2v70 + HEAD Apache Software Foundation From e52899c95617a58f5cba23830ffcac1c3c0f1cfb Mon Sep 17 00:00:00 2001 From: GihanAyesh Date: Wed, 24 Jan 2024 14:25:17 +0530 Subject: [PATCH 096/308] json-path and json-smart version bump --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e4eec39bb5..e7886d5f8e 100644 --- a/pom.xml +++ b/pom.xml @@ -1468,7 +1468,7 @@ 1.1 3.4 3.2.0.wso2v1 - 2.4.0.wso2v3 + 2.6.0.wso2v2 1.5.3 2.3.1 1.69.0.wso2v1 @@ -1535,7 +1535,7 @@ 1.3.17.wso2v1 2.4.7 9.2 - 2.4.7 + 2.4.11 3.0.0.wso2v1 2.17.1 1.1 From e1244dfab6c5d68f7f8368cfc08b2001afdaed36 Mon Sep 17 00:00:00 2001 From: yasasrangika Date: Fri, 26 Jan 2024 11:38:55 +0530 Subject: [PATCH 097/308] Upgrade transport http version with latest release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 523ee812d3..9e5f12dd44 100644 --- a/pom.xml +++ b/pom.xml @@ -1586,7 +1586,7 @@ 1.5.2 1.17.0 4.1.104.Final - 6.3.49 + 6.3.50 1.1.1.wso2v3 5.8.0 1.11.0.wso2v5 From 83f865690dc0652526a70f673fc768cf0656949c Mon Sep 17 00:00:00 2001 From: Avishka-Shamendra Date: Fri, 26 Jan 2024 11:56:28 +0530 Subject: [PATCH 098/308] Add support to config java access control through JS in script mediator --- .../synapse/mediators/bsf/ScriptMediator.java | 90 +++++++++++++++++++ .../control/AccessControlConstants.java | 31 +++++++ .../access/control/AccessControlUtils.java | 66 ++++++++++++++ .../access/control/SandboxContextFactory.java | 42 +++++++++ .../control/SandboxNativeJavaObject.java | 57 ++++++++++++ .../access/control/SandboxWrapFactory.java | 42 +++++++++ .../control/config/AccessControlConfig.java | 51 +++++++++++ .../control/config/AccessControlListType.java | 32 +++++++ 8 files changed, 411 insertions(+) create mode 100644 modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/access/control/AccessControlConstants.java create mode 100644 modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/access/control/AccessControlUtils.java create mode 100644 modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/access/control/SandboxContextFactory.java create mode 100644 modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/access/control/SandboxNativeJavaObject.java create mode 100644 modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/access/control/SandboxWrapFactory.java create mode 100644 modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/access/control/config/AccessControlConfig.java create mode 100644 modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/access/control/config/AccessControlListType.java diff --git a/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java index b94bfb4693..befa753553 100644 --- a/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java +++ b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java @@ -37,14 +37,22 @@ import org.apache.synapse.core.axis2.Axis2MessageContext; import org.apache.synapse.mediators.AbstractMediator; import org.apache.synapse.mediators.Value; +import org.apache.synapse.mediators.bsf.access.control.AccessControlUtils; +import org.apache.synapse.mediators.bsf.access.control.SandboxContextFactory; +import org.apache.synapse.mediators.bsf.access.control.config.AccessControlConfig; +import org.apache.synapse.mediators.bsf.access.control.config.AccessControlListType; import org.apache.synapse.mediators.eip.EIPUtils; +import org.mozilla.javascript.ClassShutter; import org.mozilla.javascript.Context; +import org.mozilla.javascript.ContextFactory; import javax.activation.DataHandler; import javax.script.*; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; +import java.util.Arrays; +import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.Properties; @@ -52,6 +60,13 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; +import static org.apache.synapse.mediators.bsf.access.control.AccessControlConstants.CLASS_PREFIXES; +import static org.apache.synapse.mediators.bsf.access.control.AccessControlConstants.ENABLE; +import static org.apache.synapse.mediators.bsf.access.control.AccessControlConstants.LIMIT_CLASS_ACCESS_PREFIX; +import static org.apache.synapse.mediators.bsf.access.control.AccessControlConstants.LIMIT_NATIVE_OBJECT_ACCESS_PREFIX; +import static org.apache.synapse.mediators.bsf.access.control.AccessControlConstants.LIST_TYPE; +import static org.apache.synapse.mediators.bsf.access.control.AccessControlConstants.OBJECT_NAMES; + /** * A Synapse mediator that calls a function in any scripting language supported by the BSF. * The ScriptMediator supports scripts specified in-line or those loaded through a registry @@ -175,6 +190,16 @@ public class ScriptMediator extends AbstractMediator { */ private ScriptEngineFactory oracleNashornFactory; + /** + * Store java class access control config + */ + private AccessControlConfig classAccessControlConfig; + + /** + * Store java method access config + */ + private AccessControlConfig nativeObjectAccessControlConfig; + /** * Create a script mediator for the given language and given script source. * @@ -275,6 +300,9 @@ private boolean invokeScript(MessageContext synCtx) { //if the engine is Rhino then needs to set the class loader specifically if (language.equals("js")) { Context cx = Context.enter(); + if (classAccessControlConfig != null && classAccessControlConfig.isAccessControlEnabled()) { + cx.setClassShutter(createClassShutter()); + } cx.setApplicationClassLoader(this.loader); } @@ -646,6 +674,12 @@ protected void initScriptEngine() { this.multiThreadedEngine = scriptEngine.getFactory().getParameter("THREADING") != null; log.debug("Script mediator for language : " + language + " supports multithreading? : " + multiThreadedEngine); + + readAccessControlConfigurations(MiscellaneousUtil.loadProperties("synapse.properties")); + if (nativeObjectAccessControlConfig != null && nativeObjectAccessControlConfig.isAccessControlEnabled() && + !ContextFactory.hasExplicitGlobal()) { + ContextFactory.initGlobal(new SandboxContextFactory(nativeObjectAccessControlConfig)); + } } public String getLanguage() { @@ -717,4 +751,60 @@ private ScriptEngineFactory getOracleNashornFactory() { return null; } + /** + * Creates a class shutter, which will be used inside the context that executes the script. + * This class shutter will be used to control the visibility of classes specified in the access control config, + * to the script. + * @return + */ + private ClassShutter createClassShutter() { + return new ClassShutter() { + public boolean visibleToScripts(String className) { + /* + This will be used to compare whether the current fully qualified class name starts with + any of the provided set of strings provided in the access control config. + */ + Comparator startsWithComparator = new Comparator() { + @Override + public int compare(String o1, String o2) { + if (o1 == null || o2 == null) { + return -1; + } + if (o1.startsWith(o2)) { + return 1; + } + return -1; + } + }; + return AccessControlUtils.isAccessAllowed(className, classAccessControlConfig, startsWithComparator); + } + }; + } + + /** + * Reads and sets access control configurations. + * @param properties Synapse properties. + */ + private void readAccessControlConfigurations(Properties properties) { + String limitClassAccessEnabled = properties.getProperty(LIMIT_CLASS_ACCESS_PREFIX + ENABLE); + if (Boolean.parseBoolean(limitClassAccessEnabled)) { + String limitClassAccessListType = properties.getProperty(LIMIT_CLASS_ACCESS_PREFIX + LIST_TYPE); + String limitClassAccessClassPrefixes = properties.getProperty(LIMIT_CLASS_ACCESS_PREFIX + CLASS_PREFIXES); + this.classAccessControlConfig = new AccessControlConfig(true, + AccessControlListType.valueOf(limitClassAccessListType), + Arrays.asList(limitClassAccessClassPrefixes.split(","))); + } + + String limitNativeObjectAccessEnabled = properties.getProperty(LIMIT_NATIVE_OBJECT_ACCESS_PREFIX + ENABLE); + if (Boolean.parseBoolean(limitNativeObjectAccessEnabled)) { + String limitNativeObjectAccessListType = + properties.getProperty(LIMIT_NATIVE_OBJECT_ACCESS_PREFIX + LIST_TYPE); + String limitNativeObjectAccessClassPrefixes = + properties.getProperty(LIMIT_NATIVE_OBJECT_ACCESS_PREFIX + OBJECT_NAMES); + this.nativeObjectAccessControlConfig = new AccessControlConfig(true, + AccessControlListType.valueOf(limitNativeObjectAccessListType), + Arrays.asList(limitNativeObjectAccessClassPrefixes.split(","))); + } + } + } diff --git a/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/access/control/AccessControlConstants.java b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/access/control/AccessControlConstants.java new file mode 100644 index 0000000000..e0a182ad1c --- /dev/null +++ b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/access/control/AccessControlConstants.java @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com). + * + * 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.bsf.access.control; + +/** + * Constants related to Script Mediator access control. + */ +public class AccessControlConstants { + public static String LIMIT_CLASS_ACCESS_PREFIX = "limit_java_class_access_in_scripts."; + public static String LIMIT_NATIVE_OBJECT_ACCESS_PREFIX = "limit_java_native_object_access_in_scripts."; + public static String ENABLE = "enable"; + public static String LIST_TYPE = "list_type"; + public static String CLASS_PREFIXES = "class_prefixes"; + public static String OBJECT_NAMES = "object_names"; +} diff --git a/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/access/control/AccessControlUtils.java b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/access/control/AccessControlUtils.java new file mode 100644 index 0000000000..cb2bde75e1 --- /dev/null +++ b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/access/control/AccessControlUtils.java @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com). + * + * 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.bsf.access.control; + +import org.apache.synapse.mediators.bsf.access.control.config.AccessControlConfig; +import org.apache.synapse.mediators.bsf.access.control.config.AccessControlListType; + +import java.util.Comparator; +import java.util.List; + +/** + * Utility methods related to Script Mediator access control. + */ +public class AccessControlUtils { + + /** + * Returns whether the provided string which represents a Java class or native object is accessible or not. + * The allowing/blocking will be determined by the provided AccessControlConfig, based on the matching/comparing + * done as specified in the comparator. + * @param string Java class name or native object name. + * @param accessControlConfig Access control config of the Script Mediator. + * @param comparator The comparator based on which, the provided Java class/native object name is + * matched against the provided access control config. + * @return Whether the access is allowed or not. + */ + public static boolean isAccessAllowed(String string, AccessControlConfig accessControlConfig, + Comparator comparator) { + if (accessControlConfig == null || !accessControlConfig.isAccessControlEnabled()) { + return true; // Access control is not applicable + } + + List accessControlList = accessControlConfig.getAccessControlList(); + boolean doesMatchExist = false; + for (String item : accessControlList) { + if (comparator.compare(string, item) > -1) { + doesMatchExist = true; + break; + } + } + + if (accessControlConfig.getAccessControlListType() == AccessControlListType.BLOCK_LIST) { + return !doesMatchExist; + } + if (accessControlConfig.getAccessControlListType() == AccessControlListType.ALLOW_LIST) { + return doesMatchExist; + } + return true; // Ideally we won't reach here + } +} + diff --git a/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/access/control/SandboxContextFactory.java b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/access/control/SandboxContextFactory.java new file mode 100644 index 0000000000..c773940daa --- /dev/null +++ b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/access/control/SandboxContextFactory.java @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com). + * + * 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.bsf.access.control; + +import org.apache.synapse.mediators.bsf.access.control.config.AccessControlConfig; +import org.mozilla.javascript.Context; +import org.mozilla.javascript.ContextFactory; + +/** + * Represents the sandbox context factory - which is used with access control of the Script Mediator. + */ +public class SandboxContextFactory extends ContextFactory { + private AccessControlConfig nativeObjectAccessControlConfig; + + public SandboxContextFactory(AccessControlConfig nativeObjectAccessControlConfig) { + this.nativeObjectAccessControlConfig = nativeObjectAccessControlConfig; + } + + @Override + protected Context makeContext() { + Context cx = super.makeContext(); + cx.setWrapFactory(new SandboxWrapFactory(nativeObjectAccessControlConfig)); + return cx; + } +} + diff --git a/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/access/control/SandboxNativeJavaObject.java b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/access/control/SandboxNativeJavaObject.java new file mode 100644 index 0000000000..8c73c819a8 --- /dev/null +++ b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/access/control/SandboxNativeJavaObject.java @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com). + * + * 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.bsf.access.control; + +import org.apache.synapse.mediators.bsf.access.control.config.AccessControlConfig; +import org.mozilla.javascript.NativeJavaObject; +import org.mozilla.javascript.Scriptable; + +import java.util.Comparator; + +/** + * Provides native Java objects to the sandbox, after necessary access control filtering. + */ +public class SandboxNativeJavaObject extends NativeJavaObject { + private AccessControlConfig nativeObjectAccessControlConfig; + + public SandboxNativeJavaObject(Scriptable scope, Object javaObject, Class staticType, + AccessControlConfig nativeObjectAccessControlConfig) { + super(scope, javaObject, staticType); + this.nativeObjectAccessControlConfig = nativeObjectAccessControlConfig; + } + + @Override + public Object get(String name, Scriptable start) { + Comparator equalsComparator = new Comparator() { + @Override + public int compare(String o1, String o2) { + if (o1 != null && o1.equals(o2)) { + return 0; + } + return -1; + } + }; + if (AccessControlUtils.isAccessAllowed(name, nativeObjectAccessControlConfig, equalsComparator)) { + return super.get(name, start); + } + return NOT_FOUND; + } + +} + diff --git a/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/access/control/SandboxWrapFactory.java b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/access/control/SandboxWrapFactory.java new file mode 100644 index 0000000000..4c63fef31b --- /dev/null +++ b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/access/control/SandboxWrapFactory.java @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com). + * + * 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.bsf.access.control; + +import org.apache.synapse.mediators.bsf.access.control.config.AccessControlConfig; +import org.mozilla.javascript.Context; +import org.mozilla.javascript.Scriptable; +import org.mozilla.javascript.WrapFactory; + +/** + * Wraps sandbox native Java objects that are used in Script Mediator access control. + */ +public class SandboxWrapFactory extends WrapFactory { + private AccessControlConfig nativeObjectAccessControlConfig; + + public SandboxWrapFactory(AccessControlConfig nativeObjectAccessControlConfig) { + this.nativeObjectAccessControlConfig = nativeObjectAccessControlConfig; + } + + @Override + public Scriptable wrapAsJavaObject(Context cx, Scriptable scope, Object javaObject, Class staticType) { + return new SandboxNativeJavaObject(scope, javaObject, staticType, nativeObjectAccessControlConfig); + } +} + + diff --git a/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/access/control/config/AccessControlConfig.java b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/access/control/config/AccessControlConfig.java new file mode 100644 index 0000000000..977af6b25c --- /dev/null +++ b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/access/control/config/AccessControlConfig.java @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com). + * + * 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.bsf.access.control.config; + +import java.util.List; + +/** + * Holds the configurations that are used for access control in the Script Mediator. + */ +public class AccessControlConfig { + + private boolean isAccessControlEnabled; + private AccessControlListType accessControlListType; + private List accessControlList; + + public AccessControlConfig(boolean isAccessControlEnabled, AccessControlListType accessControlListType, + List accessControlList) { + this.isAccessControlEnabled = isAccessControlEnabled; + this.accessControlListType = accessControlListType; + this.accessControlList = accessControlList; + } + + public boolean isAccessControlEnabled() { + return isAccessControlEnabled; + } + + public AccessControlListType getAccessControlListType() { + return accessControlListType; + } + + public List getAccessControlList() { + return accessControlList; + } +} + diff --git a/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/access/control/config/AccessControlListType.java b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/access/control/config/AccessControlListType.java new file mode 100644 index 0000000000..a7cae8db0d --- /dev/null +++ b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/access/control/config/AccessControlListType.java @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com). + * + * 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.bsf.access.control.config; + +/** + + * Represents the type of access control list for the Script Mediator. + + */ + +public enum AccessControlListType { + ALLOW_LIST, + BLOCK_LIST + +} + From 13fbf535fcbf3eff4b8e7ac275b48235e7a6c3a2 Mon Sep 17 00:00:00 2001 From: Avishka-Shamendra Date: Fri, 26 Jan 2024 11:57:43 +0530 Subject: [PATCH 099/308] Add java access control config tests --- .../javascript/JavaScriptMediatorTest.java | 42 +++++++++++++++++++ .../src/test/resources/synapse.properties | 23 ++++++++++ 2 files changed, 65 insertions(+) create mode 100644 modules/extensions/src/test/resources/synapse.properties diff --git a/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/javascript/JavaScriptMediatorTest.java b/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/javascript/JavaScriptMediatorTest.java index d72a9c6dac..90962bb5af 100644 --- a/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/javascript/JavaScriptMediatorTest.java +++ b/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/javascript/JavaScriptMediatorTest.java @@ -21,6 +21,7 @@ import junit.framework.TestCase; import org.apache.synapse.MessageContext; +import org.apache.synapse.SynapseException; import org.apache.synapse.mediators.TestUtils; import org.apache.synapse.mediators.bsf.ScriptMediator; @@ -63,4 +64,45 @@ public void testInlineMediatorWithImports() throws Exception { boolean response = mediator.mediate(mc); assertTrue(response); } + + /** + * Test controlling access to java classes through JS + * @throws Exception + */ + public void testJavaClassAccessControl() throws Exception { + String scriptSourceCode = "var s = new java.util.ArrayList();\n"; + + + MessageContext mc = TestUtils.getTestContext("", null); + ScriptMediator mediator = new ScriptMediator("js", scriptSourceCode, null); + + System.setProperty("properties.file.path", System.getProperty("user.dir") + "/src/test/resources/file.properties"); + + try { + mediator.mediate(mc); + fail("Failed to enforce Java class access control configuration during mediation"); + } catch(SynapseException e) {} + + } + + /** + * Test controlling access to java methods through JS + * @throws Exception + */ + public void testJavaMethodAccessControl() throws Exception { + String scriptSourceCode = "var c = this.context.getClass();\n" + + "var hashmapConstructors = c.getClassLoader().loadClass(\"java.util.HashMap\").getDeclaredConstructors();\n"; + + + MessageContext mc = TestUtils.getTestContext("", null); + ScriptMediator mediator = new ScriptMediator("js", scriptSourceCode, null); + + System.setProperty("properties.file.path", System.getProperty("user.dir") + "/src/test/resources/file.properties"); + + try { + mediator.mediate(mc); + fail("Failed to enforce Java method access control configuration during mediation"); + } catch(SynapseException e) {} + + } } diff --git a/modules/extensions/src/test/resources/synapse.properties b/modules/extensions/src/test/resources/synapse.properties new file mode 100644 index 0000000000..66b38a2e5d --- /dev/null +++ b/modules/extensions/src/test/resources/synapse.properties @@ -0,0 +1,23 @@ +# +# Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com). +# +# 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. + +limit_java_class_access_in_scripts.enable=true +limit_java_class_access_in_scripts.list_type = BLOCK_LIST +limit_java_class_access_in_scripts.class_prefixes = java.util.ArrayList +limit_java_native_object_access_in_scripts.enable = true +limit_java_native_object_access_in_scripts.list_type = BLOCK_LIST +limit_java_native_object_access_in_scripts.object_names = getClassLoader,loadClass From f7bd88ef43b6300453b9e30985bb195e3923213d Mon Sep 17 00:00:00 2001 From: Avishka-Shamendra Date: Fri, 26 Jan 2024 13:03:14 +0530 Subject: [PATCH 100/308] Fix testJavaClassAccessControl and testJavaMethodAccessControl test cases --- .../javascript/JavaScriptMediatorTest.java | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/javascript/JavaScriptMediatorTest.java b/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/javascript/JavaScriptMediatorTest.java index 90962bb5af..e61b299668 100644 --- a/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/javascript/JavaScriptMediatorTest.java +++ b/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/javascript/JavaScriptMediatorTest.java @@ -72,16 +72,20 @@ public void testInlineMediatorWithImports() throws Exception { public void testJavaClassAccessControl() throws Exception { String scriptSourceCode = "var s = new java.util.ArrayList();\n"; - MessageContext mc = TestUtils.getTestContext("", null); ScriptMediator mediator = new ScriptMediator("js", scriptSourceCode, null); System.setProperty("properties.file.path", System.getProperty("user.dir") + "/src/test/resources/file.properties"); + boolean synapseExceptionThrown = false; try { mediator.mediate(mc); - fail("Failed to enforce Java class access control configuration during mediation"); - } catch(SynapseException e) {} + } catch(SynapseException e) { + synapseExceptionThrown = true; + } + + assertTrue("As Java class access control is configured " + + "SynapseException should be thrown during mediation", synapseExceptionThrown); } @@ -93,16 +97,20 @@ public void testJavaMethodAccessControl() throws Exception { String scriptSourceCode = "var c = this.context.getClass();\n" + "var hashmapConstructors = c.getClassLoader().loadClass(\"java.util.HashMap\").getDeclaredConstructors();\n"; - MessageContext mc = TestUtils.getTestContext("", null); ScriptMediator mediator = new ScriptMediator("js", scriptSourceCode, null); System.setProperty("properties.file.path", System.getProperty("user.dir") + "/src/test/resources/file.properties"); + boolean synapseExceptionThrown = false; try { mediator.mediate(mc); - fail("Failed to enforce Java method access control configuration during mediation"); - } catch(SynapseException e) {} + } catch(SynapseException e) { + synapseExceptionThrown = true; + } + + assertTrue("As Java method access control is configured " + + "SynapseException should be thrown during mediation", synapseExceptionThrown); } } From 32b86bd750f52395f820ce62ac244e9358c7eebc Mon Sep 17 00:00:00 2001 From: akila94 Date: Fri, 1 Dec 2023 09:17:48 +0530 Subject: [PATCH 101/308] Do cert revocation improvement --- .../RevocationVerificationManager.java | 96 ++++++++++++++++++- .../certificatevalidation/ocsp/OCSPCache.java | 2 +- .../ocsp/OCSPVerifier.java | 68 +++++++------ .../config/ClientConnFactoryBuilder.java | 2 +- .../config/ServerConnFactoryBuilder.java | 63 +++++++++++- .../core/ssl/SSLServerConnFactoryBuilder.java | 2 +- .../util/ConfigurationBuilderUtil.java | 31 ++++++ 7 files changed, 225 insertions(+), 39 deletions(-) diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationManager.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationManager.java index 338b8a8a36..e2aa54498a 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationManager.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationManager.java @@ -25,9 +25,21 @@ import org.apache.synapse.transport.certificatevalidation.ocsp.OCSPCache; import org.apache.synapse.transport.certificatevalidation.ocsp.OCSPVerifier; import org.apache.synapse.transport.certificatevalidation.pathvalidation.CertificatePathValidator; +import org.apache.synapse.transport.util.ConfigurationBuilderUtil; +import org.wso2.securevault.KeyStoreType; import java.io.ByteArrayInputStream; +import java.security.InvalidKeyException; +import java.security.KeyStore; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; +import java.security.SignatureException; +import java.security.cert.CertificateException; import java.security.cert.X509Certificate; +import java.util.Arrays; +import java.util.Enumeration; +import java.util.Optional; /** * Manager class responsible for verifying certificates. This class will use the available verifiers according to @@ -37,9 +49,11 @@ public class RevocationVerificationManager { private int cacheSize = Constants.CACHE_DEFAULT_ALLOCATED_SIZE; private int cacheDelayMins = Constants.CACHE_DEFAULT_DELAY_MINS; + private boolean isFullCertChainValidationEnabled = false; private static final Log log = LogFactory.getLog(RevocationVerificationManager.class); - public RevocationVerificationManager(Integer cacheAllocatedSize, Integer cacheDelayMins) { + public RevocationVerificationManager(Integer cacheAllocatedSize, Integer cacheDelayMins, + boolean isFullCertChainValidationEnabled) { if (cacheAllocatedSize != null && cacheAllocatedSize > Constants.CACHE_MIN_ALLOCATED_SIZE && cacheAllocatedSize < Constants.CACHE_MAX_ALLOCATED_SIZE) { @@ -49,6 +63,7 @@ public RevocationVerificationManager(Integer cacheAllocatedSize, Integer cacheDe && cacheDelayMins < Constants.CACHE_MAX_DELAY_MINS) { this.cacheDelayMins = cacheDelayMins; } + this.isFullCertChainValidationEnabled = isFullCertChainValidationEnabled; } /** @@ -62,6 +77,69 @@ public void verifyRevocationStatus(javax.security.cert.X509Certificate[] peerCer X509Certificate[] convertedCertificates = convert(peerCertificates); + Optional peerCertOpt; + X509Certificate peerCert = null; + X509Certificate issuerCert = null; + String alias; + + if (!isFullCertChainValidationEnabled) { + + if (log.isDebugEnabled()) { + log.debug("Retrieving the issuer certificate from client truststore since full certificate chain " + + "validation is disabled"); + } + + KeyStore trustStore; + Enumeration aliases; + String truststorePath = System.getProperty("javax.net.ssl.trustStore"); + String truststorePassword = System.getProperty("javax.net.ssl.trustStorePassword");; + + try { + trustStore = ConfigurationBuilderUtil.getKeyStore(truststorePath, truststorePassword, + KeyStoreType.JKS.toString()); + } catch (KeyStoreException e) { + throw new CertificateVerificationException("Error loading the truststore", e); + } + + try { + aliases = trustStore.aliases(); + } catch (KeyStoreException e) { + throw new CertificateVerificationException("Error while retrieving aliases from truststore", e); + } + + while (aliases.hasMoreElements()) { + alias = aliases.nextElement(); + try { + issuerCert = (X509Certificate) trustStore.getCertificate(alias); + } catch (KeyStoreException e) { + throw new CertificateVerificationException("Unable to read the certificate from truststore with " + + "the alias: " + alias, e); + } + + if (issuerCert == null) { + throw new CertificateVerificationException("Issuer certificate not found in truststore"); + } + + // When full chain validation is disabled, only one cert is expected + peerCertOpt = Arrays.stream(convertedCertificates).findFirst(); + if (peerCertOpt.isPresent()) { + peerCert = peerCertOpt.get(); + } else { + throw new CertificateVerificationException("Peer certificate is not provided"); + } + + try { + peerCert.verify(issuerCert.getPublicKey()); + log.debug("Valid issuer certificate found in the client truststore"); + break; + } catch (SignatureException | CertificateException | NoSuchAlgorithmException | InvalidKeyException | + NoSuchProviderException e) { + // Unable to verify the signature. Check with the next certificate. + log.error("Signature not matching for alias : " + alias + ", validate with next cert"); + } + } + } + long start = System.currentTimeMillis(); OCSPCache ocspCache = OCSPCache.getCache(); @@ -73,9 +151,19 @@ public void verifyRevocationStatus(javax.security.cert.X509Certificate[] peerCer for (RevocationVerifier verifier : verifiers) { try { - CertificatePathValidator pathValidator = new CertificatePathValidator(convertedCertificates, verifier); - pathValidator.validatePath(); - log.info("Path verification Successful. Took " + (System.currentTimeMillis() - start) + " ms."); + if (isFullCertChainValidationEnabled) { + log.debug("Doing full certificate chain validation"); + CertificatePathValidator pathValidator = new CertificatePathValidator(convertedCertificates, + verifier); + pathValidator.validatePath(); + log.info("Path verification Successful. Took " + (System.currentTimeMillis() - start) + " ms."); + } else { + if (log.isDebugEnabled()) { + log.debug("Validating client certificate with the issuer certificate retrieved from" + + "the trust store"); + } + verifier.checkRevocationStatus(peerCert, issuerCert); + } return; } catch (Exception e) { log.info(verifier.getClass().getSimpleName() + " failed."); diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPCache.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPCache.java index b01d509867..471323e6b3 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPCache.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPCache.java @@ -116,7 +116,7 @@ private synchronized void replaceNewCacheValue(OCSPCacheValue cacheValue){ try { String serviceUrl = cacheValue.serviceUrl; OCSPReq request = cacheValue.request; - OCSPResp response= ocspVerifier.getOCSPResponce(serviceUrl, request); + OCSPResp response= ocspVerifier.getOCSPResponse(serviceUrl, request); if (OCSPResponseStatus.SUCCESSFUL != response.getStatus()) throw new CertificateVerificationException("OCSP response status not SUCCESSFUL"); diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPVerifier.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPVerifier.java index d9a3a11039..393127d1b8 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPVerifier.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPVerifier.java @@ -20,6 +20,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.http.HttpResponse; +import org.apache.http.client.config.RequestConfig; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.ByteArrayEntity; +import org.apache.http.entity.ContentType; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; import org.bouncycastle.asn1.*; import org.bouncycastle.asn1.ocsp.OCSPObjectIdentifiers; import org.bouncycastle.asn1.ocsp.OCSPResponseStatus; @@ -52,6 +59,12 @@ public OCSPVerifier(OCSPCache cache) { this.cache = cache; } + public static final String CONTENT_TYPE = "Content-Type"; + public static final String JSON_TYPE ="application/json"; + public static final String ACCEPT_TYPE = "Accept"; + public static final String OCSP_REQUEST_TYPE = "application/ocsp-request"; + public static final String OCSP_RESPONSE_TYPE = "application/ocsp-response"; + /** * Gets the revocation status (Good, Revoked or Unknown) of the given peer certificate. * @@ -83,7 +96,7 @@ public RevocationStatus checkRevocationStatus(X509Certificate peerCert, X509Cert SingleResp[] responses; try { - OCSPResp ocspResponse = getOCSPResponce(serviceUrl, request); + OCSPResp ocspResponse = getOCSPResponse(serviceUrl, request); if (OCSPResponseStatus.SUCCESSFUL != ocspResponse.getStatus()) { continue; // Server didn't give the response right. } @@ -128,37 +141,34 @@ private RevocationStatus getRevocationStatus(SingleResp resp) throws Certificate * @throws CertificateVerificationException * */ - protected OCSPResp getOCSPResponce(String serviceUrl, OCSPReq request) throws CertificateVerificationException { + protected OCSPResp getOCSPResponse(String serviceUrl, OCSPReq request) throws CertificateVerificationException { - try { - //Todo: Use http client. - byte[] array = request.getEncoded(); - if (serviceUrl.startsWith("http")) { - HttpURLConnection con; - URL url = new URL(serviceUrl); - con = (HttpURLConnection) url.openConnection(); - con.setRequestProperty("Content-Type", "application/ocsp-request"); - con.setRequestProperty("Accept", "application/ocsp-response"); - con.setDoOutput(true); - OutputStream out = con.getOutputStream(); - DataOutputStream dataOut = new DataOutputStream(new BufferedOutputStream(out)); - dataOut.write(array); - - dataOut.flush(); - dataOut.close(); - - //Check errors in response: - if (con.getResponseCode() / 100 != 2) { - throw new CertificateVerificationException("Error getting ocsp response." + - "Response code is " + con.getResponseCode()); - } + if (log.isDebugEnabled()) { + log.debug("Initiating HTTP request to URL: " + serviceUrl + " to get the OCSP response"); + } + + try (CloseableHttpClient client = HttpClientBuilder.create().build()) { + HttpPost httpPost = new HttpPost(serviceUrl); + + // adding request timeout configurations + if (httpPost.getConfig() == null) { + httpPost.setConfig(RequestConfig.custom().build()); + } - //Get Response - InputStream in = (InputStream) con.getContent(); - return new OCSPResp(in); - } else { - throw new CertificateVerificationException("Only http is supported for ocsp calls"); + httpPost.addHeader(CONTENT_TYPE, OCSP_REQUEST_TYPE); + httpPost.addHeader(ACCEPT_TYPE, OCSP_RESPONSE_TYPE); + httpPost.setEntity(new ByteArrayEntity(request.getEncoded(), ContentType.create(JSON_TYPE))); + HttpResponse httpResponse = client.execute(httpPost); + + //Check errors in response, if response status code is not 200 (success) range, throws exception + // eg: if response code is 200 (success) or 201 (accepted) return true, + // if response code is 404 (not found) or 500 throw exception + if (httpResponse.getStatusLine().getStatusCode() / 100 != 2) { + throw new CertificateVerificationException("Error getting ocsp response." + + "Response code is " + httpResponse.getStatusLine().getStatusCode()); } + InputStream in = httpResponse.getEntity().getContent(); + return new OCSPResp(in); } catch (IOException e) { throw new CertificateVerificationException("Cannot get ocspResponse from url: " + serviceUrl, e); } diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ClientConnFactoryBuilder.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ClientConnFactoryBuilder.java index bf504b9999..5219a29fe5 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ClientConnFactoryBuilder.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ClientConnFactoryBuilder.java @@ -146,7 +146,7 @@ public ClientConnFactoryBuilder parseSSL() throws AxisFault { cacheDelay = new Integer(cacheDelayString); } catch (NumberFormatException e) { } - revocationVerifier = new RevocationVerificationManager(cacheSize, cacheDelay); + revocationVerifier = new RevocationVerificationManager(cacheSize, cacheDelay, true); } // Process HttpProtocols diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ServerConnFactoryBuilder.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ServerConnFactoryBuilder.java index 817c11e99b..fd4a9fe133 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ServerConnFactoryBuilder.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ServerConnFactoryBuilder.java @@ -26,6 +26,7 @@ import org.apache.axis2.description.Parameter; import org.apache.axis2.description.TransportInDescription; import org.apache.axis2.transport.base.ParamUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.http.HttpHost; @@ -305,8 +306,22 @@ public ServerConnFactoryBuilder parseSSL() throws AxisFault { cacheSize = new Integer(cacheSizeString); cacheDelay = new Integer(cacheDelayString); } - catch (NumberFormatException e) {} - revocationVerifier = new RevocationVerificationManager(cacheSize, cacheDelay); + catch (NumberFormatException e) { + throw new AxisFault("Cache size or Cache delay values are malformed", e); + } + + // Checking whether the full certificate chain validation is enabled or not. + boolean isFullCertChainValidationEnabled = true; + OMElement isFullCertChainValidationConfig = cvp.getParameterElement() + .getFirstChildWithName(new QName("FullChainValidation")); + + if (isFullCertChainValidationConfig != null + && StringUtils.equals("false", isFullCertChainValidationConfig.getText())) { + isFullCertChainValidationEnabled = false; + } + + revocationVerifier = new RevocationVerificationManager(cacheSize, cacheDelay, + isFullCertChainValidationEnabled); } ssl = createSSLContext(keyStoreEl, trustStoreEl, clientAuthEl, httpsProtocolsEl, preferredCiphersEl, @@ -324,6 +339,8 @@ public ServerConnFactoryBuilder parseMultiProfileSSL() throws AxisFault { OMElement profilesEl = profileParam.getParameterElement(); SecretResolver secretResolver = SecretResolverFactory.create(profilesEl, true); Iterator profiles = profilesEl.getChildrenWithName(new QName("profile")); + RevocationVerificationManager revocationVerifier = null; + while (profiles.hasNext()) { OMElement profileEl = (OMElement) profiles.next(); OMElement bindAddressEl = profileEl.getFirstChildWithName(new QName("bindAddress")); @@ -341,8 +358,48 @@ public ServerConnFactoryBuilder parseMultiProfileSSL() throws AxisFault { OMElement preferredCiphersEl = profileEl.getFirstChildWithName(new QName(NhttpConstants.PREFERRED_CIPHERS)); final Parameter sslpParameter = transportIn.getParameter("SSLProtocol"); final String sslProtocol = sslpParameter != null ? sslpParameter.getValue().toString() : "TLS"; + + /* If multi SSL profiles are configured, checking whether the certificate revocation verifier is + configured and full certificate chain validation is enabled or not. */ + if (profileEl.getFirstChildWithName(new QName("CertificateRevocationVerifier")) != null) { + + Integer cacheSize = null; + Integer cacheDelay = null; + + OMElement revocationVerifierConfig = profileEl + .getFirstChildWithName(new QName("CertificateRevocationVerifier")); + OMElement revocationEnabled = revocationVerifierConfig + .getFirstChildWithName(new QName("Enable")); + + if (revocationEnabled != null && "true".equals(revocationEnabled.getText())) { + String cacheSizeString = revocationVerifierConfig + .getFirstChildWithName(new QName("CacheSize")).getText(); + String cacheDelayString = revocationVerifierConfig + .getFirstChildWithName(new QName("CacheDelay")).getText(); + + try { + cacheSize = new Integer(cacheSizeString); + cacheDelay = new Integer(cacheDelayString); + } catch (NumberFormatException e) { + throw new AxisFault("Cache size or Cache delay values are malformed", e); + } + } + + boolean isFullCertChainValidationEnabled = true; + OMElement isFullCertChainValidationConfig = revocationVerifierConfig + .getFirstChildWithName(new QName("FullChainValidation")); + + if (isFullCertChainValidationConfig != null + && StringUtils.equals("false", isFullCertChainValidationConfig.getText())) { + isFullCertChainValidationEnabled = false; + } + + revocationVerifier = new RevocationVerificationManager(cacheSize, cacheDelay, + isFullCertChainValidationEnabled); + } + SSLContextDetails ssl = createSSLContext(keyStoreEl, trustStoreEl, clientAuthEl, httpsProtocolsEl, - preferredCiphersEl, null, sslProtocol, secretResolver); + preferredCiphersEl, revocationVerifier, sslProtocol, secretResolver); if (sslByIPMap == null) { sslByIPMap = new HashMap(); } diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/core/ssl/SSLServerConnFactoryBuilder.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/core/ssl/SSLServerConnFactoryBuilder.java index 282900b956..4b552bd799 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/core/ssl/SSLServerConnFactoryBuilder.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/core/ssl/SSLServerConnFactoryBuilder.java @@ -70,7 +70,7 @@ public ServerConnFactoryBuilder parseSSL(OMElement keyStoreEl, OMElement trustSt } catch (NumberFormatException e) { log.error("Please specify correct Integer numbers for CacheDelay and CacheSize"); } - revocationVerifier = new RevocationVerificationManager(cacheSize, cacheDelay); + revocationVerifier = new RevocationVerificationManager(cacheSize, cacheDelay, true); } ssl = createSSLContext(keyStoreEl, trustStoreEl, clientAuthEl, httpsProtocolsEl, preferredCiphers, revocationVerifier, diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/util/ConfigurationBuilderUtil.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/util/ConfigurationBuilderUtil.java index f5a81c1572..cadb9e499b 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/util/ConfigurationBuilderUtil.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/util/ConfigurationBuilderUtil.java @@ -21,6 +21,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.security.KeyStore; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.security.cert.CertificateException; import java.util.Properties; public class ConfigurationBuilderUtil { @@ -171,4 +178,28 @@ public static String getStringProperty(String name, String def, Properties props return val == null ? def : val; } + /** + * Returns the keystore of the given file path. + * + * @param keyStoreFilePath the keystore file path + * @param keyStorePassword the keystore password + * @param keyStoreType the keystore type + * @return KeyStore + * @throws KeyStoreException On error while creating keystore + */ + public static KeyStore getKeyStore(String keyStoreFilePath, String keyStorePassword, String keyStoreType) + throws KeyStoreException { + + String file = new File(keyStoreFilePath).getAbsolutePath(); + try (FileInputStream keyStoreFileInputStream = new FileInputStream(file)) { + KeyStore keyStore = KeyStore.getInstance(keyStoreType); + keyStore.load(keyStoreFileInputStream, keyStorePassword.toCharArray()); + return keyStore; + } catch (IOException | NoSuchAlgorithmException | CertificateException e) { + String errorMessage = String.format("Keystore file does not exist in the path as configured " + + "in '%s' property.", keyStoreFilePath); + throw new KeyStoreException(errorMessage); + } + } + } From d56091b13082cdf04fe43bb600249f25c52ebf89 Mon Sep 17 00:00:00 2001 From: akila94 Date: Mon, 1 Jan 2024 19:47:55 +0530 Subject: [PATCH 102/308] Add trust store holder and cache --- .../RevocationVerificationManager.java | 113 +++++++---- .../cache/CertCache.java | 188 ++++++++++++++++++ .../ocsp/OCSPVerifier.java | 29 ++- .../config/ClientConnFactoryBuilder.java | 119 ++++++----- .../config/ServerConnFactoryBuilder.java | 68 ++++--- .../nhttp/config/TrustStoreHolder.java | 60 ++++++ .../passthru/PassThroughHttpListener.java | 7 +- .../passthru/PassThroughHttpSender.java | 8 +- .../util/ConfigurationBuilderUtil.java | 32 --- 9 files changed, 459 insertions(+), 165 deletions(-) create mode 100644 modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/cache/CertCache.java create mode 100644 modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/TrustStoreHolder.java diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationManager.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationManager.java index e2aa54498a..683df58258 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationManager.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationManager.java @@ -20,13 +20,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.synapse.transport.certificatevalidation.cache.CertCache; import org.apache.synapse.transport.certificatevalidation.crl.CRLCache; import org.apache.synapse.transport.certificatevalidation.crl.CRLVerifier; import org.apache.synapse.transport.certificatevalidation.ocsp.OCSPCache; import org.apache.synapse.transport.certificatevalidation.ocsp.OCSPVerifier; import org.apache.synapse.transport.certificatevalidation.pathvalidation.CertificatePathValidator; -import org.apache.synapse.transport.util.ConfigurationBuilderUtil; -import org.wso2.securevault.KeyStoreType; +import org.apache.synapse.transport.nhttp.config.TrustStoreHolder; import java.io.ByteArrayInputStream; import java.security.InvalidKeyException; @@ -52,6 +52,18 @@ public class RevocationVerificationManager { private boolean isFullCertChainValidationEnabled = false; private static final Log log = LogFactory.getLog(RevocationVerificationManager.class); + public RevocationVerificationManager(Integer cacheAllocatedSize, Integer cacheDelayMins) { + + if (cacheAllocatedSize != null && cacheAllocatedSize > Constants.CACHE_MIN_ALLOCATED_SIZE + && cacheAllocatedSize < Constants.CACHE_MAX_ALLOCATED_SIZE) { + this.cacheSize = cacheAllocatedSize; + } + if (cacheDelayMins != null && cacheDelayMins > Constants.CACHE_MIN_DELAY_MINS + && cacheDelayMins < Constants.CACHE_MAX_DELAY_MINS) { + this.cacheDelayMins = cacheDelayMins; + } + } + public RevocationVerificationManager(Integer cacheAllocatedSize, Integer cacheDelayMins, boolean isFullCertChainValidationEnabled) { @@ -67,8 +79,15 @@ public RevocationVerificationManager(Integer cacheAllocatedSize, Integer cacheDe } /** - * This method first tries to verify the given certificate chain using OCSP since OCSP verification is - * faster. If that fails it tries to do the verification using CRL. + * This method verifies the given certificate chain or given peer certificate for revocation based on the + * requirement of full certificate chain validation. If full chain validation is enabled (default), + * the full certificate chain will be validated before checking the chain for revocation. If full chain validation + * is disabled, this method expects a single peer certificate, and it is validated with the immediate issuer + * certificate in the truststore (The truststore must contain the immediate issuer of the peer certificate). + * In both cases, OCSP and CRL verifiers are used for revocation verification. + * 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. * @throws CertificateVerificationException */ @@ -89,53 +108,71 @@ public void verifyRevocationStatus(javax.security.cert.X509Certificate[] peerCer "validation is disabled"); } - KeyStore trustStore; + KeyStore trustStore = TrustStoreHolder.getInstance().getClientTrustStore(); Enumeration aliases; - String truststorePath = System.getProperty("javax.net.ssl.trustStore"); - String truststorePassword = System.getProperty("javax.net.ssl.trustStorePassword");; - try { - trustStore = ConfigurationBuilderUtil.getKeyStore(truststorePath, truststorePassword, - KeyStoreType.JKS.toString()); - } catch (KeyStoreException e) { - throw new CertificateVerificationException("Error loading the truststore", e); + // When full chain validation is disabled, only one cert is expected + peerCertOpt = Arrays.stream(convertedCertificates).findFirst(); + if (peerCertOpt.isPresent()) { + peerCert = peerCertOpt.get(); + } else { + throw new CertificateVerificationException("Peer certificate is not provided"); } - try { - aliases = trustStore.aliases(); - } catch (KeyStoreException e) { - throw new CertificateVerificationException("Error while retrieving aliases from truststore", e); - } + // Get cert cache and initialize it + CertCache certCache = CertCache.getCache(); + certCache.init(cacheSize,cacheDelayMins); + + if (certCache.getCacheValue(peerCert.getSerialNumber().toString()) == null) { - while (aliases.hasMoreElements()) { - alias = aliases.nextElement(); try { - issuerCert = (X509Certificate) trustStore.getCertificate(alias); + aliases = trustStore.aliases(); } catch (KeyStoreException e) { - throw new CertificateVerificationException("Unable to read the certificate from truststore with " + - "the alias: " + alias, e); + throw new CertificateVerificationException("Error while retrieving aliases from truststore", e); } - if (issuerCert == null) { - throw new CertificateVerificationException("Issuer certificate not found in truststore"); - } - - // When full chain validation is disabled, only one cert is expected - peerCertOpt = Arrays.stream(convertedCertificates).findFirst(); - if (peerCertOpt.isPresent()) { - peerCert = peerCertOpt.get(); - } else { - throw new CertificateVerificationException("Peer certificate is not provided"); + while (aliases.hasMoreElements()) { + try { + alias = aliases.nextElement(); + try { + issuerCert = (X509Certificate) trustStore.getCertificate(alias); + } catch (KeyStoreException e) { + throw new CertificateVerificationException("Unable to read the certificate from " + + "truststore with the alias: " + alias, e); + } + + if (issuerCert == null) { + throw new CertificateVerificationException("Issuer certificate not found in truststore"); + } + + peerCert.verify(issuerCert.getPublicKey()); + log.debug("Valid issuer certificate found in the client truststore. Caching.."); + + // Store the valid issuer cert in cache for future use + certCache.setCacheValue(peerCert.getSerialNumber().toString(), issuerCert); + if (log.isDebugEnabled()) { + log.debug("Issuer certificate with serial number: " + issuerCert.getSerialNumber() + .toString() + " has been cached against the serial number: " + peerCert + .getSerialNumber().toString() + " of the peer certificate."); + } + break; + } catch (SignatureException | CertificateException | NoSuchAlgorithmException | + InvalidKeyException | + NoSuchProviderException e) { + // Unable to verify the signature. Check with the next certificate. + //todo: change this to a debug log after testing. + log.error("Unable to verify the signature, checking with the next certificate..."); + } } - + } else { + X509Certificate cachedIssuerCert = certCache.getCacheValue(peerCert.getSerialNumber().toString()); try { - peerCert.verify(issuerCert.getPublicKey()); - log.debug("Valid issuer certificate found in the client truststore"); - break; - } catch (SignatureException | CertificateException | NoSuchAlgorithmException | InvalidKeyException | + peerCert.verify(cachedIssuerCert.getPublicKey()); + } catch (SignatureException | CertificateException | NoSuchAlgorithmException | + InvalidKeyException | NoSuchProviderException e) { // Unable to verify the signature. Check with the next certificate. - log.error("Signature not matching for alias : " + alias + ", validate with next cert"); + log.error("Signature not matching for alias validate with next cert"); } } } diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/cache/CertCache.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/cache/CertCache.java new file mode 100644 index 0000000000..71a483539d --- /dev/null +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/cache/CertCache.java @@ -0,0 +1,188 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF 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.transport.certificatevalidation.cache; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.synapse.commons.jmx.MBeanRegistrar; + +import java.security.cert.X509Certificate; +import java.util.Iterator; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +/** + * This is a cache to store a certificate against a unique string (can be a serial number). This is a singleton since + * more than one cache of this kind should not be allowed. This cache can be used by any place where certificate + * caching is needed. + */ +public class CertCache implements ManageableCache { + + private static volatile CertCache cache; + private static volatile Map hashMap = new ConcurrentHashMap(); + private static volatile Iterator> iterator = hashMap.entrySet().iterator(); + private static volatile CacheManager cacheManager; + private static final Log log = LogFactory.getLog(CertCache.class); + + private CertCache() { + } + + public static CertCache getCache() { + //Double-checked locking + if (cache == null) { + synchronized (CertCache.class) { + if (cache == null) { + cache = new CertCache(); + } + } + } + return cache; + } + + /** + * This initialize the Cache with a CacheManager. If this method is called, a cache manager will not be used. + * + * @param size max size of the cache + * @param delay defines how frequently the CacheManager will be started + */ + public void init(int size, int delay) { + if (cacheManager == null) { + synchronized (CertCache.class) { + if (cacheManager == null) { + cacheManager = new CacheManager(cache, size, delay); + CacheController mbean = new CacheController(cache,cacheManager); + MBeanRegistrar.getInstance().registerMBean(mbean, "CacheController", "CertCacheController"); + } + } + } + } + + public synchronized X509Certificate getCacheValue(String serialNumber) { + CertCache.TempCacheValue cacheValue = hashMap.get(serialNumber); + if (cacheValue != null) { + return cacheValue.getValue(); + } else + return null; + } + + @Override + public ManageableCacheValue getNextCacheValue() { + + //changes to the map are reflected on the keySet. And its iterator is weakly consistent. so will never + //throw concurrent modification exception. + if (iterator.hasNext()) { + return hashMap.get(iterator.next().getKey()); + } else { + resetIterator(); + return null; + } + } + + @Override + public int getCacheSize() { + + return hashMap.size(); + } + + @Override + public void resetIterator() { + + iterator = hashMap.entrySet().iterator(); + } + + public static void resetCache() { + + hashMap.clear(); + } + + public synchronized void setCacheValue(String serialNumber, X509Certificate cert) { + CertCache.TempCacheValue cacheValue = new CertCache.TempCacheValue(serialNumber, cert); + + if (log.isDebugEnabled()) { + log.debug("Before set - HashMap size " + hashMap.size()); + } + hashMap.put(serialNumber, cacheValue); + if (log.isDebugEnabled()) { + log.debug("After set - HashMap size " + hashMap.size()); + } + } + + public synchronized void removeCacheValue(String serialNumber) { + + if (log.isDebugEnabled()) { + log.debug("Before remove - HashMap size " + hashMap.size()); + } + hashMap.remove(serialNumber); + if (log.isDebugEnabled()) { + log.debug("After remove - HashMap size " + hashMap.size()); + } + } + + /** + * This is the wrapper class of the actual cache value which is a X509CRL. + */ + private class TempCacheValue implements ManageableCacheValue { + + private final String serialNumber; + private final X509Certificate issuerCertificate; + private final long timeStamp = System.currentTimeMillis(); + + public TempCacheValue(String serialNumber, X509Certificate issuerCertificate) { + + this.serialNumber = serialNumber; + this.issuerCertificate = issuerCertificate; + } + + public X509Certificate getValue() { + + return issuerCertificate; + } + + public String getKey() { + + return serialNumber; + } + + /** + * CRL has a validity period. We can reuse a downloaded CRL within that period. + */ + public boolean isValid() { + + // Will be always return true since we only set defined data. + return true; + } + + public long getTimeStamp() { + + return timeStamp; + } + + /** + * Used by cacheManager to remove invalid entries. + */ + public void removeThisCacheValue() { + + removeCacheValue(serialNumber); + } + + public void updateCacheWithNewValue() { + // No implementation needed since there are no scenarios of the cache value being invalid. + } + } +} diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPVerifier.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPVerifier.java index 393127d1b8..5744365730 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPVerifier.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPVerifier.java @@ -27,20 +27,35 @@ import org.apache.http.entity.ContentType; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; -import org.bouncycastle.asn1.*; +import org.apache.synapse.transport.certificatevalidation.CertificateVerificationException; +import org.apache.synapse.transport.certificatevalidation.Constants; +import org.apache.synapse.transport.certificatevalidation.RevocationStatus; +import org.apache.synapse.transport.certificatevalidation.RevocationVerifier; +import org.bouncycastle.asn1.ASN1InputStream; +import org.bouncycastle.asn1.DERIA5String; +import org.bouncycastle.asn1.DEROctetString; import org.bouncycastle.asn1.ocsp.OCSPObjectIdentifiers; import org.bouncycastle.asn1.ocsp.OCSPResponseStatus; -import org.bouncycastle.asn1.x509.*; +import org.bouncycastle.asn1.x509.AccessDescription; +import org.bouncycastle.asn1.x509.AuthorityInformationAccess; +import org.bouncycastle.asn1.x509.Extension; +import org.bouncycastle.asn1.x509.Extensions; +import org.bouncycastle.asn1.x509.GeneralName; import org.bouncycastle.cert.X509CertificateHolder; -import org.bouncycastle.cert.ocsp.*; -import org.apache.synapse.transport.certificatevalidation.*; +import org.bouncycastle.cert.ocsp.BasicOCSPResp; +import org.bouncycastle.cert.ocsp.CertificateID; +import org.bouncycastle.cert.ocsp.CertificateStatus; +import org.bouncycastle.cert.ocsp.OCSPReq; +import org.bouncycastle.cert.ocsp.OCSPReqBuilder; +import org.bouncycastle.cert.ocsp.OCSPResp; +import org.bouncycastle.cert.ocsp.SingleResp; import org.bouncycastle.operator.DigestCalculatorProvider; import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; import java.math.BigInteger; -import java.net.HttpURLConnection; -import java.net.URL; import java.security.Provider; import java.security.Security; import java.security.cert.X509Certificate; diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ClientConnFactoryBuilder.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ClientConnFactoryBuilder.java index 5219a29fe5..44710be55a 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ClientConnFactoryBuilder.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ClientConnFactoryBuilder.java @@ -19,27 +19,6 @@ package org.apache.synapse.transport.nhttp.config; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.security.GeneralSecurityException; -import java.security.KeyStore; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; -import java.util.Map; - -import javax.net.ssl.KeyManager; -import javax.net.ssl.KeyManagerFactory; -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManager; -import javax.net.ssl.TrustManagerFactory; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamException; - -import org.apache.axiom.om.OMAttribute; import org.apache.axiom.om.OMElement; import org.apache.axiom.om.impl.builder.StAXOMBuilder; import org.apache.axis2.AxisFault; @@ -52,7 +31,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.http.conn.ssl.X509HostnameVerifier; import org.apache.http.params.HttpParams; -import org.apache.synapse.commons.crypto.CryptoConstants; import org.apache.synapse.transport.certificatevalidation.RevocationVerificationManager; import org.apache.synapse.transport.exceptions.InvalidConfigurationException; import org.apache.synapse.transport.http.conn.ClientConnFactory; @@ -63,8 +41,25 @@ import org.apache.synapse.transport.nhttp.util.SecureVaultValueReader; import org.wso2.securevault.SecretResolver; import org.wso2.securevault.SecretResolverFactory; -import org.wso2.securevault.SecureVaultException; -import org.wso2.securevault.commons.MiscellaneousUtil; + +import javax.net.ssl.KeyManager; +import javax.net.ssl.KeyManagerFactory; +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManager; +import javax.net.ssl.TrustManagerFactory; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.security.GeneralSecurityException; +import java.security.KeyStore; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Map; public class ClientConnFactoryBuilder { @@ -76,6 +71,7 @@ public class ClientConnFactoryBuilder { private SSLContextDetails ssl = null; private Map sslByHostMap = null; private ConfigurationContext configurationContext; + TrustStoreHolder trustStoreHolder = TrustStoreHolder.getInstance(); public ClientConnFactoryBuilder(final TransportOutDescription transportOut, ConfigurationContext configurationContext) { this(transportOut); @@ -87,7 +83,7 @@ public ClientConnFactoryBuilder(final TransportOutDescription transportOut) { this.transportOut = transportOut; this.name = transportOut.getName().toUpperCase(Locale.US); } - + public ClientConnFactoryBuilder parseSSL() throws AxisFault { Parameter keyParam = transportOut.getParameter("keystore"); Parameter trustParam = transportOut.getParameter("truststore"); @@ -146,7 +142,7 @@ public ClientConnFactoryBuilder parseSSL() throws AxisFault { cacheDelay = new Integer(cacheDelayString); } catch (NumberFormatException e) { } - revocationVerifier = new RevocationVerificationManager(cacheSize, cacheDelay, true); + revocationVerifier = new RevocationVerificationManager(cacheSize, cacheDelay); } // Process HttpProtocols @@ -353,28 +349,37 @@ private SSLContext createSSLContext(OMElement keyStoreElt, OMElement trustStoreE log.warn(name + " Ignoring novalidatecert parameter since a truststore has been specified"); } - String location = trustStoreElt.getFirstChildWithName(new QName("Location")).getText(); - String type = trustStoreElt.getFirstChildWithName(new QName("Type")).getText(); - OMElement passwordElement = trustStoreElt.getFirstChildWithName(new QName("Password")); - if (passwordElement == null) { - throw new AxisFault("Cannot proceed because Password element is missing in TrustStore"); - } - String storePassword = SecureVaultValueReader.getSecureVaultValue(resolver, passwordElement); - FileInputStream fis = null; + String location = trustStoreElt.getFirstChildWithName(new QName("Location")).getText();; + KeyStore trustStore; + try { - KeyStore trustStore = KeyStore.getInstance(type); - fis = new FileInputStream(location); - if (log.isDebugEnabled()) { - log.debug(name + " Loading Trust Keystore from : " + location); + if (trustStoreHolder.getClientTrustStore() == null) { + String type = trustStoreElt.getFirstChildWithName(new QName("Type")).getText(); + OMElement passwordElement = trustStoreElt.getFirstChildWithName(new QName("Password")); + + if (passwordElement == null) { + throw new AxisFault("Cannot proceed because Password element is missing in TrustStore"); + } + + String storePassword = SecureVaultValueReader.getSecureVaultValue(resolver, passwordElement); + trustStore = KeyStore.getInstance(type); + fis = new FileInputStream(location); + + if (log.isDebugEnabled()) { + log.debug(name + " Loading Trust Keystore from : " + location); + } + + trustStore.load(fis, storePassword.toCharArray()); + trustStoreHolder.setClientTrustStore(trustStore); + } else { + trustStore = trustStoreHolder.getClientTrustStore(); } - trustStore.load(fis, storePassword.toCharArray()); TrustManagerFactory trustManagerfactory = TrustManagerFactory.getInstance( TrustManagerFactory.getDefaultAlgorithm()); trustManagerfactory.init(trustStore); trustManagers = trustManagerfactory.getTrustManagers(); - } catch (GeneralSecurityException gse) { log.error(name + " Error loading Key store : " + location, gse); throw new AxisFault("Error loading Key store : " + location, gse); @@ -424,9 +429,9 @@ private SSLContext createSSLContext(OMElement keyStoreElt, OMElement trustStoreE keyStoreElt.getFirstChildWithName(new QName("Password"))); String keyPassword = SecureVaultValueReader.getSecureVaultValue(secretResolver, keyStoreElt.getFirstChildWithName(new QName("KeyPassword"))); - - try (FileInputStream fis = new FileInputStream(location)) { - KeyStore keyStore = KeyStore.getInstance(type); + + try (FileInputStream fis = new FileInputStream(location)) { + KeyStore keyStore = KeyStore.getInstance(type); if (log.isDebugEnabled()) { log.debug(name + " Loading Identity Keystore from : " + location); } @@ -443,7 +448,7 @@ private SSLContext createSSLContext(OMElement keyStoreElt, OMElement trustStoreE } catch (IOException ioe) { log.error(name + " Error opening Keystore : " + location, ioe); throw new AxisFault("Error opening Keystore : " + location, ioe); - } + } } if (trustStoreElt != null) { @@ -451,31 +456,35 @@ private SSLContext createSSLContext(OMElement keyStoreElt, OMElement trustStoreE log.warn(name + " Ignoring novalidatecert parameter since a truststore has been specified"); } + KeyStore trustStore; String location = trustStoreElt.getFirstChildWithName(new QName("Location")).getText(); - String type = trustStoreElt.getFirstChildWithName(new QName("Type")).getText(); - String storePassword = SecureVaultValueReader - .getSecureVaultValue(secretResolver, trustStoreElt.getFirstChildWithName(new QName("Password"))); - + try (FileInputStream fis = new FileInputStream(location)) { - KeyStore trustStore = KeyStore.getInstance(type); - - if (log.isDebugEnabled()) { - log.debug(name + " Loading Trust Keystore from : " + location); + if (trustStoreHolder.getClientTrustStore() == null) { + String type = trustStoreElt.getFirstChildWithName(new QName("Type")).getText(); + String storePassword = SecureVaultValueReader.getSecureVaultValue(secretResolver, + trustStoreElt.getFirstChildWithName(new QName("Password"))); + trustStore = KeyStore.getInstance(type); + if (log.isDebugEnabled()) { + log.debug(name + " Loading Trust Keystore from : " + location); + } + trustStore.load(fis, storePassword.toCharArray()); + trustStoreHolder.setClientTrustStore(trustStore); + } else { + trustStore = trustStoreHolder.getClientTrustStore(); } - trustStore.load(fis, storePassword.toCharArray()); TrustManagerFactory trustManagerfactory = TrustManagerFactory.getInstance( TrustManagerFactory.getDefaultAlgorithm()); trustManagerfactory.init(trustStore); trustManagers = trustManagerfactory.getTrustManagers(); - } catch (GeneralSecurityException gse) { log.error(name + " Error loading Key store : " + location, gse); throw new AxisFault("Error loading Key store : " + location, gse); } catch (IOException ioe) { log.error(name + " Error opening Key store : " + location, ioe); throw new AxisFault("Error opening Key store : " + location, ioe); - } + } } else if (novalidatecert) { if (log.isWarnEnabled()) { log.warn(name + " Server certificate validation (trust) has been disabled. " + diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ServerConnFactoryBuilder.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ServerConnFactoryBuilder.java index fd4a9fe133..483d5b56ee 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ServerConnFactoryBuilder.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ServerConnFactoryBuilder.java @@ -41,6 +41,13 @@ import org.wso2.securevault.SecretResolver; import org.wso2.securevault.SecretResolverFactory; +import javax.net.ssl.KeyManager; +import javax.net.ssl.KeyManagerFactory; +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManager; +import javax.net.ssl.TrustManagerFactory; +import javax.net.ssl.X509KeyManager; +import javax.xml.namespace.QName; import java.io.FileInputStream; import java.io.IOException; import java.net.InetSocketAddress; @@ -55,14 +62,6 @@ import java.util.Locale; import java.util.Map; -import javax.net.ssl.KeyManager; -import javax.net.ssl.KeyManagerFactory; -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManager; -import javax.net.ssl.TrustManagerFactory; -import javax.net.ssl.X509KeyManager; -import javax.xml.namespace.QName; - public class ServerConnFactoryBuilder { private final Log log = LogFactory.getLog(ServerConnFactoryBuilder.class); @@ -90,13 +89,13 @@ public ServerConnFactoryBuilder(final TransportInDescription transportIn, final } protected SSLContextDetails createSSLContext( - final OMElement keyStoreEl, - final OMElement trustStoreEl, - final OMElement cientAuthEl, - final OMElement httpsProtocolsEl, - final OMElement preferredCiphersEl, - final RevocationVerificationManager verificationManager, - final String sslProtocol) throws AxisFault { + final OMElement keyStoreEl, + final OMElement trustStoreEl, + final OMElement cientAuthEl, + final OMElement httpsProtocolsEl, + final OMElement preferredCiphersEl, + final RevocationVerificationManager verificationManager, + final String sslProtocol) throws AxisFault { SecretResolver secretResolver; if (configurationContext != null && configurationContext.getAxisConfiguration() != null) { @@ -183,25 +182,38 @@ protected SSLContextDetails createSSLContext( } if (trustStoreEl != null) { - String location = getValueOfElementWithLocalName(trustStoreEl, "Location"); - String type = getValueOfElementWithLocalName(trustStoreEl, "Type"); - OMElement storePasswordEl = trustStoreEl.getFirstChildWithName(new QName("Password")); - if (storePasswordEl == null) { - throw new AxisFault("Cannot proceed because Password element is missing in TrustStore"); - } - String storePassword = SecureVaultValueReader.getSecureVaultValue(secretResolver, storePasswordEl); + TrustStoreHolder trustStoreHolder = TrustStoreHolder.getInstance(); FileInputStream fis = null; + String location = getValueOfElementWithLocalName(trustStoreEl, "Location"); + KeyStore trustStore; + try { - KeyStore trustStore = KeyStore.getInstance(type); - fis = new FileInputStream(location); - if (log.isDebugEnabled()) { - log.debug(name + " Loading Trust Keystore from : " + location); + if (trustStoreHolder.getClientTrustStore() == null) { + + String type = getValueOfElementWithLocalName(trustStoreEl, "Type"); + OMElement storePasswordEl = trustStoreEl.getFirstChildWithName(new QName("Password")); + + if (storePasswordEl == null) { + throw new AxisFault("Cannot proceed because Password element is missing in TrustStore"); + } + + String storePassword = SecureVaultValueReader.getSecureVaultValue(secretResolver, storePasswordEl); + trustStore = KeyStore.getInstance(type); + fis = new FileInputStream(location); + + if (log.isDebugEnabled()) { + log.debug(name + " Loading Trust Keystore from : " + location); + } + + trustStore.load(fis, storePassword.toCharArray()); + trustStoreHolder.setClientTrustStore(trustStore); + } else { + trustStore = trustStoreHolder.getClientTrustStore(); } - trustStore.load(fis, storePassword.toCharArray()); TrustManagerFactory trustManagerfactory = TrustManagerFactory.getInstance( - TrustManagerFactory.getDefaultAlgorithm()); + TrustManagerFactory.getDefaultAlgorithm()); trustManagerfactory.init(trustStore); trustManagers = trustManagerfactory.getTrustManagers(); diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/TrustStoreHolder.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/TrustStoreHolder.java new file mode 100644 index 0000000000..7f59f0b162 --- /dev/null +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/TrustStoreHolder.java @@ -0,0 +1,60 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF 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.transport.nhttp.config; + +import java.security.KeyStore; + +/** + * A data holder class to store the client trust store. + */ +public class TrustStoreHolder { + + private static volatile TrustStoreHolder instance; + private KeyStore clientTrustStore; + + private TrustStoreHolder() {} + + public static TrustStoreHolder getInstance() { + + if (instance == null) { + synchronized (TrustStoreHolder.class) { + if (instance == null) { + instance = new TrustStoreHolder(); + } + } + } + return instance; + } + + public KeyStore getClientTrustStore() { + return clientTrustStore; + } + + public void setClientTrustStore(KeyStore clientTrustStore) { + this.clientTrustStore = clientTrustStore; + } + + /** + * Reset the instance. + */ + public static void resetInstance() { + + instance = null; + } +} diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpListener.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpListener.java index 1d4ddf2a6a..b69cb80abd 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpListener.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpListener.java @@ -47,8 +47,6 @@ import org.apache.axis2.transport.TransportListener; import org.apache.axis2.transport.base.BaseConstants; import org.apache.axis2.transport.base.BaseUtils; -import org.apache.axis2.transport.base.ManagementSupport; -import org.apache.axis2.transport.base.TransportMBeanSupport; import org.apache.axis2.transport.base.threads.NativeThreadFactory; import org.apache.axis2.transport.base.threads.WorkerPool; import org.apache.axis2.transport.base.tracker.AxisServiceFilter; @@ -62,8 +60,10 @@ import org.apache.http.nio.reactor.IOReactorException; import org.apache.http.nio.reactor.IOReactorExceptionHandler; import org.apache.http.params.HttpConnectionParams; +import org.apache.synapse.transport.certificatevalidation.cache.CertCache; import org.apache.synapse.transport.http.conn.Scheme; import org.apache.synapse.transport.http.conn.ServerConnFactory; +import org.apache.synapse.transport.nhttp.config.TrustStoreHolder; import org.apache.synapse.transport.nhttp.config.ServerConnFactoryBuilder; import org.apache.synapse.transport.passthru.config.PassThroughConfiguration; import org.apache.synapse.transport.passthru.config.SourceConfiguration; @@ -679,9 +679,10 @@ public void reloadDynamicSSLConfig(TransportInDescription transportInDescription Parameter profilePathParam = transportInDescription.getParameter("dynamicSSLProfilesConfig"); if (oldParameter != null && profilePathParam != null) { + CertCache.resetCache(); + TrustStoreHolder.resetInstance(); transportInDescription.removeParameter(oldParameter); this.reloadSpecificEndPoints(transportInDescription); } } - } diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpSender.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpSender.java index 3af961c03f..7379363af3 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpSender.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpSender.java @@ -47,12 +47,14 @@ import org.apache.http.nio.reactor.IOReactorExceptionHandler; import org.apache.http.protocol.HTTP; import org.apache.synapse.commons.CorrelationConstants; +import org.apache.synapse.transport.certificatevalidation.cache.CertCache; import org.apache.synapse.transport.exceptions.InvalidConfigurationException; import org.apache.synapse.transport.http.conn.ClientConnFactory; import org.apache.synapse.transport.http.conn.ProxyConfig; import org.apache.synapse.transport.http.conn.Scheme; import org.apache.synapse.transport.nhttp.NhttpConstants; import org.apache.synapse.transport.nhttp.config.ClientConnFactoryBuilder; +import org.apache.synapse.transport.nhttp.config.TrustStoreHolder; import org.apache.synapse.transport.nhttp.config.ProxyConfigBuilder; import org.apache.synapse.transport.nhttp.util.MessageFormatterDecoratorFactory; import org.apache.synapse.transport.nhttp.util.NhttpUtil; @@ -557,7 +559,7 @@ public void submitResponse(MessageContext msgContext) ProtocolState state = SourceContext.getState(conn); if (state != null && state.compareTo(ProtocolState.REQUEST_DONE) <= 0) { // start sending the response if we - + boolean noEntityBodyResponse = false; if (noEntityBody != null && Boolean.TRUE == noEntityBody && pipe != null) { @@ -567,7 +569,7 @@ public void submitResponse(MessageContext msgContext) out.close(); noEntityBodyResponse = true; } - + if (!noEntityBodyResponse && msgContext.isPropertyTrue(PassThroughConstants.MESSAGE_BUILDER_INVOKED) && pipe != null) { OutputStream out = pipe.getOutputStream(); /*if (msgContext.isPropertyTrue(NhttpConstants.SC_ACCEPTED)) { @@ -705,6 +707,8 @@ private void handleException(String msg) throws AxisFault { public void reloadDynamicSSLConfig(TransportOutDescription transport) throws AxisFault { log.info("PassThroughHttpSender reloading SSL Config.."); try { + CertCache.resetCache(); + TrustStoreHolder.resetInstance(); ClientConnFactoryBuilder connFactoryBuilder = initConnFactoryBuilder(transport, this.configurationContext); connFactory = connFactoryBuilder.createConnFactory(targetConfiguration.getHttpParams()); diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/util/ConfigurationBuilderUtil.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/util/ConfigurationBuilderUtil.java index cadb9e499b..406a7a2d30 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/util/ConfigurationBuilderUtil.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/util/ConfigurationBuilderUtil.java @@ -21,13 +21,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.security.KeyStore; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; -import java.security.cert.CertificateException; import java.util.Properties; public class ConfigurationBuilderUtil { @@ -177,29 +170,4 @@ public static String getStringProperty(String name, String def, Properties props return val == null ? def : val; } - - /** - * Returns the keystore of the given file path. - * - * @param keyStoreFilePath the keystore file path - * @param keyStorePassword the keystore password - * @param keyStoreType the keystore type - * @return KeyStore - * @throws KeyStoreException On error while creating keystore - */ - public static KeyStore getKeyStore(String keyStoreFilePath, String keyStorePassword, String keyStoreType) - throws KeyStoreException { - - String file = new File(keyStoreFilePath).getAbsolutePath(); - try (FileInputStream keyStoreFileInputStream = new FileInputStream(file)) { - KeyStore keyStore = KeyStore.getInstance(keyStoreType); - keyStore.load(keyStoreFileInputStream, keyStorePassword.toCharArray()); - return keyStore; - } catch (IOException | NoSuchAlgorithmException | CertificateException e) { - String errorMessage = String.format("Keystore file does not exist in the path as configured " + - "in '%s' property.", keyStoreFilePath); - throw new KeyStoreException(errorMessage); - } - } - } From 9ceda59358a47305771e6fc734d3031c27f876b0 Mon Sep 17 00:00:00 2001 From: akila94 Date: Wed, 3 Jan 2024 10:20:47 +0530 Subject: [PATCH 103/308] Add expiry validation --- ...va => CertificateVerificationManager.java} | 46 ++++++++++++++----- .../http/conn/ClientSSLSetupHandler.java | 6 +-- .../http/conn/ServerSSLSetupHandler.java | 15 ++++-- .../config/ClientConnFactoryBuilder.java | 6 +-- .../config/ServerConnFactoryBuilder.java | 17 ++++--- .../core/ssl/SSLServerConnFactoryBuilder.java | 7 ++- 6 files changed, 63 insertions(+), 34 deletions(-) rename modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/{RevocationVerificationManager.java => CertificateVerificationManager.java} (86%) diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationManager.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/CertificateVerificationManager.java similarity index 86% rename from modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationManager.java rename to modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/CertificateVerificationManager.java index 683df58258..3ff125fd6d 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationManager.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/CertificateVerificationManager.java @@ -36,6 +36,8 @@ import java.security.NoSuchProviderException; import java.security.SignatureException; import java.security.cert.CertificateException; +import java.security.cert.CertificateExpiredException; +import java.security.cert.CertificateNotYetValidException; import java.security.cert.X509Certificate; import java.util.Arrays; import java.util.Enumeration; @@ -45,14 +47,14 @@ * Manager class responsible for verifying certificates. This class will use the available verifiers according to * a predefined policy. */ -public class RevocationVerificationManager { +public class CertificateVerificationManager { private int cacheSize = Constants.CACHE_DEFAULT_ALLOCATED_SIZE; private int cacheDelayMins = Constants.CACHE_DEFAULT_DELAY_MINS; private boolean isFullCertChainValidationEnabled = false; - private static final Log log = LogFactory.getLog(RevocationVerificationManager.class); + private static final Log log = LogFactory.getLog(CertificateVerificationManager.class); - public RevocationVerificationManager(Integer cacheAllocatedSize, Integer cacheDelayMins) { + public CertificateVerificationManager(Integer cacheAllocatedSize, Integer cacheDelayMins) { if (cacheAllocatedSize != null && cacheAllocatedSize > Constants.CACHE_MIN_ALLOCATED_SIZE && cacheAllocatedSize < Constants.CACHE_MAX_ALLOCATED_SIZE) { @@ -64,8 +66,8 @@ public RevocationVerificationManager(Integer cacheAllocatedSize, Integer cacheDe } } - public RevocationVerificationManager(Integer cacheAllocatedSize, Integer cacheDelayMins, - boolean isFullCertChainValidationEnabled) { + public CertificateVerificationManager(Integer cacheAllocatedSize, Integer cacheDelayMins, + boolean isFullCertChainValidationEnabled) { if (cacheAllocatedSize != null && cacheAllocatedSize > Constants.CACHE_MIN_ALLOCATED_SIZE && cacheAllocatedSize < Constants.CACHE_MAX_ALLOCATED_SIZE) { @@ -157,11 +159,8 @@ public void verifyRevocationStatus(javax.security.cert.X509Certificate[] peerCer } break; } catch (SignatureException | CertificateException | NoSuchAlgorithmException | - InvalidKeyException | - NoSuchProviderException e) { + InvalidKeyException | NoSuchProviderException e) { // Unable to verify the signature. Check with the next certificate. - //todo: change this to a debug log after testing. - log.error("Unable to verify the signature, checking with the next certificate..."); } } } else { @@ -171,8 +170,8 @@ public void verifyRevocationStatus(javax.security.cert.X509Certificate[] peerCer } catch (SignatureException | CertificateException | NoSuchAlgorithmException | InvalidKeyException | NoSuchProviderException e) { - // Unable to verify the signature. Check with the next certificate. - log.error("Signature not matching for alias validate with next cert"); + // Unable to verify the signature. + throw new CertificateVerificationException("Unable to verify the signature of the certificate."); } } } @@ -238,4 +237,29 @@ private X509Certificate[] convert(javax.security.cert.X509Certificate[] certs) } return certChain; } + + /** + * Checks whether a provided certificate is expired or not at the time it is validated. + * + * @param certificates + * @throws CertificateNotYetValidException + * @throws CertificateExpiredException + * @throws CertificateVerificationException + */ + public void isExpired(javax.security.cert.X509Certificate[] certificates) throws CertificateVerificationException { + + X509Certificate[] convertedCertificates = convert(certificates); + + for (X509Certificate cert : convertedCertificates) { + try { + cert.checkValidity(); + } catch (CertificateExpiredException e) { + String msg = "Peer certificate is expired"; + throw new CertificateVerificationException(msg); + } catch (CertificateNotYetValidException e) { + String msg = "Peer certificate is not valid yet"; + throw new CertificateVerificationException(msg); + } + } + } } 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 24977a7115..803be5cedd 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 @@ -33,7 +33,7 @@ import org.apache.http.nio.reactor.IOSession; import org.apache.http.nio.reactor.ssl.SSLSetupHandler; import org.apache.synapse.transport.certificatevalidation.CertificateVerificationException; -import org.apache.synapse.transport.certificatevalidation.RevocationVerificationManager; +import org.apache.synapse.transport.certificatevalidation.CertificateVerificationManager; public class ClientSSLSetupHandler implements SSLSetupHandler { @@ -139,10 +139,10 @@ public void verify( }; private final X509HostnameVerifier hostnameVerifier; - private final RevocationVerificationManager verificationManager; + private final CertificateVerificationManager verificationManager; public ClientSSLSetupHandler(final X509HostnameVerifier hostnameVerifier, - final RevocationVerificationManager verificationManager) { + final CertificateVerificationManager verificationManager) { this.hostnameVerifier = hostnameVerifier != null ? hostnameVerifier : DEFAULT; this.verificationManager = verificationManager; } 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 a4bc324ce1..3152d8f054 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 @@ -21,27 +21,32 @@ import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLException; import javax.net.ssl.SSLSession; +import javax.security.cert.X509Certificate; import org.apache.http.nio.reactor.IOSession; import org.apache.http.nio.reactor.ssl.SSLSetupHandler; import org.apache.synapse.transport.certificatevalidation.CertificateVerificationException; -import org.apache.synapse.transport.certificatevalidation.RevocationVerificationManager; +import org.apache.synapse.transport.certificatevalidation.CertificateVerificationManager; import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.SocketAddress; +import java.security.cert.CertificateExpiredException; +import java.security.cert.CertificateNotYetValidException; +import java.util.Arrays; +import java.util.List; public class ServerSSLSetupHandler implements SSLSetupHandler { private final SSLClientAuth clientAuth; /** Enabled SSL handshake protocols (e.g. SSLv3, TLSv1) */ private final String[] httpsProtocols; - private RevocationVerificationManager verificationManager; + private CertificateVerificationManager verificationManager; /** Ciphers enabled in axis2.xml, enabled all if null*/ private final String[] preferredCiphers; public ServerSSLSetupHandler(final SSLClientAuth clientAuth, final String[] httpsProtocols, - final RevocationVerificationManager verificationManager, final String[] preferredCiphers) { + final CertificateVerificationManager verificationManager, final String[] preferredCiphers) { this.clientAuth = clientAuth; this.httpsProtocols = httpsProtocols; this.verificationManager = verificationManager; @@ -78,7 +83,9 @@ public void verify( if (verificationManager != null) { try { - verificationManager.verifyRevocationStatus(sslsession.getPeerCertificateChain()); + X509Certificate[] peerCertChain = sslsession.getPeerCertificateChain(); + verificationManager.isExpired(peerCertChain); + verificationManager.verifyRevocationStatus(peerCertChain); } catch (CertificateVerificationException e) { SocketAddress remoteAddress = iosession.getRemoteAddress(); String address; diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ClientConnFactoryBuilder.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ClientConnFactoryBuilder.java index 44710be55a..bec88bfa25 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ClientConnFactoryBuilder.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ClientConnFactoryBuilder.java @@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.http.conn.ssl.X509HostnameVerifier; import org.apache.http.params.HttpParams; -import org.apache.synapse.transport.certificatevalidation.RevocationVerificationManager; +import org.apache.synapse.transport.certificatevalidation.CertificateVerificationManager; import org.apache.synapse.transport.exceptions.InvalidConfigurationException; import org.apache.synapse.transport.http.conn.ClientConnFactory; import org.apache.synapse.transport.http.conn.ClientSSLSetupHandler; @@ -129,7 +129,7 @@ public ClientConnFactoryBuilder parseSSL() throws AxisFault { final Parameter cvp = transportOut.getParameter("CertificateRevocationVerifier"); final String cvEnable = cvp != null ? cvp.getParameterElement().getAttribute(new QName("enable")).getAttributeValue() : null; - RevocationVerificationManager revocationVerifier = null; + CertificateVerificationManager revocationVerifier = null; if ("true".equalsIgnoreCase(cvEnable)) { String cacheSizeString = cvp.getParameterElement().getFirstChildWithName(new QName("CacheSize")).getText(); @@ -142,7 +142,7 @@ public ClientConnFactoryBuilder parseSSL() throws AxisFault { cacheDelay = new Integer(cacheDelayString); } catch (NumberFormatException e) { } - revocationVerifier = new RevocationVerificationManager(cacheSize, cacheDelay); + revocationVerifier = new CertificateVerificationManager(cacheSize, cacheDelay); } // Process HttpProtocols diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ServerConnFactoryBuilder.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ServerConnFactoryBuilder.java index 483d5b56ee..2598138105 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ServerConnFactoryBuilder.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ServerConnFactoryBuilder.java @@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.http.HttpHost; import org.apache.http.params.HttpParams; -import org.apache.synapse.transport.certificatevalidation.RevocationVerificationManager; +import org.apache.synapse.transport.certificatevalidation.CertificateVerificationManager; import org.apache.synapse.transport.http.conn.SSLClientAuth; import org.apache.synapse.transport.http.conn.SSLContextDetails; import org.apache.synapse.transport.http.conn.ServerConnFactory; @@ -73,6 +73,7 @@ public class ServerConnFactoryBuilder { protected SSLContextDetails ssl; private Map sslByIPMap = null; private ConfigurationContext configurationContext; + CertificateVerificationManager certificateVerifier = null; public ServerConnFactoryBuilder(final TransportInDescription transportIn, final HttpHost host, ConfigurationContext configurationContext) { @@ -94,7 +95,7 @@ protected SSLContextDetails createSSLContext( final OMElement cientAuthEl, final OMElement httpsProtocolsEl, final OMElement preferredCiphersEl, - final RevocationVerificationManager verificationManager, + final CertificateVerificationManager verificationManager, final String sslProtocol) throws AxisFault { SecretResolver secretResolver; @@ -114,7 +115,7 @@ protected SSLContextDetails createSSLContext( final OMElement cientAuthEl, final OMElement httpsProtocolsEl, final OMElement preferredCiphersEl, - final RevocationVerificationManager verificationManager, + final CertificateVerificationManager verificationManager, final String sslProtocol, final SecretResolver secretResolver) throws AxisFault { KeyManager[] keymanagers = null; @@ -307,7 +308,6 @@ public ServerConnFactoryBuilder parseSSL() throws AxisFault { final Parameter cvp = transportIn.getParameter("CertificateRevocationVerifier"); final String cvEnable = cvp != null ? cvp.getParameterElement().getAttribute(new QName("enable")).getAttributeValue() : null; - RevocationVerificationManager revocationVerifier = null; if ("true".equalsIgnoreCase(cvEnable)) { String cacheSizeString = cvp.getParameterElement().getFirstChildWithName(new QName("CacheSize")).getText(); @@ -332,12 +332,12 @@ public ServerConnFactoryBuilder parseSSL() throws AxisFault { isFullCertChainValidationEnabled = false; } - revocationVerifier = new RevocationVerificationManager(cacheSize, cacheDelay, + certificateVerifier = new CertificateVerificationManager(cacheSize, cacheDelay, isFullCertChainValidationEnabled); } ssl = createSSLContext(keyStoreEl, trustStoreEl, clientAuthEl, httpsProtocolsEl, preferredCiphersEl, - revocationVerifier, sslProtocol); + certificateVerifier, sslProtocol); return this; } @@ -351,7 +351,6 @@ public ServerConnFactoryBuilder parseMultiProfileSSL() throws AxisFault { OMElement profilesEl = profileParam.getParameterElement(); SecretResolver secretResolver = SecretResolverFactory.create(profilesEl, true); Iterator profiles = profilesEl.getChildrenWithName(new QName("profile")); - RevocationVerificationManager revocationVerifier = null; while (profiles.hasNext()) { OMElement profileEl = (OMElement) profiles.next(); @@ -406,12 +405,12 @@ public ServerConnFactoryBuilder parseMultiProfileSSL() throws AxisFault { isFullCertChainValidationEnabled = false; } - revocationVerifier = new RevocationVerificationManager(cacheSize, cacheDelay, + certificateVerifier = new CertificateVerificationManager(cacheSize, cacheDelay, isFullCertChainValidationEnabled); } SSLContextDetails ssl = createSSLContext(keyStoreEl, trustStoreEl, clientAuthEl, httpsProtocolsEl, - preferredCiphersEl, revocationVerifier, sslProtocol, secretResolver); + preferredCiphersEl, certificateVerifier, sslProtocol, secretResolver); if (sslByIPMap == null) { sslByIPMap = new HashMap(); } diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/core/ssl/SSLServerConnFactoryBuilder.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/core/ssl/SSLServerConnFactoryBuilder.java index 4b552bd799..8ea5433d4f 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/core/ssl/SSLServerConnFactoryBuilder.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/core/ssl/SSLServerConnFactoryBuilder.java @@ -19,12 +19,11 @@ import org.apache.axiom.om.OMElement; import org.apache.axis2.AxisFault; -import org.apache.axis2.description.Parameter; import org.apache.axis2.description.TransportInDescription; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.http.HttpHost; -import org.apache.synapse.transport.certificatevalidation.RevocationVerificationManager; +import org.apache.synapse.transport.certificatevalidation.CertificateVerificationManager; import org.apache.synapse.transport.nhttp.config.ServerConnFactoryBuilder; import javax.xml.namespace.QName; @@ -46,7 +45,7 @@ public ServerConnFactoryBuilder parseSSL(OMElement keyStoreEl, OMElement trustSt AxisFault { final String cvEnable = cvp != null ? cvp.getAttribute(new QName("enable")).getAttributeValue() : null; - RevocationVerificationManager revocationVerifier = null; + CertificateVerificationManager revocationVerifier = null; if ("true".equalsIgnoreCase(cvEnable)) { Iterator iterator = cvp.getChildElements(); @@ -70,7 +69,7 @@ public ServerConnFactoryBuilder parseSSL(OMElement keyStoreEl, OMElement trustSt } catch (NumberFormatException e) { log.error("Please specify correct Integer numbers for CacheDelay and CacheSize"); } - revocationVerifier = new RevocationVerificationManager(cacheSize, cacheDelay, true); + revocationVerifier = new CertificateVerificationManager(cacheSize, cacheDelay); } ssl = createSSLContext(keyStoreEl, trustStoreEl, clientAuthEl, httpsProtocolsEl, preferredCiphers, revocationVerifier, From 6bb0c86ac614ec6159b498861397b20dc7279224 Mon Sep 17 00:00:00 2001 From: akila94 Date: Thu, 4 Jan 2024 09:08:27 +0530 Subject: [PATCH 104/308] Format code --- .../certificatevalidation/cache/CertCache.java | 12 ++++++------ .../nhttp/config/ClientConnFactoryBuilder.java | 6 +++--- .../conf/vfs-move-failed-records.properties | 4 ++++ 3 files changed, 13 insertions(+), 9 deletions(-) create mode 100644 modules/transports/core/vfs/repository/conf/vfs-move-failed-records.properties diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/cache/CertCache.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/cache/CertCache.java index 71a483539d..eed0a4801c 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/cache/CertCache.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/cache/CertCache.java @@ -35,8 +35,8 @@ public class CertCache implements ManageableCache { private static volatile CertCache cache; - private static volatile Map hashMap = new ConcurrentHashMap(); - private static volatile Iterator> iterator = hashMap.entrySet().iterator(); + private static volatile Map hashMap = new ConcurrentHashMap(); + private static volatile Iterator> iterator = hashMap.entrySet().iterator(); private static volatile CacheManager cacheManager; private static final Log log = LogFactory.getLog(CertCache.class); @@ -74,7 +74,7 @@ public void init(int size, int delay) { } public synchronized X509Certificate getCacheValue(String serialNumber) { - CertCache.TempCacheValue cacheValue = hashMap.get(serialNumber); + CertCacheValue cacheValue = hashMap.get(serialNumber); if (cacheValue != null) { return cacheValue.getValue(); } else @@ -112,7 +112,7 @@ public static void resetCache() { } public synchronized void setCacheValue(String serialNumber, X509Certificate cert) { - CertCache.TempCacheValue cacheValue = new CertCache.TempCacheValue(serialNumber, cert); + CertCacheValue cacheValue = new CertCacheValue(serialNumber, cert); if (log.isDebugEnabled()) { log.debug("Before set - HashMap size " + hashMap.size()); @@ -137,13 +137,13 @@ public synchronized void removeCacheValue(String serialNumber) { /** * This is the wrapper class of the actual cache value which is a X509CRL. */ - private class TempCacheValue implements ManageableCacheValue { + private class CertCacheValue implements ManageableCacheValue { private final String serialNumber; private final X509Certificate issuerCertificate; private final long timeStamp = System.currentTimeMillis(); - public TempCacheValue(String serialNumber, X509Certificate issuerCertificate) { + public CertCacheValue(String serialNumber, X509Certificate issuerCertificate) { this.serialNumber = serialNumber; this.issuerCertificate = issuerCertificate; diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ClientConnFactoryBuilder.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ClientConnFactoryBuilder.java index bec88bfa25..5495ae9fc2 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ClientConnFactoryBuilder.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ClientConnFactoryBuilder.java @@ -129,7 +129,7 @@ public ClientConnFactoryBuilder parseSSL() throws AxisFault { final Parameter cvp = transportOut.getParameter("CertificateRevocationVerifier"); final String cvEnable = cvp != null ? cvp.getParameterElement().getAttribute(new QName("enable")).getAttributeValue() : null; - CertificateVerificationManager revocationVerifier = null; + CertificateVerificationManager certificateVerifier = null; if ("true".equalsIgnoreCase(cvEnable)) { String cacheSizeString = cvp.getParameterElement().getFirstChildWithName(new QName("CacheSize")).getText(); @@ -142,7 +142,7 @@ public ClientConnFactoryBuilder parseSSL() throws AxisFault { cacheDelay = new Integer(cacheDelayString); } catch (NumberFormatException e) { } - revocationVerifier = new CertificateVerificationManager(cacheSize, cacheDelay); + certificateVerifier = new CertificateVerificationManager(cacheSize, cacheDelay); } // Process HttpProtocols @@ -163,7 +163,7 @@ public ClientConnFactoryBuilder parseSSL() throws AxisFault { } // Initiated separately to cater setting https protocols - ClientSSLSetupHandler clientSSLSetupHandler = new ClientSSLSetupHandler(hostnameVerifier, revocationVerifier); + ClientSSLSetupHandler clientSSLSetupHandler = new ClientSSLSetupHandler(hostnameVerifier, certificateVerifier); if (null != httpsProtocols) { clientSSLSetupHandler.setHttpsProtocols(httpsProtocols); diff --git a/modules/transports/core/vfs/repository/conf/vfs-move-failed-records.properties b/modules/transports/core/vfs/repository/conf/vfs-move-failed-records.properties new file mode 100644 index 0000000000..ccabbbabad --- /dev/null +++ b/modules/transports/core/vfs/repository/conf/vfs-move-failed-records.properties @@ -0,0 +1,4 @@ +t-0-1704257728276.txt 03/01/2024/ 10:25:28 +in 03/01/2024/ 13:29:16 +t-0-1704268757607.txt 03/01/2024/ 13:29:17 +t-0-1704336995522.txt 04/01/2024/ 08:26:35 From be0c832d3e96f046cb2c7007019e7be31fa379d9 Mon Sep 17 00:00:00 2001 From: akila94 Date: Thu, 4 Jan 2024 09:19:42 +0530 Subject: [PATCH 105/308] Format code --- .../transport/certificatevalidation/cache/CertCache.java | 7 +------ .../synapse/transport/nhttp/config/TrustStoreHolder.java | 2 ++ .../vfs/repository/conf/vfs-move-failed-records.properties | 4 ---- 3 files changed, 3 insertions(+), 10 deletions(-) delete mode 100644 modules/transports/core/vfs/repository/conf/vfs-move-failed-records.properties diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/cache/CertCache.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/cache/CertCache.java index eed0a4801c..4dbd3d847a 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/cache/CertCache.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/cache/CertCache.java @@ -84,8 +84,6 @@ public synchronized X509Certificate getCacheValue(String serialNumber) { @Override public ManageableCacheValue getNextCacheValue() { - //changes to the map are reflected on the keySet. And its iterator is weakly consistent. so will never - //throw concurrent modification exception. if (iterator.hasNext()) { return hashMap.get(iterator.next().getKey()); } else { @@ -135,7 +133,7 @@ public synchronized void removeCacheValue(String serialNumber) { } /** - * This is the wrapper class of the actual cache value which is a X509CRL. + * This is the wrapper class of the actual cache value. */ private class CertCacheValue implements ManageableCacheValue { @@ -159,9 +157,6 @@ public String getKey() { return serialNumber; } - /** - * CRL has a validity period. We can reuse a downloaded CRL within that period. - */ public boolean isValid() { // Will be always return true since we only set defined data. diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/TrustStoreHolder.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/TrustStoreHolder.java index 7f59f0b162..697dd6eba6 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/TrustStoreHolder.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/TrustStoreHolder.java @@ -43,10 +43,12 @@ public static TrustStoreHolder getInstance() { } public KeyStore getClientTrustStore() { + return clientTrustStore; } public void setClientTrustStore(KeyStore clientTrustStore) { + this.clientTrustStore = clientTrustStore; } diff --git a/modules/transports/core/vfs/repository/conf/vfs-move-failed-records.properties b/modules/transports/core/vfs/repository/conf/vfs-move-failed-records.properties deleted file mode 100644 index ccabbbabad..0000000000 --- a/modules/transports/core/vfs/repository/conf/vfs-move-failed-records.properties +++ /dev/null @@ -1,4 +0,0 @@ -t-0-1704257728276.txt 03/01/2024/ 10:25:28 -in 03/01/2024/ 13:29:16 -t-0-1704268757607.txt 03/01/2024/ 13:29:17 -t-0-1704336995522.txt 04/01/2024/ 08:26:35 From 56c0e4fd0233b5832e1706a3644b65074a8827c1 Mon Sep 17 00:00:00 2001 From: akila94 Date: Thu, 4 Jan 2024 11:19:37 +0530 Subject: [PATCH 106/308] Refactor method comment --- .../CertificateVerificationManager.java | 6 ++---- 1 file changed, 2 insertions(+), 4 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 3ff125fd6d..ed70bc8f5a 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 @@ -241,10 +241,8 @@ private X509Certificate[] convert(javax.security.cert.X509Certificate[] certs) /** * Checks whether a provided certificate is expired or not at the time it is validated. * - * @param certificates - * @throws CertificateNotYetValidException - * @throws CertificateExpiredException - * @throws CertificateVerificationException + * @param certificates array of certificates needs to be validated + * @throws CertificateVerificationException if one of the certs are expired, this exception will be thrown */ public void isExpired(javax.security.cert.X509Certificate[] certificates) throws CertificateVerificationException { From c173c834510ff31cacaa75d56fcd1bd7deb2a711 Mon Sep 17 00:00:00 2001 From: akila94 Date: Fri, 5 Jan 2024 14:29:58 +0530 Subject: [PATCH 107/308] Fix code review comments --- .../CertificateVerificationManager.java | 73 ++++++++++++------- .../cache/CertCache.java | 21 +----- .../CertificatePathValidator.java | 1 + .../http/conn/ClientSSLSetupHandler.java | 2 +- .../http/conn/ServerSSLSetupHandler.java | 8 +- .../config/ServerConnFactoryBuilder.java | 38 ++++++++-- .../passthru/PassThroughHttpListener.java | 2 - .../PassThroughHttpMultiSSLListener.java | 4 + .../passthru/PassThroughHttpSender.java | 2 - 9 files changed, 85 insertions(+), 66 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 ed70bc8f5a..100767e1ef 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 @@ -51,7 +51,8 @@ public class CertificateVerificationManager { private int cacheSize = Constants.CACHE_DEFAULT_ALLOCATED_SIZE; private int cacheDelayMins = Constants.CACHE_DEFAULT_DELAY_MINS; - private boolean isFullCertChainValidationEnabled = false; + private boolean isFullCertChainValidationEnabled = true; + private boolean isCertExpiryValidationEnabled = false; private static final Log log = LogFactory.getLog(CertificateVerificationManager.class); public CertificateVerificationManager(Integer cacheAllocatedSize, Integer cacheDelayMins) { @@ -67,7 +68,8 @@ public CertificateVerificationManager(Integer cacheAllocatedSize, Integer cacheD } public CertificateVerificationManager(Integer cacheAllocatedSize, Integer cacheDelayMins, - boolean isFullCertChainValidationEnabled) { + boolean isFullCertChainValidationEnabled, + boolean isCertExpiryValidationEnabled) { if (cacheAllocatedSize != null && cacheAllocatedSize > Constants.CACHE_MIN_ALLOCATED_SIZE && cacheAllocatedSize < Constants.CACHE_MAX_ALLOCATED_SIZE) { @@ -78,6 +80,7 @@ public CertificateVerificationManager(Integer cacheAllocatedSize, Integer cacheD this.cacheDelayMins = cacheDelayMins; } this.isFullCertChainValidationEnabled = isFullCertChainValidationEnabled; + this.isCertExpiryValidationEnabled = isCertExpiryValidationEnabled; } /** @@ -93,7 +96,7 @@ public CertificateVerificationManager(Integer cacheAllocatedSize, Integer cacheD * @param peerCertificates javax.security.cert.X509Certificate[] array of peer certificate chain from peer/client. * @throws CertificateVerificationException */ - public void verifyRevocationStatus(javax.security.cert.X509Certificate[] peerCertificates) + public void verifyCertificateValidity(javax.security.cert.X509Certificate[] peerCertificates) throws CertificateVerificationException { X509Certificate[] convertedCertificates = convert(peerCertificates); @@ -123,7 +126,6 @@ public void verifyRevocationStatus(javax.security.cert.X509Certificate[] peerCer // Get cert cache and initialize it CertCache certCache = CertCache.getCache(); - certCache.init(cacheSize,cacheDelayMins); if (certCache.getCacheValue(peerCert.getSerialNumber().toString()) == null) { @@ -134,20 +136,22 @@ public void verifyRevocationStatus(javax.security.cert.X509Certificate[] peerCer } while (aliases.hasMoreElements()) { + + alias = aliases.nextElement(); try { - alias = aliases.nextElement(); - try { - issuerCert = (X509Certificate) trustStore.getCertificate(alias); - } catch (KeyStoreException e) { - throw new CertificateVerificationException("Unable to read the certificate from " + - "truststore with the alias: " + alias, e); - } + issuerCert = (X509Certificate) trustStore.getCertificate(alias); + } catch (KeyStoreException e) { + throw new CertificateVerificationException("Unable to read the certificate from " + + "truststore with the alias: " + alias, e); + } - if (issuerCert == null) { - throw new CertificateVerificationException("Issuer certificate not found in truststore"); - } + if (issuerCert == null) { + throw new CertificateVerificationException("Issuer certificate not found in truststore"); + } + try { peerCert.verify(issuerCert.getPublicKey()); + log.debug("Valid issuer certificate found in the client truststore. Caching.."); // Store the valid issuer cert in cache for future use @@ -160,7 +164,7 @@ public void verifyRevocationStatus(javax.security.cert.X509Certificate[] peerCer break; } catch (SignatureException | CertificateException | NoSuchAlgorithmException | InvalidKeyException | NoSuchProviderException e) { - // Unable to verify the signature. Check with the next certificate. + // Unable to verify the signature. Check with the next certificate in the next loop traversal. } } } else { @@ -188,16 +192,30 @@ public void verifyRevocationStatus(javax.security.cert.X509Certificate[] peerCer for (RevocationVerifier verifier : verifiers) { try { if (isFullCertChainValidationEnabled) { + + if (isCertExpiryValidationEnabled) { + log.debug("Validating certificate chain for expiry"); + if (isExpired(convertedCertificates)) { + throw new CertificateVerificationException("One of the provided certificates are expired"); + } + } + log.debug("Doing full certificate chain validation"); CertificatePathValidator pathValidator = new CertificatePathValidator(convertedCertificates, verifier); pathValidator.validatePath(); log.info("Path verification Successful. Took " + (System.currentTimeMillis() - start) + " ms."); } else { - if (log.isDebugEnabled()) { - log.debug("Validating client certificate with the issuer certificate retrieved from" + - "the trust store"); + + if (isCertExpiryValidationEnabled) { + log.debug("Validating the client certificate for expiry"); + if (isExpired(convertedCertificates)) { + throw new CertificateVerificationException("The provided certificate is expired"); + } } + + log.debug("Validating client certificate with the issuer certificate retrieved from" + + "the trust store"); verifier.checkRevocationStatus(peerCert, issuerCert); } return; @@ -241,23 +259,22 @@ private X509Certificate[] convert(javax.security.cert.X509Certificate[] certs) /** * Checks whether a provided certificate is expired or not at the time it is validated. * - * @param certificates array of certificates needs to be validated - * @throws CertificateVerificationException if one of the certs are expired, this exception will be thrown + * @param certificates certificates to be validated for expiry + * @return true if one of the certs are expired, false otherwise */ - public void isExpired(javax.security.cert.X509Certificate[] certificates) throws CertificateVerificationException { - - X509Certificate[] convertedCertificates = convert(certificates); + public boolean isExpired(X509Certificate[] certificates) { - for (X509Certificate cert : convertedCertificates) { + for (X509Certificate cert : certificates) { try { cert.checkValidity(); } catch (CertificateExpiredException e) { - String msg = "Peer certificate is expired"; - throw new CertificateVerificationException(msg); + log.error("Peer certificate is expired"); + return true; } catch (CertificateNotYetValidException e) { - String msg = "Peer certificate is not valid yet"; - throw new CertificateVerificationException(msg); + log.error("Peer certificate is not valid yet"); + return true; } } + return false; } } diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/cache/CertCache.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/cache/CertCache.java index 4dbd3d847a..9ada86e88d 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/cache/CertCache.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/cache/CertCache.java @@ -21,6 +21,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.synapse.commons.jmx.MBeanRegistrar; +import org.apache.synapse.transport.certificatevalidation.Constants; import java.security.cert.X509Certificate; import java.util.Iterator; @@ -49,30 +50,14 @@ public static CertCache getCache() { synchronized (CertCache.class) { if (cache == null) { cache = new CertCache(); + cacheManager = new CacheManager(cache, Constants.CACHE_DEFAULT_ALLOCATED_SIZE, + Constants.CACHE_DEFAULT_DELAY_MINS); } } } return cache; } - /** - * This initialize the Cache with a CacheManager. If this method is called, a cache manager will not be used. - * - * @param size max size of the cache - * @param delay defines how frequently the CacheManager will be started - */ - public void init(int size, int delay) { - if (cacheManager == null) { - synchronized (CertCache.class) { - if (cacheManager == null) { - cacheManager = new CacheManager(cache, size, delay); - CacheController mbean = new CacheController(cache,cacheManager); - MBeanRegistrar.getInstance().registerMBean(mbean, "CacheController", "CertCacheController"); - } - } - } - } - public synchronized X509Certificate getCacheValue(String serialNumber) { CertCacheValue cacheValue = hashMap.get(serialNumber); if (cacheValue != null) { diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/pathvalidation/CertificatePathValidator.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/pathvalidation/CertificatePathValidator.java index b041a7314d..b6335f88a4 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/pathvalidation/CertificatePathValidator.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/pathvalidation/CertificatePathValidator.java @@ -22,6 +22,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.synapse.transport.certificatevalidation.*; +import java.lang.reflect.InvocationTargetException; import java.security.*; import java.security.cert.X509Certificate; import java.util.List; 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 803be5cedd..e5c94d91f6 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 @@ -184,7 +184,7 @@ public void verify(IOSession iosession, SSLSession sslsession) throws SSLExcepti if (verificationManager!=null) { try { - verificationManager.verifyRevocationStatus(sslsession.getPeerCertificateChain()); + verificationManager.verifyCertificateValidity(sslsession.getPeerCertificateChain()); } 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 3152d8f054..bb4e7c08d6 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 @@ -31,10 +31,6 @@ import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.SocketAddress; -import java.security.cert.CertificateExpiredException; -import java.security.cert.CertificateNotYetValidException; -import java.util.Arrays; -import java.util.List; public class ServerSSLSetupHandler implements SSLSetupHandler { @@ -83,9 +79,7 @@ public void verify( if (verificationManager != null) { try { - X509Certificate[] peerCertChain = sslsession.getPeerCertificateChain(); - verificationManager.isExpired(peerCertChain); - verificationManager.verifyRevocationStatus(peerCertChain); + verificationManager.verifyCertificateValidity(sslsession.getPeerCertificateChain()); } catch (CertificateVerificationException e) { SocketAddress remoteAddress = iosession.getRemoteAddress(); String address; diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ServerConnFactoryBuilder.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ServerConnFactoryBuilder.java index 2598138105..b9b4b0018e 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ServerConnFactoryBuilder.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ServerConnFactoryBuilder.java @@ -324,16 +324,23 @@ public ServerConnFactoryBuilder parseSSL() throws AxisFault { // Checking whether the full certificate chain validation is enabled or not. boolean isFullCertChainValidationEnabled = true; - OMElement isFullCertChainValidationConfig = cvp.getParameterElement() + boolean isCertExpiryValidationEnabled = false; + OMElement fullCertChainValidationConfig = cvp.getParameterElement() .getFirstChildWithName(new QName("FullChainValidation")); + OMElement certExpiryValidationConfig = cvp.getParameterElement() + .getFirstChildWithName(new QName("ExpiryValidation")); - if (isFullCertChainValidationConfig != null - && StringUtils.equals("false", isFullCertChainValidationConfig.getText())) { + if (fullCertChainValidationConfig != null + && StringUtils.equals("false", fullCertChainValidationConfig.getText())) { isFullCertChainValidationEnabled = false; } + if (certExpiryValidationConfig != null && StringUtils.equals("true", certExpiryValidationConfig.getText())) { + isCertExpiryValidationEnabled = true; + } + certificateVerifier = new CertificateVerificationManager(cacheSize, cacheDelay, - isFullCertChainValidationEnabled); + isFullCertChainValidationEnabled, isCertExpiryValidationEnabled); } ssl = createSSLContext(keyStoreEl, trustStoreEl, clientAuthEl, httpsProtocolsEl, preferredCiphersEl, @@ -397,16 +404,31 @@ public ServerConnFactoryBuilder parseMultiProfileSSL() throws AxisFault { } boolean isFullCertChainValidationEnabled = true; - OMElement isFullCertChainValidationConfig = revocationVerifierConfig + boolean isCertExpiryValidationEnabled = false; + + OMElement fullCertChainValidationConfig = revocationVerifierConfig .getFirstChildWithName(new QName("FullChainValidation")); - if (isFullCertChainValidationConfig != null - && StringUtils.equals("false", isFullCertChainValidationConfig.getText())) { + OMElement certExpiryValidationConfig = revocationVerifierConfig + .getFirstChildWithName(new QName("ExpiryValidation")); + + if (fullCertChainValidationConfig != null + && StringUtils.equals("false", fullCertChainValidationConfig.getText())) { + isFullCertChainValidationEnabled = false; + } + + if (certExpiryValidationConfig != null + && StringUtils.equals("true", certExpiryValidationConfig.getText())) { + isCertExpiryValidationEnabled = true; + } + + if (fullCertChainValidationConfig != null + && StringUtils.equals("false", fullCertChainValidationConfig.getText())) { isFullCertChainValidationEnabled = false; } certificateVerifier = new CertificateVerificationManager(cacheSize, cacheDelay, - isFullCertChainValidationEnabled); + isFullCertChainValidationEnabled, isCertExpiryValidationEnabled); } SSLContextDetails ssl = createSSLContext(keyStoreEl, trustStoreEl, clientAuthEl, httpsProtocolsEl, diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpListener.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpListener.java index b69cb80abd..3e7f92c6d6 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpListener.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpListener.java @@ -679,8 +679,6 @@ public void reloadDynamicSSLConfig(TransportInDescription transportInDescription Parameter profilePathParam = transportInDescription.getParameter("dynamicSSLProfilesConfig"); if (oldParameter != null && profilePathParam != null) { - CertCache.resetCache(); - TrustStoreHolder.resetInstance(); transportInDescription.removeParameter(oldParameter); this.reloadSpecificEndPoints(transportInDescription); } diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpMultiSSLListener.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpMultiSSLListener.java index 208b364178..406ae5a53b 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpMultiSSLListener.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpMultiSSLListener.java @@ -5,10 +5,12 @@ import org.apache.axis2.description.ParameterInclude; import org.apache.axis2.description.TransportInDescription; import org.apache.http.HttpHost; +import org.apache.synapse.transport.certificatevalidation.cache.CertCache; import org.apache.synapse.transport.http.conn.Scheme; import org.apache.synapse.transport.nhttp.config.ServerConnFactoryBuilder; import org.apache.synapse.transport.dynamicconfigurations.ListenerProfileReloader; import org.apache.synapse.transport.dynamicconfigurations.SSLProfileLoader; +import org.apache.synapse.transport.nhttp.config.TrustStoreHolder; public class PassThroughHttpMultiSSLListener extends PassThroughHttpListener implements SSLProfileLoader{ @@ -39,6 +41,8 @@ protected ServerConnFactoryBuilder initConnFactoryBuilder(final TransportInDescr * @throws AxisFault */ public void reloadConfig(ParameterInclude transport) throws AxisFault { + CertCache.resetCache(); + TrustStoreHolder.resetInstance(); reloadDynamicSSLConfig((TransportInDescription) transport); } diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpSender.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpSender.java index 7379363af3..b977eb30a7 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpSender.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpSender.java @@ -707,8 +707,6 @@ private void handleException(String msg) throws AxisFault { public void reloadDynamicSSLConfig(TransportOutDescription transport) throws AxisFault { log.info("PassThroughHttpSender reloading SSL Config.."); try { - CertCache.resetCache(); - TrustStoreHolder.resetInstance(); ClientConnFactoryBuilder connFactoryBuilder = initConnFactoryBuilder(transport, this.configurationContext); connFactory = connFactoryBuilder.createConnFactory(targetConfiguration.getHttpParams()); From a543877ee3b835d9c6b8da909b49701c49accf34 Mon Sep 17 00:00:00 2001 From: akila94 Date: Mon, 22 Jan 2024 11:48:30 +0530 Subject: [PATCH 108/308] Add warn log --- .../certificatevalidation/CertificateVerificationManager.java | 2 ++ 1 file changed, 2 insertions(+) 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 100767e1ef..ceca801109 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 @@ -61,6 +61,8 @@ public CertificateVerificationManager(Integer cacheAllocatedSize, Integer cacheD && cacheAllocatedSize < Constants.CACHE_MAX_ALLOCATED_SIZE) { this.cacheSize = cacheAllocatedSize; } + log.warn("The cache size is out of range. Hence, using the default cache size value of " + + Constants.CACHE_DEFAULT_ALLOCATED_SIZE + "."); if (cacheDelayMins != null && cacheDelayMins > Constants.CACHE_MIN_DELAY_MINS && cacheDelayMins < Constants.CACHE_MAX_DELAY_MINS) { this.cacheDelayMins = cacheDelayMins; From 6671e3971d4341cc691d4558088b42f1e30ec40a Mon Sep 17 00:00:00 2001 From: akila94 Date: Tue, 23 Jan 2024 10:39:53 +0530 Subject: [PATCH 109/308] Fix PR comments --- .../CertificateVerificationManager.java | 14 +++++++------- .../certificatevalidation/crl/CRLCache.java | 3 ++- .../certificatevalidation/ocsp/OCSPCache.java | 7 +++++-- .../certificatevalidation/CRLVerifierTest.java | 3 +-- .../certificatevalidation/OCSPVerifierTest.java | 3 +-- .../RevocationVerificationTest.java | 6 ++---- .../conf/vfs-move-failed-records.properties | 1 + 7 files changed, 19 insertions(+), 18 deletions(-) create mode 100644 modules/transports/core/vfs/repository/conf/vfs-move-failed-records.properties 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 ceca801109..93ca51e710 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 @@ -67,6 +67,8 @@ public CertificateVerificationManager(Integer cacheAllocatedSize, Integer cacheD && cacheDelayMins < Constants.CACHE_MAX_DELAY_MINS) { this.cacheDelayMins = cacheDelayMins; } + log.warn("The cache delay is out of range. Hence, using the default cache delay value of " + + Constants.CACHE_DEFAULT_DELAY_MINS + "."); } public CertificateVerificationManager(Integer cacheAllocatedSize, Integer cacheDelayMins, @@ -81,6 +83,9 @@ public CertificateVerificationManager(Integer cacheAllocatedSize, Integer cacheD && cacheDelayMins < Constants.CACHE_MAX_DELAY_MINS) { this.cacheDelayMins = cacheDelayMins; } + log.warn("The cache delay is out of range. Hence, using the default cache delay value of " + + Constants.CACHE_DEFAULT_DELAY_MINS + "."); + this.isFullCertChainValidationEnabled = isFullCertChainValidationEnabled; this.isCertExpiryValidationEnabled = isCertExpiryValidationEnabled; } @@ -182,12 +187,8 @@ public void verifyCertificateValidity(javax.security.cert.X509Certificate[] peer } } - long start = System.currentTimeMillis(); - - OCSPCache ocspCache = OCSPCache.getCache(); - ocspCache.init(cacheSize, cacheDelayMins); - CRLCache crlCache = CRLCache.getCache(); - crlCache.init(cacheSize, cacheDelayMins); + OCSPCache ocspCache = OCSPCache.getCache(cacheSize, cacheDelayMins); + CRLCache crlCache = CRLCache.getCache(cacheSize, cacheDelayMins); RevocationVerifier[] verifiers = {new OCSPVerifier(ocspCache), new CRLVerifier(crlCache)}; @@ -206,7 +207,6 @@ public void verifyCertificateValidity(javax.security.cert.X509Certificate[] peer CertificatePathValidator pathValidator = new CertificatePathValidator(convertedCertificates, verifier); pathValidator.validatePath(); - log.info("Path verification Successful. Took " + (System.currentTimeMillis() - start) + " ms."); } else { if (isCertExpiryValidationEnabled) { diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/crl/CRLCache.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/crl/CRLCache.java index 11db425524..2597960102 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/crl/CRLCache.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/crl/CRLCache.java @@ -50,12 +50,13 @@ public class CRLCache implements ManageableCache { private CRLCache() { } - public static CRLCache getCache() { + public static CRLCache getCache(int cacheSize, int cacheDelayMins) { //Double checked locking if (cache == null) { synchronized (CRLCache.class) { if (cache == null) { cache = new CRLCache(); + cacheManager = new CacheManager(cache, cacheSize, cacheDelayMins); } } } diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPCache.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPCache.java index 471323e6b3..cf904cd3f4 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPCache.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPCache.java @@ -22,6 +22,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.synapse.commons.jmx.MBeanRegistrar; import org.apache.synapse.transport.certificatevalidation.CertificateVerificationException; +import org.apache.synapse.transport.certificatevalidation.Constants; import org.apache.synapse.transport.certificatevalidation.cache.CacheController; import org.apache.synapse.transport.certificatevalidation.cache.CacheManager; import org.apache.synapse.transport.certificatevalidation.cache.ManageableCache; @@ -51,12 +52,14 @@ public class OCSPCache implements ManageableCache { private OCSPCache() {} - public static OCSPCache getCache() { + public static OCSPCache getCache(int cacheSize, int cacheDelayMins) { //Double checked locking if (cache == null) { synchronized (OCSPCache.class) { - if (cache == null) + if (cache == null) { cache = new OCSPCache(); + cacheManager = new CacheManager(cache, cacheSize, cacheDelayMins); + } } } return cache; diff --git a/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/CRLVerifierTest.java b/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/CRLVerifierTest.java index 38d7964b8a..ec582f9dd7 100644 --- a/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/CRLVerifierTest.java +++ b/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/CRLVerifierTest.java @@ -88,8 +88,7 @@ public void testRevokedCertificate() throws Exception { //Create a crl with fakeRevokedCertificate marked as revoked. X509CRL x509CRL = createCRL(fakeCACert, caKeyPair.getPrivate(), revokedSerialNumber); - CRLCache cache = CRLCache.getCache(); - cache.init(5, 5); + CRLCache cache = CRLCache.getCache(5, 5); cache.setCacheValue(crlDistributionPointUrl, x509CRL); CRLVerifier crlVerifier = new CRLVerifier(cache); diff --git a/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/OCSPVerifierTest.java b/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/OCSPVerifierTest.java index 9c2299bb2b..9d4f0a01bd 100644 --- a/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/OCSPVerifierTest.java +++ b/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/OCSPVerifierTest.java @@ -107,8 +107,7 @@ public void testOCSPVerifier() throws Exception{ OCSPResp response = generateOCSPResponse(request, certificateHolder, caKeyPair.getPrivate(), caKeyPair.getPublic(), revokedID); SingleResp singleResp = ((BasicOCSPResp)response.getResponseObject()).getResponses()[0]; - OCSPCache cache = OCSPCache.getCache(); - cache.init(5,5); + OCSPCache cache = OCSPCache.getCache(5, 5); cache.setCacheValue(revokedSerialNumber,singleResp, request, null); OCSPVerifier ocspVerifier= new OCSPVerifier(cache); diff --git a/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationTest.java b/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationTest.java index 7f282dd86c..9adc063ea0 100644 --- a/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationTest.java +++ b/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationTest.java @@ -116,8 +116,7 @@ public void testOCSPPathValidationWithFakeCerts() throws Exception { private void crlPathValidation(X509Certificate[] certChain) throws Exception { - CRLCache crlCache = CRLCache.getCache(); - crlCache.init(5, 5); + CRLCache crlCache = CRLCache.getCache(5, 5); RevocationVerifier verifier = new CRLVerifier(crlCache); CertificatePathValidator pathValidator = new CertificatePathValidator(certChain, verifier); pathValidator.validatePath(); @@ -125,8 +124,7 @@ private void crlPathValidation(X509Certificate[] certChain) throws Exception { private void ocspPathValidation(X509Certificate[] certChain) throws Exception { - OCSPCache ocspCache = OCSPCache.getCache(); - ocspCache.init(5, 5); + OCSPCache ocspCache = OCSPCache.getCache(5, 5); RevocationVerifier verifier = new OCSPVerifier(ocspCache); CertificatePathValidator pathValidator = new CertificatePathValidator(certChain, verifier); pathValidator.validatePath(); diff --git a/modules/transports/core/vfs/repository/conf/vfs-move-failed-records.properties b/modules/transports/core/vfs/repository/conf/vfs-move-failed-records.properties new file mode 100644 index 0000000000..8f1ee4a76d --- /dev/null +++ b/modules/transports/core/vfs/repository/conf/vfs-move-failed-records.properties @@ -0,0 +1 @@ +t-0-1705986523002.txt 23/01/2024/ 10:38:43 \ No newline at end of file From d02fc9094da18bb166796929d8009da570dfb0b2 Mon Sep 17 00:00:00 2001 From: akila94 Date: Fri, 26 Jan 2024 15:16:20 +0530 Subject: [PATCH 110/308] Reformat logs --- .../CertificateVerificationManager.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 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 93ca51e710..2765ac41a1 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 @@ -60,15 +60,17 @@ public CertificateVerificationManager(Integer cacheAllocatedSize, Integer cacheD if (cacheAllocatedSize != null && cacheAllocatedSize > Constants.CACHE_MIN_ALLOCATED_SIZE && cacheAllocatedSize < Constants.CACHE_MAX_ALLOCATED_SIZE) { this.cacheSize = cacheAllocatedSize; + } else { + log.warn("The cache size is out of range. Hence, using the default cache size value of " + + Constants.CACHE_DEFAULT_ALLOCATED_SIZE + "."); } - log.warn("The cache size is out of range. Hence, using the default cache size value of " - + Constants.CACHE_DEFAULT_ALLOCATED_SIZE + "."); if (cacheDelayMins != null && cacheDelayMins > Constants.CACHE_MIN_DELAY_MINS && cacheDelayMins < Constants.CACHE_MAX_DELAY_MINS) { this.cacheDelayMins = cacheDelayMins; + } else { + log.warn("The cache delay is out of range. Hence, using the default cache delay value of " + + Constants.CACHE_DEFAULT_DELAY_MINS + "."); } - log.warn("The cache delay is out of range. Hence, using the default cache delay value of " - + Constants.CACHE_DEFAULT_DELAY_MINS + "."); } public CertificateVerificationManager(Integer cacheAllocatedSize, Integer cacheDelayMins, @@ -78,13 +80,17 @@ public CertificateVerificationManager(Integer cacheAllocatedSize, Integer cacheD if (cacheAllocatedSize != null && cacheAllocatedSize > Constants.CACHE_MIN_ALLOCATED_SIZE && cacheAllocatedSize < Constants.CACHE_MAX_ALLOCATED_SIZE) { this.cacheSize = cacheAllocatedSize; + } else { + log.warn("The cache size is out of range. Hence, using the default cache size value of " + + Constants.CACHE_DEFAULT_ALLOCATED_SIZE + "."); } if (cacheDelayMins != null && cacheDelayMins > Constants.CACHE_MIN_DELAY_MINS && cacheDelayMins < Constants.CACHE_MAX_DELAY_MINS) { this.cacheDelayMins = cacheDelayMins; + } else { + log.warn("The cache delay is out of range. Hence, using the default cache delay value of " + + Constants.CACHE_DEFAULT_DELAY_MINS + "."); } - log.warn("The cache delay is out of range. Hence, using the default cache delay value of " - + Constants.CACHE_DEFAULT_DELAY_MINS + "."); this.isFullCertChainValidationEnabled = isFullCertChainValidationEnabled; this.isCertExpiryValidationEnabled = isCertExpiryValidationEnabled; @@ -222,7 +228,6 @@ public void verifyCertificateValidity(javax.security.cert.X509Certificate[] peer } return; } catch (Exception e) { - log.info(verifier.getClass().getSimpleName() + " failed."); log.debug("Certificate verification with " + verifier.getClass().getSimpleName() + " failed. ", e); } } From 1ef5be0d7cd0cf37753cfd45a4a2a33d1acc811b Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 26 Jan 2024 13:39:50 +0000 Subject: [PATCH 111/308] [WSO2 Release] [Jenkins #6805] [Release 4.0.0-wso2v71] prepare release v4.0.0-wso2v71 --- 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 e85f645732..56206331cc 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v71-SNAPSHOT + 4.0.0-wso2v71 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 04cbcece08..11ac987704 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v71-SNAPSHOT + 4.0.0-wso2v71 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index af2a79066d..b91e4f2dc9 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-wso2v71-SNAPSHOT + 4.0.0-wso2v71 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 21fc3db023..0e0478a5ff 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v71-SNAPSHOT + 4.0.0-wso2v71 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 251c931b45..6b218c2184 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v71-SNAPSHOT + 4.0.0-wso2v71 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index a6972d7b94..02ad519ccf 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v71-SNAPSHOT + 4.0.0-wso2v71 ../../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 8c219c1b72..e54600a256 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-wso2v71-SNAPSHOT + 4.0.0-wso2v71 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 87e9447a26..75b6a55ee4 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-wso2v71-SNAPSHOT + 4.0.0-wso2v71 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 82d76793d8..47a9370a00 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-wso2v71-SNAPSHOT + 4.0.0-wso2v71 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 230b8dd3ec..e0173bc8ed 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-wso2v71-SNAPSHOT + 4.0.0-wso2v71 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 d415a9899f..6bbc17fc26 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-wso2v71-SNAPSHOT + 4.0.0-wso2v71 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 85a400b139..68f34aa78c 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-wso2v71-SNAPSHOT + 4.0.0-wso2v71 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 99af51484f..4ecc9585e0 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-wso2v71-SNAPSHOT + 4.0.0-wso2v71 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index efa493e2b6..d9b48334c9 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v71-SNAPSHOT + 4.0.0-wso2v71 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 6979a3d103..ef5b29c1b6 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v71-SNAPSHOT + 4.0.0-wso2v71 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 5f5a705b38..26423c8281 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v71-SNAPSHOT + 4.0.0-wso2v71 ../../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-wso2v71 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index b26a177bb9..73df8f344c 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v71-SNAPSHOT + 4.0.0-wso2v71 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 1a263c1d7c..632f73aa1a 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-wso2v71-SNAPSHOT + 4.0.0-wso2v71 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index f7e22f2efb..01fa1a27d5 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-wso2v71-SNAPSHOT + 4.0.0-wso2v71 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 4019d35842..8f4733056c 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v71-SNAPSHOT + 4.0.0-wso2v71 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 705114f673..7061ba910d 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v71-SNAPSHOT + 4.0.0-wso2v71 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 2e96f274db..47b125f564 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v71-SNAPSHOT + 4.0.0-wso2v71 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 29bf16e69e..078fb8bd0b 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v71-SNAPSHOT + 4.0.0-wso2v71 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 1fb7b76890..83a411e342 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-wso2v71-SNAPSHOT + 4.0.0-wso2v71 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 83b375f11b..121d5eb7e0 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-wso2v71-SNAPSHOT + 4.0.0-wso2v71 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index a00522c701..ac43dcb6f3 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-wso2v71-SNAPSHOT + 4.0.0-wso2v71 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 313989cd5a..7a8dae0eed 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-wso2v71-SNAPSHOT + 4.0.0-wso2v71 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index c13c620825..61e274aa30 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v71-SNAPSHOT + 4.0.0-wso2v71 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 9fb0b76443..68e1f34d8b 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v71-SNAPSHOT + 4.0.0-wso2v71 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 5f10bee805..8297a0affb 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-wso2v71-SNAPSHOT + 4.0.0-wso2v71 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index d858824cd0..0977ff4f2c 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v71-SNAPSHOT + 4.0.0-wso2v71 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-wso2v71 Apache Software Foundation From e8e70f0b201c27c9cc46c6be032c5cf0f8f3a6fc Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 26 Jan 2024 13:39:51 +0000 Subject: [PATCH 112/308] [WSO2 Release] [Jenkins #6805] [Release 4.0.0-wso2v71] 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 56206331cc..5bcded821d 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v71 + 4.0.0-wso2v72-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 11ac987704..a088dbbd44 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v71 + 4.0.0-wso2v72-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index b91e4f2dc9..7fdde64b1b 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-wso2v71 + 4.0.0-wso2v72-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 0e0478a5ff..c9e3421161 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v71 + 4.0.0-wso2v72-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 6b218c2184..b6721038bd 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v71 + 4.0.0-wso2v72-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 02ad519ccf..0cb332769e 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v71 + 4.0.0-wso2v72-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 e54600a256..2303377d32 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-wso2v71 + 4.0.0-wso2v72-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 75b6a55ee4..e3a7a78c76 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-wso2v71 + 4.0.0-wso2v72-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 47a9370a00..a444d02d4d 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-wso2v71 + 4.0.0-wso2v72-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 e0173bc8ed..89a448d423 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-wso2v71 + 4.0.0-wso2v72-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 6bbc17fc26..59a21db186 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-wso2v71 + 4.0.0-wso2v72-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 68f34aa78c..27bd89acd5 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-wso2v71 + 4.0.0-wso2v72-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 4ecc9585e0..0f4d06d7fa 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-wso2v71 + 4.0.0-wso2v72-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index d9b48334c9..7acc6b5faf 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v71 + 4.0.0-wso2v72-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index ef5b29c1b6..be1ff98b84 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v71 + 4.0.0-wso2v72-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 26423c8281..951b61bf6f 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v71 + 4.0.0-wso2v72-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-wso2v71 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 73df8f344c..24f4d3b21c 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v71 + 4.0.0-wso2v72-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 632f73aa1a..6da7f95f06 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-wso2v71 + 4.0.0-wso2v72-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 01fa1a27d5..5030966654 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-wso2v71 + 4.0.0-wso2v72-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 8f4733056c..f6631be765 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v71 + 4.0.0-wso2v72-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 7061ba910d..2af5c2a0db 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v71 + 4.0.0-wso2v72-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 47b125f564..6c5af61d53 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v71 + 4.0.0-wso2v72-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 078fb8bd0b..6c51e3189c 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v71 + 4.0.0-wso2v72-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 83a411e342..ffd57040d6 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-wso2v71 + 4.0.0-wso2v72-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 121d5eb7e0..4f399083c6 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-wso2v71 + 4.0.0-wso2v72-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index ac43dcb6f3..30aab7c13a 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-wso2v71 + 4.0.0-wso2v72-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 7a8dae0eed..ba0d6462df 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-wso2v71 + 4.0.0-wso2v72-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 61e274aa30..74939da9d1 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v71 + 4.0.0-wso2v72-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 68e1f34d8b..4c3ddb51a2 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v71 + 4.0.0-wso2v72-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 8297a0affb..041c9ea649 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-wso2v71 + 4.0.0-wso2v72-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 0977ff4f2c..c7d041bc85 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v71 + 4.0.0-wso2v72-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-wso2v71 + HEAD Apache Software Foundation From ce41c7c8d643539f15e14517327ccf1b9773c8e4 Mon Sep 17 00:00:00 2001 From: Savindu Dimal Date: Mon, 29 Jan 2024 13:37:43 +0530 Subject: [PATCH 113/308] Add config to enable/disable TLS graceful connection termination --- .../transport/passthru/SourceHandler.java | 17 ++++++++++++++--- .../transport/passthru/TargetHandler.java | 14 ++++++++++++-- .../config/PassThroughConfigPNames.java | 6 ++++++ .../config/PassThroughConfiguration.java | 11 +++++++++++ 4 files changed, 43 insertions(+), 5 deletions(-) diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceHandler.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceHandler.java index 335ccb17de..e7c5c9944c 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceHandler.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceHandler.java @@ -759,8 +759,13 @@ public void timeout(NHttpServerConnection conn) { } SourceContext.updateState(conn, ProtocolState.CLOSED); - - sourceConfiguration.getSourceConnections().closeConnection(conn, true); + + if (conf.isTLSGracefulConnectionTerminationEnabled()) { + sourceConfiguration.getSourceConnections().closeConnection(conn, true); + } else { + sourceConfiguration.getSourceConnections().shutDownConnection(conn, true); + } + if (isTimeoutOccurred) { rollbackTransaction(conn); } @@ -845,7 +850,13 @@ public void closed(NHttpServerConnection conn) { metrics.disconnected(); SourceContext.updateState(conn, ProtocolState.CLOSED); - sourceConfiguration.getSourceConnections().closeConnection(conn, isFault); + + if (conf.isTLSGracefulConnectionTerminationEnabled()) { + sourceConfiguration.getSourceConnections().closeConnection(conn, isFault); + } else { + sourceConfiguration.getSourceConnections().shutDownConnection(conn, isFault); + } + if (isFault) { rollbackTransaction(conn); metrics.exceptionOccured(); diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetHandler.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetHandler.java index 76f5694006..b7319cce8f 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetHandler.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetHandler.java @@ -827,7 +827,12 @@ public void closed(NHttpClientConnection conn) { metrics.disconnected(); TargetContext.updateState(conn, ProtocolState.CLOSED); - targetConfiguration.getConnections().closeConnection(conn, isFault); + + if (conf.isTLSGracefulConnectionTerminationEnabled()) { + targetConfiguration.getConnections().closeConnection(conn, isFault); + } else { + targetConfiguration.getConnections().shutdownConnection(conn, isFault); + } } @@ -937,7 +942,12 @@ public void timeout(NHttpClientConnection conn) { } TargetContext.updateState(conn, ProtocolState.CLOSED); - targetConfiguration.getConnections().closeConnection(conn, true); + + if (conf.isTLSGracefulConnectionTerminationEnabled()) { + targetConfiguration.getConnections().closeConnection(conn, true); + } else { + targetConfiguration.getConnections().shutdownConnection(conn, true); + } } private String workerPoolExhaustedErrorMessage(Object clientWorker diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/config/PassThroughConfigPNames.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/config/PassThroughConfigPNames.java index 57f65026d4..0fa39c4a55 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/config/PassThroughConfigPNames.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/config/PassThroughConfigPNames.java @@ -182,4 +182,10 @@ public interface PassThroughConfigPNames { * Defines whether to ignore case-sensitive headers from excess headers map */ public String IGNORE_CASE_SENSITIVE_HEADERS = "ignore_case_sensitive_headers"; + + /** + * Defines whether TransportHandler and SourceHandler has to enable/disable TLS graceful connection termination + */ + public String TLS_GRACEFUL_CONNECTION_TERMINATION = "tls_graceful_connection_termination"; + } diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/config/PassThroughConfiguration.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/config/PassThroughConfiguration.java index 6d739ec433..a504525da3 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/config/PassThroughConfiguration.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/config/PassThroughConfiguration.java @@ -70,6 +70,9 @@ public class PassThroughConfiguration { /** Reverse proxy mode is enabled or not */ private Boolean reverseProxyMode = null; + /** Enables graceful termination for TLS connection */ + private Boolean isTLSGracefulConnectionTerminationEnabled = null; + /** Default Synapse service name */ private String passThroughDefaultServiceName = null; @@ -151,6 +154,14 @@ public boolean isCloseSocketOnEndpointTimeout() { , CLOSE_SOCKET_ON_ENDPOINT_TIMEOUT, props); } + public boolean isTLSGracefulConnectionTerminationEnabled() { + if (isTLSGracefulConnectionTerminationEnabled == null) { + isTLSGracefulConnectionTerminationEnabled = getBooleanProperty( + PassThroughConfigPNames.TLS_GRACEFUL_CONNECTION_TERMINATION, true); + } + return isTLSGracefulConnectionTerminationEnabled; + } + public boolean isConsumeAndDiscard() { isConsumeAndDiscard = ConfigurationBuilderUtil.getBooleanProperty(PassThroughConfigPNames.CONSUME_AND_DISCARD, From 4b14822932885d0557bcd59c52140ec77d98353a Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 29 Jan 2024 09:24:11 +0000 Subject: [PATCH 114/308] [WSO2 Release] [Jenkins #6810] [Release 4.0.0-wso2v72] prepare release v4.0.0-wso2v72 --- 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 5bcded821d..bd1936eda9 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v72-SNAPSHOT + 4.0.0-wso2v72 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index a088dbbd44..3ff6c71a65 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v72-SNAPSHOT + 4.0.0-wso2v72 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 7fdde64b1b..9fcc3008fb 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-wso2v72-SNAPSHOT + 4.0.0-wso2v72 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index c9e3421161..5f2d164199 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v72-SNAPSHOT + 4.0.0-wso2v72 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index b6721038bd..33113a0e56 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v72-SNAPSHOT + 4.0.0-wso2v72 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 0cb332769e..bb035b2698 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v72-SNAPSHOT + 4.0.0-wso2v72 ../../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 2303377d32..d59626d707 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-wso2v72-SNAPSHOT + 4.0.0-wso2v72 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 e3a7a78c76..335c8c5963 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-wso2v72-SNAPSHOT + 4.0.0-wso2v72 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 a444d02d4d..a23bdfea33 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-wso2v72-SNAPSHOT + 4.0.0-wso2v72 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 89a448d423..84a4a89d48 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-wso2v72-SNAPSHOT + 4.0.0-wso2v72 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 59a21db186..fba9b95b58 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-wso2v72-SNAPSHOT + 4.0.0-wso2v72 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 27bd89acd5..6b242b18de 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-wso2v72-SNAPSHOT + 4.0.0-wso2v72 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 0f4d06d7fa..6481201033 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-wso2v72-SNAPSHOT + 4.0.0-wso2v72 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 7acc6b5faf..1f390e1166 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v72-SNAPSHOT + 4.0.0-wso2v72 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index be1ff98b84..fb26da5e18 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v72-SNAPSHOT + 4.0.0-wso2v72 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 951b61bf6f..bd29d3da77 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v72-SNAPSHOT + 4.0.0-wso2v72 ../../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-wso2v72 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 24f4d3b21c..ddab9a0869 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v72-SNAPSHOT + 4.0.0-wso2v72 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 6da7f95f06..debf432ae1 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-wso2v72-SNAPSHOT + 4.0.0-wso2v72 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 5030966654..281d910a7c 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-wso2v72-SNAPSHOT + 4.0.0-wso2v72 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index f6631be765..694ef26315 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v72-SNAPSHOT + 4.0.0-wso2v72 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 2af5c2a0db..c52bc6158e 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v72-SNAPSHOT + 4.0.0-wso2v72 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 6c5af61d53..b1f9934d81 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v72-SNAPSHOT + 4.0.0-wso2v72 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 6c51e3189c..97027b2637 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v72-SNAPSHOT + 4.0.0-wso2v72 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index ffd57040d6..1a89ee3a97 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-wso2v72-SNAPSHOT + 4.0.0-wso2v72 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 4f399083c6..08f1df383d 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-wso2v72-SNAPSHOT + 4.0.0-wso2v72 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 30aab7c13a..bf7ac16ff9 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-wso2v72-SNAPSHOT + 4.0.0-wso2v72 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index ba0d6462df..089390c9e6 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-wso2v72-SNAPSHOT + 4.0.0-wso2v72 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 74939da9d1..8e3af745ce 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v72-SNAPSHOT + 4.0.0-wso2v72 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 4c3ddb51a2..9d7f446c88 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v72-SNAPSHOT + 4.0.0-wso2v72 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 041c9ea649..428b6fda56 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-wso2v72-SNAPSHOT + 4.0.0-wso2v72 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index c7d041bc85..d8c26ae810 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v72-SNAPSHOT + 4.0.0-wso2v72 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-wso2v72 Apache Software Foundation From f5323e111d1472541733e44874ae0958d2348585 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 29 Jan 2024 09:24:13 +0000 Subject: [PATCH 115/308] [WSO2 Release] [Jenkins #6810] [Release 4.0.0-wso2v72] 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 bd1936eda9..ca5304dc61 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v72 + 4.0.0-wso2v73-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 3ff6c71a65..0db6545049 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v72 + 4.0.0-wso2v73-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 9fcc3008fb..01d0fadc18 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-wso2v72 + 4.0.0-wso2v73-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 5f2d164199..2fc83462b0 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v72 + 4.0.0-wso2v73-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 33113a0e56..3a24cc33c1 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v72 + 4.0.0-wso2v73-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index bb035b2698..f2cd4937b1 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v72 + 4.0.0-wso2v73-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 d59626d707..453e65a393 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-wso2v72 + 4.0.0-wso2v73-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 335c8c5963..8c2a37a38b 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-wso2v72 + 4.0.0-wso2v73-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 a23bdfea33..54fafa7cf9 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-wso2v72 + 4.0.0-wso2v73-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 84a4a89d48..acfe563c87 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-wso2v72 + 4.0.0-wso2v73-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 fba9b95b58..694b3f86fe 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-wso2v72 + 4.0.0-wso2v73-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 6b242b18de..a165353d83 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-wso2v72 + 4.0.0-wso2v73-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 6481201033..0ace0a07c9 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-wso2v72 + 4.0.0-wso2v73-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 1f390e1166..b4ec9ce026 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v72 + 4.0.0-wso2v73-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index fb26da5e18..466d6d4238 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v72 + 4.0.0-wso2v73-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index bd29d3da77..91e53b7f56 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v72 + 4.0.0-wso2v73-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-wso2v72 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index ddab9a0869..60e9746c15 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v72 + 4.0.0-wso2v73-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index debf432ae1..ead28bb563 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-wso2v72 + 4.0.0-wso2v73-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 281d910a7c..cbe811e92e 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-wso2v72 + 4.0.0-wso2v73-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 694ef26315..0f6a0d90b2 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v72 + 4.0.0-wso2v73-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index c52bc6158e..5b5234706f 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v72 + 4.0.0-wso2v73-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index b1f9934d81..ddb8d34930 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v72 + 4.0.0-wso2v73-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 97027b2637..28add51bd3 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v72 + 4.0.0-wso2v73-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 1a89ee3a97..ec342b8f5b 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-wso2v72 + 4.0.0-wso2v73-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 08f1df383d..e89db95d86 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-wso2v72 + 4.0.0-wso2v73-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index bf7ac16ff9..aebb23fe52 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-wso2v72 + 4.0.0-wso2v73-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 089390c9e6..88ca384a88 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-wso2v72 + 4.0.0-wso2v73-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 8e3af745ce..a31b9f9426 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v72 + 4.0.0-wso2v73-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 9d7f446c88..30626e7243 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v72 + 4.0.0-wso2v73-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 428b6fda56..68b3d14a5a 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-wso2v72 + 4.0.0-wso2v73-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index d8c26ae810..8631676bb9 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v72 + 4.0.0-wso2v73-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-wso2v72 + HEAD Apache Software Foundation From 81293674330afe864319f30965012a7dfecac25a Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 30 Jan 2024 09:40:47 +0000 Subject: [PATCH 116/308] [WSO2 Release] [Jenkins #6813] [Release 4.0.0-wso2v73] prepare release v4.0.0-wso2v73 --- 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 ca5304dc61..960a245d86 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v73-SNAPSHOT + 4.0.0-wso2v73 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 0db6545049..70e8e4b061 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v73-SNAPSHOT + 4.0.0-wso2v73 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 01d0fadc18..26653db5cc 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-wso2v73-SNAPSHOT + 4.0.0-wso2v73 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 2fc83462b0..eac3164f23 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v73-SNAPSHOT + 4.0.0-wso2v73 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 3a24cc33c1..2236538fbd 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v73-SNAPSHOT + 4.0.0-wso2v73 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index f2cd4937b1..282d42e6af 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v73-SNAPSHOT + 4.0.0-wso2v73 ../../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 453e65a393..0ef39a00a7 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-wso2v73-SNAPSHOT + 4.0.0-wso2v73 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 8c2a37a38b..46b8ec2d97 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-wso2v73-SNAPSHOT + 4.0.0-wso2v73 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 54fafa7cf9..400009c912 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-wso2v73-SNAPSHOT + 4.0.0-wso2v73 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 acfe563c87..7c05db4f71 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-wso2v73-SNAPSHOT + 4.0.0-wso2v73 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 694b3f86fe..2e906c6e08 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-wso2v73-SNAPSHOT + 4.0.0-wso2v73 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 a165353d83..b77d3d7a13 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-wso2v73-SNAPSHOT + 4.0.0-wso2v73 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 0ace0a07c9..af24aef0dc 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-wso2v73-SNAPSHOT + 4.0.0-wso2v73 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index b4ec9ce026..7a7e8476a4 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v73-SNAPSHOT + 4.0.0-wso2v73 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 466d6d4238..a1c5ba8f24 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v73-SNAPSHOT + 4.0.0-wso2v73 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 91e53b7f56..79058ad2d7 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v73-SNAPSHOT + 4.0.0-wso2v73 ../../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-wso2v73 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 60e9746c15..656b07e6e4 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v73-SNAPSHOT + 4.0.0-wso2v73 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index ead28bb563..b969985e72 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-wso2v73-SNAPSHOT + 4.0.0-wso2v73 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index cbe811e92e..9e38b3fac4 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-wso2v73-SNAPSHOT + 4.0.0-wso2v73 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 0f6a0d90b2..221e950da7 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v73-SNAPSHOT + 4.0.0-wso2v73 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 5b5234706f..28497f5bba 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v73-SNAPSHOT + 4.0.0-wso2v73 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index ddb8d34930..45e29eb9a9 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v73-SNAPSHOT + 4.0.0-wso2v73 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 28add51bd3..969344e447 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v73-SNAPSHOT + 4.0.0-wso2v73 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index ec342b8f5b..ddb762fea1 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-wso2v73-SNAPSHOT + 4.0.0-wso2v73 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index e89db95d86..92d6eb8c52 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-wso2v73-SNAPSHOT + 4.0.0-wso2v73 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index aebb23fe52..21ebba484d 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-wso2v73-SNAPSHOT + 4.0.0-wso2v73 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 88ca384a88..dfa5c14eab 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-wso2v73-SNAPSHOT + 4.0.0-wso2v73 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index a31b9f9426..bf560a349e 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v73-SNAPSHOT + 4.0.0-wso2v73 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 30626e7243..566cd4379f 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v73-SNAPSHOT + 4.0.0-wso2v73 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 68b3d14a5a..b705c8c5ec 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-wso2v73-SNAPSHOT + 4.0.0-wso2v73 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index c08acc5dcf..9bf1ea2257 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v73-SNAPSHOT + 4.0.0-wso2v73 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-wso2v73 Apache Software Foundation From c008566cd8f8a7a3afeb6c24c665836162124e47 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 30 Jan 2024 09:40:48 +0000 Subject: [PATCH 117/308] [WSO2 Release] [Jenkins #6813] [Release 4.0.0-wso2v73] 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 960a245d86..d563c33804 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v73 + 4.0.0-wso2v74-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 70e8e4b061..0b4f8d9eca 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v73 + 4.0.0-wso2v74-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 26653db5cc..17fe0c0f6c 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-wso2v73 + 4.0.0-wso2v74-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index eac3164f23..274eaa5be2 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v73 + 4.0.0-wso2v74-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 2236538fbd..3b1dce4cd7 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v73 + 4.0.0-wso2v74-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 282d42e6af..efdd3d4145 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v73 + 4.0.0-wso2v74-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 0ef39a00a7..244211fb43 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-wso2v73 + 4.0.0-wso2v74-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 46b8ec2d97..baca75ddce 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-wso2v73 + 4.0.0-wso2v74-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 400009c912..d7c496778d 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-wso2v73 + 4.0.0-wso2v74-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 7c05db4f71..75785b6eca 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-wso2v73 + 4.0.0-wso2v74-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 2e906c6e08..c5c7ad6a47 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-wso2v73 + 4.0.0-wso2v74-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 b77d3d7a13..e694d73398 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-wso2v73 + 4.0.0-wso2v74-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 af24aef0dc..f1a342c9aa 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-wso2v73 + 4.0.0-wso2v74-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 7a7e8476a4..bcdc25869f 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v73 + 4.0.0-wso2v74-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index a1c5ba8f24..c5b05bedb1 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v73 + 4.0.0-wso2v74-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 79058ad2d7..b014839190 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v73 + 4.0.0-wso2v74-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-wso2v73 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 656b07e6e4..591dd24c1d 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v73 + 4.0.0-wso2v74-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index b969985e72..c2026b18ac 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-wso2v73 + 4.0.0-wso2v74-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 9e38b3fac4..0a5a6dd6de 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-wso2v73 + 4.0.0-wso2v74-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 221e950da7..187fcb8fa5 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v73 + 4.0.0-wso2v74-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 28497f5bba..a42879fba1 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v73 + 4.0.0-wso2v74-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 45e29eb9a9..75397e2c73 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v73 + 4.0.0-wso2v74-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 969344e447..5f27acce2a 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v73 + 4.0.0-wso2v74-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index ddb762fea1..08f7f94c60 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-wso2v73 + 4.0.0-wso2v74-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 92d6eb8c52..2b5fd31dd7 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-wso2v73 + 4.0.0-wso2v74-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 21ebba484d..accc33dca0 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-wso2v73 + 4.0.0-wso2v74-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index dfa5c14eab..a4ece06952 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-wso2v73 + 4.0.0-wso2v74-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index bf560a349e..54620c43bb 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v73 + 4.0.0-wso2v74-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 566cd4379f..cd45dfb6b0 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v73 + 4.0.0-wso2v74-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index b705c8c5ec..9ea15537d0 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-wso2v73 + 4.0.0-wso2v74-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 9bf1ea2257..45b170c7b0 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v73 + 4.0.0-wso2v74-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-wso2v73 + HEAD Apache Software Foundation From 5cfd65f4a7eacb69ad6350a51fc1b9a8f2d0c054 Mon Sep 17 00:00:00 2001 From: tgtshanika Date: Tue, 30 Jan 2024 20:03:34 +0530 Subject: [PATCH 118/308] Upgrade opentelemetry version --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 45b170c7b0..e7d5c4e98b 100644 --- a/pom.xml +++ b/pom.xml @@ -1569,7 +1569,7 @@ 2.16.1 2.16.1 33.0.0-jre - 1.0.1 + 1.0.2 2.9.4.wso2v1 7.4.2.wso2v1 0.8.6 @@ -1589,7 +1589,7 @@ 6.3.50 1.1.1.wso2v3 5.8.0 - 1.11.0.wso2v5 + 1.34.1.wso2v1 4.9.3.wso2v2 2.8.0.wso2v2 2.16.3 From 89ba71bcf77089a23d6d70a424ef9cf7eaaef80a Mon Sep 17 00:00:00 2001 From: Janaka Pushpakumara Date: Thu, 1 Feb 2024 11:56:41 +0530 Subject: [PATCH 119/308] Change IFO to ERROR --- .../org/apache/synapse/message/store/impl/jms/JmsStore.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/synapse/message/store/impl/jms/JmsStore.java b/modules/core/src/main/java/org/apache/synapse/message/store/impl/jms/JmsStore.java index 824aa4cf4f..1d3b1ad2d7 100644 --- a/modules/core/src/main/java/org/apache/synapse/message/store/impl/jms/JmsStore.java +++ b/modules/core/src/main/java/org/apache/synapse/message/store/impl/jms/JmsStore.java @@ -237,7 +237,7 @@ public void init(SynapseEnvironment se) { try { initme(); } catch (StoreForwardException | JMSException e) { - logger.info(nameString() + ". Initialization failed...", e); + logger.error(nameString() + ". Initialization failed...", e); } super.init(se); logger.info(nameString() + ". Initialized... "); From 42739df015d6f9b86a09caba75f9118821a283eb Mon Sep 17 00:00:00 2001 From: DedunuKarunarathne <46235093+DedunuKarunarathne@users.noreply.github.com> Date: Thu, 1 Feb 2024 14:16:47 +0530 Subject: [PATCH 120/308] Fix incorrect HTTP status code when an HTTP request with synapse unsupported HTTP Method is received Fix incorrect HTTP status code when an HTTP request with synapse unsupported HTTP Method is received. Fixes: https://github.com/wso2/product-ei/issues/5449 --- .../transport/passthru/SourceHandler.java | 80 +++++++++++-------- 1 file changed, 45 insertions(+), 35 deletions(-) diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceHandler.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceHandler.java index 335ccb17de..bcd7242f8a 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceHandler.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceHandler.java @@ -28,6 +28,7 @@ import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; import org.apache.http.HttpVersion; +import org.apache.http.MethodNotSupportedException; import org.apache.http.message.BasicHttpResponse; import org.apache.http.nio.ContentDecoder; import org.apache.http.nio.ContentEncoder; @@ -895,42 +896,12 @@ public void exception(NHttpServerConnection conn, Exception ex) { isFault = true; SourceContext.updateState(conn, ProtocolState.CLOSED); sourceConfiguration.getSourceConnections().shutDownConnection(conn, true); + } else if (ex instanceof MethodNotSupportedException) { + isFault = generateHTTPErrorResponse(conn, ex, HttpVersion.HTTP_1_1, HttpStatus.SC_NOT_IMPLEMENTED, + "Not Implemented"); } else if (ex instanceof HttpException) { - log.error("HttpException occurred ", ex); - if (PassThroughCorrelationConfigDataHolder.isEnable()) { - logHttpRequestErrorInCorrelationLog(conn, "HTTP Exception"); - } - try { - if (conn.isResponseSubmitted()) { - sourceConfiguration.getSourceConnections().shutDownConnection(conn, true); - return; - } - HttpContext httpContext = conn.getContext(); - - HttpResponse response = new BasicHttpResponse( - HttpVersion.HTTP_1_1, HttpStatus.SC_BAD_REQUEST, "Bad request"); - response.setParams( - new DefaultedHttpParams(sourceConfiguration.getHttpParams(), - response.getParams())); - response.addHeader(HTTP.CONN_DIRECTIVE, HTTP.CONN_CLOSE); - - // Pre-process HTTP request - httpContext.setAttribute(ExecutionContext.HTTP_CONNECTION, conn); - httpContext.setAttribute(ExecutionContext.HTTP_REQUEST, null); - httpContext.setAttribute(ExecutionContext.HTTP_RESPONSE, response); - - sourceConfiguration.getHttpProcessor().process(response, httpContext); - - conn.submitResponse(response); - SourceContext.updateState(conn, ProtocolState.CLOSED); - informWriterError(conn); - conn.close(); - } catch (Exception ex1) { - log.error(ex1.getMessage(), ex1); - SourceContext.updateState(conn, ProtocolState.CLOSED); - sourceConfiguration.getSourceConnections().shutDownConnection(conn, true); - isFault = true; - } + isFault = generateHTTPErrorResponse(conn, ex, HttpVersion.HTTP_1_1, HttpStatus.SC_BAD_REQUEST, + "Bad request"); } else { log.error("Unexpected error: " + ex.getMessage(), ex); SourceContext.updateState(conn, ProtocolState.CLOSED); @@ -943,6 +914,45 @@ public void exception(NHttpServerConnection conn, Exception ex) { } } + private boolean generateHTTPErrorResponse (NHttpServerConnection conn, Exception ex, HttpVersion version, + int statusCode, String reason) { + log.error("HttpException occurred ", ex); + boolean isFault = false; + if (PassThroughCorrelationConfigDataHolder.isEnable()) { + logHttpRequestErrorInCorrelationLog(conn, "HTTP Exception"); + } + try { + if (conn.isResponseSubmitted()) { + sourceConfiguration.getSourceConnections().shutDownConnection(conn, true); + return false; + } + HttpContext httpContext = conn.getContext(); + + HttpResponse response = new BasicHttpResponse(version, statusCode, reason); + response.setParams( + new DefaultedHttpParams(sourceConfiguration.getHttpParams(), response.getParams())); + response.addHeader(HTTP.CONN_DIRECTIVE, HTTP.CONN_CLOSE); + + // Pre-process HTTP request + httpContext.setAttribute(ExecutionContext.HTTP_CONNECTION, conn); + httpContext.setAttribute(ExecutionContext.HTTP_REQUEST, null); + httpContext.setAttribute(ExecutionContext.HTTP_RESPONSE, response); + + sourceConfiguration.getHttpProcessor().process(response, httpContext); + + conn.submitResponse(response); + SourceContext.updateState(conn, ProtocolState.CLOSED); + informWriterError(conn); + conn.close(); + } catch (Exception ex1) { + log.error(ex1.getMessage(), ex1); + SourceContext.updateState(conn, ProtocolState.CLOSED); + sourceConfiguration.getSourceConnections().shutDownConnection(conn, true); + isFault = true; + } + return isFault; + } + private Map getLoggingInfo(NHttpServerConnection conn, ProtocolState state) { HashMap logDetails = new HashMap<>(); SourceContext sourceContext = SourceContext.get(conn); From d63f86ceaa2b69af3ae37ce7c6b2c5a5762b9d21 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 1 Feb 2024 09:28:34 +0000 Subject: [PATCH 121/308] [WSO2 Release] [Jenkins #6817] [Release 4.0.0-wso2v74] prepare release v4.0.0-wso2v74 --- 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 d563c33804..04b40fab4c 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v74-SNAPSHOT + 4.0.0-wso2v74 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 0b4f8d9eca..1775c02f21 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v74-SNAPSHOT + 4.0.0-wso2v74 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 17fe0c0f6c..c3680d86f4 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-wso2v74-SNAPSHOT + 4.0.0-wso2v74 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 274eaa5be2..99d69b42df 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v74-SNAPSHOT + 4.0.0-wso2v74 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 3b1dce4cd7..80cffea4c2 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v74-SNAPSHOT + 4.0.0-wso2v74 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index efdd3d4145..b4776c4e20 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v74-SNAPSHOT + 4.0.0-wso2v74 ../../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 244211fb43..47721becc9 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-wso2v74-SNAPSHOT + 4.0.0-wso2v74 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 baca75ddce..f8ccbe5379 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-wso2v74-SNAPSHOT + 4.0.0-wso2v74 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 d7c496778d..a009ae20bf 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-wso2v74-SNAPSHOT + 4.0.0-wso2v74 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 75785b6eca..21bef3b323 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-wso2v74-SNAPSHOT + 4.0.0-wso2v74 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 c5c7ad6a47..3a28da5f6d 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-wso2v74-SNAPSHOT + 4.0.0-wso2v74 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 e694d73398..8292ae59d3 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-wso2v74-SNAPSHOT + 4.0.0-wso2v74 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 f1a342c9aa..d8e6fd323b 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-wso2v74-SNAPSHOT + 4.0.0-wso2v74 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index bcdc25869f..8a8e881259 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v74-SNAPSHOT + 4.0.0-wso2v74 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index c5b05bedb1..65623eee56 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v74-SNAPSHOT + 4.0.0-wso2v74 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index b014839190..962457294a 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v74-SNAPSHOT + 4.0.0-wso2v74 ../../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-wso2v74 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 591dd24c1d..d66254eac4 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v74-SNAPSHOT + 4.0.0-wso2v74 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index c2026b18ac..425f2e74ba 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-wso2v74-SNAPSHOT + 4.0.0-wso2v74 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 0a5a6dd6de..40de68448b 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-wso2v74-SNAPSHOT + 4.0.0-wso2v74 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 187fcb8fa5..65a20932ab 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v74-SNAPSHOT + 4.0.0-wso2v74 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index a42879fba1..58f09d8c5b 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v74-SNAPSHOT + 4.0.0-wso2v74 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 75397e2c73..46bbe18db2 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v74-SNAPSHOT + 4.0.0-wso2v74 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 5f27acce2a..aef0be8fe1 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v74-SNAPSHOT + 4.0.0-wso2v74 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 08f7f94c60..a31234821f 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-wso2v74-SNAPSHOT + 4.0.0-wso2v74 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 2b5fd31dd7..de58b0a763 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-wso2v74-SNAPSHOT + 4.0.0-wso2v74 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index accc33dca0..e6cd5a06b0 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-wso2v74-SNAPSHOT + 4.0.0-wso2v74 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index a4ece06952..87cb6ec328 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-wso2v74-SNAPSHOT + 4.0.0-wso2v74 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 54620c43bb..aeb4326678 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v74-SNAPSHOT + 4.0.0-wso2v74 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index cd45dfb6b0..8eef3ae4db 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v74-SNAPSHOT + 4.0.0-wso2v74 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 9ea15537d0..5b3659eb91 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-wso2v74-SNAPSHOT + 4.0.0-wso2v74 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 45b170c7b0..c73b538438 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v74-SNAPSHOT + 4.0.0-wso2v74 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-wso2v74 Apache Software Foundation From 7eaf56d8cd83adf27df26519a3ca69c621d1d792 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 1 Feb 2024 09:28:36 +0000 Subject: [PATCH 122/308] [WSO2 Release] [Jenkins #6817] [Release 4.0.0-wso2v74] 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 04b40fab4c..79883dd64d 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v74 + 4.0.0-wso2v75-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 1775c02f21..57fd5226e7 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v74 + 4.0.0-wso2v75-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index c3680d86f4..63acdd776a 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-wso2v74 + 4.0.0-wso2v75-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 99d69b42df..fd97fbb5ec 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v74 + 4.0.0-wso2v75-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 80cffea4c2..2b2b4ae2ff 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v74 + 4.0.0-wso2v75-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index b4776c4e20..2808c53a07 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v74 + 4.0.0-wso2v75-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 47721becc9..1e01dfe36e 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-wso2v74 + 4.0.0-wso2v75-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 f8ccbe5379..f7d156415b 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-wso2v74 + 4.0.0-wso2v75-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 a009ae20bf..e71deab0b9 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-wso2v74 + 4.0.0-wso2v75-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 21bef3b323..c9d4819376 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-wso2v74 + 4.0.0-wso2v75-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 3a28da5f6d..bcb8f0bd7d 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-wso2v74 + 4.0.0-wso2v75-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 8292ae59d3..061e268ea6 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-wso2v74 + 4.0.0-wso2v75-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 d8e6fd323b..5aff0cfc21 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-wso2v74 + 4.0.0-wso2v75-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 8a8e881259..1f2a1276e6 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v74 + 4.0.0-wso2v75-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 65623eee56..2c768c645e 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v74 + 4.0.0-wso2v75-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 962457294a..b72fbe3c36 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v74 + 4.0.0-wso2v75-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-wso2v74 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index d66254eac4..de4e33a5ce 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v74 + 4.0.0-wso2v75-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 425f2e74ba..195b1acc98 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-wso2v74 + 4.0.0-wso2v75-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 40de68448b..a3b282d11f 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-wso2v74 + 4.0.0-wso2v75-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 65a20932ab..16ee5c4908 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v74 + 4.0.0-wso2v75-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 58f09d8c5b..c2108eac11 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v74 + 4.0.0-wso2v75-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 46bbe18db2..85d94ed6ed 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v74 + 4.0.0-wso2v75-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index aef0be8fe1..38bb41a918 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v74 + 4.0.0-wso2v75-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index a31234821f..f3e31e2507 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-wso2v74 + 4.0.0-wso2v75-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index de58b0a763..2d63e4f932 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-wso2v74 + 4.0.0-wso2v75-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index e6cd5a06b0..82a746a829 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-wso2v74 + 4.0.0-wso2v75-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 87cb6ec328..c877f5b8b5 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-wso2v74 + 4.0.0-wso2v75-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index aeb4326678..54485575df 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v74 + 4.0.0-wso2v75-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 8eef3ae4db..82126d90d5 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v74 + 4.0.0-wso2v75-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 5b3659eb91..39b214aa65 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-wso2v74 + 4.0.0-wso2v75-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index c73b538438..84b3d35d3d 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v74 + 4.0.0-wso2v75-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-wso2v74 + HEAD Apache Software Foundation From 95c36a1eef3ecad0dbb73d44cda236ab2cb5cfb9 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 1 Feb 2024 10:25:50 +0000 Subject: [PATCH 123/308] [WSO2 Release] [Jenkins #6819] [Release 4.0.0-wso2v75] prepare release v4.0.0-wso2v75 --- 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 79883dd64d..d5bdbff918 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v75-SNAPSHOT + 4.0.0-wso2v75 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 57fd5226e7..877ea8c7ff 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v75-SNAPSHOT + 4.0.0-wso2v75 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 63acdd776a..6eefc6ba94 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-wso2v75-SNAPSHOT + 4.0.0-wso2v75 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index fd97fbb5ec..3e48925543 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v75-SNAPSHOT + 4.0.0-wso2v75 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 2b2b4ae2ff..035bd20a2a 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v75-SNAPSHOT + 4.0.0-wso2v75 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 2808c53a07..fcafd7b49a 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v75-SNAPSHOT + 4.0.0-wso2v75 ../../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 1e01dfe36e..615f5cc1a2 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-wso2v75-SNAPSHOT + 4.0.0-wso2v75 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 f7d156415b..2b7cfeed89 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-wso2v75-SNAPSHOT + 4.0.0-wso2v75 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 e71deab0b9..355b3d1ea7 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-wso2v75-SNAPSHOT + 4.0.0-wso2v75 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 c9d4819376..3e91c1876c 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-wso2v75-SNAPSHOT + 4.0.0-wso2v75 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 bcb8f0bd7d..6e55214ea7 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-wso2v75-SNAPSHOT + 4.0.0-wso2v75 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 061e268ea6..6c13a98eae 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-wso2v75-SNAPSHOT + 4.0.0-wso2v75 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 5aff0cfc21..1a40026b4b 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-wso2v75-SNAPSHOT + 4.0.0-wso2v75 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 1f2a1276e6..b68400b94f 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v75-SNAPSHOT + 4.0.0-wso2v75 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 2c768c645e..c7d502ce8a 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v75-SNAPSHOT + 4.0.0-wso2v75 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index b72fbe3c36..f77427e0af 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v75-SNAPSHOT + 4.0.0-wso2v75 ../../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-wso2v75 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index de4e33a5ce..67275d7753 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v75-SNAPSHOT + 4.0.0-wso2v75 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 195b1acc98..367816f0b9 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-wso2v75-SNAPSHOT + 4.0.0-wso2v75 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index a3b282d11f..21b41303b8 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-wso2v75-SNAPSHOT + 4.0.0-wso2v75 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 16ee5c4908..b8183cff15 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v75-SNAPSHOT + 4.0.0-wso2v75 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index c2108eac11..64de31e4cc 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v75-SNAPSHOT + 4.0.0-wso2v75 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 85d94ed6ed..7b0ae4e662 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v75-SNAPSHOT + 4.0.0-wso2v75 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 38bb41a918..cf2af8a5cb 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v75-SNAPSHOT + 4.0.0-wso2v75 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index f3e31e2507..51d01f755e 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-wso2v75-SNAPSHOT + 4.0.0-wso2v75 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 2d63e4f932..bdb6a11d85 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-wso2v75-SNAPSHOT + 4.0.0-wso2v75 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 82a746a829..da6efe290e 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-wso2v75-SNAPSHOT + 4.0.0-wso2v75 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index c877f5b8b5..d54f5d202f 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-wso2v75-SNAPSHOT + 4.0.0-wso2v75 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 54485575df..b9a74263d5 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v75-SNAPSHOT + 4.0.0-wso2v75 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 82126d90d5..60445493eb 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v75-SNAPSHOT + 4.0.0-wso2v75 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 39b214aa65..5ccd73a000 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-wso2v75-SNAPSHOT + 4.0.0-wso2v75 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 84b3d35d3d..7d05cc4574 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v75-SNAPSHOT + 4.0.0-wso2v75 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-wso2v75 Apache Software Foundation From 2e61cb52181513f628755bfa176e980196b6a563 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 1 Feb 2024 10:25:51 +0000 Subject: [PATCH 124/308] [WSO2 Release] [Jenkins #6819] [Release 4.0.0-wso2v75] 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 d5bdbff918..68e57a900b 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v75 + 4.0.0-wso2v76-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 877ea8c7ff..6432467c16 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v75 + 4.0.0-wso2v76-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 6eefc6ba94..0c650734d8 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-wso2v75 + 4.0.0-wso2v76-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 3e48925543..c38f04aaa8 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v75 + 4.0.0-wso2v76-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 035bd20a2a..e6a50cecf7 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v75 + 4.0.0-wso2v76-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index fcafd7b49a..1fb4dd5dec 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v75 + 4.0.0-wso2v76-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 615f5cc1a2..662307a14c 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-wso2v75 + 4.0.0-wso2v76-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 2b7cfeed89..d1e97f27b8 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-wso2v75 + 4.0.0-wso2v76-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 355b3d1ea7..433da12d27 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-wso2v75 + 4.0.0-wso2v76-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 3e91c1876c..1b447725e8 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-wso2v75 + 4.0.0-wso2v76-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 6e55214ea7..ed28229960 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-wso2v75 + 4.0.0-wso2v76-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 6c13a98eae..b4ad98620d 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-wso2v75 + 4.0.0-wso2v76-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 1a40026b4b..521e50cdf9 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-wso2v75 + 4.0.0-wso2v76-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index b68400b94f..14d62f3672 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v75 + 4.0.0-wso2v76-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index c7d502ce8a..9d6992e5c1 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v75 + 4.0.0-wso2v76-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index f77427e0af..1ae20d71a5 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v75 + 4.0.0-wso2v76-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-wso2v75 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 67275d7753..4c69e1227b 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v75 + 4.0.0-wso2v76-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 367816f0b9..12893d2e09 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-wso2v75 + 4.0.0-wso2v76-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 21b41303b8..52274f6e27 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-wso2v75 + 4.0.0-wso2v76-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index b8183cff15..eca9e198bc 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v75 + 4.0.0-wso2v76-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 64de31e4cc..4057f96271 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v75 + 4.0.0-wso2v76-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 7b0ae4e662..d48f0ad074 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v75 + 4.0.0-wso2v76-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index cf2af8a5cb..e4d74a88da 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v75 + 4.0.0-wso2v76-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 51d01f755e..e6dbfdba06 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-wso2v75 + 4.0.0-wso2v76-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index bdb6a11d85..34bd7cec83 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-wso2v75 + 4.0.0-wso2v76-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index da6efe290e..029d271bfe 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-wso2v75 + 4.0.0-wso2v76-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index d54f5d202f..73491c6d8b 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-wso2v75 + 4.0.0-wso2v76-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index b9a74263d5..863af70a22 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v75 + 4.0.0-wso2v76-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 60445493eb..037d6fb235 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v75 + 4.0.0-wso2v76-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 5ccd73a000..c1c702dd9d 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-wso2v75 + 4.0.0-wso2v76-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 7d05cc4574..4f45ada4c1 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v75 + 4.0.0-wso2v76-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-wso2v75 + HEAD Apache Software Foundation From 06988571e3cf74ecb5e4cc459964fe31dd780015 Mon Sep 17 00:00:00 2001 From: Arunan Sugunakumar Date: Fri, 2 Feb 2024 07:42:49 +0530 Subject: [PATCH 125/308] Avoid clearing buffer when ProducerError occurs in Passthru pipe Resolves wso2/micro-integrator#3081 --- .../main/java/org/apache/synapse/transport/passthru/Pipe.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/Pipe.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/Pipe.java index 73fe7ea168..a13403bd16 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/Pipe.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/Pipe.java @@ -672,7 +672,6 @@ public void write(final byte[] b, int off, int len) throws IOException { return; } else if (isProducerError()) { writeCondition.signalAll(); - buffer.clear(); return; } } else if (consumerIoControl instanceof NHttpClientConnection) { From a13d9600c41b75fea3a1f781a6256c482ed303f6 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 2 Feb 2024 04:28:32 +0000 Subject: [PATCH 126/308] [WSO2 Release] [Jenkins #6822] [Release 4.0.0-wso2v76] prepare release v4.0.0-wso2v76 --- 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 68e57a900b..004e2ece82 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v76-SNAPSHOT + 4.0.0-wso2v76 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 6432467c16..7b0892021b 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v76-SNAPSHOT + 4.0.0-wso2v76 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 0c650734d8..d8094b3792 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-wso2v76-SNAPSHOT + 4.0.0-wso2v76 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index c38f04aaa8..00d6269caa 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v76-SNAPSHOT + 4.0.0-wso2v76 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index e6a50cecf7..8f8f59fac7 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v76-SNAPSHOT + 4.0.0-wso2v76 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 1fb4dd5dec..304e93427e 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v76-SNAPSHOT + 4.0.0-wso2v76 ../../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 662307a14c..751fe77585 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-wso2v76-SNAPSHOT + 4.0.0-wso2v76 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 d1e97f27b8..1a497843d2 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-wso2v76-SNAPSHOT + 4.0.0-wso2v76 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 433da12d27..15896e9b98 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-wso2v76-SNAPSHOT + 4.0.0-wso2v76 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 1b447725e8..9cebcb190c 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-wso2v76-SNAPSHOT + 4.0.0-wso2v76 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 ed28229960..2beea0506d 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-wso2v76-SNAPSHOT + 4.0.0-wso2v76 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 b4ad98620d..be0d60c3a1 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-wso2v76-SNAPSHOT + 4.0.0-wso2v76 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 521e50cdf9..44c8f7b057 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-wso2v76-SNAPSHOT + 4.0.0-wso2v76 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 14d62f3672..01c1a1d9e1 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v76-SNAPSHOT + 4.0.0-wso2v76 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 9d6992e5c1..267ce92d5d 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v76-SNAPSHOT + 4.0.0-wso2v76 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 1ae20d71a5..a76c3399d0 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v76-SNAPSHOT + 4.0.0-wso2v76 ../../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-wso2v76 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 4c69e1227b..574cc3da3c 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v76-SNAPSHOT + 4.0.0-wso2v76 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 12893d2e09..a4eb6fddd2 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-wso2v76-SNAPSHOT + 4.0.0-wso2v76 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 52274f6e27..d595cc0c23 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-wso2v76-SNAPSHOT + 4.0.0-wso2v76 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index eca9e198bc..a3944e264c 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v76-SNAPSHOT + 4.0.0-wso2v76 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 4057f96271..9024ba0a13 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v76-SNAPSHOT + 4.0.0-wso2v76 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index d48f0ad074..2e22c37568 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v76-SNAPSHOT + 4.0.0-wso2v76 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index e4d74a88da..ddbfe58aa5 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v76-SNAPSHOT + 4.0.0-wso2v76 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index e6dbfdba06..4ba1107655 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-wso2v76-SNAPSHOT + 4.0.0-wso2v76 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 34bd7cec83..c98f4a1bef 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-wso2v76-SNAPSHOT + 4.0.0-wso2v76 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 029d271bfe..a3108583d8 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-wso2v76-SNAPSHOT + 4.0.0-wso2v76 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 73491c6d8b..4e02701c3e 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-wso2v76-SNAPSHOT + 4.0.0-wso2v76 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 863af70a22..429c12fb44 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v76-SNAPSHOT + 4.0.0-wso2v76 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 037d6fb235..17ee302bb8 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v76-SNAPSHOT + 4.0.0-wso2v76 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index c1c702dd9d..0c1ce9e3b9 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-wso2v76-SNAPSHOT + 4.0.0-wso2v76 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 4f45ada4c1..7a244f54e7 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v76-SNAPSHOT + 4.0.0-wso2v76 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-wso2v76 Apache Software Foundation From d5625474e8f7c4fe0084f2128cf61608037292c5 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 2 Feb 2024 04:28:34 +0000 Subject: [PATCH 127/308] [WSO2 Release] [Jenkins #6822] [Release 4.0.0-wso2v76] 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 004e2ece82..f726e0b594 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v76 + 4.0.0-wso2v77-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 7b0892021b..ed8ac70550 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v76 + 4.0.0-wso2v77-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index d8094b3792..7b379f7ef1 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-wso2v76 + 4.0.0-wso2v77-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 00d6269caa..390fa5d07b 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v76 + 4.0.0-wso2v77-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 8f8f59fac7..7f5445c77f 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v76 + 4.0.0-wso2v77-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 304e93427e..65e77f4bb5 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v76 + 4.0.0-wso2v77-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 751fe77585..9ce5980997 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-wso2v76 + 4.0.0-wso2v77-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 1a497843d2..f28328d002 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-wso2v76 + 4.0.0-wso2v77-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 15896e9b98..64234d5f49 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-wso2v76 + 4.0.0-wso2v77-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 9cebcb190c..e61a94220e 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-wso2v76 + 4.0.0-wso2v77-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 2beea0506d..6461f1d6e6 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-wso2v76 + 4.0.0-wso2v77-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 be0d60c3a1..bb4b1dee9b 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-wso2v76 + 4.0.0-wso2v77-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 44c8f7b057..31efea3162 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-wso2v76 + 4.0.0-wso2v77-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 01c1a1d9e1..34c116c770 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v76 + 4.0.0-wso2v77-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 267ce92d5d..b7e2ed9c69 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v76 + 4.0.0-wso2v77-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index a76c3399d0..78ef21af89 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v76 + 4.0.0-wso2v77-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-wso2v76 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 574cc3da3c..13e3540ed5 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v76 + 4.0.0-wso2v77-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index a4eb6fddd2..05e7566241 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-wso2v76 + 4.0.0-wso2v77-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index d595cc0c23..7cb6721e88 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-wso2v76 + 4.0.0-wso2v77-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index a3944e264c..77fc14f53f 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v76 + 4.0.0-wso2v77-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 9024ba0a13..36e04e7963 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v76 + 4.0.0-wso2v77-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 2e22c37568..bc8aa5f0a6 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v76 + 4.0.0-wso2v77-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index ddbfe58aa5..d9d0bd820a 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v76 + 4.0.0-wso2v77-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 4ba1107655..368c54c3ba 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-wso2v76 + 4.0.0-wso2v77-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index c98f4a1bef..4272421ea0 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-wso2v76 + 4.0.0-wso2v77-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index a3108583d8..554f172e22 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-wso2v76 + 4.0.0-wso2v77-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 4e02701c3e..b5327867b7 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-wso2v76 + 4.0.0-wso2v77-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 429c12fb44..2cd40dd10d 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v76 + 4.0.0-wso2v77-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 17ee302bb8..30a9c9f18c 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v76 + 4.0.0-wso2v77-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 0c1ce9e3b9..33fc0c8f4e 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-wso2v76 + 4.0.0-wso2v77-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 7a244f54e7..503b8d2f6a 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v76 + 4.0.0-wso2v77-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-wso2v76 + HEAD Apache Software Foundation From bbdfa1cdc0279b0226f399a986d8bf9106f3e21a Mon Sep 17 00:00:00 2001 From: tgtshanika Date: Fri, 2 Feb 2024 12:21:02 +0530 Subject: [PATCH 128/308] Upgrade opentelemetry with guava version range --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e7d5c4e98b..357f1d522a 100644 --- a/pom.xml +++ b/pom.xml @@ -1589,7 +1589,7 @@ 6.3.50 1.1.1.wso2v3 5.8.0 - 1.34.1.wso2v1 + 1.11.0.wso2v6 4.9.3.wso2v2 2.8.0.wso2v2 2.16.3 From 2ad3e5f84ecdf4f560f10a00b964a9a9405dcd89 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 2 Feb 2024 07:53:56 +0000 Subject: [PATCH 129/308] [WSO2 Release] [Jenkins #6824] [Release 4.0.0-wso2v77] prepare release v4.0.0-wso2v77 --- 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 f726e0b594..e8ab50fc73 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v77-SNAPSHOT + 4.0.0-wso2v77 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index ed8ac70550..71e54a8782 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v77-SNAPSHOT + 4.0.0-wso2v77 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 7b379f7ef1..18d1986905 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-wso2v77-SNAPSHOT + 4.0.0-wso2v77 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 390fa5d07b..2438efe6aa 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v77-SNAPSHOT + 4.0.0-wso2v77 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 7f5445c77f..c020fa3cda 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v77-SNAPSHOT + 4.0.0-wso2v77 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 65e77f4bb5..f2bb0a5113 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v77-SNAPSHOT + 4.0.0-wso2v77 ../../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 9ce5980997..40e4d4c1fd 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-wso2v77-SNAPSHOT + 4.0.0-wso2v77 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 f28328d002..848183b9a3 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-wso2v77-SNAPSHOT + 4.0.0-wso2v77 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 64234d5f49..c7269b8e6f 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-wso2v77-SNAPSHOT + 4.0.0-wso2v77 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 e61a94220e..9798391883 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-wso2v77-SNAPSHOT + 4.0.0-wso2v77 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 6461f1d6e6..02ea50c5f2 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-wso2v77-SNAPSHOT + 4.0.0-wso2v77 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 bb4b1dee9b..91904981ed 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-wso2v77-SNAPSHOT + 4.0.0-wso2v77 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 31efea3162..0cf60d261b 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-wso2v77-SNAPSHOT + 4.0.0-wso2v77 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 34c116c770..c04dfcf8fc 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v77-SNAPSHOT + 4.0.0-wso2v77 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index b7e2ed9c69..4677972198 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v77-SNAPSHOT + 4.0.0-wso2v77 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 78ef21af89..8fa9d604d2 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v77-SNAPSHOT + 4.0.0-wso2v77 ../../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-wso2v77 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 13e3540ed5..2e5882e939 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v77-SNAPSHOT + 4.0.0-wso2v77 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 05e7566241..c8cf404d86 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-wso2v77-SNAPSHOT + 4.0.0-wso2v77 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 7cb6721e88..2816d18042 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-wso2v77-SNAPSHOT + 4.0.0-wso2v77 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 77fc14f53f..a12df6c8eb 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v77-SNAPSHOT + 4.0.0-wso2v77 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 36e04e7963..c1f8dcbe4d 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v77-SNAPSHOT + 4.0.0-wso2v77 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index bc8aa5f0a6..706e3a6bb8 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v77-SNAPSHOT + 4.0.0-wso2v77 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index d9d0bd820a..72cdf16523 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v77-SNAPSHOT + 4.0.0-wso2v77 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 368c54c3ba..214d54cb53 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-wso2v77-SNAPSHOT + 4.0.0-wso2v77 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 4272421ea0..250dd388f9 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-wso2v77-SNAPSHOT + 4.0.0-wso2v77 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 554f172e22..7308dd3eeb 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-wso2v77-SNAPSHOT + 4.0.0-wso2v77 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index b5327867b7..0860578349 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-wso2v77-SNAPSHOT + 4.0.0-wso2v77 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 2cd40dd10d..3c28a034ef 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v77-SNAPSHOT + 4.0.0-wso2v77 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 30a9c9f18c..1640c9eea0 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v77-SNAPSHOT + 4.0.0-wso2v77 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 33fc0c8f4e..c658442720 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-wso2v77-SNAPSHOT + 4.0.0-wso2v77 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 4e771f6f2e..3613b2a01f 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v77-SNAPSHOT + 4.0.0-wso2v77 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-wso2v77 Apache Software Foundation From 509df9b389cab087596fcf39ddd0752cf8997d96 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 2 Feb 2024 07:53:58 +0000 Subject: [PATCH 130/308] [WSO2 Release] [Jenkins #6824] [Release 4.0.0-wso2v77] 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 e8ab50fc73..d5f5cd0686 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v77 + 4.0.0-wso2v78-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 71e54a8782..d12de6bfc2 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v77 + 4.0.0-wso2v78-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 18d1986905..c6c40ddb62 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-wso2v77 + 4.0.0-wso2v78-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 2438efe6aa..c98d243abf 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v77 + 4.0.0-wso2v78-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index c020fa3cda..ded7d367a7 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v77 + 4.0.0-wso2v78-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index f2bb0a5113..2ce3326d7b 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v77 + 4.0.0-wso2v78-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 40e4d4c1fd..022fca77fe 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-wso2v77 + 4.0.0-wso2v78-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 848183b9a3..cba008882c 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-wso2v77 + 4.0.0-wso2v78-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 c7269b8e6f..9f1323c0df 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-wso2v77 + 4.0.0-wso2v78-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 9798391883..78bd5b13fb 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-wso2v77 + 4.0.0-wso2v78-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 02ea50c5f2..824ce56a53 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-wso2v77 + 4.0.0-wso2v78-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 91904981ed..205e3e7d32 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-wso2v77 + 4.0.0-wso2v78-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 0cf60d261b..cd032ccdf5 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-wso2v77 + 4.0.0-wso2v78-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index c04dfcf8fc..fbdd246426 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v77 + 4.0.0-wso2v78-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 4677972198..d6bdb63935 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v77 + 4.0.0-wso2v78-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 8fa9d604d2..ff4bfa263b 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v77 + 4.0.0-wso2v78-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-wso2v77 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 2e5882e939..30af8a1f92 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v77 + 4.0.0-wso2v78-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index c8cf404d86..8175d7e82c 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-wso2v77 + 4.0.0-wso2v78-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 2816d18042..fc06027a45 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-wso2v77 + 4.0.0-wso2v78-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index a12df6c8eb..0d4fd408e4 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v77 + 4.0.0-wso2v78-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index c1f8dcbe4d..75ea622442 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v77 + 4.0.0-wso2v78-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 706e3a6bb8..9895371a02 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v77 + 4.0.0-wso2v78-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 72cdf16523..029d8694a0 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v77 + 4.0.0-wso2v78-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 214d54cb53..bdf44c2902 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-wso2v77 + 4.0.0-wso2v78-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 250dd388f9..398c71ab06 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-wso2v77 + 4.0.0-wso2v78-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 7308dd3eeb..66ad12244c 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-wso2v77 + 4.0.0-wso2v78-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 0860578349..4a1d379b1c 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-wso2v77 + 4.0.0-wso2v78-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 3c28a034ef..42f8bd4c6d 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v77 + 4.0.0-wso2v78-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 1640c9eea0..b6b9047429 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v77 + 4.0.0-wso2v78-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index c658442720..9cdeb45419 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-wso2v77 + 4.0.0-wso2v78-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 3613b2a01f..4ffcdf0545 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v77 + 4.0.0-wso2v78-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-wso2v77 + HEAD Apache Software Foundation From d144caf2122ace4638c691971b65ebba2e0edd79 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 8 Feb 2024 07:56:43 +0000 Subject: [PATCH 131/308] [WSO2 Release] [Jenkins #6832] [Release 4.0.0-wso2v78] prepare release v4.0.0-wso2v78 --- 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 d5f5cd0686..a9043f4d77 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v78-SNAPSHOT + 4.0.0-wso2v78 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index d12de6bfc2..2fe88e677a 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v78-SNAPSHOT + 4.0.0-wso2v78 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index c6c40ddb62..d28ac1b24e 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-wso2v78-SNAPSHOT + 4.0.0-wso2v78 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index c98d243abf..fdd0ea8d0f 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v78-SNAPSHOT + 4.0.0-wso2v78 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index ded7d367a7..40546ed27a 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v78-SNAPSHOT + 4.0.0-wso2v78 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 2ce3326d7b..241e9c48eb 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v78-SNAPSHOT + 4.0.0-wso2v78 ../../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 022fca77fe..4a82caff0d 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-wso2v78-SNAPSHOT + 4.0.0-wso2v78 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 cba008882c..f8061909d1 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-wso2v78-SNAPSHOT + 4.0.0-wso2v78 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 9f1323c0df..bf8ff9fa91 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-wso2v78-SNAPSHOT + 4.0.0-wso2v78 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 78bd5b13fb..f882344b54 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-wso2v78-SNAPSHOT + 4.0.0-wso2v78 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 824ce56a53..c79230e941 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-wso2v78-SNAPSHOT + 4.0.0-wso2v78 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 205e3e7d32..59c3d09c5c 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-wso2v78-SNAPSHOT + 4.0.0-wso2v78 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 cd032ccdf5..a1910e82b5 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-wso2v78-SNAPSHOT + 4.0.0-wso2v78 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index fbdd246426..94a5a5124c 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v78-SNAPSHOT + 4.0.0-wso2v78 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index d6bdb63935..a64f403637 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v78-SNAPSHOT + 4.0.0-wso2v78 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index ff4bfa263b..0c2501f6bf 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v78-SNAPSHOT + 4.0.0-wso2v78 ../../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-wso2v78 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 30af8a1f92..5c49138b32 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v78-SNAPSHOT + 4.0.0-wso2v78 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 8175d7e82c..73996bde12 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-wso2v78-SNAPSHOT + 4.0.0-wso2v78 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index fc06027a45..ff5e6d6ced 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-wso2v78-SNAPSHOT + 4.0.0-wso2v78 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 0d4fd408e4..6d39e1b318 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v78-SNAPSHOT + 4.0.0-wso2v78 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 75ea622442..8cd595e16d 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v78-SNAPSHOT + 4.0.0-wso2v78 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 9895371a02..cb4179b9dc 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v78-SNAPSHOT + 4.0.0-wso2v78 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 029d8694a0..3df2eaf40c 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v78-SNAPSHOT + 4.0.0-wso2v78 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index bdf44c2902..0dd3420978 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-wso2v78-SNAPSHOT + 4.0.0-wso2v78 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 398c71ab06..3251e7727b 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-wso2v78-SNAPSHOT + 4.0.0-wso2v78 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 66ad12244c..8e1e17b338 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-wso2v78-SNAPSHOT + 4.0.0-wso2v78 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 4a1d379b1c..2d63eb7150 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-wso2v78-SNAPSHOT + 4.0.0-wso2v78 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 42f8bd4c6d..5cd555531b 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v78-SNAPSHOT + 4.0.0-wso2v78 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index b6b9047429..749fae19c0 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v78-SNAPSHOT + 4.0.0-wso2v78 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 9cdeb45419..c27d88247e 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-wso2v78-SNAPSHOT + 4.0.0-wso2v78 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 4ffcdf0545..e901cce6cb 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v78-SNAPSHOT + 4.0.0-wso2v78 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-wso2v78 Apache Software Foundation From 6666e7e8943cf4b6bb5f5cc1d5aa762c300d77da Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 8 Feb 2024 07:56:45 +0000 Subject: [PATCH 132/308] [WSO2 Release] [Jenkins #6832] [Release 4.0.0-wso2v78] 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 a9043f4d77..d840ba4938 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v78 + 4.0.0-wso2v79-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 2fe88e677a..c72e875bca 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v78 + 4.0.0-wso2v79-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index d28ac1b24e..0dadd42316 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-wso2v78 + 4.0.0-wso2v79-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index fdd0ea8d0f..259f97bb83 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v78 + 4.0.0-wso2v79-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 40546ed27a..8218aed984 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v78 + 4.0.0-wso2v79-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 241e9c48eb..8caf399983 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v78 + 4.0.0-wso2v79-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 4a82caff0d..7e95924648 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-wso2v78 + 4.0.0-wso2v79-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 f8061909d1..ecb4e10197 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-wso2v78 + 4.0.0-wso2v79-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 bf8ff9fa91..308127b2e3 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-wso2v78 + 4.0.0-wso2v79-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 f882344b54..3cc18abeb9 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-wso2v78 + 4.0.0-wso2v79-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 c79230e941..cdf4b9e60c 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-wso2v78 + 4.0.0-wso2v79-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 59c3d09c5c..0dca2ed56c 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-wso2v78 + 4.0.0-wso2v79-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 a1910e82b5..a2e80eda68 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-wso2v78 + 4.0.0-wso2v79-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 94a5a5124c..57bc3a74ee 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v78 + 4.0.0-wso2v79-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index a64f403637..1ffe1d6512 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v78 + 4.0.0-wso2v79-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 0c2501f6bf..461d91801e 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v78 + 4.0.0-wso2v79-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-wso2v78 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 5c49138b32..46bda83af9 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v78 + 4.0.0-wso2v79-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 73996bde12..8be2118e74 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-wso2v78 + 4.0.0-wso2v79-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index ff5e6d6ced..15a17be3af 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-wso2v78 + 4.0.0-wso2v79-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 6d39e1b318..a6ebd0ace3 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v78 + 4.0.0-wso2v79-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 8cd595e16d..68d614a5f7 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v78 + 4.0.0-wso2v79-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index cb4179b9dc..8d13eda926 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v78 + 4.0.0-wso2v79-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 3df2eaf40c..107475619f 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v78 + 4.0.0-wso2v79-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 0dd3420978..71a011389f 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-wso2v78 + 4.0.0-wso2v79-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 3251e7727b..646cbd743c 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-wso2v78 + 4.0.0-wso2v79-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 8e1e17b338..ba4e8c278c 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-wso2v78 + 4.0.0-wso2v79-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 2d63eb7150..0b1ca0e531 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-wso2v78 + 4.0.0-wso2v79-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 5cd555531b..7779daced2 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v78 + 4.0.0-wso2v79-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 749fae19c0..3245da206a 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v78 + 4.0.0-wso2v79-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index c27d88247e..441411c9a6 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-wso2v78 + 4.0.0-wso2v79-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index e901cce6cb..36f2e18601 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v78 + 4.0.0-wso2v79-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-wso2v78 + HEAD Apache Software Foundation From 3fde39159798f103598534a51a466ef258a875b7 Mon Sep 17 00:00:00 2001 From: GihanAyesh Date: Thu, 8 Feb 2024 14:45:11 +0530 Subject: [PATCH 133/308] version bump --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 165a8ef696..eeb806d3bb 100644 --- a/pom.xml +++ b/pom.xml @@ -1468,7 +1468,7 @@ 1.1 3.4 3.2.0.wso2v1 - 2.6.0.wso2v2 + 2.9.0.wso2v1 1.5.3 2.3.1 1.69.0.wso2v1 @@ -1533,9 +1533,9 @@ 4.12 1.5.3 1.3.17.wso2v1 - 2.4.7 + 2.5.0 9.2 - 2.4.11 + 2.5.0 3.0.0.wso2v1 2.17.1 1.1 From 250bf2fb82834600c5f3cf7112dbf844cabddbbd Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 9 Feb 2024 04:47:26 +0000 Subject: [PATCH 134/308] [WSO2 Release] [Jenkins #6835] [Release 4.0.0-wso2v79] prepare release v4.0.0-wso2v79 --- 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 d840ba4938..d5483305f8 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v79-SNAPSHOT + 4.0.0-wso2v79 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index c72e875bca..74966212c6 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v79-SNAPSHOT + 4.0.0-wso2v79 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 0dadd42316..68a5d81095 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-wso2v79-SNAPSHOT + 4.0.0-wso2v79 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 259f97bb83..7244266ae9 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v79-SNAPSHOT + 4.0.0-wso2v79 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 8218aed984..51170434c2 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v79-SNAPSHOT + 4.0.0-wso2v79 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 8caf399983..131572d87c 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v79-SNAPSHOT + 4.0.0-wso2v79 ../../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 7e95924648..bdbb37f902 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-wso2v79-SNAPSHOT + 4.0.0-wso2v79 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 ecb4e10197..401a3398db 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-wso2v79-SNAPSHOT + 4.0.0-wso2v79 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 308127b2e3..c978619b6c 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-wso2v79-SNAPSHOT + 4.0.0-wso2v79 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 3cc18abeb9..fda44af7af 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-wso2v79-SNAPSHOT + 4.0.0-wso2v79 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 cdf4b9e60c..a173e84cd1 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-wso2v79-SNAPSHOT + 4.0.0-wso2v79 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 0dca2ed56c..263573afd1 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-wso2v79-SNAPSHOT + 4.0.0-wso2v79 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 a2e80eda68..7fc6ae39e2 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-wso2v79-SNAPSHOT + 4.0.0-wso2v79 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 57bc3a74ee..dddc29d289 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v79-SNAPSHOT + 4.0.0-wso2v79 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 1ffe1d6512..e1ac76d3e6 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v79-SNAPSHOT + 4.0.0-wso2v79 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 461d91801e..5df017b3d8 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v79-SNAPSHOT + 4.0.0-wso2v79 ../../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-wso2v79 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 46bda83af9..d6b641b0d1 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v79-SNAPSHOT + 4.0.0-wso2v79 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 8be2118e74..910626c49f 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-wso2v79-SNAPSHOT + 4.0.0-wso2v79 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 15a17be3af..d8f71f515e 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-wso2v79-SNAPSHOT + 4.0.0-wso2v79 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index a6ebd0ace3..1eedadee77 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v79-SNAPSHOT + 4.0.0-wso2v79 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 68d614a5f7..62ad446f2a 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v79-SNAPSHOT + 4.0.0-wso2v79 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 8d13eda926..2f33fcb81e 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v79-SNAPSHOT + 4.0.0-wso2v79 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 107475619f..e0e07b8799 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v79-SNAPSHOT + 4.0.0-wso2v79 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 71a011389f..8ac29a588c 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-wso2v79-SNAPSHOT + 4.0.0-wso2v79 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 646cbd743c..9417e0e81a 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-wso2v79-SNAPSHOT + 4.0.0-wso2v79 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index ba4e8c278c..5f0b739120 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-wso2v79-SNAPSHOT + 4.0.0-wso2v79 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 0b1ca0e531..84713bfd84 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-wso2v79-SNAPSHOT + 4.0.0-wso2v79 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 7779daced2..870df77548 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v79-SNAPSHOT + 4.0.0-wso2v79 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 3245da206a..5ed1f8a338 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v79-SNAPSHOT + 4.0.0-wso2v79 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 441411c9a6..2586f92d6f 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-wso2v79-SNAPSHOT + 4.0.0-wso2v79 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 36f2e18601..61c38e1122 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v79-SNAPSHOT + 4.0.0-wso2v79 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-wso2v79 Apache Software Foundation From a40ea6d2c55e8ff7b0e86ff4be9028f2607019ff Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 9 Feb 2024 04:47:28 +0000 Subject: [PATCH 135/308] [WSO2 Release] [Jenkins #6835] [Release 4.0.0-wso2v79] 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 d5483305f8..631bf926c7 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v79 + 4.0.0-wso2v80-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 74966212c6..2f57f5665f 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v79 + 4.0.0-wso2v80-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 68a5d81095..3dc92d292b 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-wso2v79 + 4.0.0-wso2v80-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 7244266ae9..b5110f2283 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v79 + 4.0.0-wso2v80-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 51170434c2..efa412336f 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v79 + 4.0.0-wso2v80-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 131572d87c..bc9c53f25d 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v79 + 4.0.0-wso2v80-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 bdbb37f902..a33e116078 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-wso2v79 + 4.0.0-wso2v80-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 401a3398db..0465713544 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-wso2v79 + 4.0.0-wso2v80-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 c978619b6c..49ded81e8b 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-wso2v79 + 4.0.0-wso2v80-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 fda44af7af..f663e9e903 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-wso2v79 + 4.0.0-wso2v80-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 a173e84cd1..46bb266bd6 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-wso2v79 + 4.0.0-wso2v80-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 263573afd1..1f25b48dd4 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-wso2v79 + 4.0.0-wso2v80-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 7fc6ae39e2..db4b83856d 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-wso2v79 + 4.0.0-wso2v80-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index dddc29d289..a0938c0af7 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v79 + 4.0.0-wso2v80-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index e1ac76d3e6..0c65be24ec 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v79 + 4.0.0-wso2v80-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 5df017b3d8..50653438c8 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v79 + 4.0.0-wso2v80-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-wso2v79 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index d6b641b0d1..a642d3bca4 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v79 + 4.0.0-wso2v80-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 910626c49f..e571f611e1 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-wso2v79 + 4.0.0-wso2v80-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index d8f71f515e..8ee05929f1 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-wso2v79 + 4.0.0-wso2v80-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 1eedadee77..ea50888a7b 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v79 + 4.0.0-wso2v80-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 62ad446f2a..561681d448 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v79 + 4.0.0-wso2v80-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 2f33fcb81e..6d1d836477 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v79 + 4.0.0-wso2v80-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index e0e07b8799..4cbfcde93e 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v79 + 4.0.0-wso2v80-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 8ac29a588c..1e6e5c7e7b 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-wso2v79 + 4.0.0-wso2v80-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 9417e0e81a..97e42b2466 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-wso2v79 + 4.0.0-wso2v80-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 5f0b739120..47b50f6efe 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-wso2v79 + 4.0.0-wso2v80-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 84713bfd84..26afe3bbc7 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-wso2v79 + 4.0.0-wso2v80-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 870df77548..fdd4981e4c 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v79 + 4.0.0-wso2v80-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 5ed1f8a338..0640efc6ff 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v79 + 4.0.0-wso2v80-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 2586f92d6f..9e0ed79e46 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-wso2v79 + 4.0.0-wso2v80-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 61c38e1122..69a7c28fc2 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v79 + 4.0.0-wso2v80-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-wso2v79 + HEAD Apache Software Foundation From 684a4cf35d57cdba2254e604ed8264709629eb51 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 9 Feb 2024 07:25:59 +0000 Subject: [PATCH 136/308] [WSO2 Release] [Jenkins #6837] [Release 4.0.0-wso2v80] prepare release v4.0.0-wso2v80 --- 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 631bf926c7..09ea0953ce 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v80-SNAPSHOT + 4.0.0-wso2v80 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 2f57f5665f..aa7b2f12c5 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v80-SNAPSHOT + 4.0.0-wso2v80 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 3dc92d292b..fb7f19602d 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-wso2v80-SNAPSHOT + 4.0.0-wso2v80 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index b5110f2283..cca05d438f 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v80-SNAPSHOT + 4.0.0-wso2v80 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index efa412336f..294ac81c53 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v80-SNAPSHOT + 4.0.0-wso2v80 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index bc9c53f25d..00be8001f5 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v80-SNAPSHOT + 4.0.0-wso2v80 ../../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 a33e116078..5c77bea78b 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-wso2v80-SNAPSHOT + 4.0.0-wso2v80 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 0465713544..ff87226182 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-wso2v80-SNAPSHOT + 4.0.0-wso2v80 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 49ded81e8b..c5c5a3789e 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-wso2v80-SNAPSHOT + 4.0.0-wso2v80 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 f663e9e903..04af048cc5 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-wso2v80-SNAPSHOT + 4.0.0-wso2v80 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 46bb266bd6..6d1a36a460 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-wso2v80-SNAPSHOT + 4.0.0-wso2v80 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 1f25b48dd4..a100a6ee65 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-wso2v80-SNAPSHOT + 4.0.0-wso2v80 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 db4b83856d..0b04ace4d9 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-wso2v80-SNAPSHOT + 4.0.0-wso2v80 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index a0938c0af7..586b0726be 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v80-SNAPSHOT + 4.0.0-wso2v80 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 0c65be24ec..720c8e5473 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v80-SNAPSHOT + 4.0.0-wso2v80 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 50653438c8..b668c96d1c 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v80-SNAPSHOT + 4.0.0-wso2v80 ../../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-wso2v80 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index a642d3bca4..c08dc4fd9d 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v80-SNAPSHOT + 4.0.0-wso2v80 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index e571f611e1..a4c263aad4 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-wso2v80-SNAPSHOT + 4.0.0-wso2v80 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 8ee05929f1..694e96abf9 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-wso2v80-SNAPSHOT + 4.0.0-wso2v80 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index ea50888a7b..e74b5df767 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v80-SNAPSHOT + 4.0.0-wso2v80 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 561681d448..8ff9b15ced 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v80-SNAPSHOT + 4.0.0-wso2v80 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 6d1d836477..38d010182f 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v80-SNAPSHOT + 4.0.0-wso2v80 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 4cbfcde93e..9a6976f7b0 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v80-SNAPSHOT + 4.0.0-wso2v80 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 1e6e5c7e7b..93cd1d6033 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-wso2v80-SNAPSHOT + 4.0.0-wso2v80 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 97e42b2466..ed9241993f 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-wso2v80-SNAPSHOT + 4.0.0-wso2v80 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 47b50f6efe..31db48b0ce 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-wso2v80-SNAPSHOT + 4.0.0-wso2v80 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 26afe3bbc7..d7c6a162bb 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-wso2v80-SNAPSHOT + 4.0.0-wso2v80 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index fdd4981e4c..6937929c60 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v80-SNAPSHOT + 4.0.0-wso2v80 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 0640efc6ff..dd0a0b215d 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v80-SNAPSHOT + 4.0.0-wso2v80 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 9e0ed79e46..3c1c517d1f 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-wso2v80-SNAPSHOT + 4.0.0-wso2v80 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 59ded056c4..a3c033b96b 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v80-SNAPSHOT + 4.0.0-wso2v80 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-wso2v80 Apache Software Foundation From 0ea915239f41d65eab2f7d9e7dfb2ff97369f23c Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 9 Feb 2024 07:26:01 +0000 Subject: [PATCH 137/308] [WSO2 Release] [Jenkins #6837] [Release 4.0.0-wso2v80] 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 09ea0953ce..4e48b85414 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v80 + 4.0.0-wso2v81-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index aa7b2f12c5..2bcd74fe98 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v80 + 4.0.0-wso2v81-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index fb7f19602d..036ecbcded 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-wso2v80 + 4.0.0-wso2v81-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index cca05d438f..f289d8765b 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v80 + 4.0.0-wso2v81-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 294ac81c53..e640da4c3b 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v80 + 4.0.0-wso2v81-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 00be8001f5..aadc52499e 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v80 + 4.0.0-wso2v81-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 5c77bea78b..6eb0a1f6e1 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-wso2v80 + 4.0.0-wso2v81-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 ff87226182..fbcd95a78b 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-wso2v80 + 4.0.0-wso2v81-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 c5c5a3789e..676ea6ae5e 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-wso2v80 + 4.0.0-wso2v81-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 04af048cc5..f5edd3a44f 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-wso2v80 + 4.0.0-wso2v81-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 6d1a36a460..a5243c1368 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-wso2v80 + 4.0.0-wso2v81-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 a100a6ee65..182a2b936e 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-wso2v80 + 4.0.0-wso2v81-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 0b04ace4d9..d26a66abbd 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-wso2v80 + 4.0.0-wso2v81-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 586b0726be..54e6ab3fdb 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v80 + 4.0.0-wso2v81-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 720c8e5473..19c0a7eb69 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v80 + 4.0.0-wso2v81-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index b668c96d1c..1a676c6fe2 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v80 + 4.0.0-wso2v81-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-wso2v80 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index c08dc4fd9d..13fb01106a 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v80 + 4.0.0-wso2v81-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index a4c263aad4..494aa3cb89 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-wso2v80 + 4.0.0-wso2v81-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 694e96abf9..a716ef8e9b 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-wso2v80 + 4.0.0-wso2v81-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index e74b5df767..ae82447ff4 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v80 + 4.0.0-wso2v81-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 8ff9b15ced..879dfd2d3d 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v80 + 4.0.0-wso2v81-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 38d010182f..654c581d93 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v80 + 4.0.0-wso2v81-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 9a6976f7b0..bcc48566c3 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v80 + 4.0.0-wso2v81-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 93cd1d6033..62af97332e 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-wso2v80 + 4.0.0-wso2v81-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index ed9241993f..b01611c485 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-wso2v80 + 4.0.0-wso2v81-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 31db48b0ce..99378d7045 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-wso2v80 + 4.0.0-wso2v81-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index d7c6a162bb..d8f2aa4203 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-wso2v80 + 4.0.0-wso2v81-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 6937929c60..7630ee0656 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v80 + 4.0.0-wso2v81-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index dd0a0b215d..5643671f53 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v80 + 4.0.0-wso2v81-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 3c1c517d1f..37bb4814ab 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-wso2v80 + 4.0.0-wso2v81-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index a3c033b96b..d5ac1699ba 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v80 + 4.0.0-wso2v81-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-wso2v80 + HEAD Apache Software Foundation From 7efd1388ad32557a2baba831d25ccc45c3065e61 Mon Sep 17 00:00:00 2001 From: tgtshanika Date: Mon, 12 Feb 2024 13:01:13 +0530 Subject: [PATCH 138/308] Upgrade json schema validator to 2.2.6.wso2v10 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d5ac1699ba..b97ef9ec03 100644 --- a/pom.xml +++ b/pom.xml @@ -1565,7 +1565,7 @@ 3.0.1 2.0.9 3.0.0 - 2.2.6.wso2v9 + 2.2.6.wso2v10 2.16.1 2.16.1 33.0.0-jre From 643cd656f4b921c9607233c3b3fe3cb21536ba84 Mon Sep 17 00:00:00 2001 From: Dulanjali Dilmi Date: Tue, 13 Feb 2024 10:38:54 +0530 Subject: [PATCH 139/308] Upgrade dependencies Related Issue: Related issue:wso2/micro-integrator#3109 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 36f2e18601..2e67928068 100644 --- a/pom.xml +++ b/pom.xml @@ -1490,7 +1490,7 @@ ${version.tomcat}.wso2v1 1.3 1.5.0.wso2v1 - 2.2.0-wso2v16 + 2.2.0-wso2v17 6.6 3.9.0 ${commons.net.version}.wso2v1 @@ -1501,8 +1501,8 @@ 2.1.6 1.1 - 1.6.1-wso2v92 - 2.0.0-wso2v67 + 1.6.1-wso2v97 + 2.0.0-wso2v68 1.2.11-wso2v21 1.4.7 1.3.04 From aba5faf5de98cf79f137a2a8e65d401cb261d5f3 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 13 Feb 2024 06:03:13 +0000 Subject: [PATCH 140/308] [WSO2 Release] [Jenkins #6843] [Release 4.0.0-wso2v81] prepare release v4.0.0-wso2v81 --- 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 4e48b85414..86d114d150 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v81-SNAPSHOT + 4.0.0-wso2v81 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 2bcd74fe98..8021658b33 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v81-SNAPSHOT + 4.0.0-wso2v81 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 036ecbcded..141a4ad6b0 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-wso2v81-SNAPSHOT + 4.0.0-wso2v81 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index f289d8765b..735dd4179d 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v81-SNAPSHOT + 4.0.0-wso2v81 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index e640da4c3b..4cc6f0e6f8 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v81-SNAPSHOT + 4.0.0-wso2v81 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index aadc52499e..4e1dd7271d 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v81-SNAPSHOT + 4.0.0-wso2v81 ../../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 6eb0a1f6e1..7950ef8c44 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-wso2v81-SNAPSHOT + 4.0.0-wso2v81 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 fbcd95a78b..13e19a4521 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-wso2v81-SNAPSHOT + 4.0.0-wso2v81 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 676ea6ae5e..10b2f8bb21 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-wso2v81-SNAPSHOT + 4.0.0-wso2v81 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 f5edd3a44f..95e3a26de3 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-wso2v81-SNAPSHOT + 4.0.0-wso2v81 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 a5243c1368..cef094a006 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-wso2v81-SNAPSHOT + 4.0.0-wso2v81 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 182a2b936e..96b53ef4ff 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-wso2v81-SNAPSHOT + 4.0.0-wso2v81 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 d26a66abbd..9cb80c4a3d 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-wso2v81-SNAPSHOT + 4.0.0-wso2v81 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 54e6ab3fdb..86826165fe 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v81-SNAPSHOT + 4.0.0-wso2v81 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 19c0a7eb69..cbbc549f1d 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v81-SNAPSHOT + 4.0.0-wso2v81 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 1a676c6fe2..f38735d37e 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v81-SNAPSHOT + 4.0.0-wso2v81 ../../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-wso2v81 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 13fb01106a..8c2346717a 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v81-SNAPSHOT + 4.0.0-wso2v81 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 494aa3cb89..7abc19a2c3 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-wso2v81-SNAPSHOT + 4.0.0-wso2v81 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index a716ef8e9b..02463ed672 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-wso2v81-SNAPSHOT + 4.0.0-wso2v81 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index ae82447ff4..d0e51278ef 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v81-SNAPSHOT + 4.0.0-wso2v81 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 879dfd2d3d..17a7a4cf1e 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v81-SNAPSHOT + 4.0.0-wso2v81 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 654c581d93..d869bdf4d2 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v81-SNAPSHOT + 4.0.0-wso2v81 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index bcc48566c3..a8b794a9ab 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v81-SNAPSHOT + 4.0.0-wso2v81 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 62af97332e..5fa39c97f2 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-wso2v81-SNAPSHOT + 4.0.0-wso2v81 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index b01611c485..7678418ebf 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-wso2v81-SNAPSHOT + 4.0.0-wso2v81 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 99378d7045..424f14b838 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-wso2v81-SNAPSHOT + 4.0.0-wso2v81 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index d8f2aa4203..33a22132c4 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-wso2v81-SNAPSHOT + 4.0.0-wso2v81 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 7630ee0656..a42a738bd3 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v81-SNAPSHOT + 4.0.0-wso2v81 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 5643671f53..e39bb29333 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v81-SNAPSHOT + 4.0.0-wso2v81 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 37bb4814ab..b9ca51d357 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-wso2v81-SNAPSHOT + 4.0.0-wso2v81 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index f5afb39f48..06e896ba15 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v81-SNAPSHOT + 4.0.0-wso2v81 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-wso2v81 Apache Software Foundation From 8382cc2321278f0b8fe6de15ef8e3aaf61436eb4 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 13 Feb 2024 06:03:15 +0000 Subject: [PATCH 141/308] [WSO2 Release] [Jenkins #6843] [Release 4.0.0-wso2v81] 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 86d114d150..2f9ca33be6 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v81 + 4.0.0-wso2v82-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 8021658b33..de7e149aba 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v81 + 4.0.0-wso2v82-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 141a4ad6b0..d72033be98 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-wso2v81 + 4.0.0-wso2v82-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 735dd4179d..af5c69745d 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v81 + 4.0.0-wso2v82-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 4cc6f0e6f8..c06c82f4a7 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v81 + 4.0.0-wso2v82-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 4e1dd7271d..8009b94e4d 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v81 + 4.0.0-wso2v82-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 7950ef8c44..591e361202 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-wso2v81 + 4.0.0-wso2v82-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 13e19a4521..882b7833ac 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-wso2v81 + 4.0.0-wso2v82-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 10b2f8bb21..796abff010 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-wso2v81 + 4.0.0-wso2v82-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 95e3a26de3..82b9c22747 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-wso2v81 + 4.0.0-wso2v82-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 cef094a006..9164838f59 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-wso2v81 + 4.0.0-wso2v82-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 96b53ef4ff..b2b1f39e79 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-wso2v81 + 4.0.0-wso2v82-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 9cb80c4a3d..96f1893cb0 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-wso2v81 + 4.0.0-wso2v82-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 86826165fe..61a605baad 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v81 + 4.0.0-wso2v82-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index cbbc549f1d..c42b73898b 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v81 + 4.0.0-wso2v82-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index f38735d37e..91487abed3 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v81 + 4.0.0-wso2v82-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-wso2v81 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 8c2346717a..2bc35901d6 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v81 + 4.0.0-wso2v82-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 7abc19a2c3..c31f5ddc24 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-wso2v81 + 4.0.0-wso2v82-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 02463ed672..3366d82ac1 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-wso2v81 + 4.0.0-wso2v82-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index d0e51278ef..8727f6e297 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v81 + 4.0.0-wso2v82-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 17a7a4cf1e..052faa11e1 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v81 + 4.0.0-wso2v82-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index d869bdf4d2..a8405eabc5 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v81 + 4.0.0-wso2v82-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index a8b794a9ab..b0bfa4ceed 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v81 + 4.0.0-wso2v82-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 5fa39c97f2..a65b336b28 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-wso2v81 + 4.0.0-wso2v82-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 7678418ebf..280acfaaef 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-wso2v81 + 4.0.0-wso2v82-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 424f14b838..79ba971975 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-wso2v81 + 4.0.0-wso2v82-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 33a22132c4..906b6732ed 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-wso2v81 + 4.0.0-wso2v82-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index a42a738bd3..0f353b0336 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v81 + 4.0.0-wso2v82-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index e39bb29333..dcd5b45edb 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v81 + 4.0.0-wso2v82-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index b9ca51d357..27518cc40d 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-wso2v81 + 4.0.0-wso2v82-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 06e896ba15..7742b7850c 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v81 + 4.0.0-wso2v82-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-wso2v81 + HEAD Apache Software Foundation From 43a8113901f823ec961e36821f7facfaccc6150f Mon Sep 17 00:00:00 2001 From: Arunan Sugunakumar Date: Tue, 13 Feb 2024 11:43:56 +0530 Subject: [PATCH 142/308] Upgrade httpcore-nio to use forked version --- .../org.apache.synapse.transport.nhttp.feature/pom.xml | 4 ++-- modules/transports/core/nhttp/pom.xml | 2 +- pom.xml | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) 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 676ea6ae5e..c35f6e5c7f 100644 --- a/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml +++ b/modules/features/org.apache.synapse.transport.nhttp.feature/pom.xml @@ -44,7 +44,7 @@ httpcore - org.apache.httpcomponents.wso2 + org.wso2.orbit.httpcomponents httpcore-nio @@ -78,7 +78,7 @@ org.apache.synapse:synapse-commons org.apache.synapse:synapse-nhttp-transport org.apache.httpcomponents.wso2:httpcore - org.apache.httpcomponents.wso2:httpcore-nio + org.wso2.orbit.httpcomponents:httpcore-nio org.wso2.orbit.org.apache.httpcomponents:httpclient diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 62af97332e..f4fde36557 100644 --- a/modules/transports/core/nhttp/pom.xml +++ b/modules/transports/core/nhttp/pom.xml @@ -176,7 +176,7 @@ httpcore - org.apache.httpcomponents + org.wso2.httpcomponents httpcore-nio diff --git a/pom.xml b/pom.xml index f5afb39f48..3efa7ce6b4 100644 --- a/pom.xml +++ b/pom.xml @@ -667,9 +667,9 @@ ${httpcore.version} - org.apache.httpcomponents + org.wso2.httpcomponents httpcore-nio - ${httpcore-nio.version} + ${httpcore-nio.wso2.version} org.apache.httpcomponents @@ -682,7 +682,7 @@ ${httpcore.wso2.version} - org.apache.httpcomponents.wso2 + org.wso2.orbit.httpcomponents httpcore-nio ${httpcore-nio.wso2.version} @@ -1476,7 +1476,7 @@ 4.4.16 ${httpcore.version}.wso2v1 4.4.16 - ${httpcore-nio.version}.wso2v1 + ${httpcore-nio.version}-wso2v4 4.5.13 ${hc.httpclient.version}.wso2v1 1.8.5 From 9bc1bb6207c9b0069f1066afd28db7f98a386870 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 14 Feb 2024 03:36:43 +0000 Subject: [PATCH 143/308] [WSO2 Release] [Jenkins #6846] [Release 4.0.0-wso2v82] prepare release v4.0.0-wso2v82 --- 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 2f9ca33be6..82d07fbd53 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v82-SNAPSHOT + 4.0.0-wso2v82 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index de7e149aba..38c0cf8986 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v82-SNAPSHOT + 4.0.0-wso2v82 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index d72033be98..eb94cfc4ca 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-wso2v82-SNAPSHOT + 4.0.0-wso2v82 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index af5c69745d..b9884c0463 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v82-SNAPSHOT + 4.0.0-wso2v82 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index c06c82f4a7..d7e5f1eb9d 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v82-SNAPSHOT + 4.0.0-wso2v82 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 8009b94e4d..da1ff95d59 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v82-SNAPSHOT + 4.0.0-wso2v82 ../../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 591e361202..6a6cdaf683 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-wso2v82-SNAPSHOT + 4.0.0-wso2v82 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 882b7833ac..f1ce07c3bd 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-wso2v82-SNAPSHOT + 4.0.0-wso2v82 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 5aa2e4671e..c028d6e439 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-wso2v82-SNAPSHOT + 4.0.0-wso2v82 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 82b9c22747..79e4b99e97 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-wso2v82-SNAPSHOT + 4.0.0-wso2v82 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 9164838f59..ebe4e69009 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-wso2v82-SNAPSHOT + 4.0.0-wso2v82 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 b2b1f39e79..c1548ea36a 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-wso2v82-SNAPSHOT + 4.0.0-wso2v82 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 96f1893cb0..a0bdf31117 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-wso2v82-SNAPSHOT + 4.0.0-wso2v82 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 61a605baad..9a7375734e 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v82-SNAPSHOT + 4.0.0-wso2v82 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index c42b73898b..80aeea1591 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v82-SNAPSHOT + 4.0.0-wso2v82 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 91487abed3..14b0583831 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v82-SNAPSHOT + 4.0.0-wso2v82 ../../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-wso2v82 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 2bc35901d6..2ce2051fb9 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v82-SNAPSHOT + 4.0.0-wso2v82 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index c31f5ddc24..ed02153b76 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-wso2v82-SNAPSHOT + 4.0.0-wso2v82 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 3366d82ac1..f45dc71bb7 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-wso2v82-SNAPSHOT + 4.0.0-wso2v82 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 8727f6e297..8f2422b008 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v82-SNAPSHOT + 4.0.0-wso2v82 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 052faa11e1..74f419b13e 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v82-SNAPSHOT + 4.0.0-wso2v82 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index a8405eabc5..d57f11204f 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v82-SNAPSHOT + 4.0.0-wso2v82 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index b0bfa4ceed..65b0406a11 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v82-SNAPSHOT + 4.0.0-wso2v82 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 5a25fedac6..3c13c5b0e5 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-wso2v82-SNAPSHOT + 4.0.0-wso2v82 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 280acfaaef..ff127b474d 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-wso2v82-SNAPSHOT + 4.0.0-wso2v82 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 79ba971975..00b71f1d39 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-wso2v82-SNAPSHOT + 4.0.0-wso2v82 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 906b6732ed..3cb41b0f50 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-wso2v82-SNAPSHOT + 4.0.0-wso2v82 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 0f353b0336..9070f8e7c8 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v82-SNAPSHOT + 4.0.0-wso2v82 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index dcd5b45edb..3c091b73d8 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v82-SNAPSHOT + 4.0.0-wso2v82 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 27518cc40d..3731c7f171 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-wso2v82-SNAPSHOT + 4.0.0-wso2v82 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 16a2bc28b1..1e218d6c65 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v82-SNAPSHOT + 4.0.0-wso2v82 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-wso2v82 Apache Software Foundation From 033ecf45098963cf2a6a4c56995ed8710f203262 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 14 Feb 2024 03:36:44 +0000 Subject: [PATCH 144/308] [WSO2 Release] [Jenkins #6846] [Release 4.0.0-wso2v82] 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 82d07fbd53..2693ddeea9 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v82 + 4.0.0-wso2v83-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 38c0cf8986..4e41d076ea 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v82 + 4.0.0-wso2v83-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index eb94cfc4ca..f38b5ad364 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-wso2v82 + 4.0.0-wso2v83-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index b9884c0463..7d9455777b 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v82 + 4.0.0-wso2v83-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index d7e5f1eb9d..9cfc6e9785 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v82 + 4.0.0-wso2v83-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index da1ff95d59..ae5122fa42 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v82 + 4.0.0-wso2v83-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 6a6cdaf683..2f1fc67f40 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-wso2v82 + 4.0.0-wso2v83-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 f1ce07c3bd..d4c5f2a9d9 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-wso2v82 + 4.0.0-wso2v83-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 c028d6e439..0d18c768ee 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-wso2v82 + 4.0.0-wso2v83-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 79e4b99e97..f390fc9fdd 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-wso2v82 + 4.0.0-wso2v83-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 ebe4e69009..471278e9ae 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-wso2v82 + 4.0.0-wso2v83-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 c1548ea36a..31c0c5489d 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-wso2v82 + 4.0.0-wso2v83-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 a0bdf31117..88a53a49cc 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-wso2v82 + 4.0.0-wso2v83-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 9a7375734e..5973993409 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v82 + 4.0.0-wso2v83-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 80aeea1591..ca1a39fe3d 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v82 + 4.0.0-wso2v83-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 14b0583831..f982a1a6b1 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v82 + 4.0.0-wso2v83-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-wso2v82 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 2ce2051fb9..3465532dcb 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v82 + 4.0.0-wso2v83-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index ed02153b76..04b6212396 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-wso2v82 + 4.0.0-wso2v83-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index f45dc71bb7..2bba5d887b 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-wso2v82 + 4.0.0-wso2v83-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 8f2422b008..5b16961290 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v82 + 4.0.0-wso2v83-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 74f419b13e..65be48e677 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v82 + 4.0.0-wso2v83-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index d57f11204f..5720ed0e22 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v82 + 4.0.0-wso2v83-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 65b0406a11..f890811851 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v82 + 4.0.0-wso2v83-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 3c13c5b0e5..c9c88ccf50 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-wso2v82 + 4.0.0-wso2v83-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index ff127b474d..5ba21396bf 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-wso2v82 + 4.0.0-wso2v83-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 00b71f1d39..a362b774fc 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-wso2v82 + 4.0.0-wso2v83-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 3cb41b0f50..6fea58c438 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-wso2v82 + 4.0.0-wso2v83-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 9070f8e7c8..56d396d9a6 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v82 + 4.0.0-wso2v83-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 3c091b73d8..b3b9058283 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v82 + 4.0.0-wso2v83-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 3731c7f171..64b1b8f6d9 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-wso2v82 + 4.0.0-wso2v83-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 1e218d6c65..4840895537 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v82 + 4.0.0-wso2v83-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-wso2v82 + HEAD Apache Software Foundation From 2f079c52cbdcca1183f23e10d897958b96c4e8bf Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 14 Feb 2024 05:45:39 +0000 Subject: [PATCH 145/308] [WSO2 Release] [Jenkins #6848] [Release 4.0.0-wso2v83] prepare release v4.0.0-wso2v83 --- 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 2693ddeea9..91a4fa651e 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v83-SNAPSHOT + 4.0.0-wso2v83 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 4e41d076ea..8c345083d9 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v83-SNAPSHOT + 4.0.0-wso2v83 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index f38b5ad364..2c3437e37c 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-wso2v83-SNAPSHOT + 4.0.0-wso2v83 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 7d9455777b..ed51c984a0 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v83-SNAPSHOT + 4.0.0-wso2v83 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 9cfc6e9785..a49cb38401 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v83-SNAPSHOT + 4.0.0-wso2v83 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index ae5122fa42..88e268a22f 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v83-SNAPSHOT + 4.0.0-wso2v83 ../../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 2f1fc67f40..0a641237cd 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-wso2v83-SNAPSHOT + 4.0.0-wso2v83 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 d4c5f2a9d9..70844fbcbe 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-wso2v83-SNAPSHOT + 4.0.0-wso2v83 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 0d18c768ee..bb3b695437 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-wso2v83-SNAPSHOT + 4.0.0-wso2v83 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 f390fc9fdd..748b7706ea 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-wso2v83-SNAPSHOT + 4.0.0-wso2v83 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 471278e9ae..965d67425a 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-wso2v83-SNAPSHOT + 4.0.0-wso2v83 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 31c0c5489d..1c3ef799bd 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-wso2v83-SNAPSHOT + 4.0.0-wso2v83 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 88a53a49cc..5f306624ec 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-wso2v83-SNAPSHOT + 4.0.0-wso2v83 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 5973993409..73db33da8b 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v83-SNAPSHOT + 4.0.0-wso2v83 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index ca1a39fe3d..2823f6a173 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v83-SNAPSHOT + 4.0.0-wso2v83 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index f982a1a6b1..cbef28e2b6 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v83-SNAPSHOT + 4.0.0-wso2v83 ../../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-wso2v83 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 3465532dcb..5c7e3b7364 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v83-SNAPSHOT + 4.0.0-wso2v83 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 04b6212396..a04d511743 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-wso2v83-SNAPSHOT + 4.0.0-wso2v83 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 2bba5d887b..1bfbaacd8b 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-wso2v83-SNAPSHOT + 4.0.0-wso2v83 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 5b16961290..e90e5616cc 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v83-SNAPSHOT + 4.0.0-wso2v83 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 65be48e677..64a2c6c554 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v83-SNAPSHOT + 4.0.0-wso2v83 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 5720ed0e22..7162b31af9 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v83-SNAPSHOT + 4.0.0-wso2v83 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index f890811851..59ddc871cf 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v83-SNAPSHOT + 4.0.0-wso2v83 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index c9c88ccf50..86f064bbd2 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-wso2v83-SNAPSHOT + 4.0.0-wso2v83 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 5ba21396bf..9238e1b022 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-wso2v83-SNAPSHOT + 4.0.0-wso2v83 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index a362b774fc..4aed43b9ab 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-wso2v83-SNAPSHOT + 4.0.0-wso2v83 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 6fea58c438..80fedc98f0 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-wso2v83-SNAPSHOT + 4.0.0-wso2v83 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 56d396d9a6..877645e3bb 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v83-SNAPSHOT + 4.0.0-wso2v83 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index b3b9058283..b4bedfdb15 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v83-SNAPSHOT + 4.0.0-wso2v83 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 64b1b8f6d9..a270f2be6a 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-wso2v83-SNAPSHOT + 4.0.0-wso2v83 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 5f3db4d842..df38854e65 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v83-SNAPSHOT + 4.0.0-wso2v83 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-wso2v83 Apache Software Foundation From 564af81a57f619ec03a4a564c1031dc91ec234df Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 14 Feb 2024 05:45:41 +0000 Subject: [PATCH 146/308] [WSO2 Release] [Jenkins #6848] [Release 4.0.0-wso2v83] 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 91a4fa651e..da951d0eee 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v83 + 4.0.0-wso2v84-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 8c345083d9..660fef49b7 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v83 + 4.0.0-wso2v84-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 2c3437e37c..c374eef35d 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-wso2v83 + 4.0.0-wso2v84-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index ed51c984a0..ad7e4886c3 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v83 + 4.0.0-wso2v84-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index a49cb38401..c7bcaa7a06 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v83 + 4.0.0-wso2v84-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 88e268a22f..9d6d597b24 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v83 + 4.0.0-wso2v84-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 0a641237cd..2545207203 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-wso2v83 + 4.0.0-wso2v84-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 70844fbcbe..6446755003 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-wso2v83 + 4.0.0-wso2v84-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 bb3b695437..86502fb8f9 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-wso2v83 + 4.0.0-wso2v84-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 748b7706ea..19da2e8ada 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-wso2v83 + 4.0.0-wso2v84-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 965d67425a..e5ec064013 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-wso2v83 + 4.0.0-wso2v84-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 1c3ef799bd..586099de13 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-wso2v83 + 4.0.0-wso2v84-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 5f306624ec..14d2e8742b 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-wso2v83 + 4.0.0-wso2v84-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 73db33da8b..93cd0a4116 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v83 + 4.0.0-wso2v84-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 2823f6a173..9b0b0b0c09 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v83 + 4.0.0-wso2v84-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index cbef28e2b6..2c2506f73b 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v83 + 4.0.0-wso2v84-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-wso2v83 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 5c7e3b7364..7c5bab5fc7 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v83 + 4.0.0-wso2v84-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index a04d511743..21c654a6a6 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-wso2v83 + 4.0.0-wso2v84-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 1bfbaacd8b..f18466034d 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-wso2v83 + 4.0.0-wso2v84-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index e90e5616cc..a40f65316c 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v83 + 4.0.0-wso2v84-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 64a2c6c554..1a6489be59 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v83 + 4.0.0-wso2v84-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 7162b31af9..d782595001 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v83 + 4.0.0-wso2v84-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 59ddc871cf..670ccf2994 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v83 + 4.0.0-wso2v84-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 86f064bbd2..2da2553533 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-wso2v83 + 4.0.0-wso2v84-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 9238e1b022..66895862ac 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-wso2v83 + 4.0.0-wso2v84-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 4aed43b9ab..d12eafe113 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-wso2v83 + 4.0.0-wso2v84-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 80fedc98f0..71c39e7203 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-wso2v83 + 4.0.0-wso2v84-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 877645e3bb..5a1a1fd072 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v83 + 4.0.0-wso2v84-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index b4bedfdb15..a56c93e10d 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v83 + 4.0.0-wso2v84-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index a270f2be6a..aceebc854b 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-wso2v83 + 4.0.0-wso2v84-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index df38854e65..ba7701c62c 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v83 + 4.0.0-wso2v84-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-wso2v83 + HEAD Apache Software Foundation From 8294911edcb316b7e7d0dfeeb9bb9fed35a406a6 Mon Sep 17 00:00:00 2001 From: Dulanjali Dilmi Date: Wed, 14 Feb 2024 15:41:29 +0530 Subject: [PATCH 147/308] Fix json path issue in Mediators Fix issue with Enrich mediator and foreach meadiator after Json Path Upgrade Fix https://github.com/wso2/micro-integrator/issues/3116 --- .../synapse/mediators/builtin/ForEachMediator.java | 5 +++++ .../apache/synapse/mediators/elementary/Target.java | 12 +++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ForEachMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ForEachMediator.java index 3483448b1d..72b3b3c7c7 100644 --- a/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ForEachMediator.java +++ b/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ForEachMediator.java @@ -129,6 +129,11 @@ public boolean mediate(MessageContext synCtx) { + " is not a valid JSON array", synCtx); } JsonArray iterableJsonArray = iterableChildElements.getAsJsonArray(); + // If the iterableJsonArray is empty, then no need to continue the mediation + if (iterableJsonArray.isEmpty()){ + log.info("No elements found for the JSONPath : " + expression); + return true; + } if (synLog.isTraceOrDebugEnabled()) { synLog.traceOrDebug("Splitting with JSONPath : " + expression + " resulted in " + iterableJsonArray.size() + " elements."); diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/elementary/Target.java b/modules/core/src/main/java/org/apache/synapse/mediators/elementary/Target.java index 1027629b42..1887073f9c 100644 --- a/modules/core/src/main/java/org/apache/synapse/mediators/elementary/Target.java +++ b/modules/core/src/main/java/org/apache/synapse/mediators/elementary/Target.java @@ -527,9 +527,15 @@ private String removeJSONFromString(MessageContext synCtx, String inputString, S if (path.equals("$") || path.equals("$.")) { result = ""; } else { - DocumentContext doc = JsonPath.parse(result); - doc.delete(path); - result = doc.jsonString(); + Object list = JsonPath.compile(path).read(result); + if (!((JsonArray) list).isEmpty()) { + DocumentContext doc = JsonPath.parse(result); + doc.delete(path); + result = doc.jsonString(); + } else { + log.info("No matching elements were found for the given JSONPath: " + path + ". Therefore, " + + "no elements were removed."); + } } } } From 5ab5719b5d2de2333b127f7597b2c38642e82850 Mon Sep 17 00:00:00 2001 From: DedunuKarunarathne <46235093+DedunuKarunarathne@users.noreply.github.com> Date: Fri, 16 Feb 2024 12:20:56 +0530 Subject: [PATCH 148/308] Fix analytics data of template endpoints publishing twice --- .../synapse/endpoints/TemplateEndpoint.java | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/TemplateEndpoint.java b/modules/core/src/main/java/org/apache/synapse/endpoints/TemplateEndpoint.java index 20ebd32d4e..abfc0e978a 100644 --- a/modules/core/src/main/java/org/apache/synapse/endpoints/TemplateEndpoint.java +++ b/modules/core/src/main/java/org/apache/synapse/endpoints/TemplateEndpoint.java @@ -51,23 +51,7 @@ public class TemplateEndpoint extends AbstractEndpoint { @Override public void send(MessageContext synCtx) { - if (RuntimeStatisticCollector.isStatisticsEnabled()) { - Integer currentIndex = null; - if (getDefinition() != null) { - currentIndex = OpenEventCollector.reportChildEntryEvent(synCtx, getReportingName(), - ComponentType.ENDPOINT, getDefinition().getAspectConfiguration(), true); - } - try { - sendMessage(synCtx); - } finally { - if (currentIndex != null) { - CloseEventCollector.closeEntryEvent(synCtx, getReportingName(), ComponentType.MEDIATOR, - currentIndex, false); - } - } - } else { - sendMessage(synCtx); - } + sendMessage(synCtx); } @Override From f4333c883079474102e10775ab0b0697c858c447 Mon Sep 17 00:00:00 2001 From: malakaganga Date: Fri, 16 Feb 2024 12:09:19 +0530 Subject: [PATCH 149/308] Fix source payload not preserving in call mediator When there isn't a defined source when using source and target with call mediator the source supposed to be the body and after mediation the original payload in this case source should be preserved but in this case there isn't a define source it was not happening and I have fixed it by adding a dummy source. Fixes: https://github.com/wso2/micro-integrator/issues/3086 --- .../org/apache/synapse/config/xml/CallMediatorFactory.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/CallMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/CallMediatorFactory.java index 60902c7aec..6b444e750d 100644 --- a/modules/core/src/main/java/org/apache/synapse/config/xml/CallMediatorFactory.java +++ b/modules/core/src/main/java/org/apache/synapse/config/xml/CallMediatorFactory.java @@ -109,6 +109,11 @@ public Mediator createSpecificMediator(OMElement elem, Properties properties) { OMElement targetEle = elem.getFirstChildWithName(TARGET_Q); if (targetEle != null) { + if (sourceEle == null) { + Source source = CallMediatorEnrichUtil.createSourceWithBody(); + callMediator.setSourceAvailable(true); + callMediator.setSourceForOutboundPayload(source); + } Target target = new Target(); populateTarget(callMediator, target, targetEle); callMediator.setTargetForInboundPayload(target); From 41fec506f86440bff85ea48323c473dc181268c3 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 16 Feb 2024 08:09:12 +0000 Subject: [PATCH 150/308] [WSO2 Release] [Jenkins #6852] [Release 4.0.0-wso2v84] prepare release v4.0.0-wso2v84 --- 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 da951d0eee..05f5803736 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v84-SNAPSHOT + 4.0.0-wso2v84 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 660fef49b7..e67b10480a 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v84-SNAPSHOT + 4.0.0-wso2v84 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index c374eef35d..7c978cfbc0 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-wso2v84-SNAPSHOT + 4.0.0-wso2v84 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index ad7e4886c3..815daa26d6 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v84-SNAPSHOT + 4.0.0-wso2v84 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index c7bcaa7a06..6fd59dc69c 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v84-SNAPSHOT + 4.0.0-wso2v84 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 9d6d597b24..6bf95a7824 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v84-SNAPSHOT + 4.0.0-wso2v84 ../../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 2545207203..9358947f1a 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-wso2v84-SNAPSHOT + 4.0.0-wso2v84 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 6446755003..48fc735728 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-wso2v84-SNAPSHOT + 4.0.0-wso2v84 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 86502fb8f9..c9ed872582 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-wso2v84-SNAPSHOT + 4.0.0-wso2v84 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 19da2e8ada..ac90c8c26c 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-wso2v84-SNAPSHOT + 4.0.0-wso2v84 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 e5ec064013..26a818e856 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-wso2v84-SNAPSHOT + 4.0.0-wso2v84 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 586099de13..b00e9add06 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-wso2v84-SNAPSHOT + 4.0.0-wso2v84 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 14d2e8742b..6762798806 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-wso2v84-SNAPSHOT + 4.0.0-wso2v84 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 93cd0a4116..4020ee46fc 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v84-SNAPSHOT + 4.0.0-wso2v84 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 9b0b0b0c09..9ae3349c5d 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v84-SNAPSHOT + 4.0.0-wso2v84 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 2c2506f73b..cd4be3bfa1 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v84-SNAPSHOT + 4.0.0-wso2v84 ../../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-wso2v84 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 7c5bab5fc7..83b15afa27 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v84-SNAPSHOT + 4.0.0-wso2v84 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 21c654a6a6..2502f40596 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-wso2v84-SNAPSHOT + 4.0.0-wso2v84 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index f18466034d..106adb9f32 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-wso2v84-SNAPSHOT + 4.0.0-wso2v84 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index a40f65316c..d3b21e659d 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v84-SNAPSHOT + 4.0.0-wso2v84 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 1a6489be59..7139e8b4ec 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v84-SNAPSHOT + 4.0.0-wso2v84 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index d782595001..fc3b40a60e 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v84-SNAPSHOT + 4.0.0-wso2v84 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 670ccf2994..73897d0738 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v84-SNAPSHOT + 4.0.0-wso2v84 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 2da2553533..d3f14aa0a0 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-wso2v84-SNAPSHOT + 4.0.0-wso2v84 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 66895862ac..b46b0c5736 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-wso2v84-SNAPSHOT + 4.0.0-wso2v84 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index d12eafe113..2185f49bce 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-wso2v84-SNAPSHOT + 4.0.0-wso2v84 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 71c39e7203..c3a4349704 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-wso2v84-SNAPSHOT + 4.0.0-wso2v84 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 5a1a1fd072..82585d22c0 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v84-SNAPSHOT + 4.0.0-wso2v84 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index a56c93e10d..c2f1753401 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v84-SNAPSHOT + 4.0.0-wso2v84 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index aceebc854b..132b4ef460 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-wso2v84-SNAPSHOT + 4.0.0-wso2v84 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index ba7701c62c..0dad2ab85e 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v84-SNAPSHOT + 4.0.0-wso2v84 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-wso2v84 Apache Software Foundation From 01c71d1276c10e9e69fa98deefd846b50f21dc7b Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 16 Feb 2024 08:09:13 +0000 Subject: [PATCH 151/308] [WSO2 Release] [Jenkins #6852] [Release 4.0.0-wso2v84] 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 05f5803736..1ba559470a 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v84 + 4.0.0-wso2v85-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index e67b10480a..02dbbe61a0 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v84 + 4.0.0-wso2v85-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 7c978cfbc0..57a7e941b4 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-wso2v84 + 4.0.0-wso2v85-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 815daa26d6..876d173a15 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v84 + 4.0.0-wso2v85-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 6fd59dc69c..1c51fe9b0a 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v84 + 4.0.0-wso2v85-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 6bf95a7824..b95227c7b0 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v84 + 4.0.0-wso2v85-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 9358947f1a..d316e83df6 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-wso2v84 + 4.0.0-wso2v85-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 48fc735728..bf6b57a00e 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-wso2v84 + 4.0.0-wso2v85-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 c9ed872582..88e05baf2d 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-wso2v84 + 4.0.0-wso2v85-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 ac90c8c26c..2b6686241c 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-wso2v84 + 4.0.0-wso2v85-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 26a818e856..673f9560d5 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-wso2v84 + 4.0.0-wso2v85-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 b00e9add06..12ef10f55d 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-wso2v84 + 4.0.0-wso2v85-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 6762798806..07e3586d83 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-wso2v84 + 4.0.0-wso2v85-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 4020ee46fc..16e764a8f5 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v84 + 4.0.0-wso2v85-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 9ae3349c5d..135aa229ae 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v84 + 4.0.0-wso2v85-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index cd4be3bfa1..a91543ae35 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v84 + 4.0.0-wso2v85-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-wso2v84 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 83b15afa27..c192219002 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v84 + 4.0.0-wso2v85-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 2502f40596..5ecfbb5368 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-wso2v84 + 4.0.0-wso2v85-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 106adb9f32..f3a03dfb23 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-wso2v84 + 4.0.0-wso2v85-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index d3b21e659d..d2a3cf393d 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v84 + 4.0.0-wso2v85-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 7139e8b4ec..afc12232ba 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v84 + 4.0.0-wso2v85-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index fc3b40a60e..f7dcd0b04d 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v84 + 4.0.0-wso2v85-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 73897d0738..4a83f2d6a2 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v84 + 4.0.0-wso2v85-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index d3f14aa0a0..0f92f367fd 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-wso2v84 + 4.0.0-wso2v85-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index b46b0c5736..ab207e2131 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-wso2v84 + 4.0.0-wso2v85-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 2185f49bce..f889281fd2 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-wso2v84 + 4.0.0-wso2v85-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index c3a4349704..2a6e0c2ca1 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-wso2v84 + 4.0.0-wso2v85-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 82585d22c0..329c86e021 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v84 + 4.0.0-wso2v85-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index c2f1753401..4edd239c2d 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v84 + 4.0.0-wso2v85-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 132b4ef460..bff3b4c7e8 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-wso2v84 + 4.0.0-wso2v85-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 0dad2ab85e..9504e1a089 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v84 + 4.0.0-wso2v85-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-wso2v84 + HEAD Apache Software Foundation From 0d3f0c91847a285859a3a8131d0d4bff3f188a21 Mon Sep 17 00:00:00 2001 From: DedunuKarunarathne <46235093+DedunuKarunarathne@users.noreply.github.com> Date: Fri, 16 Feb 2024 15:00:04 +0530 Subject: [PATCH 152/308] Code formatting --- .../synapse/endpoints/TemplateEndpoint.java | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/TemplateEndpoint.java b/modules/core/src/main/java/org/apache/synapse/endpoints/TemplateEndpoint.java index abfc0e978a..f24d50814c 100644 --- a/modules/core/src/main/java/org/apache/synapse/endpoints/TemplateEndpoint.java +++ b/modules/core/src/main/java/org/apache/synapse/endpoints/TemplateEndpoint.java @@ -51,7 +51,15 @@ public class TemplateEndpoint extends AbstractEndpoint { @Override public void send(MessageContext synCtx) { - sendMessage(synCtx); + reLoadAndInitEndpoint(synCtx.getEnvironment()); + + if (realEndpoint != null) { + realEndpoint.send(synCtx); + } else { + informFailure(synCtx, SynapseConstants.ENDPOINT_IN_DIRECT_NOT_READY, + "Couldn't find the endpoint with the name " + getName() + + " & template : " + template); + } } @Override @@ -64,18 +72,6 @@ protected void createJsonRepresentation() { endpointJson.put("template", getTemplate()); } - public void sendMessage(MessageContext synCtx) { - reLoadAndInitEndpoint(synCtx.getEnvironment()); - - if (realEndpoint != null) { - realEndpoint.send(synCtx); - } else { - informFailure(synCtx, SynapseConstants.ENDPOINT_IN_DIRECT_NOT_READY, - "Couldn't find the endpoint with the name " + getName() + - " & template : " + template); - } - } - public Map getParameters() { return parameters; } From 3f0cab844871539b6559e6e246f499a5ff0c15a2 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 16 Feb 2024 10:09:57 +0000 Subject: [PATCH 153/308] [WSO2 Release] [Jenkins #6854] [Release 4.0.0-wso2v85] prepare release v4.0.0-wso2v85 --- 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 1ba559470a..ee59351908 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v85-SNAPSHOT + 4.0.0-wso2v85 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 02dbbe61a0..0c5b131bfc 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v85-SNAPSHOT + 4.0.0-wso2v85 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 57a7e941b4..b4536f176c 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-wso2v85-SNAPSHOT + 4.0.0-wso2v85 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 876d173a15..a227a51eaf 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v85-SNAPSHOT + 4.0.0-wso2v85 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 1c51fe9b0a..ea83858135 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v85-SNAPSHOT + 4.0.0-wso2v85 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index b95227c7b0..897b02cc2b 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v85-SNAPSHOT + 4.0.0-wso2v85 ../../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 d316e83df6..028aef304b 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-wso2v85-SNAPSHOT + 4.0.0-wso2v85 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 bf6b57a00e..28bfbb81f8 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-wso2v85-SNAPSHOT + 4.0.0-wso2v85 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 88e05baf2d..3a1818219b 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-wso2v85-SNAPSHOT + 4.0.0-wso2v85 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 2b6686241c..895f78a490 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-wso2v85-SNAPSHOT + 4.0.0-wso2v85 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 673f9560d5..b7385bebac 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-wso2v85-SNAPSHOT + 4.0.0-wso2v85 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 12ef10f55d..7146441ac6 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-wso2v85-SNAPSHOT + 4.0.0-wso2v85 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 07e3586d83..5a8a68df29 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-wso2v85-SNAPSHOT + 4.0.0-wso2v85 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 16e764a8f5..cfa29f76ef 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v85-SNAPSHOT + 4.0.0-wso2v85 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 135aa229ae..ed2d838ed2 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v85-SNAPSHOT + 4.0.0-wso2v85 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index a91543ae35..27a8067e06 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v85-SNAPSHOT + 4.0.0-wso2v85 ../../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-wso2v85 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index c192219002..143990d4a3 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v85-SNAPSHOT + 4.0.0-wso2v85 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 5ecfbb5368..515f4a0b44 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-wso2v85-SNAPSHOT + 4.0.0-wso2v85 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index f3a03dfb23..25c5940d1c 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-wso2v85-SNAPSHOT + 4.0.0-wso2v85 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index d2a3cf393d..a8a0cc4e46 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v85-SNAPSHOT + 4.0.0-wso2v85 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index afc12232ba..169bcc19b5 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v85-SNAPSHOT + 4.0.0-wso2v85 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index f7dcd0b04d..1019a30e3e 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v85-SNAPSHOT + 4.0.0-wso2v85 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 4a83f2d6a2..7f4be468b0 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v85-SNAPSHOT + 4.0.0-wso2v85 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 0f92f367fd..09ac6c76dd 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-wso2v85-SNAPSHOT + 4.0.0-wso2v85 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index ab207e2131..77395766ff 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-wso2v85-SNAPSHOT + 4.0.0-wso2v85 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index f889281fd2..73c56b8cb7 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-wso2v85-SNAPSHOT + 4.0.0-wso2v85 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 2a6e0c2ca1..43a6aa6458 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-wso2v85-SNAPSHOT + 4.0.0-wso2v85 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 329c86e021..0a79a487b6 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v85-SNAPSHOT + 4.0.0-wso2v85 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 4edd239c2d..19bacb760d 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v85-SNAPSHOT + 4.0.0-wso2v85 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index bff3b4c7e8..b5df318ef2 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-wso2v85-SNAPSHOT + 4.0.0-wso2v85 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 9504e1a089..81b42187e3 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v85-SNAPSHOT + 4.0.0-wso2v85 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-wso2v85 Apache Software Foundation From ae78c1a50489a421467f89f3bf6c24e7cda3d39f Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 16 Feb 2024 10:09:59 +0000 Subject: [PATCH 154/308] [WSO2 Release] [Jenkins #6854] [Release 4.0.0-wso2v85] 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 ee59351908..eef6a4d5ec 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v85 + 4.0.0-wso2v86-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 0c5b131bfc..497f3a7f13 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v85 + 4.0.0-wso2v86-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index b4536f176c..90b7b10cc7 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-wso2v85 + 4.0.0-wso2v86-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index a227a51eaf..b40e192804 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v85 + 4.0.0-wso2v86-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index ea83858135..6ff3a69259 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v85 + 4.0.0-wso2v86-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 897b02cc2b..11c7d7a247 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v85 + 4.0.0-wso2v86-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 028aef304b..8e5d16b3fc 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-wso2v85 + 4.0.0-wso2v86-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 28bfbb81f8..13052f12d5 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-wso2v85 + 4.0.0-wso2v86-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 3a1818219b..84ef592756 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-wso2v85 + 4.0.0-wso2v86-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 895f78a490..ec1330c297 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-wso2v85 + 4.0.0-wso2v86-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 b7385bebac..75e9bd795d 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-wso2v85 + 4.0.0-wso2v86-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 7146441ac6..59a19d6573 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-wso2v85 + 4.0.0-wso2v86-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 5a8a68df29..10a7ec4660 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-wso2v85 + 4.0.0-wso2v86-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index cfa29f76ef..dc5150cfac 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v85 + 4.0.0-wso2v86-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index ed2d838ed2..5a626cf2a4 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v85 + 4.0.0-wso2v86-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 27a8067e06..cf5fccb88b 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v85 + 4.0.0-wso2v86-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-wso2v85 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 143990d4a3..b27b004e3b 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v85 + 4.0.0-wso2v86-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 515f4a0b44..59248bdb74 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-wso2v85 + 4.0.0-wso2v86-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 25c5940d1c..ccd3f8cce2 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-wso2v85 + 4.0.0-wso2v86-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index a8a0cc4e46..6737ed7e9a 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v85 + 4.0.0-wso2v86-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 169bcc19b5..3d63401b50 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v85 + 4.0.0-wso2v86-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 1019a30e3e..10d5fed9d7 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v85 + 4.0.0-wso2v86-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 7f4be468b0..76dfa99961 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v85 + 4.0.0-wso2v86-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 09ac6c76dd..e38fe03937 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-wso2v85 + 4.0.0-wso2v86-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 77395766ff..5748d96562 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-wso2v85 + 4.0.0-wso2v86-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 73c56b8cb7..12aff78822 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-wso2v85 + 4.0.0-wso2v86-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 43a6aa6458..d126cf0cec 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-wso2v85 + 4.0.0-wso2v86-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 0a79a487b6..6a5c688c71 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v85 + 4.0.0-wso2v86-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 19bacb760d..8da2ab3690 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v85 + 4.0.0-wso2v86-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index b5df318ef2..a3a5ed73d8 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-wso2v85 + 4.0.0-wso2v86-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 81b42187e3..d3b37f7c45 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v85 + 4.0.0-wso2v86-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-wso2v85 + HEAD Apache Software Foundation From 1ccbd3c7aead8fe17a9f348c5cb53994db2dfff1 Mon Sep 17 00:00:00 2001 From: Dushani Wellappili Date: Fri, 16 Feb 2024 15:49:42 +0530 Subject: [PATCH 155/308] Revert "Do cert revocation improvement to validate with only one client certificate in the request when the issuer of that cert is present in the client trust store" --- .../CertificateVerificationManager.java | 287 ------------------ .../RevocationVerificationManager.java | 116 +++++++ .../cache/CertCache.java | 168 ---------- .../certificatevalidation/crl/CRLCache.java | 3 +- .../certificatevalidation/ocsp/OCSPCache.java | 9 +- .../ocsp/OCSPVerifier.java | 97 +++--- .../CertificatePathValidator.java | 1 - .../http/conn/ClientSSLSetupHandler.java | 8 +- .../http/conn/ServerSSLSetupHandler.java | 9 +- .../config/ClientConnFactoryBuilder.java | 125 ++++---- .../config/ServerConnFactoryBuilder.java | 160 +++------- .../nhttp/config/TrustStoreHolder.java | 62 ---- .../passthru/PassThroughHttpListener.java | 5 +- .../PassThroughHttpMultiSSLListener.java | 4 - .../passthru/PassThroughHttpSender.java | 6 +- .../core/ssl/SSLServerConnFactoryBuilder.java | 7 +- .../util/ConfigurationBuilderUtil.java | 1 + .../CRLVerifierTest.java | 3 +- .../OCSPVerifierTest.java | 3 +- .../RevocationVerificationTest.java | 6 +- .../conf/vfs-move-failed-records.properties | 1 - 21 files changed, 275 insertions(+), 806 deletions(-) delete mode 100644 modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/CertificateVerificationManager.java create mode 100644 modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationManager.java delete mode 100644 modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/cache/CertCache.java delete mode 100644 modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/TrustStoreHolder.java delete mode 100644 modules/transports/core/vfs/repository/conf/vfs-move-failed-records.properties 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 deleted file mode 100644 index 2765ac41a1..0000000000 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/CertificateVerificationManager.java +++ /dev/null @@ -1,287 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF 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.transport.certificatevalidation; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.synapse.transport.certificatevalidation.cache.CertCache; -import org.apache.synapse.transport.certificatevalidation.crl.CRLCache; -import org.apache.synapse.transport.certificatevalidation.crl.CRLVerifier; -import org.apache.synapse.transport.certificatevalidation.ocsp.OCSPCache; -import org.apache.synapse.transport.certificatevalidation.ocsp.OCSPVerifier; -import org.apache.synapse.transport.certificatevalidation.pathvalidation.CertificatePathValidator; -import org.apache.synapse.transport.nhttp.config.TrustStoreHolder; - -import java.io.ByteArrayInputStream; -import java.security.InvalidKeyException; -import java.security.KeyStore; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; -import java.security.NoSuchProviderException; -import java.security.SignatureException; -import java.security.cert.CertificateException; -import java.security.cert.CertificateExpiredException; -import java.security.cert.CertificateNotYetValidException; -import java.security.cert.X509Certificate; -import java.util.Arrays; -import java.util.Enumeration; -import java.util.Optional; - -/** - * Manager class responsible for verifying certificates. This class will use the available verifiers according to - * a predefined policy. - */ -public class CertificateVerificationManager { - - private int cacheSize = Constants.CACHE_DEFAULT_ALLOCATED_SIZE; - private int cacheDelayMins = Constants.CACHE_DEFAULT_DELAY_MINS; - private boolean isFullCertChainValidationEnabled = true; - private boolean isCertExpiryValidationEnabled = false; - private static final Log log = LogFactory.getLog(CertificateVerificationManager.class); - - public CertificateVerificationManager(Integer cacheAllocatedSize, Integer cacheDelayMins) { - - if (cacheAllocatedSize != null && cacheAllocatedSize > Constants.CACHE_MIN_ALLOCATED_SIZE - && cacheAllocatedSize < Constants.CACHE_MAX_ALLOCATED_SIZE) { - this.cacheSize = cacheAllocatedSize; - } else { - log.warn("The cache size is out of range. Hence, using the default cache size value of " - + Constants.CACHE_DEFAULT_ALLOCATED_SIZE + "."); - } - if (cacheDelayMins != null && cacheDelayMins > Constants.CACHE_MIN_DELAY_MINS - && cacheDelayMins < Constants.CACHE_MAX_DELAY_MINS) { - this.cacheDelayMins = cacheDelayMins; - } else { - log.warn("The cache delay is out of range. Hence, using the default cache delay value of " - + Constants.CACHE_DEFAULT_DELAY_MINS + "."); - } - } - - public CertificateVerificationManager(Integer cacheAllocatedSize, Integer cacheDelayMins, - boolean isFullCertChainValidationEnabled, - boolean isCertExpiryValidationEnabled) { - - if (cacheAllocatedSize != null && cacheAllocatedSize > Constants.CACHE_MIN_ALLOCATED_SIZE - && cacheAllocatedSize < Constants.CACHE_MAX_ALLOCATED_SIZE) { - this.cacheSize = cacheAllocatedSize; - } else { - log.warn("The cache size is out of range. Hence, using the default cache size value of " - + Constants.CACHE_DEFAULT_ALLOCATED_SIZE + "."); - } - if (cacheDelayMins != null && cacheDelayMins > Constants.CACHE_MIN_DELAY_MINS - && cacheDelayMins < Constants.CACHE_MAX_DELAY_MINS) { - this.cacheDelayMins = cacheDelayMins; - } else { - log.warn("The cache delay is out of range. Hence, using the default cache delay value of " - + Constants.CACHE_DEFAULT_DELAY_MINS + "."); - } - - this.isFullCertChainValidationEnabled = isFullCertChainValidationEnabled; - this.isCertExpiryValidationEnabled = isCertExpiryValidationEnabled; - } - - /** - * This method verifies the given certificate chain or given peer certificate for revocation based on the - * requirement of full certificate chain validation. If full chain validation is enabled (default), - * the full certificate chain will be validated before checking the chain for revocation. If full chain validation - * is disabled, this method expects a single peer certificate, and it is validated with the immediate issuer - * certificate in the truststore (The truststore must contain the immediate issuer of the peer certificate). - * In both cases, OCSP and CRL verifiers are used for revocation verification. - * 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. - * @throws CertificateVerificationException - */ - public void verifyCertificateValidity(javax.security.cert.X509Certificate[] peerCertificates) - throws CertificateVerificationException { - - X509Certificate[] convertedCertificates = convert(peerCertificates); - - Optional peerCertOpt; - X509Certificate peerCert = null; - X509Certificate issuerCert = null; - String alias; - - if (!isFullCertChainValidationEnabled) { - - if (log.isDebugEnabled()) { - log.debug("Retrieving the issuer certificate from client truststore since full certificate chain " + - "validation is disabled"); - } - - KeyStore trustStore = TrustStoreHolder.getInstance().getClientTrustStore(); - Enumeration aliases; - - // When full chain validation is disabled, only one cert is expected - peerCertOpt = Arrays.stream(convertedCertificates).findFirst(); - if (peerCertOpt.isPresent()) { - peerCert = peerCertOpt.get(); - } else { - throw new CertificateVerificationException("Peer certificate is not provided"); - } - - // Get cert cache and initialize it - CertCache certCache = CertCache.getCache(); - - if (certCache.getCacheValue(peerCert.getSerialNumber().toString()) == null) { - - try { - aliases = trustStore.aliases(); - } catch (KeyStoreException e) { - throw new CertificateVerificationException("Error while retrieving aliases from truststore", e); - } - - while (aliases.hasMoreElements()) { - - alias = aliases.nextElement(); - try { - issuerCert = (X509Certificate) trustStore.getCertificate(alias); - } catch (KeyStoreException e) { - throw new CertificateVerificationException("Unable to read the certificate from " + - "truststore with the alias: " + alias, e); - } - - if (issuerCert == null) { - throw new CertificateVerificationException("Issuer certificate not found in truststore"); - } - - try { - peerCert.verify(issuerCert.getPublicKey()); - - log.debug("Valid issuer certificate found in the client truststore. Caching.."); - - // Store the valid issuer cert in cache for future use - certCache.setCacheValue(peerCert.getSerialNumber().toString(), issuerCert); - if (log.isDebugEnabled()) { - log.debug("Issuer certificate with serial number: " + issuerCert.getSerialNumber() - .toString() + " has been cached against the serial number: " + peerCert - .getSerialNumber().toString() + " of the peer certificate."); - } - break; - } catch (SignatureException | CertificateException | NoSuchAlgorithmException | - InvalidKeyException | NoSuchProviderException e) { - // Unable to verify the signature. Check with the next certificate in the next loop traversal. - } - } - } else { - X509Certificate cachedIssuerCert = certCache.getCacheValue(peerCert.getSerialNumber().toString()); - try { - peerCert.verify(cachedIssuerCert.getPublicKey()); - } catch (SignatureException | CertificateException | NoSuchAlgorithmException | - InvalidKeyException | - NoSuchProviderException e) { - // Unable to verify the signature. - throw new CertificateVerificationException("Unable to verify the signature of the certificate."); - } - } - } - - OCSPCache ocspCache = OCSPCache.getCache(cacheSize, cacheDelayMins); - CRLCache crlCache = CRLCache.getCache(cacheSize, cacheDelayMins); - - RevocationVerifier[] verifiers = {new OCSPVerifier(ocspCache), new CRLVerifier(crlCache)}; - - for (RevocationVerifier verifier : verifiers) { - try { - if (isFullCertChainValidationEnabled) { - - if (isCertExpiryValidationEnabled) { - log.debug("Validating certificate chain for expiry"); - if (isExpired(convertedCertificates)) { - throw new CertificateVerificationException("One of the provided certificates are expired"); - } - } - - log.debug("Doing full certificate chain validation"); - CertificatePathValidator pathValidator = new CertificatePathValidator(convertedCertificates, - verifier); - pathValidator.validatePath(); - } else { - - if (isCertExpiryValidationEnabled) { - log.debug("Validating the client certificate for expiry"); - if (isExpired(convertedCertificates)) { - throw new CertificateVerificationException("The provided certificate is expired"); - } - } - - log.debug("Validating client certificate with the issuer certificate retrieved from" + - "the trust store"); - verifier.checkRevocationStatus(peerCert, issuerCert); - } - return; - } catch (Exception e) { - log.debug("Certificate verification with " + verifier.getClass().getSimpleName() + " failed. ", e); - } - } - throw new CertificateVerificationException("Path Verification Failed for both OCSP and CRL"); - } - - /** - * @param certs array of javax.security.cert.X509Certificate[] s. - * @return the converted array of java.security.cert.X509Certificate[] s. - * @throws CertificateVerificationException - */ - private X509Certificate[] convert(javax.security.cert.X509Certificate[] certs) - throws CertificateVerificationException { - X509Certificate[] certChain = new X509Certificate[certs.length]; - Throwable exceptionThrown; - for (int i = 0; i < certs.length; i++) { - try { - byte[] encoded = certs[i].getEncoded(); - ByteArrayInputStream bis = new ByteArrayInputStream(encoded); - java.security.cert.CertificateFactory cf - = 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) { - exceptionThrown = e; - } - throw new CertificateVerificationException("Cant Convert certificates from javax to java", exceptionThrown); - } - return certChain; - } - - /** - * Checks whether a provided certificate is expired or not at the time it is validated. - * - * @param certificates certificates to be validated for expiry - * @return true if one of the certs are expired, false otherwise - */ - public boolean isExpired(X509Certificate[] certificates) { - - for (X509Certificate cert : certificates) { - try { - cert.checkValidity(); - } catch (CertificateExpiredException e) { - log.error("Peer certificate is expired"); - return true; - } catch (CertificateNotYetValidException e) { - log.error("Peer certificate is not valid yet"); - return true; - } - } - return false; - } -} diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationManager.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationManager.java new file mode 100644 index 0000000000..338b8a8a36 --- /dev/null +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationManager.java @@ -0,0 +1,116 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF 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.transport.certificatevalidation; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.synapse.transport.certificatevalidation.crl.CRLCache; +import org.apache.synapse.transport.certificatevalidation.crl.CRLVerifier; +import org.apache.synapse.transport.certificatevalidation.ocsp.OCSPCache; +import org.apache.synapse.transport.certificatevalidation.ocsp.OCSPVerifier; +import org.apache.synapse.transport.certificatevalidation.pathvalidation.CertificatePathValidator; + +import java.io.ByteArrayInputStream; +import java.security.cert.X509Certificate; + +/** + * Manager class responsible for verifying certificates. This class will use the available verifiers according to + * a predefined policy. + */ +public class RevocationVerificationManager { + + private int cacheSize = Constants.CACHE_DEFAULT_ALLOCATED_SIZE; + private int cacheDelayMins = Constants.CACHE_DEFAULT_DELAY_MINS; + private static final Log log = LogFactory.getLog(RevocationVerificationManager.class); + + public RevocationVerificationManager(Integer cacheAllocatedSize, Integer cacheDelayMins) { + + if (cacheAllocatedSize != null && cacheAllocatedSize > Constants.CACHE_MIN_ALLOCATED_SIZE + && cacheAllocatedSize < Constants.CACHE_MAX_ALLOCATED_SIZE) { + this.cacheSize = cacheAllocatedSize; + } + if (cacheDelayMins != null && cacheDelayMins > Constants.CACHE_MIN_DELAY_MINS + && cacheDelayMins < Constants.CACHE_MAX_DELAY_MINS) { + this.cacheDelayMins = cacheDelayMins; + } + } + + /** + * This method first tries to verify the given certificate chain 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. + * @throws CertificateVerificationException + */ + public void verifyRevocationStatus(javax.security.cert.X509Certificate[] peerCertificates) + throws CertificateVerificationException { + + X509Certificate[] convertedCertificates = convert(peerCertificates); + + long start = System.currentTimeMillis(); + + OCSPCache ocspCache = OCSPCache.getCache(); + ocspCache.init(cacheSize, cacheDelayMins); + CRLCache crlCache = CRLCache.getCache(); + crlCache.init(cacheSize, cacheDelayMins); + + RevocationVerifier[] verifiers = {new OCSPVerifier(ocspCache), new CRLVerifier(crlCache)}; + + for (RevocationVerifier verifier : verifiers) { + try { + CertificatePathValidator pathValidator = new CertificatePathValidator(convertedCertificates, verifier); + pathValidator.validatePath(); + log.info("Path verification Successful. Took " + (System.currentTimeMillis() - start) + " ms."); + return; + } catch (Exception e) { + log.info(verifier.getClass().getSimpleName() + " failed."); + log.debug("Certificate verification with " + verifier.getClass().getSimpleName() + " failed. ", e); + } + } + throw new CertificateVerificationException("Path Verification Failed for both OCSP and CRL"); + } + + /** + * @param certs array of javax.security.cert.X509Certificate[] s. + * @return the converted array of java.security.cert.X509Certificate[] s. + * @throws CertificateVerificationException + */ + private X509Certificate[] convert(javax.security.cert.X509Certificate[] certs) + throws CertificateVerificationException { + X509Certificate[] certChain = new X509Certificate[certs.length]; + Throwable exceptionThrown; + for (int i = 0; i < certs.length; i++) { + try { + byte[] encoded = certs[i].getEncoded(); + ByteArrayInputStream bis = new ByteArrayInputStream(encoded); + java.security.cert.CertificateFactory cf + = 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) { + exceptionThrown = e; + } + throw new CertificateVerificationException("Cant Convert certificates from javax to java", exceptionThrown); + } + return certChain; + } +} diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/cache/CertCache.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/cache/CertCache.java deleted file mode 100644 index 9ada86e88d..0000000000 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/cache/CertCache.java +++ /dev/null @@ -1,168 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF 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.transport.certificatevalidation.cache; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.synapse.commons.jmx.MBeanRegistrar; -import org.apache.synapse.transport.certificatevalidation.Constants; - -import java.security.cert.X509Certificate; -import java.util.Iterator; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -/** - * This is a cache to store a certificate against a unique string (can be a serial number). This is a singleton since - * more than one cache of this kind should not be allowed. This cache can be used by any place where certificate - * caching is needed. - */ -public class CertCache implements ManageableCache { - - private static volatile CertCache cache; - private static volatile Map hashMap = new ConcurrentHashMap(); - private static volatile Iterator> iterator = hashMap.entrySet().iterator(); - private static volatile CacheManager cacheManager; - private static final Log log = LogFactory.getLog(CertCache.class); - - private CertCache() { - } - - public static CertCache getCache() { - //Double-checked locking - if (cache == null) { - synchronized (CertCache.class) { - if (cache == null) { - cache = new CertCache(); - cacheManager = new CacheManager(cache, Constants.CACHE_DEFAULT_ALLOCATED_SIZE, - Constants.CACHE_DEFAULT_DELAY_MINS); - } - } - } - return cache; - } - - public synchronized X509Certificate getCacheValue(String serialNumber) { - CertCacheValue cacheValue = hashMap.get(serialNumber); - if (cacheValue != null) { - return cacheValue.getValue(); - } else - return null; - } - - @Override - public ManageableCacheValue getNextCacheValue() { - - if (iterator.hasNext()) { - return hashMap.get(iterator.next().getKey()); - } else { - resetIterator(); - return null; - } - } - - @Override - public int getCacheSize() { - - return hashMap.size(); - } - - @Override - public void resetIterator() { - - iterator = hashMap.entrySet().iterator(); - } - - public static void resetCache() { - - hashMap.clear(); - } - - public synchronized void setCacheValue(String serialNumber, X509Certificate cert) { - CertCacheValue cacheValue = new CertCacheValue(serialNumber, cert); - - if (log.isDebugEnabled()) { - log.debug("Before set - HashMap size " + hashMap.size()); - } - hashMap.put(serialNumber, cacheValue); - if (log.isDebugEnabled()) { - log.debug("After set - HashMap size " + hashMap.size()); - } - } - - public synchronized void removeCacheValue(String serialNumber) { - - if (log.isDebugEnabled()) { - log.debug("Before remove - HashMap size " + hashMap.size()); - } - hashMap.remove(serialNumber); - if (log.isDebugEnabled()) { - log.debug("After remove - HashMap size " + hashMap.size()); - } - } - - /** - * This is the wrapper class of the actual cache value. - */ - private class CertCacheValue implements ManageableCacheValue { - - private final String serialNumber; - private final X509Certificate issuerCertificate; - private final long timeStamp = System.currentTimeMillis(); - - public CertCacheValue(String serialNumber, X509Certificate issuerCertificate) { - - this.serialNumber = serialNumber; - this.issuerCertificate = issuerCertificate; - } - - public X509Certificate getValue() { - - return issuerCertificate; - } - - public String getKey() { - - return serialNumber; - } - - public boolean isValid() { - - // Will be always return true since we only set defined data. - return true; - } - - public long getTimeStamp() { - - return timeStamp; - } - - /** - * Used by cacheManager to remove invalid entries. - */ - public void removeThisCacheValue() { - - removeCacheValue(serialNumber); - } - - public void updateCacheWithNewValue() { - // No implementation needed since there are no scenarios of the cache value being invalid. - } - } -} diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/crl/CRLCache.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/crl/CRLCache.java index 2597960102..11db425524 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/crl/CRLCache.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/crl/CRLCache.java @@ -50,13 +50,12 @@ public class CRLCache implements ManageableCache { private CRLCache() { } - public static CRLCache getCache(int cacheSize, int cacheDelayMins) { + public static CRLCache getCache() { //Double checked locking if (cache == null) { synchronized (CRLCache.class) { if (cache == null) { cache = new CRLCache(); - cacheManager = new CacheManager(cache, cacheSize, cacheDelayMins); } } } diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPCache.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPCache.java index cf904cd3f4..b01d509867 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPCache.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPCache.java @@ -22,7 +22,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.synapse.commons.jmx.MBeanRegistrar; import org.apache.synapse.transport.certificatevalidation.CertificateVerificationException; -import org.apache.synapse.transport.certificatevalidation.Constants; import org.apache.synapse.transport.certificatevalidation.cache.CacheController; import org.apache.synapse.transport.certificatevalidation.cache.CacheManager; import org.apache.synapse.transport.certificatevalidation.cache.ManageableCache; @@ -52,14 +51,12 @@ public class OCSPCache implements ManageableCache { private OCSPCache() {} - public static OCSPCache getCache(int cacheSize, int cacheDelayMins) { + public static OCSPCache getCache() { //Double checked locking if (cache == null) { synchronized (OCSPCache.class) { - if (cache == null) { + if (cache == null) cache = new OCSPCache(); - cacheManager = new CacheManager(cache, cacheSize, cacheDelayMins); - } } } return cache; @@ -119,7 +116,7 @@ private synchronized void replaceNewCacheValue(OCSPCacheValue cacheValue){ try { String serviceUrl = cacheValue.serviceUrl; OCSPReq request = cacheValue.request; - OCSPResp response= ocspVerifier.getOCSPResponse(serviceUrl, request); + OCSPResp response= ocspVerifier.getOCSPResponce(serviceUrl, request); if (OCSPResponseStatus.SUCCESSFUL != response.getStatus()) throw new CertificateVerificationException("OCSP response status not SUCCESSFUL"); diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPVerifier.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPVerifier.java index 5744365730..d9a3a11039 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPVerifier.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPVerifier.java @@ -20,42 +20,20 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.http.HttpResponse; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.ByteArrayEntity; -import org.apache.http.entity.ContentType; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.synapse.transport.certificatevalidation.CertificateVerificationException; -import org.apache.synapse.transport.certificatevalidation.Constants; -import org.apache.synapse.transport.certificatevalidation.RevocationStatus; -import org.apache.synapse.transport.certificatevalidation.RevocationVerifier; -import org.bouncycastle.asn1.ASN1InputStream; -import org.bouncycastle.asn1.DERIA5String; -import org.bouncycastle.asn1.DEROctetString; +import org.bouncycastle.asn1.*; import org.bouncycastle.asn1.ocsp.OCSPObjectIdentifiers; import org.bouncycastle.asn1.ocsp.OCSPResponseStatus; -import org.bouncycastle.asn1.x509.AccessDescription; -import org.bouncycastle.asn1.x509.AuthorityInformationAccess; -import org.bouncycastle.asn1.x509.Extension; -import org.bouncycastle.asn1.x509.Extensions; -import org.bouncycastle.asn1.x509.GeneralName; +import org.bouncycastle.asn1.x509.*; import org.bouncycastle.cert.X509CertificateHolder; -import org.bouncycastle.cert.ocsp.BasicOCSPResp; -import org.bouncycastle.cert.ocsp.CertificateID; -import org.bouncycastle.cert.ocsp.CertificateStatus; -import org.bouncycastle.cert.ocsp.OCSPReq; -import org.bouncycastle.cert.ocsp.OCSPReqBuilder; -import org.bouncycastle.cert.ocsp.OCSPResp; -import org.bouncycastle.cert.ocsp.SingleResp; +import org.bouncycastle.cert.ocsp.*; +import org.apache.synapse.transport.certificatevalidation.*; import org.bouncycastle.operator.DigestCalculatorProvider; import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; +import java.io.*; import java.math.BigInteger; +import java.net.HttpURLConnection; +import java.net.URL; import java.security.Provider; import java.security.Security; import java.security.cert.X509Certificate; @@ -74,12 +52,6 @@ public OCSPVerifier(OCSPCache cache) { this.cache = cache; } - public static final String CONTENT_TYPE = "Content-Type"; - public static final String JSON_TYPE ="application/json"; - public static final String ACCEPT_TYPE = "Accept"; - public static final String OCSP_REQUEST_TYPE = "application/ocsp-request"; - public static final String OCSP_RESPONSE_TYPE = "application/ocsp-response"; - /** * Gets the revocation status (Good, Revoked or Unknown) of the given peer certificate. * @@ -111,7 +83,7 @@ public RevocationStatus checkRevocationStatus(X509Certificate peerCert, X509Cert SingleResp[] responses; try { - OCSPResp ocspResponse = getOCSPResponse(serviceUrl, request); + OCSPResp ocspResponse = getOCSPResponce(serviceUrl, request); if (OCSPResponseStatus.SUCCESSFUL != ocspResponse.getStatus()) { continue; // Server didn't give the response right. } @@ -156,34 +128,37 @@ private RevocationStatus getRevocationStatus(SingleResp resp) throws Certificate * @throws CertificateVerificationException * */ - protected OCSPResp getOCSPResponse(String serviceUrl, OCSPReq request) throws CertificateVerificationException { - - if (log.isDebugEnabled()) { - log.debug("Initiating HTTP request to URL: " + serviceUrl + " to get the OCSP response"); - } - - try (CloseableHttpClient client = HttpClientBuilder.create().build()) { - HttpPost httpPost = new HttpPost(serviceUrl); + protected OCSPResp getOCSPResponce(String serviceUrl, OCSPReq request) throws CertificateVerificationException { - // adding request timeout configurations - if (httpPost.getConfig() == null) { - httpPost.setConfig(RequestConfig.custom().build()); - } + try { + //Todo: Use http client. + byte[] array = request.getEncoded(); + if (serviceUrl.startsWith("http")) { + HttpURLConnection con; + URL url = new URL(serviceUrl); + con = (HttpURLConnection) url.openConnection(); + con.setRequestProperty("Content-Type", "application/ocsp-request"); + con.setRequestProperty("Accept", "application/ocsp-response"); + con.setDoOutput(true); + OutputStream out = con.getOutputStream(); + DataOutputStream dataOut = new DataOutputStream(new BufferedOutputStream(out)); + dataOut.write(array); + + dataOut.flush(); + dataOut.close(); + + //Check errors in response: + if (con.getResponseCode() / 100 != 2) { + throw new CertificateVerificationException("Error getting ocsp response." + + "Response code is " + con.getResponseCode()); + } - httpPost.addHeader(CONTENT_TYPE, OCSP_REQUEST_TYPE); - httpPost.addHeader(ACCEPT_TYPE, OCSP_RESPONSE_TYPE); - httpPost.setEntity(new ByteArrayEntity(request.getEncoded(), ContentType.create(JSON_TYPE))); - HttpResponse httpResponse = client.execute(httpPost); - - //Check errors in response, if response status code is not 200 (success) range, throws exception - // eg: if response code is 200 (success) or 201 (accepted) return true, - // if response code is 404 (not found) or 500 throw exception - if (httpResponse.getStatusLine().getStatusCode() / 100 != 2) { - throw new CertificateVerificationException("Error getting ocsp response." + - "Response code is " + httpResponse.getStatusLine().getStatusCode()); + //Get Response + InputStream in = (InputStream) con.getContent(); + return new OCSPResp(in); + } else { + throw new CertificateVerificationException("Only http is supported for ocsp calls"); } - InputStream in = httpResponse.getEntity().getContent(); - return new OCSPResp(in); } catch (IOException e) { throw new CertificateVerificationException("Cannot get ocspResponse from url: " + serviceUrl, e); } diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/pathvalidation/CertificatePathValidator.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/pathvalidation/CertificatePathValidator.java index b6335f88a4..b041a7314d 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/pathvalidation/CertificatePathValidator.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/pathvalidation/CertificatePathValidator.java @@ -22,7 +22,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.synapse.transport.certificatevalidation.*; -import java.lang.reflect.InvocationTargetException; import java.security.*; import java.security.cert.X509Certificate; import java.util.List; 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 e5c94d91f6..24977a7115 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 @@ -33,7 +33,7 @@ import org.apache.http.nio.reactor.IOSession; import org.apache.http.nio.reactor.ssl.SSLSetupHandler; import org.apache.synapse.transport.certificatevalidation.CertificateVerificationException; -import org.apache.synapse.transport.certificatevalidation.CertificateVerificationManager; +import org.apache.synapse.transport.certificatevalidation.RevocationVerificationManager; public class ClientSSLSetupHandler implements SSLSetupHandler { @@ -139,10 +139,10 @@ public void verify( }; private final X509HostnameVerifier hostnameVerifier; - private final CertificateVerificationManager verificationManager; + private final RevocationVerificationManager verificationManager; public ClientSSLSetupHandler(final X509HostnameVerifier hostnameVerifier, - final CertificateVerificationManager verificationManager) { + final RevocationVerificationManager verificationManager) { this.hostnameVerifier = hostnameVerifier != null ? hostnameVerifier : DEFAULT; this.verificationManager = verificationManager; } @@ -184,7 +184,7 @@ public void verify(IOSession iosession, SSLSession sslsession) throws SSLExcepti if (verificationManager!=null) { try { - verificationManager.verifyCertificateValidity(sslsession.getPeerCertificateChain()); + verificationManager.verifyRevocationStatus(sslsession.getPeerCertificateChain()); } 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 bb4e7c08d6..a4bc324ce1 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 @@ -21,12 +21,11 @@ import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLException; import javax.net.ssl.SSLSession; -import javax.security.cert.X509Certificate; import org.apache.http.nio.reactor.IOSession; import org.apache.http.nio.reactor.ssl.SSLSetupHandler; import org.apache.synapse.transport.certificatevalidation.CertificateVerificationException; -import org.apache.synapse.transport.certificatevalidation.CertificateVerificationManager; +import org.apache.synapse.transport.certificatevalidation.RevocationVerificationManager; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -37,12 +36,12 @@ public class ServerSSLSetupHandler implements SSLSetupHandler { private final SSLClientAuth clientAuth; /** Enabled SSL handshake protocols (e.g. SSLv3, TLSv1) */ private final String[] httpsProtocols; - private CertificateVerificationManager verificationManager; + private RevocationVerificationManager verificationManager; /** Ciphers enabled in axis2.xml, enabled all if null*/ private final String[] preferredCiphers; public ServerSSLSetupHandler(final SSLClientAuth clientAuth, final String[] httpsProtocols, - final CertificateVerificationManager verificationManager, final String[] preferredCiphers) { + final RevocationVerificationManager verificationManager, final String[] preferredCiphers) { this.clientAuth = clientAuth; this.httpsProtocols = httpsProtocols; this.verificationManager = verificationManager; @@ -79,7 +78,7 @@ public void verify( if (verificationManager != null) { try { - verificationManager.verifyCertificateValidity(sslsession.getPeerCertificateChain()); + verificationManager.verifyRevocationStatus(sslsession.getPeerCertificateChain()); } catch (CertificateVerificationException e) { SocketAddress remoteAddress = iosession.getRemoteAddress(); String address; diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ClientConnFactoryBuilder.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ClientConnFactoryBuilder.java index 5495ae9fc2..bf504b9999 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ClientConnFactoryBuilder.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ClientConnFactoryBuilder.java @@ -19,6 +19,27 @@ package org.apache.synapse.transport.nhttp.config; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.security.GeneralSecurityException; +import java.security.KeyStore; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Map; + +import javax.net.ssl.KeyManager; +import javax.net.ssl.KeyManagerFactory; +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManager; +import javax.net.ssl.TrustManagerFactory; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; + +import org.apache.axiom.om.OMAttribute; import org.apache.axiom.om.OMElement; import org.apache.axiom.om.impl.builder.StAXOMBuilder; import org.apache.axis2.AxisFault; @@ -31,7 +52,8 @@ import org.apache.commons.logging.LogFactory; import org.apache.http.conn.ssl.X509HostnameVerifier; import org.apache.http.params.HttpParams; -import org.apache.synapse.transport.certificatevalidation.CertificateVerificationManager; +import org.apache.synapse.commons.crypto.CryptoConstants; +import org.apache.synapse.transport.certificatevalidation.RevocationVerificationManager; import org.apache.synapse.transport.exceptions.InvalidConfigurationException; import org.apache.synapse.transport.http.conn.ClientConnFactory; import org.apache.synapse.transport.http.conn.ClientSSLSetupHandler; @@ -41,25 +63,8 @@ import org.apache.synapse.transport.nhttp.util.SecureVaultValueReader; import org.wso2.securevault.SecretResolver; import org.wso2.securevault.SecretResolverFactory; - -import javax.net.ssl.KeyManager; -import javax.net.ssl.KeyManagerFactory; -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManager; -import javax.net.ssl.TrustManagerFactory; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamException; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.security.GeneralSecurityException; -import java.security.KeyStore; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; -import java.util.Map; +import org.wso2.securevault.SecureVaultException; +import org.wso2.securevault.commons.MiscellaneousUtil; public class ClientConnFactoryBuilder { @@ -71,7 +76,6 @@ public class ClientConnFactoryBuilder { private SSLContextDetails ssl = null; private Map sslByHostMap = null; private ConfigurationContext configurationContext; - TrustStoreHolder trustStoreHolder = TrustStoreHolder.getInstance(); public ClientConnFactoryBuilder(final TransportOutDescription transportOut, ConfigurationContext configurationContext) { this(transportOut); @@ -83,7 +87,7 @@ public ClientConnFactoryBuilder(final TransportOutDescription transportOut) { this.transportOut = transportOut; this.name = transportOut.getName().toUpperCase(Locale.US); } - + public ClientConnFactoryBuilder parseSSL() throws AxisFault { Parameter keyParam = transportOut.getParameter("keystore"); Parameter trustParam = transportOut.getParameter("truststore"); @@ -129,7 +133,7 @@ public ClientConnFactoryBuilder parseSSL() throws AxisFault { final Parameter cvp = transportOut.getParameter("CertificateRevocationVerifier"); final String cvEnable = cvp != null ? cvp.getParameterElement().getAttribute(new QName("enable")).getAttributeValue() : null; - CertificateVerificationManager certificateVerifier = null; + RevocationVerificationManager revocationVerifier = null; if ("true".equalsIgnoreCase(cvEnable)) { String cacheSizeString = cvp.getParameterElement().getFirstChildWithName(new QName("CacheSize")).getText(); @@ -142,7 +146,7 @@ public ClientConnFactoryBuilder parseSSL() throws AxisFault { cacheDelay = new Integer(cacheDelayString); } catch (NumberFormatException e) { } - certificateVerifier = new CertificateVerificationManager(cacheSize, cacheDelay); + revocationVerifier = new RevocationVerificationManager(cacheSize, cacheDelay); } // Process HttpProtocols @@ -163,7 +167,7 @@ public ClientConnFactoryBuilder parseSSL() throws AxisFault { } // Initiated separately to cater setting https protocols - ClientSSLSetupHandler clientSSLSetupHandler = new ClientSSLSetupHandler(hostnameVerifier, certificateVerifier); + ClientSSLSetupHandler clientSSLSetupHandler = new ClientSSLSetupHandler(hostnameVerifier, revocationVerifier); if (null != httpsProtocols) { clientSSLSetupHandler.setHttpsProtocols(httpsProtocols); @@ -349,37 +353,28 @@ private SSLContext createSSLContext(OMElement keyStoreElt, OMElement trustStoreE log.warn(name + " Ignoring novalidatecert parameter since a truststore has been specified"); } - FileInputStream fis = null; - String location = trustStoreElt.getFirstChildWithName(new QName("Location")).getText();; - KeyStore trustStore; + String location = trustStoreElt.getFirstChildWithName(new QName("Location")).getText(); + String type = trustStoreElt.getFirstChildWithName(new QName("Type")).getText(); + OMElement passwordElement = trustStoreElt.getFirstChildWithName(new QName("Password")); + if (passwordElement == null) { + throw new AxisFault("Cannot proceed because Password element is missing in TrustStore"); + } + String storePassword = SecureVaultValueReader.getSecureVaultValue(resolver, passwordElement); + FileInputStream fis = null; try { - if (trustStoreHolder.getClientTrustStore() == null) { - String type = trustStoreElt.getFirstChildWithName(new QName("Type")).getText(); - OMElement passwordElement = trustStoreElt.getFirstChildWithName(new QName("Password")); - - if (passwordElement == null) { - throw new AxisFault("Cannot proceed because Password element is missing in TrustStore"); - } - - String storePassword = SecureVaultValueReader.getSecureVaultValue(resolver, passwordElement); - trustStore = KeyStore.getInstance(type); - fis = new FileInputStream(location); - - if (log.isDebugEnabled()) { - log.debug(name + " Loading Trust Keystore from : " + location); - } - - trustStore.load(fis, storePassword.toCharArray()); - trustStoreHolder.setClientTrustStore(trustStore); - } else { - trustStore = trustStoreHolder.getClientTrustStore(); + KeyStore trustStore = KeyStore.getInstance(type); + fis = new FileInputStream(location); + if (log.isDebugEnabled()) { + log.debug(name + " Loading Trust Keystore from : " + location); } + trustStore.load(fis, storePassword.toCharArray()); TrustManagerFactory trustManagerfactory = TrustManagerFactory.getInstance( TrustManagerFactory.getDefaultAlgorithm()); trustManagerfactory.init(trustStore); trustManagers = trustManagerfactory.getTrustManagers(); + } catch (GeneralSecurityException gse) { log.error(name + " Error loading Key store : " + location, gse); throw new AxisFault("Error loading Key store : " + location, gse); @@ -429,9 +424,9 @@ private SSLContext createSSLContext(OMElement keyStoreElt, OMElement trustStoreE keyStoreElt.getFirstChildWithName(new QName("Password"))); String keyPassword = SecureVaultValueReader.getSecureVaultValue(secretResolver, keyStoreElt.getFirstChildWithName(new QName("KeyPassword"))); - - try (FileInputStream fis = new FileInputStream(location)) { - KeyStore keyStore = KeyStore.getInstance(type); + + try (FileInputStream fis = new FileInputStream(location)) { + KeyStore keyStore = KeyStore.getInstance(type); if (log.isDebugEnabled()) { log.debug(name + " Loading Identity Keystore from : " + location); } @@ -448,7 +443,7 @@ private SSLContext createSSLContext(OMElement keyStoreElt, OMElement trustStoreE } catch (IOException ioe) { log.error(name + " Error opening Keystore : " + location, ioe); throw new AxisFault("Error opening Keystore : " + location, ioe); - } + } } if (trustStoreElt != null) { @@ -456,35 +451,31 @@ private SSLContext createSSLContext(OMElement keyStoreElt, OMElement trustStoreE log.warn(name + " Ignoring novalidatecert parameter since a truststore has been specified"); } - KeyStore trustStore; String location = trustStoreElt.getFirstChildWithName(new QName("Location")).getText(); - + String type = trustStoreElt.getFirstChildWithName(new QName("Type")).getText(); + String storePassword = SecureVaultValueReader + .getSecureVaultValue(secretResolver, trustStoreElt.getFirstChildWithName(new QName("Password"))); + try (FileInputStream fis = new FileInputStream(location)) { - if (trustStoreHolder.getClientTrustStore() == null) { - String type = trustStoreElt.getFirstChildWithName(new QName("Type")).getText(); - String storePassword = SecureVaultValueReader.getSecureVaultValue(secretResolver, - trustStoreElt.getFirstChildWithName(new QName("Password"))); - trustStore = KeyStore.getInstance(type); - if (log.isDebugEnabled()) { - log.debug(name + " Loading Trust Keystore from : " + location); - } - trustStore.load(fis, storePassword.toCharArray()); - trustStoreHolder.setClientTrustStore(trustStore); - } else { - trustStore = trustStoreHolder.getClientTrustStore(); + KeyStore trustStore = KeyStore.getInstance(type); + + if (log.isDebugEnabled()) { + log.debug(name + " Loading Trust Keystore from : " + location); } + trustStore.load(fis, storePassword.toCharArray()); TrustManagerFactory trustManagerfactory = TrustManagerFactory.getInstance( TrustManagerFactory.getDefaultAlgorithm()); trustManagerfactory.init(trustStore); trustManagers = trustManagerfactory.getTrustManagers(); + } catch (GeneralSecurityException gse) { log.error(name + " Error loading Key store : " + location, gse); throw new AxisFault("Error loading Key store : " + location, gse); } catch (IOException ioe) { log.error(name + " Error opening Key store : " + location, ioe); throw new AxisFault("Error opening Key store : " + location, ioe); - } + } } else if (novalidatecert) { if (log.isWarnEnabled()) { log.warn(name + " Server certificate validation (trust) has been disabled. " + diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ServerConnFactoryBuilder.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ServerConnFactoryBuilder.java index b9b4b0018e..817c11e99b 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ServerConnFactoryBuilder.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ServerConnFactoryBuilder.java @@ -26,12 +26,11 @@ import org.apache.axis2.description.Parameter; import org.apache.axis2.description.TransportInDescription; import org.apache.axis2.transport.base.ParamUtils; -import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.http.HttpHost; import org.apache.http.params.HttpParams; -import org.apache.synapse.transport.certificatevalidation.CertificateVerificationManager; +import org.apache.synapse.transport.certificatevalidation.RevocationVerificationManager; import org.apache.synapse.transport.http.conn.SSLClientAuth; import org.apache.synapse.transport.http.conn.SSLContextDetails; import org.apache.synapse.transport.http.conn.ServerConnFactory; @@ -41,13 +40,6 @@ import org.wso2.securevault.SecretResolver; import org.wso2.securevault.SecretResolverFactory; -import javax.net.ssl.KeyManager; -import javax.net.ssl.KeyManagerFactory; -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManager; -import javax.net.ssl.TrustManagerFactory; -import javax.net.ssl.X509KeyManager; -import javax.xml.namespace.QName; import java.io.FileInputStream; import java.io.IOException; import java.net.InetSocketAddress; @@ -62,6 +54,14 @@ import java.util.Locale; import java.util.Map; +import javax.net.ssl.KeyManager; +import javax.net.ssl.KeyManagerFactory; +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManager; +import javax.net.ssl.TrustManagerFactory; +import javax.net.ssl.X509KeyManager; +import javax.xml.namespace.QName; + public class ServerConnFactoryBuilder { private final Log log = LogFactory.getLog(ServerConnFactoryBuilder.class); @@ -73,7 +73,6 @@ public class ServerConnFactoryBuilder { protected SSLContextDetails ssl; private Map sslByIPMap = null; private ConfigurationContext configurationContext; - CertificateVerificationManager certificateVerifier = null; public ServerConnFactoryBuilder(final TransportInDescription transportIn, final HttpHost host, ConfigurationContext configurationContext) { @@ -90,13 +89,13 @@ public ServerConnFactoryBuilder(final TransportInDescription transportIn, final } protected SSLContextDetails createSSLContext( - final OMElement keyStoreEl, - final OMElement trustStoreEl, - final OMElement cientAuthEl, - final OMElement httpsProtocolsEl, - final OMElement preferredCiphersEl, - final CertificateVerificationManager verificationManager, - final String sslProtocol) throws AxisFault { + final OMElement keyStoreEl, + final OMElement trustStoreEl, + final OMElement cientAuthEl, + final OMElement httpsProtocolsEl, + final OMElement preferredCiphersEl, + final RevocationVerificationManager verificationManager, + final String sslProtocol) throws AxisFault { SecretResolver secretResolver; if (configurationContext != null && configurationContext.getAxisConfiguration() != null) { @@ -115,7 +114,7 @@ protected SSLContextDetails createSSLContext( final OMElement cientAuthEl, final OMElement httpsProtocolsEl, final OMElement preferredCiphersEl, - final CertificateVerificationManager verificationManager, + final RevocationVerificationManager verificationManager, final String sslProtocol, final SecretResolver secretResolver) throws AxisFault { KeyManager[] keymanagers = null; @@ -183,38 +182,25 @@ protected SSLContextDetails createSSLContext( } if (trustStoreEl != null) { + String location = getValueOfElementWithLocalName(trustStoreEl, "Location"); + String type = getValueOfElementWithLocalName(trustStoreEl, "Type"); + OMElement storePasswordEl = trustStoreEl.getFirstChildWithName(new QName("Password")); + if (storePasswordEl == null) { + throw new AxisFault("Cannot proceed because Password element is missing in TrustStore"); + } + String storePassword = SecureVaultValueReader.getSecureVaultValue(secretResolver, storePasswordEl); - TrustStoreHolder trustStoreHolder = TrustStoreHolder.getInstance(); FileInputStream fis = null; - String location = getValueOfElementWithLocalName(trustStoreEl, "Location"); - KeyStore trustStore; - try { - if (trustStoreHolder.getClientTrustStore() == null) { - - String type = getValueOfElementWithLocalName(trustStoreEl, "Type"); - OMElement storePasswordEl = trustStoreEl.getFirstChildWithName(new QName("Password")); - - if (storePasswordEl == null) { - throw new AxisFault("Cannot proceed because Password element is missing in TrustStore"); - } - - String storePassword = SecureVaultValueReader.getSecureVaultValue(secretResolver, storePasswordEl); - trustStore = KeyStore.getInstance(type); - fis = new FileInputStream(location); - - if (log.isDebugEnabled()) { - log.debug(name + " Loading Trust Keystore from : " + location); - } - - trustStore.load(fis, storePassword.toCharArray()); - trustStoreHolder.setClientTrustStore(trustStore); - } else { - trustStore = trustStoreHolder.getClientTrustStore(); + KeyStore trustStore = KeyStore.getInstance(type); + fis = new FileInputStream(location); + if (log.isDebugEnabled()) { + log.debug(name + " Loading Trust Keystore from : " + location); } + trustStore.load(fis, storePassword.toCharArray()); TrustManagerFactory trustManagerfactory = TrustManagerFactory.getInstance( - TrustManagerFactory.getDefaultAlgorithm()); + TrustManagerFactory.getDefaultAlgorithm()); trustManagerfactory.init(trustStore); trustManagers = trustManagerfactory.getTrustManagers(); @@ -308,6 +294,7 @@ public ServerConnFactoryBuilder parseSSL() throws AxisFault { final Parameter cvp = transportIn.getParameter("CertificateRevocationVerifier"); final String cvEnable = cvp != null ? cvp.getParameterElement().getAttribute(new QName("enable")).getAttributeValue() : null; + RevocationVerificationManager revocationVerifier = null; if ("true".equalsIgnoreCase(cvEnable)) { String cacheSizeString = cvp.getParameterElement().getFirstChildWithName(new QName("CacheSize")).getText(); @@ -318,33 +305,12 @@ public ServerConnFactoryBuilder parseSSL() throws AxisFault { cacheSize = new Integer(cacheSizeString); cacheDelay = new Integer(cacheDelayString); } - catch (NumberFormatException e) { - throw new AxisFault("Cache size or Cache delay values are malformed", e); - } - - // Checking whether the full certificate chain validation is enabled or not. - boolean isFullCertChainValidationEnabled = true; - boolean isCertExpiryValidationEnabled = false; - OMElement fullCertChainValidationConfig = cvp.getParameterElement() - .getFirstChildWithName(new QName("FullChainValidation")); - OMElement certExpiryValidationConfig = cvp.getParameterElement() - .getFirstChildWithName(new QName("ExpiryValidation")); - - if (fullCertChainValidationConfig != null - && StringUtils.equals("false", fullCertChainValidationConfig.getText())) { - isFullCertChainValidationEnabled = false; - } - - if (certExpiryValidationConfig != null && StringUtils.equals("true", certExpiryValidationConfig.getText())) { - isCertExpiryValidationEnabled = true; - } - - certificateVerifier = new CertificateVerificationManager(cacheSize, cacheDelay, - isFullCertChainValidationEnabled, isCertExpiryValidationEnabled); + catch (NumberFormatException e) {} + revocationVerifier = new RevocationVerificationManager(cacheSize, cacheDelay); } ssl = createSSLContext(keyStoreEl, trustStoreEl, clientAuthEl, httpsProtocolsEl, preferredCiphersEl, - certificateVerifier, sslProtocol); + revocationVerifier, sslProtocol); return this; } @@ -358,7 +324,6 @@ public ServerConnFactoryBuilder parseMultiProfileSSL() throws AxisFault { OMElement profilesEl = profileParam.getParameterElement(); SecretResolver secretResolver = SecretResolverFactory.create(profilesEl, true); Iterator profiles = profilesEl.getChildrenWithName(new QName("profile")); - while (profiles.hasNext()) { OMElement profileEl = (OMElement) profiles.next(); OMElement bindAddressEl = profileEl.getFirstChildWithName(new QName("bindAddress")); @@ -376,63 +341,8 @@ public ServerConnFactoryBuilder parseMultiProfileSSL() throws AxisFault { OMElement preferredCiphersEl = profileEl.getFirstChildWithName(new QName(NhttpConstants.PREFERRED_CIPHERS)); final Parameter sslpParameter = transportIn.getParameter("SSLProtocol"); final String sslProtocol = sslpParameter != null ? sslpParameter.getValue().toString() : "TLS"; - - /* If multi SSL profiles are configured, checking whether the certificate revocation verifier is - configured and full certificate chain validation is enabled or not. */ - if (profileEl.getFirstChildWithName(new QName("CertificateRevocationVerifier")) != null) { - - Integer cacheSize = null; - Integer cacheDelay = null; - - OMElement revocationVerifierConfig = profileEl - .getFirstChildWithName(new QName("CertificateRevocationVerifier")); - OMElement revocationEnabled = revocationVerifierConfig - .getFirstChildWithName(new QName("Enable")); - - if (revocationEnabled != null && "true".equals(revocationEnabled.getText())) { - String cacheSizeString = revocationVerifierConfig - .getFirstChildWithName(new QName("CacheSize")).getText(); - String cacheDelayString = revocationVerifierConfig - .getFirstChildWithName(new QName("CacheDelay")).getText(); - - try { - cacheSize = new Integer(cacheSizeString); - cacheDelay = new Integer(cacheDelayString); - } catch (NumberFormatException e) { - throw new AxisFault("Cache size or Cache delay values are malformed", e); - } - } - - boolean isFullCertChainValidationEnabled = true; - boolean isCertExpiryValidationEnabled = false; - - OMElement fullCertChainValidationConfig = revocationVerifierConfig - .getFirstChildWithName(new QName("FullChainValidation")); - - OMElement certExpiryValidationConfig = revocationVerifierConfig - .getFirstChildWithName(new QName("ExpiryValidation")); - - if (fullCertChainValidationConfig != null - && StringUtils.equals("false", fullCertChainValidationConfig.getText())) { - isFullCertChainValidationEnabled = false; - } - - if (certExpiryValidationConfig != null - && StringUtils.equals("true", certExpiryValidationConfig.getText())) { - isCertExpiryValidationEnabled = true; - } - - if (fullCertChainValidationConfig != null - && StringUtils.equals("false", fullCertChainValidationConfig.getText())) { - isFullCertChainValidationEnabled = false; - } - - certificateVerifier = new CertificateVerificationManager(cacheSize, cacheDelay, - isFullCertChainValidationEnabled, isCertExpiryValidationEnabled); - } - SSLContextDetails ssl = createSSLContext(keyStoreEl, trustStoreEl, clientAuthEl, httpsProtocolsEl, - preferredCiphersEl, certificateVerifier, sslProtocol, secretResolver); + preferredCiphersEl, null, sslProtocol, secretResolver); if (sslByIPMap == null) { sslByIPMap = new HashMap(); } diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/TrustStoreHolder.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/TrustStoreHolder.java deleted file mode 100644 index 697dd6eba6..0000000000 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/TrustStoreHolder.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF 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.transport.nhttp.config; - -import java.security.KeyStore; - -/** - * A data holder class to store the client trust store. - */ -public class TrustStoreHolder { - - private static volatile TrustStoreHolder instance; - private KeyStore clientTrustStore; - - private TrustStoreHolder() {} - - public static TrustStoreHolder getInstance() { - - if (instance == null) { - synchronized (TrustStoreHolder.class) { - if (instance == null) { - instance = new TrustStoreHolder(); - } - } - } - return instance; - } - - public KeyStore getClientTrustStore() { - - return clientTrustStore; - } - - public void setClientTrustStore(KeyStore clientTrustStore) { - - this.clientTrustStore = clientTrustStore; - } - - /** - * Reset the instance. - */ - public static void resetInstance() { - - instance = null; - } -} diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpListener.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpListener.java index 3e7f92c6d6..1d4ddf2a6a 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpListener.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpListener.java @@ -47,6 +47,8 @@ import org.apache.axis2.transport.TransportListener; import org.apache.axis2.transport.base.BaseConstants; import org.apache.axis2.transport.base.BaseUtils; +import org.apache.axis2.transport.base.ManagementSupport; +import org.apache.axis2.transport.base.TransportMBeanSupport; import org.apache.axis2.transport.base.threads.NativeThreadFactory; import org.apache.axis2.transport.base.threads.WorkerPool; import org.apache.axis2.transport.base.tracker.AxisServiceFilter; @@ -60,10 +62,8 @@ import org.apache.http.nio.reactor.IOReactorException; import org.apache.http.nio.reactor.IOReactorExceptionHandler; import org.apache.http.params.HttpConnectionParams; -import org.apache.synapse.transport.certificatevalidation.cache.CertCache; import org.apache.synapse.transport.http.conn.Scheme; import org.apache.synapse.transport.http.conn.ServerConnFactory; -import org.apache.synapse.transport.nhttp.config.TrustStoreHolder; import org.apache.synapse.transport.nhttp.config.ServerConnFactoryBuilder; import org.apache.synapse.transport.passthru.config.PassThroughConfiguration; import org.apache.synapse.transport.passthru.config.SourceConfiguration; @@ -683,4 +683,5 @@ public void reloadDynamicSSLConfig(TransportInDescription transportInDescription this.reloadSpecificEndPoints(transportInDescription); } } + } diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpMultiSSLListener.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpMultiSSLListener.java index 406ae5a53b..208b364178 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpMultiSSLListener.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpMultiSSLListener.java @@ -5,12 +5,10 @@ import org.apache.axis2.description.ParameterInclude; import org.apache.axis2.description.TransportInDescription; import org.apache.http.HttpHost; -import org.apache.synapse.transport.certificatevalidation.cache.CertCache; import org.apache.synapse.transport.http.conn.Scheme; import org.apache.synapse.transport.nhttp.config.ServerConnFactoryBuilder; import org.apache.synapse.transport.dynamicconfigurations.ListenerProfileReloader; import org.apache.synapse.transport.dynamicconfigurations.SSLProfileLoader; -import org.apache.synapse.transport.nhttp.config.TrustStoreHolder; public class PassThroughHttpMultiSSLListener extends PassThroughHttpListener implements SSLProfileLoader{ @@ -41,8 +39,6 @@ protected ServerConnFactoryBuilder initConnFactoryBuilder(final TransportInDescr * @throws AxisFault */ public void reloadConfig(ParameterInclude transport) throws AxisFault { - CertCache.resetCache(); - TrustStoreHolder.resetInstance(); reloadDynamicSSLConfig((TransportInDescription) transport); } diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpSender.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpSender.java index b977eb30a7..3af961c03f 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpSender.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpSender.java @@ -47,14 +47,12 @@ import org.apache.http.nio.reactor.IOReactorExceptionHandler; import org.apache.http.protocol.HTTP; import org.apache.synapse.commons.CorrelationConstants; -import org.apache.synapse.transport.certificatevalidation.cache.CertCache; import org.apache.synapse.transport.exceptions.InvalidConfigurationException; import org.apache.synapse.transport.http.conn.ClientConnFactory; import org.apache.synapse.transport.http.conn.ProxyConfig; import org.apache.synapse.transport.http.conn.Scheme; import org.apache.synapse.transport.nhttp.NhttpConstants; import org.apache.synapse.transport.nhttp.config.ClientConnFactoryBuilder; -import org.apache.synapse.transport.nhttp.config.TrustStoreHolder; import org.apache.synapse.transport.nhttp.config.ProxyConfigBuilder; import org.apache.synapse.transport.nhttp.util.MessageFormatterDecoratorFactory; import org.apache.synapse.transport.nhttp.util.NhttpUtil; @@ -559,7 +557,7 @@ public void submitResponse(MessageContext msgContext) ProtocolState state = SourceContext.getState(conn); if (state != null && state.compareTo(ProtocolState.REQUEST_DONE) <= 0) { // start sending the response if we - + boolean noEntityBodyResponse = false; if (noEntityBody != null && Boolean.TRUE == noEntityBody && pipe != null) { @@ -569,7 +567,7 @@ public void submitResponse(MessageContext msgContext) out.close(); noEntityBodyResponse = true; } - + if (!noEntityBodyResponse && msgContext.isPropertyTrue(PassThroughConstants.MESSAGE_BUILDER_INVOKED) && pipe != null) { OutputStream out = pipe.getOutputStream(); /*if (msgContext.isPropertyTrue(NhttpConstants.SC_ACCEPTED)) { diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/core/ssl/SSLServerConnFactoryBuilder.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/core/ssl/SSLServerConnFactoryBuilder.java index 8ea5433d4f..282900b956 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/core/ssl/SSLServerConnFactoryBuilder.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/core/ssl/SSLServerConnFactoryBuilder.java @@ -19,11 +19,12 @@ import org.apache.axiom.om.OMElement; import org.apache.axis2.AxisFault; +import org.apache.axis2.description.Parameter; import org.apache.axis2.description.TransportInDescription; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.http.HttpHost; -import org.apache.synapse.transport.certificatevalidation.CertificateVerificationManager; +import org.apache.synapse.transport.certificatevalidation.RevocationVerificationManager; import org.apache.synapse.transport.nhttp.config.ServerConnFactoryBuilder; import javax.xml.namespace.QName; @@ -45,7 +46,7 @@ public ServerConnFactoryBuilder parseSSL(OMElement keyStoreEl, OMElement trustSt AxisFault { final String cvEnable = cvp != null ? cvp.getAttribute(new QName("enable")).getAttributeValue() : null; - CertificateVerificationManager revocationVerifier = null; + RevocationVerificationManager revocationVerifier = null; if ("true".equalsIgnoreCase(cvEnable)) { Iterator iterator = cvp.getChildElements(); @@ -69,7 +70,7 @@ public ServerConnFactoryBuilder parseSSL(OMElement keyStoreEl, OMElement trustSt } catch (NumberFormatException e) { log.error("Please specify correct Integer numbers for CacheDelay and CacheSize"); } - revocationVerifier = new CertificateVerificationManager(cacheSize, cacheDelay); + revocationVerifier = new RevocationVerificationManager(cacheSize, cacheDelay); } ssl = createSSLContext(keyStoreEl, trustStoreEl, clientAuthEl, httpsProtocolsEl, preferredCiphers, revocationVerifier, diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/util/ConfigurationBuilderUtil.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/util/ConfigurationBuilderUtil.java index 406a7a2d30..f5a81c1572 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/util/ConfigurationBuilderUtil.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/util/ConfigurationBuilderUtil.java @@ -170,4 +170,5 @@ public static String getStringProperty(String name, String def, Properties props return val == null ? def : val; } + } diff --git a/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/CRLVerifierTest.java b/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/CRLVerifierTest.java index ec582f9dd7..38d7964b8a 100644 --- a/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/CRLVerifierTest.java +++ b/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/CRLVerifierTest.java @@ -88,7 +88,8 @@ public void testRevokedCertificate() throws Exception { //Create a crl with fakeRevokedCertificate marked as revoked. X509CRL x509CRL = createCRL(fakeCACert, caKeyPair.getPrivate(), revokedSerialNumber); - CRLCache cache = CRLCache.getCache(5, 5); + CRLCache cache = CRLCache.getCache(); + cache.init(5, 5); cache.setCacheValue(crlDistributionPointUrl, x509CRL); CRLVerifier crlVerifier = new CRLVerifier(cache); diff --git a/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/OCSPVerifierTest.java b/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/OCSPVerifierTest.java index 9d4f0a01bd..9c2299bb2b 100644 --- a/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/OCSPVerifierTest.java +++ b/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/OCSPVerifierTest.java @@ -107,7 +107,8 @@ public void testOCSPVerifier() throws Exception{ OCSPResp response = generateOCSPResponse(request, certificateHolder, caKeyPair.getPrivate(), caKeyPair.getPublic(), revokedID); SingleResp singleResp = ((BasicOCSPResp)response.getResponseObject()).getResponses()[0]; - OCSPCache cache = OCSPCache.getCache(5, 5); + OCSPCache cache = OCSPCache.getCache(); + cache.init(5,5); cache.setCacheValue(revokedSerialNumber,singleResp, request, null); OCSPVerifier ocspVerifier= new OCSPVerifier(cache); diff --git a/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationTest.java b/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationTest.java index 9adc063ea0..7f282dd86c 100644 --- a/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationTest.java +++ b/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationTest.java @@ -116,7 +116,8 @@ public void testOCSPPathValidationWithFakeCerts() throws Exception { private void crlPathValidation(X509Certificate[] certChain) throws Exception { - CRLCache crlCache = CRLCache.getCache(5, 5); + CRLCache crlCache = CRLCache.getCache(); + crlCache.init(5, 5); RevocationVerifier verifier = new CRLVerifier(crlCache); CertificatePathValidator pathValidator = new CertificatePathValidator(certChain, verifier); pathValidator.validatePath(); @@ -124,7 +125,8 @@ private void crlPathValidation(X509Certificate[] certChain) throws Exception { private void ocspPathValidation(X509Certificate[] certChain) throws Exception { - OCSPCache ocspCache = OCSPCache.getCache(5, 5); + OCSPCache ocspCache = OCSPCache.getCache(); + ocspCache.init(5, 5); RevocationVerifier verifier = new OCSPVerifier(ocspCache); CertificatePathValidator pathValidator = new CertificatePathValidator(certChain, verifier); pathValidator.validatePath(); diff --git a/modules/transports/core/vfs/repository/conf/vfs-move-failed-records.properties b/modules/transports/core/vfs/repository/conf/vfs-move-failed-records.properties deleted file mode 100644 index 8f1ee4a76d..0000000000 --- a/modules/transports/core/vfs/repository/conf/vfs-move-failed-records.properties +++ /dev/null @@ -1 +0,0 @@ -t-0-1705986523002.txt 23/01/2024/ 10:38:43 \ No newline at end of file From 858eebed0c60e4e866c54f91864f7a44f6f4f059 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 16 Feb 2024 10:44:36 +0000 Subject: [PATCH 156/308] [WSO2 Release] [Jenkins #6855] [Release 4.0.0-wso2v86] prepare release v4.0.0-wso2v86 --- 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 eef6a4d5ec..63bf24503d 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v86-SNAPSHOT + 4.0.0-wso2v86 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 497f3a7f13..f6bcf0ced4 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v86-SNAPSHOT + 4.0.0-wso2v86 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 90b7b10cc7..520d2ac237 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-wso2v86-SNAPSHOT + 4.0.0-wso2v86 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index b40e192804..efb8b82621 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v86-SNAPSHOT + 4.0.0-wso2v86 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 6ff3a69259..5c409f83d0 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v86-SNAPSHOT + 4.0.0-wso2v86 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 11c7d7a247..711a8aeb91 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v86-SNAPSHOT + 4.0.0-wso2v86 ../../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 8e5d16b3fc..713fd2169b 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-wso2v86-SNAPSHOT + 4.0.0-wso2v86 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 13052f12d5..13e3830bd0 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-wso2v86-SNAPSHOT + 4.0.0-wso2v86 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 84ef592756..005cb9523c 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-wso2v86-SNAPSHOT + 4.0.0-wso2v86 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 ec1330c297..e94db8ce68 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-wso2v86-SNAPSHOT + 4.0.0-wso2v86 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 75e9bd795d..17016c649b 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-wso2v86-SNAPSHOT + 4.0.0-wso2v86 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 59a19d6573..66495e8c90 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-wso2v86-SNAPSHOT + 4.0.0-wso2v86 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 10a7ec4660..663c086882 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-wso2v86-SNAPSHOT + 4.0.0-wso2v86 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index dc5150cfac..ca11ddacc8 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v86-SNAPSHOT + 4.0.0-wso2v86 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 5a626cf2a4..248e8219ab 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v86-SNAPSHOT + 4.0.0-wso2v86 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index cf5fccb88b..9e8e8e6b5d 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v86-SNAPSHOT + 4.0.0-wso2v86 ../../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-wso2v86 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index b27b004e3b..10943ec640 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v86-SNAPSHOT + 4.0.0-wso2v86 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 59248bdb74..43302f2737 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-wso2v86-SNAPSHOT + 4.0.0-wso2v86 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index ccd3f8cce2..55c7e5d294 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-wso2v86-SNAPSHOT + 4.0.0-wso2v86 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 6737ed7e9a..66f3f97ccb 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v86-SNAPSHOT + 4.0.0-wso2v86 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 3d63401b50..dbdaedb7bd 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v86-SNAPSHOT + 4.0.0-wso2v86 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 10d5fed9d7..c168268b45 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v86-SNAPSHOT + 4.0.0-wso2v86 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 76dfa99961..ef741cf0f8 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v86-SNAPSHOT + 4.0.0-wso2v86 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index e38fe03937..9c122ef46b 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-wso2v86-SNAPSHOT + 4.0.0-wso2v86 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 5748d96562..0bfe60bc10 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-wso2v86-SNAPSHOT + 4.0.0-wso2v86 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 12aff78822..0a887de639 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-wso2v86-SNAPSHOT + 4.0.0-wso2v86 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index d126cf0cec..8ed63f9c33 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-wso2v86-SNAPSHOT + 4.0.0-wso2v86 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 6a5c688c71..bf315c6bb6 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v86-SNAPSHOT + 4.0.0-wso2v86 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 8da2ab3690..c68b3230e3 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v86-SNAPSHOT + 4.0.0-wso2v86 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index a3a5ed73d8..9fc3f2fe70 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-wso2v86-SNAPSHOT + 4.0.0-wso2v86 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index d3b37f7c45..68c01f8d79 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v86-SNAPSHOT + 4.0.0-wso2v86 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-wso2v86 Apache Software Foundation From c3777af395c9b1f38abb1cb3bf97891717894a0d Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 16 Feb 2024 10:44:38 +0000 Subject: [PATCH 157/308] [WSO2 Release] [Jenkins #6855] [Release 4.0.0-wso2v86] 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 63bf24503d..38dea0151e 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v86 + 4.0.0-wso2v87-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index f6bcf0ced4..3b2db711c6 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v86 + 4.0.0-wso2v87-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 520d2ac237..33cc5d34f4 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-wso2v86 + 4.0.0-wso2v87-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index efb8b82621..195edcfffa 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v86 + 4.0.0-wso2v87-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 5c409f83d0..6ee34fc421 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v86 + 4.0.0-wso2v87-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 711a8aeb91..62850bdaec 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v86 + 4.0.0-wso2v87-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 713fd2169b..de6fa9e7f8 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-wso2v86 + 4.0.0-wso2v87-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 13e3830bd0..453748cfb6 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-wso2v86 + 4.0.0-wso2v87-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 005cb9523c..f154969d79 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-wso2v86 + 4.0.0-wso2v87-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 e94db8ce68..d5a3942788 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-wso2v86 + 4.0.0-wso2v87-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 17016c649b..508d1bd3ed 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-wso2v86 + 4.0.0-wso2v87-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 66495e8c90..3860d658db 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-wso2v86 + 4.0.0-wso2v87-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 663c086882..e027ba55f3 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-wso2v86 + 4.0.0-wso2v87-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index ca11ddacc8..920b66a3c7 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v86 + 4.0.0-wso2v87-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 248e8219ab..c01d998495 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v86 + 4.0.0-wso2v87-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 9e8e8e6b5d..7562b44e05 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v86 + 4.0.0-wso2v87-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-wso2v86 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 10943ec640..cb8dda275b 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v86 + 4.0.0-wso2v87-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 43302f2737..087cb59bea 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-wso2v86 + 4.0.0-wso2v87-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 55c7e5d294..732649d30a 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-wso2v86 + 4.0.0-wso2v87-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 66f3f97ccb..ef560ec6fa 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v86 + 4.0.0-wso2v87-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index dbdaedb7bd..d9e7ae0017 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v86 + 4.0.0-wso2v87-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index c168268b45..54f544e3b7 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v86 + 4.0.0-wso2v87-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index ef741cf0f8..f2ee22ca7d 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v86 + 4.0.0-wso2v87-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 9c122ef46b..d5e7d0ea8b 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-wso2v86 + 4.0.0-wso2v87-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 0bfe60bc10..ad4b9aa97b 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-wso2v86 + 4.0.0-wso2v87-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 0a887de639..f9ef6b1be5 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-wso2v86 + 4.0.0-wso2v87-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 8ed63f9c33..f99b82109b 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-wso2v86 + 4.0.0-wso2v87-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index bf315c6bb6..fa0b4c6b85 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v86 + 4.0.0-wso2v87-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index c68b3230e3..e152e3e2db 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v86 + 4.0.0-wso2v87-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 9fc3f2fe70..b4d25da991 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-wso2v86 + 4.0.0-wso2v87-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 68c01f8d79..fae51ca7fd 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v86 + 4.0.0-wso2v87-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-wso2v86 + HEAD Apache Software Foundation From db9ccd11523563d667009fe6951f8a6368fbedb8 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 16 Feb 2024 11:20:07 +0000 Subject: [PATCH 158/308] [WSO2 Release] [Jenkins #6856] [Release 4.0.0-wso2v87] prepare release v4.0.0-wso2v87 --- 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 38dea0151e..be378da513 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v87-SNAPSHOT + 4.0.0-wso2v87 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 3b2db711c6..42543859c3 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v87-SNAPSHOT + 4.0.0-wso2v87 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 33cc5d34f4..76c496cf3c 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-wso2v87-SNAPSHOT + 4.0.0-wso2v87 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 195edcfffa..07e3a9ef1c 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v87-SNAPSHOT + 4.0.0-wso2v87 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 6ee34fc421..e6d4d2902b 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v87-SNAPSHOT + 4.0.0-wso2v87 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 62850bdaec..0a7e2847a2 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v87-SNAPSHOT + 4.0.0-wso2v87 ../../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 de6fa9e7f8..cfccf60828 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-wso2v87-SNAPSHOT + 4.0.0-wso2v87 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 453748cfb6..9209c33d32 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-wso2v87-SNAPSHOT + 4.0.0-wso2v87 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 f154969d79..95ad9ac34b 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-wso2v87-SNAPSHOT + 4.0.0-wso2v87 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 d5a3942788..40ec8e3b8f 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-wso2v87-SNAPSHOT + 4.0.0-wso2v87 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 508d1bd3ed..640d422f81 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-wso2v87-SNAPSHOT + 4.0.0-wso2v87 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 3860d658db..e7f85828a3 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-wso2v87-SNAPSHOT + 4.0.0-wso2v87 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 e027ba55f3..40f6b84867 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-wso2v87-SNAPSHOT + 4.0.0-wso2v87 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 920b66a3c7..7d50f2c809 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v87-SNAPSHOT + 4.0.0-wso2v87 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index c01d998495..133b2f83d3 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v87-SNAPSHOT + 4.0.0-wso2v87 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 7562b44e05..611caa6d19 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v87-SNAPSHOT + 4.0.0-wso2v87 ../../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-wso2v87 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index cb8dda275b..704d4f4ae4 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v87-SNAPSHOT + 4.0.0-wso2v87 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 087cb59bea..bc92445151 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-wso2v87-SNAPSHOT + 4.0.0-wso2v87 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 732649d30a..e1e9243c05 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-wso2v87-SNAPSHOT + 4.0.0-wso2v87 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index ef560ec6fa..2b0d99878b 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v87-SNAPSHOT + 4.0.0-wso2v87 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index d9e7ae0017..d5f058acdb 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v87-SNAPSHOT + 4.0.0-wso2v87 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 54f544e3b7..741a5b298a 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v87-SNAPSHOT + 4.0.0-wso2v87 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index f2ee22ca7d..1699cc3e53 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v87-SNAPSHOT + 4.0.0-wso2v87 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index d5e7d0ea8b..2142e882b0 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-wso2v87-SNAPSHOT + 4.0.0-wso2v87 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index ad4b9aa97b..9a35be46bf 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-wso2v87-SNAPSHOT + 4.0.0-wso2v87 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index f9ef6b1be5..65b82fff3b 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-wso2v87-SNAPSHOT + 4.0.0-wso2v87 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index f99b82109b..bbb2cfb95d 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-wso2v87-SNAPSHOT + 4.0.0-wso2v87 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index fa0b4c6b85..e7c4a0cbc0 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v87-SNAPSHOT + 4.0.0-wso2v87 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index e152e3e2db..4cebc41ee9 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v87-SNAPSHOT + 4.0.0-wso2v87 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index b4d25da991..7e3b6a9ef0 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-wso2v87-SNAPSHOT + 4.0.0-wso2v87 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index fae51ca7fd..12328bf64a 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v87-SNAPSHOT + 4.0.0-wso2v87 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-wso2v87 Apache Software Foundation From 81833a39cad39d89eb8ff54c3b0254134ad5d3e8 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 16 Feb 2024 11:20:09 +0000 Subject: [PATCH 159/308] [WSO2 Release] [Jenkins #6856] [Release 4.0.0-wso2v87] 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 be378da513..a71846b791 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v87 + 4.0.0-wso2v88-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 42543859c3..b85d126247 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v87 + 4.0.0-wso2v88-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 76c496cf3c..99746bbe07 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-wso2v87 + 4.0.0-wso2v88-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 07e3a9ef1c..8b5da20ae7 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v87 + 4.0.0-wso2v88-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index e6d4d2902b..63dc98c9f7 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v87 + 4.0.0-wso2v88-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 0a7e2847a2..379ffc3dd8 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v87 + 4.0.0-wso2v88-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 cfccf60828..b67beb50c3 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-wso2v87 + 4.0.0-wso2v88-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 9209c33d32..e31b0b6605 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-wso2v87 + 4.0.0-wso2v88-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 95ad9ac34b..9d5b384cfb 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-wso2v87 + 4.0.0-wso2v88-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 40ec8e3b8f..bbd8aaa49d 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-wso2v87 + 4.0.0-wso2v88-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 640d422f81..551a286308 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-wso2v87 + 4.0.0-wso2v88-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 e7f85828a3..f9b6dfce24 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-wso2v87 + 4.0.0-wso2v88-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 40f6b84867..aa5a9f734b 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-wso2v87 + 4.0.0-wso2v88-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 7d50f2c809..04481e92b8 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v87 + 4.0.0-wso2v88-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 133b2f83d3..b3c5004d5a 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v87 + 4.0.0-wso2v88-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 611caa6d19..5118922071 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v87 + 4.0.0-wso2v88-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-wso2v87 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 704d4f4ae4..094912f187 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v87 + 4.0.0-wso2v88-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index bc92445151..4966a9d525 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-wso2v87 + 4.0.0-wso2v88-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index e1e9243c05..566cbfe988 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-wso2v87 + 4.0.0-wso2v88-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 2b0d99878b..b9922eb1d3 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v87 + 4.0.0-wso2v88-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index d5f058acdb..9f19b03602 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v87 + 4.0.0-wso2v88-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 741a5b298a..25d7ca4e4f 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v87 + 4.0.0-wso2v88-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 1699cc3e53..aac3a5ad9e 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v87 + 4.0.0-wso2v88-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 2142e882b0..c1daa84a0d 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-wso2v87 + 4.0.0-wso2v88-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 9a35be46bf..c11fe8e4fc 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-wso2v87 + 4.0.0-wso2v88-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 65b82fff3b..0b574bdf2e 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-wso2v87 + 4.0.0-wso2v88-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index bbb2cfb95d..43b1c0818e 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-wso2v87 + 4.0.0-wso2v88-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index e7c4a0cbc0..9149c0434c 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v87 + 4.0.0-wso2v88-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 4cebc41ee9..3bf44f7ed0 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v87 + 4.0.0-wso2v88-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 7e3b6a9ef0..e07fb310ca 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-wso2v87 + 4.0.0-wso2v88-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 12328bf64a..8e6ddd3808 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v87 + 4.0.0-wso2v88-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-wso2v87 + HEAD Apache Software Foundation From 8855b4aeb16f1296b5c257b67b4f8061615adcdc Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 16 Feb 2024 11:54:10 +0000 Subject: [PATCH 160/308] [WSO2 Release] [Jenkins #6857] [Release 4.0.0-wso2v88] prepare release v4.0.0-wso2v88 --- 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 a71846b791..d2b2148d7e 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v88-SNAPSHOT + 4.0.0-wso2v88 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index b85d126247..d57a903e63 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v88-SNAPSHOT + 4.0.0-wso2v88 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 99746bbe07..7048d1440f 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-wso2v88-SNAPSHOT + 4.0.0-wso2v88 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 8b5da20ae7..83f5950c91 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v88-SNAPSHOT + 4.0.0-wso2v88 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 63dc98c9f7..7864970d39 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v88-SNAPSHOT + 4.0.0-wso2v88 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 379ffc3dd8..7898f6a2c4 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v88-SNAPSHOT + 4.0.0-wso2v88 ../../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 b67beb50c3..beee66d079 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-wso2v88-SNAPSHOT + 4.0.0-wso2v88 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 e31b0b6605..541e273c88 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-wso2v88-SNAPSHOT + 4.0.0-wso2v88 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 9d5b384cfb..ac9ad0ba10 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-wso2v88-SNAPSHOT + 4.0.0-wso2v88 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 bbd8aaa49d..4ec28841ca 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-wso2v88-SNAPSHOT + 4.0.0-wso2v88 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 551a286308..0edaa71406 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-wso2v88-SNAPSHOT + 4.0.0-wso2v88 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 f9b6dfce24..49bbb155fb 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-wso2v88-SNAPSHOT + 4.0.0-wso2v88 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 aa5a9f734b..8dce4774e8 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-wso2v88-SNAPSHOT + 4.0.0-wso2v88 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 04481e92b8..1db214d241 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v88-SNAPSHOT + 4.0.0-wso2v88 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index b3c5004d5a..383a9a6049 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v88-SNAPSHOT + 4.0.0-wso2v88 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 5118922071..e09653757e 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v88-SNAPSHOT + 4.0.0-wso2v88 ../../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-wso2v88 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 094912f187..f65e223553 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v88-SNAPSHOT + 4.0.0-wso2v88 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 4966a9d525..d437461bf7 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-wso2v88-SNAPSHOT + 4.0.0-wso2v88 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 566cbfe988..6e3be11825 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-wso2v88-SNAPSHOT + 4.0.0-wso2v88 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index b9922eb1d3..2333535e31 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v88-SNAPSHOT + 4.0.0-wso2v88 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 9f19b03602..45fa54fe5c 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v88-SNAPSHOT + 4.0.0-wso2v88 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 25d7ca4e4f..097a237728 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v88-SNAPSHOT + 4.0.0-wso2v88 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index aac3a5ad9e..7b1cb1087f 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v88-SNAPSHOT + 4.0.0-wso2v88 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index c1daa84a0d..6daa687cbe 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-wso2v88-SNAPSHOT + 4.0.0-wso2v88 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index c11fe8e4fc..4750c56110 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-wso2v88-SNAPSHOT + 4.0.0-wso2v88 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 0b574bdf2e..bd744c27e6 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-wso2v88-SNAPSHOT + 4.0.0-wso2v88 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 43b1c0818e..bf7994b72d 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-wso2v88-SNAPSHOT + 4.0.0-wso2v88 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 9149c0434c..1677b935f9 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v88-SNAPSHOT + 4.0.0-wso2v88 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 3bf44f7ed0..7a1cf78e8d 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v88-SNAPSHOT + 4.0.0-wso2v88 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index e07fb310ca..e8a6c906b6 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-wso2v88-SNAPSHOT + 4.0.0-wso2v88 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 8e6ddd3808..ed401fe643 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v88-SNAPSHOT + 4.0.0-wso2v88 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-wso2v88 Apache Software Foundation From 6a49ea8699400e9eafe937a2b8dcb5c4a8d558dd Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 16 Feb 2024 11:54:11 +0000 Subject: [PATCH 161/308] [WSO2 Release] [Jenkins #6857] [Release 4.0.0-wso2v88] 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 d2b2148d7e..282ca4d771 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v88 + 4.0.0-wso2v89-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index d57a903e63..317e788d32 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v88 + 4.0.0-wso2v89-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 7048d1440f..20e0c3b4fd 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-wso2v88 + 4.0.0-wso2v89-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 83f5950c91..e474a7bd5e 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v88 + 4.0.0-wso2v89-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 7864970d39..9441e615b8 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v88 + 4.0.0-wso2v89-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 7898f6a2c4..b9a0cd6166 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v88 + 4.0.0-wso2v89-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 beee66d079..064c2620f4 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-wso2v88 + 4.0.0-wso2v89-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 541e273c88..03bd63d4ee 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-wso2v88 + 4.0.0-wso2v89-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 ac9ad0ba10..562b14adad 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-wso2v88 + 4.0.0-wso2v89-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 4ec28841ca..26834c18e0 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-wso2v88 + 4.0.0-wso2v89-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 0edaa71406..ee93404b68 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-wso2v88 + 4.0.0-wso2v89-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 49bbb155fb..dc0cca5e93 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-wso2v88 + 4.0.0-wso2v89-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 8dce4774e8..a91b9208ba 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-wso2v88 + 4.0.0-wso2v89-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 1db214d241..4451d35ddd 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v88 + 4.0.0-wso2v89-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 383a9a6049..79358c2a55 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v88 + 4.0.0-wso2v89-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index e09653757e..98c6c4c6e5 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v88 + 4.0.0-wso2v89-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-wso2v88 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index f65e223553..0752200cc0 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v88 + 4.0.0-wso2v89-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index d437461bf7..3b65e813ec 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-wso2v88 + 4.0.0-wso2v89-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 6e3be11825..4468fd6ab9 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-wso2v88 + 4.0.0-wso2v89-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 2333535e31..d581329d42 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v88 + 4.0.0-wso2v89-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 45fa54fe5c..0ba51161c5 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v88 + 4.0.0-wso2v89-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 097a237728..d1d2b36c42 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v88 + 4.0.0-wso2v89-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 7b1cb1087f..9f501f9fee 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v88 + 4.0.0-wso2v89-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 6daa687cbe..907f8e1b11 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-wso2v88 + 4.0.0-wso2v89-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 4750c56110..82c42f0693 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-wso2v88 + 4.0.0-wso2v89-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index bd744c27e6..8071f1c852 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-wso2v88 + 4.0.0-wso2v89-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index bf7994b72d..08060a9fd2 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-wso2v88 + 4.0.0-wso2v89-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 1677b935f9..c2a932c0b1 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v88 + 4.0.0-wso2v89-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 7a1cf78e8d..a0d3e46151 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v88 + 4.0.0-wso2v89-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index e8a6c906b6..27ef3c6a88 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-wso2v88 + 4.0.0-wso2v89-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index ed401fe643..20cd596a86 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v88 + 4.0.0-wso2v89-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-wso2v88 + HEAD Apache Software Foundation From 39cf0a1e0fa60ad96bc91afaf4c6c331fcc1a54b Mon Sep 17 00:00:00 2001 From: Dulanjali Dilmi Date: Sun, 18 Feb 2024 01:39:23 +0530 Subject: [PATCH 162/308] Fix issue with Enrich mediator after Json Path Upgrade --- .../java/org/apache/synapse/mediators/elementary/Target.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/elementary/Target.java b/modules/core/src/main/java/org/apache/synapse/mediators/elementary/Target.java index 1887073f9c..2c9cd6ed01 100644 --- a/modules/core/src/main/java/org/apache/synapse/mediators/elementary/Target.java +++ b/modules/core/src/main/java/org/apache/synapse/mediators/elementary/Target.java @@ -527,8 +527,8 @@ private String removeJSONFromString(MessageContext synCtx, String inputString, S if (path.equals("$") || path.equals("$.")) { result = ""; } else { - Object list = JsonPath.compile(path).read(result); - if (!((JsonArray) list).isEmpty()) { + JsonElement list = JsonPath.parse(result).read(path); + if (!(list instanceof JsonArray) || !((JsonArray) list).isEmpty()) { DocumentContext doc = JsonPath.parse(result); doc.delete(path); result = doc.jsonString(); From acf80b5ed04c2cbd051f534056264cc147ed5982 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 19 Feb 2024 04:37:33 +0000 Subject: [PATCH 163/308] [WSO2 Release] [Jenkins #6862] [Release 4.0.0-wso2v89] prepare release v4.0.0-wso2v89 --- 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 282ca4d771..3092dde50b 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v89-SNAPSHOT + 4.0.0-wso2v89 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 317e788d32..bad4adcda4 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v89-SNAPSHOT + 4.0.0-wso2v89 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 20e0c3b4fd..db13a26784 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-wso2v89-SNAPSHOT + 4.0.0-wso2v89 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index e474a7bd5e..860ac51679 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v89-SNAPSHOT + 4.0.0-wso2v89 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 9441e615b8..69bca614a5 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v89-SNAPSHOT + 4.0.0-wso2v89 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index b9a0cd6166..61ccfd4049 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v89-SNAPSHOT + 4.0.0-wso2v89 ../../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 064c2620f4..7fc4c00527 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-wso2v89-SNAPSHOT + 4.0.0-wso2v89 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 03bd63d4ee..7b5b61e702 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-wso2v89-SNAPSHOT + 4.0.0-wso2v89 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 562b14adad..80ac688b1e 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-wso2v89-SNAPSHOT + 4.0.0-wso2v89 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 26834c18e0..ad805f89b4 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-wso2v89-SNAPSHOT + 4.0.0-wso2v89 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 ee93404b68..6f8a5194c1 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-wso2v89-SNAPSHOT + 4.0.0-wso2v89 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 dc0cca5e93..6188ae6080 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-wso2v89-SNAPSHOT + 4.0.0-wso2v89 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 a91b9208ba..8fe3c866da 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-wso2v89-SNAPSHOT + 4.0.0-wso2v89 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 4451d35ddd..c07cf67b7c 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v89-SNAPSHOT + 4.0.0-wso2v89 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 79358c2a55..88c6d06d5f 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v89-SNAPSHOT + 4.0.0-wso2v89 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 98c6c4c6e5..2dc7731e99 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v89-SNAPSHOT + 4.0.0-wso2v89 ../../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-wso2v89 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 0752200cc0..deb582deac 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v89-SNAPSHOT + 4.0.0-wso2v89 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 3b65e813ec..e74d33da3e 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-wso2v89-SNAPSHOT + 4.0.0-wso2v89 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 4468fd6ab9..2e02a93358 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-wso2v89-SNAPSHOT + 4.0.0-wso2v89 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index d581329d42..35f735058e 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v89-SNAPSHOT + 4.0.0-wso2v89 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 0ba51161c5..bdb13d3fdd 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v89-SNAPSHOT + 4.0.0-wso2v89 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index d1d2b36c42..7ae6ff6a49 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v89-SNAPSHOT + 4.0.0-wso2v89 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 9f501f9fee..cf1e6ba5b0 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v89-SNAPSHOT + 4.0.0-wso2v89 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 907f8e1b11..6f8bae7307 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-wso2v89-SNAPSHOT + 4.0.0-wso2v89 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 82c42f0693..581e60d9e1 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-wso2v89-SNAPSHOT + 4.0.0-wso2v89 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 8071f1c852..917d4bd290 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-wso2v89-SNAPSHOT + 4.0.0-wso2v89 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 08060a9fd2..2c81972217 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-wso2v89-SNAPSHOT + 4.0.0-wso2v89 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index c2a932c0b1..484f47f1ac 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v89-SNAPSHOT + 4.0.0-wso2v89 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index a0d3e46151..dd338d95bf 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v89-SNAPSHOT + 4.0.0-wso2v89 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 27ef3c6a88..d5699c6823 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-wso2v89-SNAPSHOT + 4.0.0-wso2v89 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 20cd596a86..e8d0ee1683 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v89-SNAPSHOT + 4.0.0-wso2v89 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-wso2v89 Apache Software Foundation From 11a47453f2d96672fef47c912df0a01afd96df60 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 19 Feb 2024 04:37:34 +0000 Subject: [PATCH 164/308] [WSO2 Release] [Jenkins #6862] [Release 4.0.0-wso2v89] 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 3092dde50b..13140a9db9 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v89 + 4.0.0-wso2v90-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index bad4adcda4..579c022817 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v89 + 4.0.0-wso2v90-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index db13a26784..e4b0e92fdf 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-wso2v89 + 4.0.0-wso2v90-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 860ac51679..b641336ae4 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v89 + 4.0.0-wso2v90-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 69bca614a5..3b6aec6a36 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v89 + 4.0.0-wso2v90-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 61ccfd4049..b241993a13 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v89 + 4.0.0-wso2v90-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 7fc4c00527..a539c37d81 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-wso2v89 + 4.0.0-wso2v90-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 7b5b61e702..201bf91104 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-wso2v89 + 4.0.0-wso2v90-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 80ac688b1e..c99748e392 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-wso2v89 + 4.0.0-wso2v90-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 ad805f89b4..2c0f8a7db1 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-wso2v89 + 4.0.0-wso2v90-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 6f8a5194c1..d860bfe8ad 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-wso2v89 + 4.0.0-wso2v90-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 6188ae6080..8d879c8c56 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-wso2v89 + 4.0.0-wso2v90-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 8fe3c866da..6aa5a9f7b0 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-wso2v89 + 4.0.0-wso2v90-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index c07cf67b7c..3f0cedd34c 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v89 + 4.0.0-wso2v90-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 88c6d06d5f..cf556b950b 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v89 + 4.0.0-wso2v90-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 2dc7731e99..d980a1d57a 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v89 + 4.0.0-wso2v90-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-wso2v89 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index deb582deac..fd4c1d96fa 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v89 + 4.0.0-wso2v90-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index e74d33da3e..7982484325 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-wso2v89 + 4.0.0-wso2v90-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 2e02a93358..c6b367e61c 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-wso2v89 + 4.0.0-wso2v90-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 35f735058e..58c3987774 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v89 + 4.0.0-wso2v90-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index bdb13d3fdd..8a92bfbafa 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v89 + 4.0.0-wso2v90-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 7ae6ff6a49..97cf68935b 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v89 + 4.0.0-wso2v90-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index cf1e6ba5b0..53e41b7c4b 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v89 + 4.0.0-wso2v90-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 6f8bae7307..f29e6b69a2 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-wso2v89 + 4.0.0-wso2v90-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 581e60d9e1..607e5f782e 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-wso2v89 + 4.0.0-wso2v90-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 917d4bd290..01f4550edf 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-wso2v89 + 4.0.0-wso2v90-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 2c81972217..28135722d4 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-wso2v89 + 4.0.0-wso2v90-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 484f47f1ac..bdb143ebe0 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v89 + 4.0.0-wso2v90-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index dd338d95bf..297398404c 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v89 + 4.0.0-wso2v90-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index d5699c6823..490a150566 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-wso2v89 + 4.0.0-wso2v90-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index e8d0ee1683..6283e5ed1c 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v89 + 4.0.0-wso2v90-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-wso2v89 + HEAD Apache Software Foundation From 5d50d1daa2296e407a780ac6b355e0e7ead5780e Mon Sep 17 00:00:00 2001 From: Dulanjali Dilmi Date: Mon, 19 Feb 2024 15:06:59 +0530 Subject: [PATCH 165/308] Upgrade dependencies Upgrade rabbitmq version to 5.20.0 and upgrade axis2-transport version Related issue:#3109 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ba7701c62c..0cb93564b6 100644 --- a/pom.xml +++ b/pom.xml @@ -1502,7 +1502,7 @@ 1.1 1.6.1-wso2v97 - 2.0.0-wso2v68 + 2.0.0-wso2v69 1.2.11-wso2v21 1.4.7 1.3.04 @@ -1588,7 +1588,7 @@ 4.1.104.Final 6.3.50 1.1.1.wso2v3 - 5.8.0 + 5.20.0 1.11.0.wso2v6 4.9.3.wso2v2 2.8.0.wso2v2 From 055fbddbcdeca2b0f88fd140ab6d37838d260428 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 19 Feb 2024 10:13:14 +0000 Subject: [PATCH 166/308] [WSO2 Release] [Jenkins #6864] [Release 4.0.0-wso2v90] prepare release v4.0.0-wso2v90 --- 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 13140a9db9..150d213802 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v90-SNAPSHOT + 4.0.0-wso2v90 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 579c022817..8b0dc2b5c1 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v90-SNAPSHOT + 4.0.0-wso2v90 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index e4b0e92fdf..02447ac3c4 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-wso2v90-SNAPSHOT + 4.0.0-wso2v90 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index b641336ae4..86e8abdce1 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v90-SNAPSHOT + 4.0.0-wso2v90 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 3b6aec6a36..b3ff57f884 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v90-SNAPSHOT + 4.0.0-wso2v90 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index b241993a13..87104bc0de 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v90-SNAPSHOT + 4.0.0-wso2v90 ../../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 a539c37d81..31433b348c 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-wso2v90-SNAPSHOT + 4.0.0-wso2v90 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 201bf91104..a3f8a79120 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-wso2v90-SNAPSHOT + 4.0.0-wso2v90 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 c99748e392..9c2817fbe2 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-wso2v90-SNAPSHOT + 4.0.0-wso2v90 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 2c0f8a7db1..830713022e 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-wso2v90-SNAPSHOT + 4.0.0-wso2v90 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 d860bfe8ad..94dd6efa89 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-wso2v90-SNAPSHOT + 4.0.0-wso2v90 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 8d879c8c56..67e0e96bfb 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-wso2v90-SNAPSHOT + 4.0.0-wso2v90 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 6aa5a9f7b0..91b8eba4e3 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-wso2v90-SNAPSHOT + 4.0.0-wso2v90 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 3f0cedd34c..f0b1b91fe5 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v90-SNAPSHOT + 4.0.0-wso2v90 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index cf556b950b..dde8e4da0d 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v90-SNAPSHOT + 4.0.0-wso2v90 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index d980a1d57a..7d440a5597 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v90-SNAPSHOT + 4.0.0-wso2v90 ../../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-wso2v90 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index fd4c1d96fa..4e5edc9b6a 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v90-SNAPSHOT + 4.0.0-wso2v90 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 7982484325..9e9714f10a 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-wso2v90-SNAPSHOT + 4.0.0-wso2v90 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index c6b367e61c..8453cea810 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-wso2v90-SNAPSHOT + 4.0.0-wso2v90 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 58c3987774..685a55eebd 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v90-SNAPSHOT + 4.0.0-wso2v90 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 8a92bfbafa..562d2f85e1 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v90-SNAPSHOT + 4.0.0-wso2v90 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 97cf68935b..7d25e3f5f7 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v90-SNAPSHOT + 4.0.0-wso2v90 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 53e41b7c4b..0e7848a1f6 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v90-SNAPSHOT + 4.0.0-wso2v90 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index f29e6b69a2..a4494ea945 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-wso2v90-SNAPSHOT + 4.0.0-wso2v90 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 607e5f782e..df1fbd43fb 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-wso2v90-SNAPSHOT + 4.0.0-wso2v90 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 01f4550edf..44d26f0df5 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-wso2v90-SNAPSHOT + 4.0.0-wso2v90 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 28135722d4..ce363a4b7b 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-wso2v90-SNAPSHOT + 4.0.0-wso2v90 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index bdb143ebe0..0d5a9152c0 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v90-SNAPSHOT + 4.0.0-wso2v90 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 297398404c..1fdefd0062 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v90-SNAPSHOT + 4.0.0-wso2v90 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 490a150566..1e6dabb852 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-wso2v90-SNAPSHOT + 4.0.0-wso2v90 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index bdd029da8a..2fe49c8e8b 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v90-SNAPSHOT + 4.0.0-wso2v90 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-wso2v90 Apache Software Foundation From 6765940a34493d1d2cc1591198ebbd355433e5a9 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 19 Feb 2024 10:13:16 +0000 Subject: [PATCH 167/308] [WSO2 Release] [Jenkins #6864] [Release 4.0.0-wso2v90] 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 150d213802..8db3e2afc3 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v90 + 4.0.0-wso2v91-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 8b0dc2b5c1..cb86acb4fe 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v90 + 4.0.0-wso2v91-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 02447ac3c4..a2bb9fce8b 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-wso2v90 + 4.0.0-wso2v91-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 86e8abdce1..c70b78bb58 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v90 + 4.0.0-wso2v91-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index b3ff57f884..52dc51fc1e 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v90 + 4.0.0-wso2v91-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 87104bc0de..0bcc9c2d6f 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v90 + 4.0.0-wso2v91-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 31433b348c..28c85e74e8 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-wso2v90 + 4.0.0-wso2v91-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 a3f8a79120..dde7cdce52 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-wso2v90 + 4.0.0-wso2v91-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 9c2817fbe2..276afdb734 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-wso2v90 + 4.0.0-wso2v91-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 830713022e..f90f2e313f 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-wso2v90 + 4.0.0-wso2v91-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 94dd6efa89..f3207ae692 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-wso2v90 + 4.0.0-wso2v91-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 67e0e96bfb..6b7725a32e 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-wso2v90 + 4.0.0-wso2v91-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 91b8eba4e3..9c3863443b 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-wso2v90 + 4.0.0-wso2v91-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index f0b1b91fe5..2202f1f0ce 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v90 + 4.0.0-wso2v91-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index dde8e4da0d..7765646f06 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v90 + 4.0.0-wso2v91-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 7d440a5597..e84fec51c9 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v90 + 4.0.0-wso2v91-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-wso2v90 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 4e5edc9b6a..6ecfbcd9de 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v90 + 4.0.0-wso2v91-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 9e9714f10a..ba6ae0dc87 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-wso2v90 + 4.0.0-wso2v91-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 8453cea810..77aabb6bf6 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-wso2v90 + 4.0.0-wso2v91-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 685a55eebd..4fde0c3844 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v90 + 4.0.0-wso2v91-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 562d2f85e1..b46f08b740 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v90 + 4.0.0-wso2v91-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 7d25e3f5f7..bb6bafedfe 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v90 + 4.0.0-wso2v91-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 0e7848a1f6..9f40dac77a 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v90 + 4.0.0-wso2v91-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index a4494ea945..7560c7922f 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-wso2v90 + 4.0.0-wso2v91-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index df1fbd43fb..239023792c 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-wso2v90 + 4.0.0-wso2v91-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 44d26f0df5..06d97e10ee 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-wso2v90 + 4.0.0-wso2v91-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index ce363a4b7b..3c96b42407 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-wso2v90 + 4.0.0-wso2v91-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 0d5a9152c0..7a58b6fd49 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v90 + 4.0.0-wso2v91-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 1fdefd0062..3719e12ed6 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v90 + 4.0.0-wso2v91-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 1e6dabb852..07dd9bf837 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-wso2v90 + 4.0.0-wso2v91-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 2fe49c8e8b..38161239c1 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v90 + 4.0.0-wso2v91-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-wso2v90 + HEAD Apache Software Foundation From 538513cda99acf5d5b68ed7ac2a88933dec64f07 Mon Sep 17 00:00:00 2001 From: Arunan Sugunakumar Date: Tue, 20 Feb 2024 16:23:32 +0530 Subject: [PATCH 168/308] Fix import for SOAP11Factory in DeferredMessageBuilder Resolves wso2/micro-integrator#3117 When org.apache.axiom.soap.impl.dom.soap11.SOAP11Factory is used, the Envelope type is different from other normal usecases. --- .../transport/passthru/util/DeferredMessageBuilder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/util/DeferredMessageBuilder.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/util/DeferredMessageBuilder.java index 820b0939da..08e0c7e30a 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/util/DeferredMessageBuilder.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/util/DeferredMessageBuilder.java @@ -18,7 +18,7 @@ import org.apache.axiom.om.OMElement; import org.apache.axiom.soap.SOAPEnvelope; -import org.apache.axiom.soap.impl.dom.soap11.SOAP11Factory; +import org.apache.axiom.soap.impl.llom.soap11.SOAP11Factory; import org.apache.axis2.AxisFault; import org.apache.axis2.Constants; import org.apache.axis2.builder.*; @@ -143,7 +143,7 @@ public OMElement getDocument(MessageContext msgCtx, InputStream in) throws if (builder != null) { try { if (contentLength != null && "0".equals(contentLength) && !msgCtx.isDoingREST()) { - element = new org.apache.axiom.soap.impl.llom.soap11.SOAP11Factory().getDefaultEnvelope(); + element = new SOAP11Factory().getDefaultEnvelope(); //since we are setting an empty envelop to achieve the empty body, we have to set a different //content-type other than text/xml, application/soap+xml or any other content-type which will //invoke the soap builder, otherwise soap builder will get hit and an empty envelope From 6a4859182e1637545efb6ae49f35377284edaa4a Mon Sep 17 00:00:00 2001 From: Chamika Sudusinghe <44718392+chamikasudusinghe@users.noreply.github.com> Date: Tue, 20 Jun 2023 20:40:35 +0530 Subject: [PATCH 169/308] refactored the methods to get resources of apis Issue: wso2/api-manager#1564 --- .../main/java/org/apache/synapse/api/API.java | 28 +++----------- .../java/org/apache/synapse/api/ApiUtils.java | 37 ++++++++++++++++--- .../api/dispatch/DefaultDispatcher.java | 2 + .../dispatch/URITemplateBasedDispatcher.java | 5 ++- .../dispatch/URLMappingBasedDispatcher.java | 4 ++ .../apache/synapse/rest/RESTConstants.java | 1 + 6 files changed, 47 insertions(+), 30 deletions(-) diff --git a/modules/core/src/main/java/org/apache/synapse/api/API.java b/modules/core/src/main/java/org/apache/synapse/api/API.java index 78cfb298c6..2c59db3b47 100644 --- a/modules/core/src/main/java/org/apache/synapse/api/API.java +++ b/modules/core/src/main/java/org/apache/synapse/api/API.java @@ -246,6 +246,10 @@ public Resource[] getResources() { return resources.values().toArray(new Resource[resources.size()]); } + public Map getResourcesMap() { + return resources; + } + public void addHandler(Handler handler) { handlers.add(handler); } @@ -443,12 +447,7 @@ public void process(MessageContext synCtx) { msgCtx.getIncomingTransportName() + "://" + hostHeader); } - Set acceptableResources = new LinkedHashSet(); - for (Resource r : resources.values()) { - if (isBound(r, synCtx) && r.canProcess(synCtx)) { - acceptableResources.add(r); - } - } + Set acceptableResources = ApiUtils.getAcceptableResources(resources, synCtx); boolean processed = false; if (!acceptableResources.isEmpty()) { @@ -530,23 +529,6 @@ private void handleMethodNotAllowed(MessageContext synCtx) { } - /** - * Checks whether the provided resource is capable of processing the message from the provided message context. - * The resource becomes capable to do this when the it contains either the name of the api caller, - * or {@value ApiConstants#DEFAULT_BINDING_ENDPOINT_NAME}, in its binds-to. - * - * @param resource Resource object - * @param synCtx MessageContext object - * @return Whether the provided resource is bound to the provided message context - */ - private boolean isBound(Resource resource, MessageContext synCtx) { - Collection bindings = resource.getBindsTo(); - Object apiCaller = synCtx.getProperty(ApiConstants.API_CALLER); - if (apiCaller != null) { - return bindings.contains(apiCaller.toString()); - } - return bindings.contains(ApiConstants.DEFAULT_BINDING_ENDPOINT_NAME); - } /** * Helper method to use when no matching resource found diff --git a/modules/core/src/main/java/org/apache/synapse/api/ApiUtils.java b/modules/core/src/main/java/org/apache/synapse/api/ApiUtils.java index 03f87607c0..a7a6ecde00 100644 --- a/modules/core/src/main/java/org/apache/synapse/api/ApiUtils.java +++ b/modules/core/src/main/java/org/apache/synapse/api/ApiUtils.java @@ -39,8 +39,7 @@ import java.net.URISyntaxException; import java.net.URL; import java.net.URLDecoder; -import java.util.ArrayList; -import java.util.List; +import java.util.*; public class ApiUtils { @@ -158,6 +157,34 @@ public static String getSubRequestPath(MessageContext synCtx) { return (String) synCtx.getProperty(RESTConstants.REST_SUB_REQUEST_PATH); } + /** + * Checks whether the provided resource is capable of processing the message from the provided message context. + * The resource becomes capable to do this when the it contains either the name of the api caller, + * or {@value ApiConstants#DEFAULT_BINDING_ENDPOINT_NAME}, in its binds-to. + * + * @param resource Resource object + * @param synCtx MessageContext object + * @return Whether the provided resource is bound to the provided message context + */ + public static boolean isBound(Resource resource, MessageContext synCtx) { + Collection bindings = resource.getBindsTo(); + Object apiCaller = synCtx.getProperty(ApiConstants.API_CALLER); + if (apiCaller != null) { + return bindings.contains(apiCaller.toString()); + } + return bindings.contains(ApiConstants.DEFAULT_BINDING_ENDPOINT_NAME); + } + + public static Set getAcceptableResources(Map resources, MessageContext synCtx) { + Set acceptableResources = new LinkedHashSet(); + for (Resource r : resources.values()) { + if (isBound(r, synCtx) && r.canProcess(synCtx)) { + acceptableResources.add(r); + } + } + return acceptableResources; + } + public static List getDispatchers() { return dispatchers; } @@ -177,10 +204,10 @@ private static void handleException(String msg, Throwable t) { * and false if the two values don't match */ public static boolean matchApiPath(String path, String context) { - if (!path.startsWith(context + "/") && !path.startsWith(context + "?") && - !context.equals(path) && !"/".equals(context)) { + if (!path.startsWith(context + "/") && !path.startsWith(context + "?") + && !context.equals(path) && !"/".equals(context)) { return false; } return true; } -} +} \ No newline at end of file diff --git a/modules/core/src/main/java/org/apache/synapse/api/dispatch/DefaultDispatcher.java b/modules/core/src/main/java/org/apache/synapse/api/dispatch/DefaultDispatcher.java index b2ed6f41d1..58ccaa1598 100644 --- a/modules/core/src/main/java/org/apache/synapse/api/dispatch/DefaultDispatcher.java +++ b/modules/core/src/main/java/org/apache/synapse/api/dispatch/DefaultDispatcher.java @@ -20,6 +20,7 @@ import org.apache.synapse.MessageContext; import org.apache.synapse.api.Resource; +import org.apache.synapse.rest.RESTConstants; import java.util.Collection; @@ -28,6 +29,7 @@ public class DefaultDispatcher implements RESTDispatcher { public Resource findResource(MessageContext synCtx, Collection resources) { for (Resource resource : resources) { if (resource.getDispatcherHelper() == null) { + synCtx.setProperty(RESTConstants.SELECTED_RESOURCE, resource); return resource; } } diff --git a/modules/core/src/main/java/org/apache/synapse/api/dispatch/URITemplateBasedDispatcher.java b/modules/core/src/main/java/org/apache/synapse/api/dispatch/URITemplateBasedDispatcher.java index 27f77ff24f..007e684747 100644 --- a/modules/core/src/main/java/org/apache/synapse/api/dispatch/URITemplateBasedDispatcher.java +++ b/modules/core/src/main/java/org/apache/synapse/api/dispatch/URITemplateBasedDispatcher.java @@ -35,12 +35,13 @@ public Resource findResource(MessageContext synCtx, Collection resourc DispatcherHelper helper = r.getDispatcherHelper(); if (helper instanceof URITemplateHelper) { URITemplateHelper templateHelper = (URITemplateHelper) helper; - Map variables = new HashMap(); + Map variables = new HashMap(); if (templateHelper.getUriTemplate().matches(url, variables)) { - for (Map.Entry entry : variables.entrySet()) { + for (Map.Entry entry : variables.entrySet()) { synCtx.setProperty(RESTConstants.REST_URI_VARIABLE_PREFIX + entry.getKey(), entry.getValue()); } + synCtx.setProperty(RESTConstants.SELECTED_RESOURCE, r); return r; } } diff --git a/modules/core/src/main/java/org/apache/synapse/api/dispatch/URLMappingBasedDispatcher.java b/modules/core/src/main/java/org/apache/synapse/api/dispatch/URLMappingBasedDispatcher.java index 5a45551b6b..6a0e2639df 100644 --- a/modules/core/src/main/java/org/apache/synapse/api/dispatch/URLMappingBasedDispatcher.java +++ b/modules/core/src/main/java/org/apache/synapse/api/dispatch/URLMappingBasedDispatcher.java @@ -23,6 +23,7 @@ import org.apache.synapse.MessageContext; import org.apache.synapse.api.ApiUtils; import org.apache.synapse.api.Resource; +import org.apache.synapse.rest.RESTConstants; import java.util.ArrayList; import java.util.Collection; @@ -55,6 +56,7 @@ public Resource findResource(MessageContext synCtx, Collection resourc if (log.isDebugEnabled()) { log.debug("Found exact URL match for: " + url); } + synCtx.setProperty(RESTConstants.SELECTED_RESOURCE, filteredResources.get(i)); return filteredResources.get(i); } } @@ -72,6 +74,7 @@ public Resource findResource(MessageContext synCtx, Collection resourc if (log.isDebugEnabled()) { log.debug("Found path match for: " + url + " with matching length: " + maxLength); } + synCtx.setProperty(RESTConstants.SELECTED_RESOURCE, matchedResource); return matchedResource; } @@ -80,6 +83,7 @@ public Resource findResource(MessageContext synCtx, Collection resourc if (log.isDebugEnabled()) { log.debug("Found extension match for: " + url); } + synCtx.setProperty(RESTConstants.SELECTED_RESOURCE, filteredResources.get(i)); return filteredResources.get(i); } } diff --git a/modules/core/src/main/java/org/apache/synapse/rest/RESTConstants.java b/modules/core/src/main/java/org/apache/synapse/rest/RESTConstants.java index 8c41f33b3c..3dbda87712 100644 --- a/modules/core/src/main/java/org/apache/synapse/rest/RESTConstants.java +++ b/modules/core/src/main/java/org/apache/synapse/rest/RESTConstants.java @@ -91,5 +91,6 @@ public static enum METHODS { */ public static final String IS_PROMETHEUS_ENGAGED = "IS_PROMETHEUS_ENGAGED"; public static final String PROCESSED_API = "PROCESSED_API"; + public static final String SELECTED_RESOURCE = "SELECTED_RESOURCE"; } From 23c60201f0315a4b08d13efeea7742adfb16cf8b Mon Sep 17 00:00:00 2001 From: Chamika Sudusinghe <44718392+chamikasudusinghe@users.noreply.github.com> Date: Thu, 22 Jun 2023 10:26:51 +0530 Subject: [PATCH 170/308] util to identify the selected api --- .../java/org/apache/synapse/api/ApiUtils.java | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/modules/core/src/main/java/org/apache/synapse/api/ApiUtils.java b/modules/core/src/main/java/org/apache/synapse/api/ApiUtils.java index a7a6ecde00..784fff4577 100644 --- a/modules/core/src/main/java/org/apache/synapse/api/ApiUtils.java +++ b/modules/core/src/main/java/org/apache/synapse/api/ApiUtils.java @@ -25,6 +25,9 @@ import org.apache.synapse.MessageContext; import org.apache.synapse.SynapseConstants; import org.apache.synapse.SynapseException; +import org.apache.synapse.api.version.ContextVersionStrategy; +import org.apache.synapse.api.version.DefaultStrategy; +import org.apache.synapse.api.version.URLBasedVersionStrategy; import org.apache.synapse.core.axis2.Axis2MessageContext; import org.apache.synapse.rest.RESTConstants; import org.apache.synapse.api.dispatch.DefaultDispatcher; @@ -185,6 +188,66 @@ public static Set getAcceptableResources(Map resourc return acceptableResources; } + public static API getSelectedAPI(MessageContext synCtx) { + API selectedApi; + API defaultAPI = null; + //getting the API collection from the synapse configuration to find the invoked API + Collection apiSet = synCtx.getEnvironment().getSynapseConfiguration().getAPIs(); + //Since swapping elements are not possible with sets, Collection is converted to a List + List defaultStrategyApiSet = new ArrayList(apiSet); + //To avoid apiSet being modified concurrently + List duplicateApiSet = new ArrayList<>(apiSet); + //identiy the api using canProcess method + for (API api : duplicateApiSet) { + if (identifySelectedAPI(api, synCtx, defaultStrategyApiSet)) { + selectedApi = api; + return selectedApi; + } + } + for (API api : defaultStrategyApiSet) { + api.setLogSetterValue(); + if (api.canProcess(synCtx)) { + if (log.isDebugEnabled()) { + log.debug("Located specific API: " + api.getName() + " for processing message"); + } + selectedApi = api; + return selectedApi; + } + } + if (defaultAPI != null && defaultAPI.canProcess(synCtx)) { + defaultAPI.setLogSetterValue(); + return defaultAPI; + } + return null; + } + + public static boolean identifySelectedAPI(API api, MessageContext synCtx, List defaultStrategyApiSet) { + API defaultAPI = null; + api.setLogSetterValue(); + if ("/".equals(api.getContext())) { + defaultAPI = api; + } else if (api.getVersionStrategy().getClass().getName().equals(DefaultStrategy.class.getName())) { + //APIs whose VersionStrategy is bound to an instance of DefaultStrategy, should be skipped and processed at + // last.Otherwise they will be always chosen to process the request without matching the version. + defaultStrategyApiSet.add(api); + } else if (api.getVersionStrategy().getClass().getName().equals(ContextVersionStrategy.class.getName()) + || api.getVersionStrategy().getClass().getName().equals(URLBasedVersionStrategy.class.getName())) { + api.setLogSetterValue(); + if (api.canProcess(synCtx)) { + if (log.isDebugEnabled()) { + log.debug("Located specific API: " + api.getName() + " for processing message"); + } + return true; + } + } else if (api.canProcess(synCtx)) { + if (log.isDebugEnabled()) { + log.debug("Located specific API: " + api.getName() + " for processing message"); + } + return true; + } + return false; + } + public static List getDispatchers() { return dispatchers; } From 11dca3a21f181ea4a62868addea9de0304a3caaa Mon Sep 17 00:00:00 2001 From: tharikaGitHub Date: Thu, 22 Feb 2024 20:10:25 +0530 Subject: [PATCH 171/308] Remove wild card import --- .../src/main/java/org/apache/synapse/api/ApiUtils.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/synapse/api/ApiUtils.java b/modules/core/src/main/java/org/apache/synapse/api/ApiUtils.java index 784fff4577..bf688bb79d 100644 --- a/modules/core/src/main/java/org/apache/synapse/api/ApiUtils.java +++ b/modules/core/src/main/java/org/apache/synapse/api/ApiUtils.java @@ -42,7 +42,12 @@ import java.net.URISyntaxException; import java.net.URL; import java.net.URLDecoder; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Map; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; public class ApiUtils { From de060776662a8927e060f7ce1c049a2423a68fa9 Mon Sep 17 00:00:00 2001 From: malakaganga Date: Fri, 23 Feb 2024 17:08:59 +0530 Subject: [PATCH 172/308] Fix not sending fault response when Endpoint TO While reading the request if a endpoint time out happens the fault sequence response is not written to the back end. The reason for this is the thread is remaining actively in SourceHandler inputReady method while reading request when timeout happens so it would never hit responseReady method until the thread is released. So I achieved that by suspending the input when timeout happens. Also important aspect here is that this is a error scenario since we haven't read input completely hence haven't sent request data completely hence we need to avoid returning the buffers to the buffer factory as well. Fixes: https://github.com/wso2/api-manager/issues/2499 imp2 --- .../synapse/core/axis2/TimeoutHandler.java | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/modules/core/src/main/java/org/apache/synapse/core/axis2/TimeoutHandler.java b/modules/core/src/main/java/org/apache/synapse/core/axis2/TimeoutHandler.java index afa6982932..f79ff00131 100644 --- a/modules/core/src/main/java/org/apache/synapse/core/axis2/TimeoutHandler.java +++ b/modules/core/src/main/java/org/apache/synapse/core/axis2/TimeoutHandler.java @@ -24,6 +24,7 @@ import org.apache.axis2.description.TransportOutDescription; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.http.nio.NHttpServerConnection; import org.apache.synapse.FaultHandler; import org.apache.synapse.MessageContext; import org.apache.synapse.ServerContextInformation; @@ -36,6 +37,9 @@ import org.apache.synapse.commons.logger.ContextAwareLogger; import org.apache.synapse.rest.RESTConstants; import org.apache.synapse.transport.passthru.PassThroughConstants; +import org.apache.synapse.transport.passthru.ProtocolState; +import org.apache.synapse.transport.passthru.SourceContext; +import org.apache.synapse.transport.passthru.TargetContext; import org.apache.synapse.transport.passthru.config.PassThroughConfiguration; import org.apache.synapse.util.ConcurrencyThrottlingUtils; @@ -119,7 +123,7 @@ private void processCallbacks() { if (callbackStore.size() > 0) { long currentTime = currentTime(); - + boolean closeSocketOnEndpointTimeout = false; List toRemove = new ArrayList(); for (Object key : callbackStore.keySet()) { @@ -175,6 +179,27 @@ private void processCallbacks() { SynapseConstants.HANDLER_TIME_OUT); msgContext.setProperty(SynapseConstants.ERROR_MESSAGE, SEND_TIMEOUT_MESSAGE); + NHttpServerConnection sourceConn = (NHttpServerConnection) axis2MessageContext. + getProperty(PassThroughConstants.PASS_THROUGH_SOURCE_CONNECTION); + if (sourceConn != null && SourceContext.get(sourceConn).getState() + != ProtocolState.REQUEST_DONE) { + //Suspend input to avoid invoking input ready method and set this property here + //to avoid invoking the input ready method, while fault response is mediating through + //the mediation since we have set REQUEST_DONE state in SourceHandler responseReady + // method + sourceConn.suspendInput(); + SourceContext sourceContext = (SourceContext) sourceConn.getContext().getAttribute + (TargetContext.CONNECTION_INFORMATION); + if (sourceContext != null) { + sourceContext.setIsSourceRequestMarkedToBeDiscarded(true); + } + // This is to gurantee that the connection is closed after the response is sent and + // not to release the buffer to the factory + SourceContext.get(sourceConn).setShutDown(true); + + // We have to close the target connection since the request is invalid + closeSocketOnEndpointTimeout = true; + } /* Clear the NO_KEEPALIVE property to prevent closing response connection when going through the fault sequence due to end point time out. Since the axis2 message context used here @@ -257,7 +282,7 @@ private void processCallbacks() { if (RuntimeStatisticCollector.isStatisticsEnabled()) { CallbackStatisticCollector.callbackCompletionEvent(callback.getSynapseOutMsgCtx(), (String) key); } - if (conf.isCloseSocketOnEndpointTimeout()) { + if (closeSocketOnEndpointTimeout || conf.isCloseSocketOnEndpointTimeout()) { TransportOutDescription transportOut = callback.getAxis2OutMsgCtx().getTransportOut(); if (transportOut != null && transportOut.getSender() != null) { // Call the TransportSender's onAppError method to release any resources From 9c40da905d9aff1122111795a1b2d5bc681a2038 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 26 Feb 2024 09:51:35 +0000 Subject: [PATCH 173/308] [WSO2 Release] [Jenkins #6873] [Release 4.0.0-wso2v91] prepare release v4.0.0-wso2v91 --- 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 8db3e2afc3..bcef31c642 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v91-SNAPSHOT + 4.0.0-wso2v91 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index cb86acb4fe..78cde25a41 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v91-SNAPSHOT + 4.0.0-wso2v91 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index a2bb9fce8b..d0fda8b747 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-wso2v91-SNAPSHOT + 4.0.0-wso2v91 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index c70b78bb58..d8750bdfed 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v91-SNAPSHOT + 4.0.0-wso2v91 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 52dc51fc1e..687df80aaf 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v91-SNAPSHOT + 4.0.0-wso2v91 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 0bcc9c2d6f..9ef7e48236 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v91-SNAPSHOT + 4.0.0-wso2v91 ../../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 28c85e74e8..aa8aaa87f6 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-wso2v91-SNAPSHOT + 4.0.0-wso2v91 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 dde7cdce52..f59a1999d7 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-wso2v91-SNAPSHOT + 4.0.0-wso2v91 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 276afdb734..8706b5f885 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-wso2v91-SNAPSHOT + 4.0.0-wso2v91 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 f90f2e313f..6b47bb25e3 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-wso2v91-SNAPSHOT + 4.0.0-wso2v91 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 f3207ae692..e448c42841 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-wso2v91-SNAPSHOT + 4.0.0-wso2v91 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 6b7725a32e..8d6dcbe603 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-wso2v91-SNAPSHOT + 4.0.0-wso2v91 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 9c3863443b..d0433259de 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-wso2v91-SNAPSHOT + 4.0.0-wso2v91 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 2202f1f0ce..6381d872e0 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v91-SNAPSHOT + 4.0.0-wso2v91 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 7765646f06..74b6871156 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v91-SNAPSHOT + 4.0.0-wso2v91 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index e84fec51c9..8507616602 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v91-SNAPSHOT + 4.0.0-wso2v91 ../../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-wso2v91 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 6ecfbcd9de..0e0c6e2f64 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v91-SNAPSHOT + 4.0.0-wso2v91 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index ba6ae0dc87..93e5d66373 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-wso2v91-SNAPSHOT + 4.0.0-wso2v91 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 77aabb6bf6..d775ead8e4 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-wso2v91-SNAPSHOT + 4.0.0-wso2v91 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 4fde0c3844..f13037da1d 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v91-SNAPSHOT + 4.0.0-wso2v91 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index b46f08b740..2b35d93b0e 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v91-SNAPSHOT + 4.0.0-wso2v91 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index bb6bafedfe..32748e0892 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v91-SNAPSHOT + 4.0.0-wso2v91 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 9f40dac77a..0fdfc5d88e 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v91-SNAPSHOT + 4.0.0-wso2v91 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 7560c7922f..8c8f946a28 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-wso2v91-SNAPSHOT + 4.0.0-wso2v91 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 239023792c..8a8ac92f65 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-wso2v91-SNAPSHOT + 4.0.0-wso2v91 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 06d97e10ee..07328b42f3 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-wso2v91-SNAPSHOT + 4.0.0-wso2v91 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 3c96b42407..c0a8ec2f7a 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-wso2v91-SNAPSHOT + 4.0.0-wso2v91 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 7a58b6fd49..a851f078e4 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v91-SNAPSHOT + 4.0.0-wso2v91 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 3719e12ed6..dc82c152dd 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v91-SNAPSHOT + 4.0.0-wso2v91 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 07dd9bf837..0270cea2c3 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-wso2v91-SNAPSHOT + 4.0.0-wso2v91 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 38161239c1..36393f8fe8 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v91-SNAPSHOT + 4.0.0-wso2v91 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-wso2v91 Apache Software Foundation From 0f4f8536e010ad63172ac36307ab5f462d94e173 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 26 Feb 2024 09:51:36 +0000 Subject: [PATCH 174/308] [WSO2 Release] [Jenkins #6873] [Release 4.0.0-wso2v91] 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 bcef31c642..fd1894cea6 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v91 + 4.0.0-wso2v92-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 78cde25a41..086f43ec2c 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v91 + 4.0.0-wso2v92-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index d0fda8b747..ff4e6f50f0 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-wso2v91 + 4.0.0-wso2v92-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index d8750bdfed..d18125e8b0 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v91 + 4.0.0-wso2v92-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 687df80aaf..8f60eea1b3 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v91 + 4.0.0-wso2v92-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 9ef7e48236..1333951546 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v91 + 4.0.0-wso2v92-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 aa8aaa87f6..d37bb531c2 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-wso2v91 + 4.0.0-wso2v92-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 f59a1999d7..f8ff772443 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-wso2v91 + 4.0.0-wso2v92-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 8706b5f885..9074b4a54f 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-wso2v91 + 4.0.0-wso2v92-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 6b47bb25e3..00e0de4ab6 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-wso2v91 + 4.0.0-wso2v92-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 e448c42841..6c1048f90a 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-wso2v91 + 4.0.0-wso2v92-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 8d6dcbe603..87981d6a6d 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-wso2v91 + 4.0.0-wso2v92-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 d0433259de..0fee63d795 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-wso2v91 + 4.0.0-wso2v92-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 6381d872e0..87b092e9a3 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v91 + 4.0.0-wso2v92-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 74b6871156..a32df5882f 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v91 + 4.0.0-wso2v92-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 8507616602..74754b6b31 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v91 + 4.0.0-wso2v92-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-wso2v91 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 0e0c6e2f64..124a23ff39 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v91 + 4.0.0-wso2v92-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 93e5d66373..097cd5fa58 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-wso2v91 + 4.0.0-wso2v92-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index d775ead8e4..fe4fb322f5 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-wso2v91 + 4.0.0-wso2v92-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index f13037da1d..d7b9f6bf4c 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v91 + 4.0.0-wso2v92-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 2b35d93b0e..2aebc5c5e4 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v91 + 4.0.0-wso2v92-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 32748e0892..46d2ecb146 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v91 + 4.0.0-wso2v92-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 0fdfc5d88e..0eeb2f94ba 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v91 + 4.0.0-wso2v92-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 8c8f946a28..576bcab027 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-wso2v91 + 4.0.0-wso2v92-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 8a8ac92f65..729d29b7d0 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-wso2v91 + 4.0.0-wso2v92-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 07328b42f3..21b8ccce42 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-wso2v91 + 4.0.0-wso2v92-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index c0a8ec2f7a..2adcd1caec 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-wso2v91 + 4.0.0-wso2v92-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index a851f078e4..9bdb448cb8 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v91 + 4.0.0-wso2v92-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index dc82c152dd..8d95451483 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v91 + 4.0.0-wso2v92-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 0270cea2c3..6c91aa86be 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-wso2v91 + 4.0.0-wso2v92-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 36393f8fe8..cecbca266c 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v91 + 4.0.0-wso2v92-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-wso2v91 + HEAD Apache Software Foundation From a73b51be5603002dc6c8f92ad9ee592da6dce448 Mon Sep 17 00:00:00 2001 From: malakaganga Date: Tue, 27 Feb 2024 11:40:41 +0530 Subject: [PATCH 175/308] Support disable cookies in blocking client The requirement is to disable cookies in blocking client. In order to do this, we will need support for Fixes: https://github.com/wso2/product-ei/issues/4430 --- .../message/senders/blocking/BlockingMsgSenderUtils.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/core/src/main/java/org/apache/synapse/message/senders/blocking/BlockingMsgSenderUtils.java b/modules/core/src/main/java/org/apache/synapse/message/senders/blocking/BlockingMsgSenderUtils.java index 395da3b1c8..0a33e14892 100644 --- a/modules/core/src/main/java/org/apache/synapse/message/senders/blocking/BlockingMsgSenderUtils.java +++ b/modules/core/src/main/java/org/apache/synapse/message/senders/blocking/BlockingMsgSenderUtils.java @@ -334,6 +334,8 @@ private static void setProperties(org.apache.axis2.context.MessageContext axisIn private static String[] allowedProperties = {"JSON_OBJECT", "JSON_STRING", + "FOLLOW_REDIRECT", + "DISABLE_COOKIE", "setCharacterEncoding", NhttpConstants.DISTRIBUTED_TRANSACTION, NhttpConstants.DISTRIBUTED_TRANSACTION_MANAGER, From 1af424bccb2a1c9824a52e51fffb7ea81025edb2 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 27 Feb 2024 10:51:04 +0000 Subject: [PATCH 176/308] [WSO2 Release] [Jenkins #6876] [Release 4.0.0-wso2v92] prepare release v4.0.0-wso2v92 --- 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 fd1894cea6..0fcc378c5d 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v92-SNAPSHOT + 4.0.0-wso2v92 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 086f43ec2c..91b0253143 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v92-SNAPSHOT + 4.0.0-wso2v92 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index ff4e6f50f0..22f4f0ac2d 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-wso2v92-SNAPSHOT + 4.0.0-wso2v92 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index d18125e8b0..4562fd8f85 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v92-SNAPSHOT + 4.0.0-wso2v92 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 8f60eea1b3..234b0632ba 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v92-SNAPSHOT + 4.0.0-wso2v92 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 1333951546..8dbc80a754 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v92-SNAPSHOT + 4.0.0-wso2v92 ../../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 d37bb531c2..c0ad670bd6 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-wso2v92-SNAPSHOT + 4.0.0-wso2v92 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 f8ff772443..4c481bc569 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-wso2v92-SNAPSHOT + 4.0.0-wso2v92 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 9074b4a54f..11aa257855 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-wso2v92-SNAPSHOT + 4.0.0-wso2v92 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 00e0de4ab6..9620e00fec 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-wso2v92-SNAPSHOT + 4.0.0-wso2v92 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 6c1048f90a..5e81e8cc7c 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-wso2v92-SNAPSHOT + 4.0.0-wso2v92 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 87981d6a6d..478f9e5827 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-wso2v92-SNAPSHOT + 4.0.0-wso2v92 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 0fee63d795..e668a0a90f 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-wso2v92-SNAPSHOT + 4.0.0-wso2v92 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 87b092e9a3..42c3009f58 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v92-SNAPSHOT + 4.0.0-wso2v92 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index a32df5882f..1b416e5233 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v92-SNAPSHOT + 4.0.0-wso2v92 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 74754b6b31..e34098ae14 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v92-SNAPSHOT + 4.0.0-wso2v92 ../../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-wso2v92 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 124a23ff39..acb08b4b9d 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v92-SNAPSHOT + 4.0.0-wso2v92 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 097cd5fa58..fa70ec75be 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-wso2v92-SNAPSHOT + 4.0.0-wso2v92 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index fe4fb322f5..43520a83f4 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-wso2v92-SNAPSHOT + 4.0.0-wso2v92 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index d7b9f6bf4c..b9e1b81b48 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v92-SNAPSHOT + 4.0.0-wso2v92 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 2aebc5c5e4..98ecd01e02 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v92-SNAPSHOT + 4.0.0-wso2v92 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 46d2ecb146..60f5f121b7 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v92-SNAPSHOT + 4.0.0-wso2v92 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 0eeb2f94ba..33c8c83c84 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v92-SNAPSHOT + 4.0.0-wso2v92 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 576bcab027..575a9f7800 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-wso2v92-SNAPSHOT + 4.0.0-wso2v92 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 729d29b7d0..3cbd298da4 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-wso2v92-SNAPSHOT + 4.0.0-wso2v92 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 21b8ccce42..74b077c5ef 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-wso2v92-SNAPSHOT + 4.0.0-wso2v92 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 2adcd1caec..543b2171ad 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-wso2v92-SNAPSHOT + 4.0.0-wso2v92 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 9bdb448cb8..a7a59f99b4 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v92-SNAPSHOT + 4.0.0-wso2v92 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 8d95451483..e76e9bb3f4 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v92-SNAPSHOT + 4.0.0-wso2v92 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 6c91aa86be..9e1b2656d8 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-wso2v92-SNAPSHOT + 4.0.0-wso2v92 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index cecbca266c..e88b48e56f 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v92-SNAPSHOT + 4.0.0-wso2v92 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-wso2v92 Apache Software Foundation From c29f0128cd831c237e855a9fc902357c1ccc0955 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Tue, 27 Feb 2024 10:51:06 +0000 Subject: [PATCH 177/308] [WSO2 Release] [Jenkins #6876] [Release 4.0.0-wso2v92] 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 0fcc378c5d..db7b24fae5 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v92 + 4.0.0-wso2v93-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 91b0253143..a7ec1d0e0f 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v92 + 4.0.0-wso2v93-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 22f4f0ac2d..80ffe1977a 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-wso2v92 + 4.0.0-wso2v93-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 4562fd8f85..8d16435a85 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v92 + 4.0.0-wso2v93-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 234b0632ba..106c602f75 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v92 + 4.0.0-wso2v93-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 8dbc80a754..b2419d6778 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v92 + 4.0.0-wso2v93-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 c0ad670bd6..b582e6b926 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-wso2v92 + 4.0.0-wso2v93-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 4c481bc569..718db2fbaa 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-wso2v92 + 4.0.0-wso2v93-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 11aa257855..e35f399a1b 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-wso2v92 + 4.0.0-wso2v93-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 9620e00fec..7a887d6c34 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-wso2v92 + 4.0.0-wso2v93-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 5e81e8cc7c..b56d69bb2d 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-wso2v92 + 4.0.0-wso2v93-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 478f9e5827..ef38922ef7 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-wso2v92 + 4.0.0-wso2v93-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 e668a0a90f..c25fb50582 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-wso2v92 + 4.0.0-wso2v93-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 42c3009f58..be79b6c30d 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v92 + 4.0.0-wso2v93-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 1b416e5233..88cb9d7062 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v92 + 4.0.0-wso2v93-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index e34098ae14..b3b1960448 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v92 + 4.0.0-wso2v93-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-wso2v92 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index acb08b4b9d..5c10a2c7d4 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v92 + 4.0.0-wso2v93-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index fa70ec75be..4c5ff96093 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-wso2v92 + 4.0.0-wso2v93-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 43520a83f4..d907f8014b 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-wso2v92 + 4.0.0-wso2v93-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index b9e1b81b48..901616e5c3 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v92 + 4.0.0-wso2v93-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 98ecd01e02..8ed205ded3 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v92 + 4.0.0-wso2v93-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 60f5f121b7..c94584a525 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v92 + 4.0.0-wso2v93-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 33c8c83c84..b1f9ca024a 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v92 + 4.0.0-wso2v93-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 575a9f7800..6fd4bf0198 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-wso2v92 + 4.0.0-wso2v93-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 3cbd298da4..52de7a1bc7 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-wso2v92 + 4.0.0-wso2v93-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 74b077c5ef..142503e0e0 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-wso2v92 + 4.0.0-wso2v93-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 543b2171ad..7ef51cdc59 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-wso2v92 + 4.0.0-wso2v93-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index a7a59f99b4..35a52b8530 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v92 + 4.0.0-wso2v93-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index e76e9bb3f4..92b336aecd 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v92 + 4.0.0-wso2v93-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 9e1b2656d8..e531ec1f08 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-wso2v92 + 4.0.0-wso2v93-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index e88b48e56f..58ad9959b5 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v92 + 4.0.0-wso2v93-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-wso2v92 + HEAD Apache Software Foundation From c8b0473113c9ba1b2a8e7ab48e50b0edbcb12ef1 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 28 Feb 2024 08:31:53 +0000 Subject: [PATCH 178/308] [WSO2 Release] [Jenkins #6879] [Release 4.0.0-wso2v93] prepare release v4.0.0-wso2v93 --- 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 db7b24fae5..086eef2ebd 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v93-SNAPSHOT + 4.0.0-wso2v93 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index a7ec1d0e0f..88ca427ba5 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v93-SNAPSHOT + 4.0.0-wso2v93 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 80ffe1977a..e6f934b320 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-wso2v93-SNAPSHOT + 4.0.0-wso2v93 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 8d16435a85..18b2e806a5 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v93-SNAPSHOT + 4.0.0-wso2v93 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 106c602f75..fe59e84c4a 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v93-SNAPSHOT + 4.0.0-wso2v93 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index b2419d6778..8cf488beae 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v93-SNAPSHOT + 4.0.0-wso2v93 ../../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 b582e6b926..445e76c515 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-wso2v93-SNAPSHOT + 4.0.0-wso2v93 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 718db2fbaa..9a50886124 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-wso2v93-SNAPSHOT + 4.0.0-wso2v93 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 e35f399a1b..da75bf5779 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-wso2v93-SNAPSHOT + 4.0.0-wso2v93 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 7a887d6c34..595d323307 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-wso2v93-SNAPSHOT + 4.0.0-wso2v93 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 b56d69bb2d..d6d3be59b4 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-wso2v93-SNAPSHOT + 4.0.0-wso2v93 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 ef38922ef7..01bd5ed71d 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-wso2v93-SNAPSHOT + 4.0.0-wso2v93 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 c25fb50582..bd20053385 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-wso2v93-SNAPSHOT + 4.0.0-wso2v93 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index be79b6c30d..fad8641877 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v93-SNAPSHOT + 4.0.0-wso2v93 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 88cb9d7062..a1568638a5 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v93-SNAPSHOT + 4.0.0-wso2v93 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index b3b1960448..c639559c38 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v93-SNAPSHOT + 4.0.0-wso2v93 ../../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-wso2v93 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 5c10a2c7d4..6c60345ec7 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v93-SNAPSHOT + 4.0.0-wso2v93 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 4c5ff96093..f42e893034 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-wso2v93-SNAPSHOT + 4.0.0-wso2v93 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index d907f8014b..5909d48950 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-wso2v93-SNAPSHOT + 4.0.0-wso2v93 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 901616e5c3..baf6ed7d62 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v93-SNAPSHOT + 4.0.0-wso2v93 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 8ed205ded3..e22aaa07ec 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v93-SNAPSHOT + 4.0.0-wso2v93 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index c94584a525..a0d276ac03 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v93-SNAPSHOT + 4.0.0-wso2v93 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index b1f9ca024a..4d1f6d2af2 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v93-SNAPSHOT + 4.0.0-wso2v93 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 6fd4bf0198..327f134c16 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-wso2v93-SNAPSHOT + 4.0.0-wso2v93 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 52de7a1bc7..83d65a634b 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-wso2v93-SNAPSHOT + 4.0.0-wso2v93 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 142503e0e0..7839acbc42 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-wso2v93-SNAPSHOT + 4.0.0-wso2v93 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 7ef51cdc59..d18a4f51c8 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-wso2v93-SNAPSHOT + 4.0.0-wso2v93 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 35a52b8530..a93574ce7b 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v93-SNAPSHOT + 4.0.0-wso2v93 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 92b336aecd..52f916d46d 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v93-SNAPSHOT + 4.0.0-wso2v93 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index e531ec1f08..2489869eea 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-wso2v93-SNAPSHOT + 4.0.0-wso2v93 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 58ad9959b5..1a6c95836f 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v93-SNAPSHOT + 4.0.0-wso2v93 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-wso2v93 Apache Software Foundation From e4a27d8ca6a5e7886c1f8e00ed479af0bdc549a6 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 28 Feb 2024 08:31:54 +0000 Subject: [PATCH 179/308] [WSO2 Release] [Jenkins #6879] [Release 4.0.0-wso2v93] 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 086eef2ebd..438d48e1f3 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v93 + 4.0.0-wso2v94-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 88ca427ba5..4af93fdd68 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v93 + 4.0.0-wso2v94-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index e6f934b320..4921007edb 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-wso2v93 + 4.0.0-wso2v94-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 18b2e806a5..9b8ddc4f9f 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v93 + 4.0.0-wso2v94-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index fe59e84c4a..8c3846b949 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v93 + 4.0.0-wso2v94-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 8cf488beae..15b81bb424 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v93 + 4.0.0-wso2v94-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 445e76c515..3c716b602f 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-wso2v93 + 4.0.0-wso2v94-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 9a50886124..edc62f2ab5 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-wso2v93 + 4.0.0-wso2v94-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 da75bf5779..d820fb81b8 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-wso2v93 + 4.0.0-wso2v94-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 595d323307..84bf80f08b 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-wso2v93 + 4.0.0-wso2v94-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 d6d3be59b4..65610e6173 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-wso2v93 + 4.0.0-wso2v94-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 01bd5ed71d..f99d5c2079 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-wso2v93 + 4.0.0-wso2v94-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 bd20053385..84931f9583 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-wso2v93 + 4.0.0-wso2v94-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index fad8641877..4f4c89e777 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v93 + 4.0.0-wso2v94-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index a1568638a5..dc0dbd17c7 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v93 + 4.0.0-wso2v94-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index c639559c38..9828b6280c 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v93 + 4.0.0-wso2v94-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-wso2v93 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 6c60345ec7..63817c4c56 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v93 + 4.0.0-wso2v94-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index f42e893034..e06f0abca7 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-wso2v93 + 4.0.0-wso2v94-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 5909d48950..f098b986aa 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-wso2v93 + 4.0.0-wso2v94-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index baf6ed7d62..b476e7b4d0 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v93 + 4.0.0-wso2v94-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index e22aaa07ec..2809307890 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v93 + 4.0.0-wso2v94-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index a0d276ac03..9060af4810 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v93 + 4.0.0-wso2v94-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 4d1f6d2af2..3e559ddb4b 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v93 + 4.0.0-wso2v94-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 327f134c16..3d3eb2992a 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-wso2v93 + 4.0.0-wso2v94-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 83d65a634b..fe5fc313f4 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-wso2v93 + 4.0.0-wso2v94-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 7839acbc42..43b3d5988f 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-wso2v93 + 4.0.0-wso2v94-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index d18a4f51c8..7c325d17ee 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-wso2v93 + 4.0.0-wso2v94-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index a93574ce7b..7abd7ee6ce 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v93 + 4.0.0-wso2v94-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 52f916d46d..ce4b905a37 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v93 + 4.0.0-wso2v94-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 2489869eea..8f2b3889fc 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-wso2v93 + 4.0.0-wso2v94-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 1a6c95836f..e7bab34f36 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v93 + 4.0.0-wso2v94-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-wso2v93 + HEAD Apache Software Foundation From 9f727fedbca886f63f31cff48798a52f8e30f28b Mon Sep 17 00:00:00 2001 From: tgtshanika Date: Thu, 29 Feb 2024 07:32:05 +0530 Subject: [PATCH 180/308] Upgrade zipkin, okhttp and okio --- modules/core/pom.xml | 2 +- .../features/org.apache.synapse.wso2.feature/pom.xml | 4 ++-- pom.xml | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 4af93fdd68..ad106d7c7c 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -458,7 +458,7 @@ okio - io.zipkin.reporter2 + org.wso2.orbit.io.zipkin.reporter2 zipkin-sender-okhttp3 diff --git a/modules/features/org.apache.synapse.wso2.feature/pom.xml b/modules/features/org.apache.synapse.wso2.feature/pom.xml index 84931f9583..f4d9deeaa6 100644 --- a/modules/features/org.apache.synapse.wso2.feature/pom.xml +++ b/modules/features/org.apache.synapse.wso2.feature/pom.xml @@ -161,9 +161,9 @@ org.wso2.orbit.com.squareup.okhttp:okhttp:${okhttp.wso2.version} org.wso2.orbit.com.squareup.okio:okio:${okio.wso2.version} - io.zipkin.reporter2:zipkin-sender-okhttp3:${zipkin.sender.okhttp3.version} + org.wso2.orbit.io.zipkin.reporter2:zipkin-sender-okhttp3:${zipkin.sender.okhttp3.version} - io.zipkin.reporter2:zipkin-reporter:${zipkin.sender.okhttp3.version} + io.zipkin.reporter2:zipkin-reporter:${zipkin-reporter.version} io.zipkin.zipkin2:zipkin:${zipkin.version} javax.annotation:javax.annotation-api diff --git a/pom.xml b/pom.xml index e7bab34f36..b5ecf1df58 100644 --- a/pom.xml +++ b/pom.xml @@ -1128,7 +1128,7 @@ ${zipkin-reporter.version} - io.zipkin.reporter2 + org.wso2.orbit.io.zipkin.reporter2 zipkin-sender-okhttp3 ${zipkin.sender.okhttp3.version} @@ -1590,11 +1590,11 @@ 1.1.1.wso2v3 5.20.0 1.11.0.wso2v6 - 4.9.3.wso2v2 - 2.8.0.wso2v2 - 2.16.3 - 2.23.2 - 2.16.3 + 4.12.0.wso2v1 + 3.6.0.wso2v1 + 3.3.0.wso2v1 + 2.27.1 + 3.3.0 1.3.2 1.2.4 0.11.3.wso2v1 From f83e20e4410a1bffec9d910c775ca99aff168c0c Mon Sep 17 00:00:00 2001 From: akila94 Date: Mon, 26 Feb 2024 09:47:55 +0530 Subject: [PATCH 181/308] Improve cert revocation validation --- .../CertificateVerificationManager.java | 287 ++++++++++++++++++ .../RevocationVerificationManager.java | 116 ------- .../cache/CertCache.java | 167 ++++++++++ .../certificatevalidation/crl/CRLCache.java | 4 +- .../certificatevalidation/ocsp/OCSPCache.java | 11 +- .../ocsp/OCSPVerifier.java | 93 +++--- .../http/conn/ClientSSLSetupHandler.java | 27 +- .../http/conn/ServerSSLSetupHandler.java | 15 +- .../config/ClientConnFactoryBuilder.java | 62 ++-- .../config/ServerConnFactoryBuilder.java | 121 ++++++-- .../nhttp/config/TrustStoreHolder.java | 62 ++++ .../PassThroughHttpMultiSSLListener.java | 8 +- .../passthru/PassThroughHttpSSLSender.java | 8 +- .../core/ssl/SSLServerConnFactoryBuilder.java | 7 +- .../CRLVerifierTest.java | 2 +- .../OCSPVerifierTest.java | 2 +- .../RevocationVerificationTest.java | 4 +- 17 files changed, 748 insertions(+), 248 deletions(-) create mode 100644 modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/CertificateVerificationManager.java delete mode 100644 modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationManager.java create mode 100644 modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/cache/CertCache.java create mode 100644 modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/TrustStoreHolder.java 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 new file mode 100644 index 0000000000..d138dce7a8 --- /dev/null +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/CertificateVerificationManager.java @@ -0,0 +1,287 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF 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.transport.certificatevalidation; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.synapse.transport.certificatevalidation.cache.CertCache; +import org.apache.synapse.transport.certificatevalidation.crl.CRLCache; +import org.apache.synapse.transport.certificatevalidation.crl.CRLVerifier; +import org.apache.synapse.transport.certificatevalidation.ocsp.OCSPCache; +import org.apache.synapse.transport.certificatevalidation.ocsp.OCSPVerifier; +import org.apache.synapse.transport.certificatevalidation.pathvalidation.CertificatePathValidator; +import org.apache.synapse.transport.nhttp.config.TrustStoreHolder; + +import java.io.ByteArrayInputStream; +import java.security.InvalidKeyException; +import java.security.KeyStore; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; +import java.security.SignatureException; +import java.security.cert.CertificateException; +import java.security.cert.CertificateExpiredException; +import java.security.cert.CertificateNotYetValidException; +import java.security.cert.X509Certificate; +import java.util.Arrays; +import java.util.Enumeration; +import java.util.Optional; + +/** + * Manager class responsible for verifying certificates. This class will use the available verifiers according to + * a predefined policy. + */ +public class CertificateVerificationManager { + + private int cacheSize = Constants.CACHE_DEFAULT_ALLOCATED_SIZE; + private int cacheDelayMins = Constants.CACHE_DEFAULT_DELAY_MINS; + private boolean isFullCertChainValidationEnabled = true; + private boolean isCertExpiryValidationEnabled = false; + private static final Log log = LogFactory.getLog(CertificateVerificationManager.class); + + public CertificateVerificationManager(Integer cacheAllocatedSize, Integer cacheDelayMins) { + + if (cacheAllocatedSize != null && cacheAllocatedSize > Constants.CACHE_MIN_ALLOCATED_SIZE + && cacheAllocatedSize < Constants.CACHE_MAX_ALLOCATED_SIZE) { + this.cacheSize = cacheAllocatedSize; + } else { + log.warn("The cache size is out of range. Hence, using the default cache size value of " + + Constants.CACHE_DEFAULT_ALLOCATED_SIZE + "."); + } + if (cacheDelayMins != null && cacheDelayMins > Constants.CACHE_MIN_DELAY_MINS + && cacheDelayMins < Constants.CACHE_MAX_DELAY_MINS) { + this.cacheDelayMins = cacheDelayMins; + } else { + log.warn("The cache delay is out of range. Hence, using the default cache delay value of " + + Constants.CACHE_DEFAULT_DELAY_MINS + "."); + } + } + + public CertificateVerificationManager(Integer cacheAllocatedSize, Integer cacheDelayMins, + boolean isFullCertChainValidationEnabled, + boolean isCertExpiryValidationEnabled) { + + if (cacheAllocatedSize != null && cacheAllocatedSize > Constants.CACHE_MIN_ALLOCATED_SIZE + && cacheAllocatedSize < Constants.CACHE_MAX_ALLOCATED_SIZE) { + this.cacheSize = cacheAllocatedSize; + } else { + log.warn("The cache size is out of range. Hence, using the default cache size value of " + + Constants.CACHE_DEFAULT_ALLOCATED_SIZE + "."); + } + if (cacheDelayMins != null && cacheDelayMins > Constants.CACHE_MIN_DELAY_MINS + && cacheDelayMins < Constants.CACHE_MAX_DELAY_MINS) { + this.cacheDelayMins = cacheDelayMins; + } else { + log.warn("The cache delay is out of range. Hence, using the default cache delay value of " + + Constants.CACHE_DEFAULT_DELAY_MINS + "."); + } + + this.isFullCertChainValidationEnabled = isFullCertChainValidationEnabled; + this.isCertExpiryValidationEnabled = isCertExpiryValidationEnabled; + } + + /** + * This method verifies the given certificate chain or given peer certificate for revocation based on the + * requirement of full certificate chain validation. If full chain validation is enabled (default), + * the full certificate chain will be validated before checking the chain for revocation. If full chain validation + * is disabled, this method expects a single peer certificate, and it is validated with the immediate issuer + * certificate in the truststore (The truststore must contain the immediate issuer of the peer certificate). + * In both cases, OCSP and CRL verifiers are used for revocation verification. + * 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. + * @throws CertificateVerificationException + */ + public void verifyCertificateValidity(javax.security.cert.X509Certificate[] peerCertificates) + throws CertificateVerificationException { + + X509Certificate[] convertedCertificates = convert(peerCertificates); + + Optional peerCertOpt; + X509Certificate peerCert = null; + X509Certificate issuerCert = null; + String alias; + + if (!isFullCertChainValidationEnabled) { + + if (log.isDebugEnabled()) { + log.debug("Retrieving the issuer certificate from client truststore since full certificate chain " + + "validation is disabled"); + } + + KeyStore trustStore = TrustStoreHolder.getInstance().getClientTrustStore(); + Enumeration aliases; + + // When full chain validation is disabled, only one cert is expected + peerCertOpt = Arrays.stream(convertedCertificates).findFirst(); + if (peerCertOpt.isPresent()) { + peerCert = peerCertOpt.get(); + } else { + throw new CertificateVerificationException("Peer certificate is not provided"); + } + + // Get cert cache and initialize it + CertCache certCache = CertCache.getCache(); + + if (certCache.getCacheValue(peerCert.getSerialNumber().toString()) == null) { + + try { + aliases = trustStore.aliases(); + } catch (KeyStoreException e) { + throw new CertificateVerificationException("Error while retrieving aliases from truststore", e); + } + + while (aliases.hasMoreElements()) { + + alias = aliases.nextElement(); + try { + issuerCert = (X509Certificate) trustStore.getCertificate(alias); + } catch (KeyStoreException e) { + throw new CertificateVerificationException("Unable to read the certificate from " + + "truststore with the alias: " + alias, e); + } + + if (issuerCert == null) { + throw new CertificateVerificationException("Issuer certificate not found in truststore"); + } + + try { + peerCert.verify(issuerCert.getPublicKey()); + + log.debug("Valid issuer certificate found in the client truststore. Caching.."); + + // Store the valid issuer cert in cache for future use + certCache.setCacheValue(peerCert.getSerialNumber().toString(), issuerCert); + if (log.isDebugEnabled()) { + log.debug("Issuer certificate with serial number: " + issuerCert.getSerialNumber() + .toString() + " has been cached against the serial number: " + peerCert + .getSerialNumber().toString() + " of the peer certificate."); + } + break; + } catch (SignatureException | CertificateException | NoSuchAlgorithmException | + InvalidKeyException | NoSuchProviderException e) { + // Unable to verify the signature. Check with the next certificate in the next loop traversal. + } + } + } else { + X509Certificate cachedIssuerCert = certCache.getCacheValue(peerCert.getSerialNumber().toString()); + try { + peerCert.verify(cachedIssuerCert.getPublicKey()); + } catch (SignatureException | CertificateException | NoSuchAlgorithmException | + InvalidKeyException | + NoSuchProviderException e) { + // Unable to verify the signature. + throw new CertificateVerificationException("Unable to verify the signature of the certificate."); + } + } + } + + OCSPCache ocspCache = OCSPCache.getCache(cacheSize, cacheDelayMins); + CRLCache crlCache = CRLCache.getCache(cacheSize, cacheDelayMins); + + RevocationVerifier[] verifiers = {new OCSPVerifier(ocspCache), new CRLVerifier(crlCache)}; + + for (RevocationVerifier verifier : verifiers) { + try { + if (isFullCertChainValidationEnabled) { + + if (isCertExpiryValidationEnabled) { + log.debug("Validating certificate chain for expiry"); + if (isExpired(convertedCertificates)) { + throw new CertificateVerificationException("One of the provided certificates are expired"); + } + } + + log.debug("Doing full certificate chain validation"); + CertificatePathValidator pathValidator = new CertificatePathValidator(convertedCertificates, + verifier); + pathValidator.validatePath(); + } else { + + if (isCertExpiryValidationEnabled) { + log.debug("Validating the client certificate for expiry"); + if (isExpired(convertedCertificates)) { + throw new CertificateVerificationException("The provided certificate is expired"); + } + } + + log.debug("Validating client certificate with the issuer certificate retrieved from" + + "the trust store"); + verifier.checkRevocationStatus(peerCert, issuerCert); + } + return; + } catch (Exception e) { + log.debug("Certificate verification with " + verifier.getClass().getSimpleName() + " failed. ", e); + } + } + throw new CertificateVerificationException("Path Verification Failed for both OCSP and CRL"); + } + + /** + * @param certs array of javax.security.cert.X509Certificate[] s. + * @return the converted array of java.security.cert.X509Certificate[] s. + * @throws CertificateVerificationException + */ + private X509Certificate[] convert(javax.security.cert.X509Certificate[] certs) + throws CertificateVerificationException { + X509Certificate[] certChain = new X509Certificate[certs.length]; + Throwable exceptionThrown; + for (int i = 0; i < certs.length; i++) { + try { + byte[] encoded = certs[i].getEncoded(); + ByteArrayInputStream bis = new ByteArrayInputStream(encoded); + java.security.cert.CertificateFactory cf + = 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) { + exceptionThrown = e; + } + throw new CertificateVerificationException("Cant Convert certificates from javax to java", exceptionThrown); + } + return certChain; + } + + /** + * Checks whether a provided certificate is expired or not at the time it is validated. + * + * @param certificates certificates to be validated for expiry + * @return true if one of the certs are expired, false otherwise + */ + public boolean isExpired(X509Certificate[] certificates) { + + for (X509Certificate cert : certificates) { + try { + cert.checkValidity(); + } catch (CertificateExpiredException e) { + log.error("Peer certificate is expired"); + return true; + } catch (CertificateNotYetValidException e) { + log.error("Peer certificate is not valid yet"); + return true; + } + } + return false; + } +} \ No newline at end of file diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationManager.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationManager.java deleted file mode 100644 index 338b8a8a36..0000000000 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationManager.java +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF 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.transport.certificatevalidation; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.synapse.transport.certificatevalidation.crl.CRLCache; -import org.apache.synapse.transport.certificatevalidation.crl.CRLVerifier; -import org.apache.synapse.transport.certificatevalidation.ocsp.OCSPCache; -import org.apache.synapse.transport.certificatevalidation.ocsp.OCSPVerifier; -import org.apache.synapse.transport.certificatevalidation.pathvalidation.CertificatePathValidator; - -import java.io.ByteArrayInputStream; -import java.security.cert.X509Certificate; - -/** - * Manager class responsible for verifying certificates. This class will use the available verifiers according to - * a predefined policy. - */ -public class RevocationVerificationManager { - - private int cacheSize = Constants.CACHE_DEFAULT_ALLOCATED_SIZE; - private int cacheDelayMins = Constants.CACHE_DEFAULT_DELAY_MINS; - private static final Log log = LogFactory.getLog(RevocationVerificationManager.class); - - public RevocationVerificationManager(Integer cacheAllocatedSize, Integer cacheDelayMins) { - - if (cacheAllocatedSize != null && cacheAllocatedSize > Constants.CACHE_MIN_ALLOCATED_SIZE - && cacheAllocatedSize < Constants.CACHE_MAX_ALLOCATED_SIZE) { - this.cacheSize = cacheAllocatedSize; - } - if (cacheDelayMins != null && cacheDelayMins > Constants.CACHE_MIN_DELAY_MINS - && cacheDelayMins < Constants.CACHE_MAX_DELAY_MINS) { - this.cacheDelayMins = cacheDelayMins; - } - } - - /** - * This method first tries to verify the given certificate chain 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. - * @throws CertificateVerificationException - */ - public void verifyRevocationStatus(javax.security.cert.X509Certificate[] peerCertificates) - throws CertificateVerificationException { - - X509Certificate[] convertedCertificates = convert(peerCertificates); - - long start = System.currentTimeMillis(); - - OCSPCache ocspCache = OCSPCache.getCache(); - ocspCache.init(cacheSize, cacheDelayMins); - CRLCache crlCache = CRLCache.getCache(); - crlCache.init(cacheSize, cacheDelayMins); - - RevocationVerifier[] verifiers = {new OCSPVerifier(ocspCache), new CRLVerifier(crlCache)}; - - for (RevocationVerifier verifier : verifiers) { - try { - CertificatePathValidator pathValidator = new CertificatePathValidator(convertedCertificates, verifier); - pathValidator.validatePath(); - log.info("Path verification Successful. Took " + (System.currentTimeMillis() - start) + " ms."); - return; - } catch (Exception e) { - log.info(verifier.getClass().getSimpleName() + " failed."); - log.debug("Certificate verification with " + verifier.getClass().getSimpleName() + " failed. ", e); - } - } - throw new CertificateVerificationException("Path Verification Failed for both OCSP and CRL"); - } - - /** - * @param certs array of javax.security.cert.X509Certificate[] s. - * @return the converted array of java.security.cert.X509Certificate[] s. - * @throws CertificateVerificationException - */ - private X509Certificate[] convert(javax.security.cert.X509Certificate[] certs) - throws CertificateVerificationException { - X509Certificate[] certChain = new X509Certificate[certs.length]; - Throwable exceptionThrown; - for (int i = 0; i < certs.length; i++) { - try { - byte[] encoded = certs[i].getEncoded(); - ByteArrayInputStream bis = new ByteArrayInputStream(encoded); - java.security.cert.CertificateFactory cf - = 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) { - exceptionThrown = e; - } - throw new CertificateVerificationException("Cant Convert certificates from javax to java", exceptionThrown); - } - return certChain; - } -} diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/cache/CertCache.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/cache/CertCache.java new file mode 100644 index 0000000000..36772385b4 --- /dev/null +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/cache/CertCache.java @@ -0,0 +1,167 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF 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.transport.certificatevalidation.cache; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.synapse.transport.certificatevalidation.Constants; + +import java.security.cert.X509Certificate; +import java.util.Iterator; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +/** + * This is a cache to store a certificate against a unique string (can be a serial number). This is a singleton since + * more than one cache of this kind should not be allowed. This cache can be used by any place where certificate + * caching is needed. + */ +public class CertCache implements ManageableCache { + + private static volatile CertCache cache; + private static volatile Map hashMap = new ConcurrentHashMap(); + private static volatile Iterator> iterator = hashMap.entrySet().iterator(); + private static volatile CacheManager cacheManager; + private static final Log log = LogFactory.getLog(CertCache.class); + + private CertCache() { + } + + public static CertCache getCache() { + //Double-checked locking + if (cache == null) { + synchronized (CertCache.class) { + if (cache == null) { + cache = new CertCache(); + cacheManager = new CacheManager(cache, Constants.CACHE_DEFAULT_ALLOCATED_SIZE, + Constants.CACHE_DEFAULT_DELAY_MINS); + } + } + } + return cache; + } + + public synchronized X509Certificate getCacheValue(String serialNumber) { + CertCacheValue cacheValue = hashMap.get(serialNumber); + if (cacheValue != null) { + return cacheValue.getValue(); + } else + return null; + } + + @Override + public ManageableCacheValue getNextCacheValue() { + + if (iterator.hasNext()) { + return hashMap.get(iterator.next().getKey()); + } else { + resetIterator(); + return null; + } + } + + @Override + public int getCacheSize() { + + return hashMap.size(); + } + + @Override + public void resetIterator() { + + iterator = hashMap.entrySet().iterator(); + } + + public static void resetCache() { + + hashMap.clear(); + } + + public synchronized void setCacheValue(String serialNumber, X509Certificate cert) { + CertCacheValue cacheValue = new CertCacheValue(serialNumber, cert); + + if (log.isDebugEnabled()) { + log.debug("Before set - HashMap size " + hashMap.size()); + } + hashMap.put(serialNumber, cacheValue); + if (log.isDebugEnabled()) { + log.debug("After set - HashMap size " + hashMap.size()); + } + } + + public synchronized void removeCacheValue(String serialNumber) { + + if (log.isDebugEnabled()) { + log.debug("Before remove - HashMap size " + hashMap.size()); + } + hashMap.remove(serialNumber); + if (log.isDebugEnabled()) { + log.debug("After remove - HashMap size " + hashMap.size()); + } + } + + /** + * This is the wrapper class of the actual cache value. + */ + private class CertCacheValue implements ManageableCacheValue { + + private final String serialNumber; + private final X509Certificate issuerCertificate; + private final long timeStamp = System.currentTimeMillis(); + + public CertCacheValue(String serialNumber, X509Certificate issuerCertificate) { + + this.serialNumber = serialNumber; + this.issuerCertificate = issuerCertificate; + } + + public X509Certificate getValue() { + + return issuerCertificate; + } + + public String getKey() { + + return serialNumber; + } + + public boolean isValid() { + + // Will be always return true since we only set defined data. + return true; + } + + public long getTimeStamp() { + + return timeStamp; + } + + /** + * Used by cacheManager to remove invalid entries. + */ + public void removeThisCacheValue() { + + removeCacheValue(serialNumber); + } + + public void updateCacheWithNewValue() { + // No implementation needed since there are no scenarios of the cache value being invalid. + } + } +} \ No newline at end of file diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/crl/CRLCache.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/crl/CRLCache.java index 11db425524..357ecf10ce 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/crl/CRLCache.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/crl/CRLCache.java @@ -20,7 +20,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.apache.synapse.commons.jmx.MBeanRegistrar; import org.apache.synapse.transport.certificatevalidation.cache.CacheController; import org.apache.synapse.transport.certificatevalidation.cache.CacheManager; @@ -50,12 +49,13 @@ public class CRLCache implements ManageableCache { private CRLCache() { } - public static CRLCache getCache() { + public static CRLCache getCache(int cacheSize, int cacheDelayMins) { //Double checked locking if (cache == null) { synchronized (CRLCache.class) { if (cache == null) { cache = new CRLCache(); + cacheManager = new CacheManager(cache, cacheSize, cacheDelayMins); } } } diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPCache.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPCache.java index b01d509867..819e077580 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPCache.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPCache.java @@ -27,7 +27,10 @@ import org.apache.synapse.transport.certificatevalidation.cache.ManageableCache; import org.apache.synapse.transport.certificatevalidation.cache.ManageableCacheValue; import org.bouncycastle.asn1.ocsp.OCSPResponseStatus; -import org.bouncycastle.cert.ocsp.*; +import org.bouncycastle.cert.ocsp.BasicOCSPResp; +import org.bouncycastle.cert.ocsp.OCSPReq; +import org.bouncycastle.cert.ocsp.OCSPResp; +import org.bouncycastle.cert.ocsp.SingleResp; import java.math.BigInteger; import java.util.Date; @@ -51,12 +54,14 @@ public class OCSPCache implements ManageableCache { private OCSPCache() {} - public static OCSPCache getCache() { + public static OCSPCache getCache(int cacheSize, int cacheDelayMins) { //Double checked locking if (cache == null) { synchronized (OCSPCache.class) { - if (cache == null) + if (cache == null) { cache = new OCSPCache(); + cacheManager = new CacheManager(cache, cacheSize, cacheDelayMins); + } } } return cache; diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPVerifier.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPVerifier.java index d9a3a11039..4ba283f9e3 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPVerifier.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPVerifier.java @@ -20,20 +20,42 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.bouncycastle.asn1.*; +import org.apache.http.HttpResponse; +import org.apache.http.client.config.RequestConfig; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.ByteArrayEntity; +import org.apache.http.entity.ContentType; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.synapse.transport.certificatevalidation.CertificateVerificationException; +import org.apache.synapse.transport.certificatevalidation.Constants; +import org.apache.synapse.transport.certificatevalidation.RevocationStatus; +import org.apache.synapse.transport.certificatevalidation.RevocationVerifier; +import org.bouncycastle.asn1.ASN1InputStream; +import org.bouncycastle.asn1.DERIA5String; +import org.bouncycastle.asn1.DEROctetString; import org.bouncycastle.asn1.ocsp.OCSPObjectIdentifiers; import org.bouncycastle.asn1.ocsp.OCSPResponseStatus; -import org.bouncycastle.asn1.x509.*; +import org.bouncycastle.asn1.x509.AccessDescription; +import org.bouncycastle.asn1.x509.AuthorityInformationAccess; +import org.bouncycastle.asn1.x509.Extension; +import org.bouncycastle.asn1.x509.Extensions; +import org.bouncycastle.asn1.x509.GeneralName; import org.bouncycastle.cert.X509CertificateHolder; -import org.bouncycastle.cert.ocsp.*; -import org.apache.synapse.transport.certificatevalidation.*; +import org.bouncycastle.cert.ocsp.BasicOCSPResp; +import org.bouncycastle.cert.ocsp.CertificateID; +import org.bouncycastle.cert.ocsp.CertificateStatus; +import org.bouncycastle.cert.ocsp.OCSPReq; +import org.bouncycastle.cert.ocsp.OCSPReqBuilder; +import org.bouncycastle.cert.ocsp.OCSPResp; +import org.bouncycastle.cert.ocsp.SingleResp; import org.bouncycastle.operator.DigestCalculatorProvider; import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; import java.math.BigInteger; -import java.net.HttpURLConnection; -import java.net.URL; import java.security.Provider; import java.security.Security; import java.security.cert.X509Certificate; @@ -52,6 +74,13 @@ public OCSPVerifier(OCSPCache cache) { this.cache = cache; } + public static final String CONTENT_TYPE = "Content-Type"; + public static final String JSON_TYPE ="application/json"; + public static final String ACCEPT_TYPE = "Accept"; + public static final String OCSP_REQUEST_TYPE = "application/ocsp-request"; + public static final String OCSP_RESPONSE_TYPE = "application/ocsp-response"; + + /** * Gets the revocation status (Good, Revoked or Unknown) of the given peer certificate. * @@ -130,35 +159,31 @@ private RevocationStatus getRevocationStatus(SingleResp resp) throws Certificate */ protected OCSPResp getOCSPResponce(String serviceUrl, OCSPReq request) throws CertificateVerificationException { - try { - //Todo: Use http client. - byte[] array = request.getEncoded(); - if (serviceUrl.startsWith("http")) { - HttpURLConnection con; - URL url = new URL(serviceUrl); - con = (HttpURLConnection) url.openConnection(); - con.setRequestProperty("Content-Type", "application/ocsp-request"); - con.setRequestProperty("Accept", "application/ocsp-response"); - con.setDoOutput(true); - OutputStream out = con.getOutputStream(); - DataOutputStream dataOut = new DataOutputStream(new BufferedOutputStream(out)); - dataOut.write(array); - - dataOut.flush(); - dataOut.close(); - - //Check errors in response: - if (con.getResponseCode() / 100 != 2) { - throw new CertificateVerificationException("Error getting ocsp response." + - "Response code is " + con.getResponseCode()); - } + if (log.isDebugEnabled()) { + log.debug("Initiating HTTP request to URL: " + serviceUrl + " to get the OCSP response"); + } + + try (CloseableHttpClient client = HttpClientBuilder.create().build()) { + HttpPost httpPost = new HttpPost(serviceUrl); - //Get Response - InputStream in = (InputStream) con.getContent(); - return new OCSPResp(in); - } else { - throw new CertificateVerificationException("Only http is supported for ocsp calls"); + // adding request timeout configurations + if (httpPost.getConfig() == null) { + httpPost.setConfig(RequestConfig.custom().build()); + } + httpPost.addHeader(CONTENT_TYPE, OCSP_REQUEST_TYPE); + httpPost.addHeader(ACCEPT_TYPE, OCSP_RESPONSE_TYPE); + httpPost.setEntity(new ByteArrayEntity(request.getEncoded(), ContentType.create(JSON_TYPE))); + HttpResponse httpResponse = client.execute(httpPost); + + //Check errors in response, if response status code is not 200 (success) range, throws exception + // eg: if response code is 200 (success) or 201 (accepted) return true, + // if response code is 404 (not found) or 500 throw exception + if (httpResponse.getStatusLine().getStatusCode() / 100 != 2) { + throw new CertificateVerificationException("Error getting ocsp response." + + "Response code is " + httpResponse.getStatusLine().getStatusCode()); } + InputStream in = httpResponse.getEntity().getContent(); + return new OCSPResp(in); } catch (IOException e) { throw new CertificateVerificationException("Cannot get ocspResponse from url: " + serviceUrl, e); } 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 24977a7115..caf0c87e73 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 @@ -18,22 +18,21 @@ */ package org.apache.synapse.transport.http.conn; -import java.net.InetSocketAddress; -import java.net.SocketAddress; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Arrays; - -import javax.net.ssl.SSLEngine; -import javax.net.ssl.SSLException; -import javax.net.ssl.SSLSession; - import org.apache.http.conn.ssl.AbstractVerifier; import org.apache.http.conn.ssl.X509HostnameVerifier; import org.apache.http.nio.reactor.IOSession; import org.apache.http.nio.reactor.ssl.SSLSetupHandler; import org.apache.synapse.transport.certificatevalidation.CertificateVerificationException; -import org.apache.synapse.transport.certificatevalidation.RevocationVerificationManager; +import org.apache.synapse.transport.certificatevalidation.CertificateVerificationManager; + +import javax.net.ssl.SSLEngine; +import javax.net.ssl.SSLException; +import javax.net.ssl.SSLSession; +import java.net.InetSocketAddress; +import java.net.SocketAddress; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.Arrays; public class ClientSSLSetupHandler implements SSLSetupHandler { @@ -139,10 +138,10 @@ public void verify( }; private final X509HostnameVerifier hostnameVerifier; - private final RevocationVerificationManager verificationManager; + private final CertificateVerificationManager verificationManager; public ClientSSLSetupHandler(final X509HostnameVerifier hostnameVerifier, - final RevocationVerificationManager verificationManager) { + final CertificateVerificationManager verificationManager) { this.hostnameVerifier = hostnameVerifier != null ? hostnameVerifier : DEFAULT; this.verificationManager = verificationManager; } @@ -184,7 +183,7 @@ public void verify(IOSession iosession, SSLSession sslsession) throws SSLExcepti if (verificationManager!=null) { try { - verificationManager.verifyRevocationStatus(sslsession.getPeerCertificateChain()); + verificationManager.verifyCertificateValidity(sslsession.getPeerCertificateChain()); } 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 a4bc324ce1..9898979455 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 @@ -18,15 +18,14 @@ */ package org.apache.synapse.transport.http.conn; -import javax.net.ssl.SSLEngine; -import javax.net.ssl.SSLException; -import javax.net.ssl.SSLSession; - import org.apache.http.nio.reactor.IOSession; import org.apache.http.nio.reactor.ssl.SSLSetupHandler; import org.apache.synapse.transport.certificatevalidation.CertificateVerificationException; -import org.apache.synapse.transport.certificatevalidation.RevocationVerificationManager; +import org.apache.synapse.transport.certificatevalidation.CertificateVerificationManager; +import javax.net.ssl.SSLEngine; +import javax.net.ssl.SSLException; +import javax.net.ssl.SSLSession; import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.SocketAddress; @@ -36,12 +35,12 @@ public class ServerSSLSetupHandler implements SSLSetupHandler { private final SSLClientAuth clientAuth; /** Enabled SSL handshake protocols (e.g. SSLv3, TLSv1) */ private final String[] httpsProtocols; - private RevocationVerificationManager verificationManager; + private CertificateVerificationManager verificationManager; /** Ciphers enabled in axis2.xml, enabled all if null*/ private final String[] preferredCiphers; public ServerSSLSetupHandler(final SSLClientAuth clientAuth, final String[] httpsProtocols, - final RevocationVerificationManager verificationManager, final String[] preferredCiphers) { + final CertificateVerificationManager verificationManager, final String[] preferredCiphers) { this.clientAuth = clientAuth; this.httpsProtocols = httpsProtocols; this.verificationManager = verificationManager; @@ -78,7 +77,7 @@ public void verify( if (verificationManager != null) { try { - verificationManager.verifyRevocationStatus(sslsession.getPeerCertificateChain()); + verificationManager.verifyCertificateValidity(sslsession.getPeerCertificateChain()); } catch (CertificateVerificationException e) { SocketAddress remoteAddress = iosession.getRemoteAddress(); String address; diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ClientConnFactoryBuilder.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ClientConnFactoryBuilder.java index bf504b9999..f076479c7d 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ClientConnFactoryBuilder.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ClientConnFactoryBuilder.java @@ -19,27 +19,6 @@ package org.apache.synapse.transport.nhttp.config; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.security.GeneralSecurityException; -import java.security.KeyStore; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Locale; -import java.util.Map; - -import javax.net.ssl.KeyManager; -import javax.net.ssl.KeyManagerFactory; -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManager; -import javax.net.ssl.TrustManagerFactory; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamException; - -import org.apache.axiom.om.OMAttribute; import org.apache.axiom.om.OMElement; import org.apache.axiom.om.impl.builder.StAXOMBuilder; import org.apache.axis2.AxisFault; @@ -52,8 +31,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.http.conn.ssl.X509HostnameVerifier; import org.apache.http.params.HttpParams; -import org.apache.synapse.commons.crypto.CryptoConstants; -import org.apache.synapse.transport.certificatevalidation.RevocationVerificationManager; +import org.apache.synapse.transport.certificatevalidation.CertificateVerificationManager; import org.apache.synapse.transport.exceptions.InvalidConfigurationException; import org.apache.synapse.transport.http.conn.ClientConnFactory; import org.apache.synapse.transport.http.conn.ClientSSLSetupHandler; @@ -63,8 +41,25 @@ import org.apache.synapse.transport.nhttp.util.SecureVaultValueReader; import org.wso2.securevault.SecretResolver; import org.wso2.securevault.SecretResolverFactory; -import org.wso2.securevault.SecureVaultException; -import org.wso2.securevault.commons.MiscellaneousUtil; + +import javax.net.ssl.KeyManager; +import javax.net.ssl.KeyManagerFactory; +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManager; +import javax.net.ssl.TrustManagerFactory; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.security.GeneralSecurityException; +import java.security.KeyStore; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Map; public class ClientConnFactoryBuilder { @@ -87,7 +82,7 @@ public ClientConnFactoryBuilder(final TransportOutDescription transportOut) { this.transportOut = transportOut; this.name = transportOut.getName().toUpperCase(Locale.US); } - + public ClientConnFactoryBuilder parseSSL() throws AxisFault { Parameter keyParam = transportOut.getParameter("keystore"); Parameter trustParam = transportOut.getParameter("truststore"); @@ -133,7 +128,7 @@ public ClientConnFactoryBuilder parseSSL() throws AxisFault { final Parameter cvp = transportOut.getParameter("CertificateRevocationVerifier"); final String cvEnable = cvp != null ? cvp.getParameterElement().getAttribute(new QName("enable")).getAttributeValue() : null; - RevocationVerificationManager revocationVerifier = null; + CertificateVerificationManager certificateVerifier = null; if ("true".equalsIgnoreCase(cvEnable)) { String cacheSizeString = cvp.getParameterElement().getFirstChildWithName(new QName("CacheSize")).getText(); @@ -146,7 +141,7 @@ public ClientConnFactoryBuilder parseSSL() throws AxisFault { cacheDelay = new Integer(cacheDelayString); } catch (NumberFormatException e) { } - revocationVerifier = new RevocationVerificationManager(cacheSize, cacheDelay); + certificateVerifier = new CertificateVerificationManager(cacheSize, cacheDelay); } // Process HttpProtocols @@ -167,7 +162,7 @@ public ClientConnFactoryBuilder parseSSL() throws AxisFault { } // Initiated separately to cater setting https protocols - ClientSSLSetupHandler clientSSLSetupHandler = new ClientSSLSetupHandler(hostnameVerifier, revocationVerifier); + ClientSSLSetupHandler clientSSLSetupHandler = new ClientSSLSetupHandler(hostnameVerifier, certificateVerifier); if (null != httpsProtocols) { clientSSLSetupHandler.setHttpsProtocols(httpsProtocols); @@ -374,7 +369,6 @@ private SSLContext createSSLContext(OMElement keyStoreElt, OMElement trustStoreE TrustManagerFactory.getDefaultAlgorithm()); trustManagerfactory.init(trustStore); trustManagers = trustManagerfactory.getTrustManagers(); - } catch (GeneralSecurityException gse) { log.error(name + " Error loading Key store : " + location, gse); throw new AxisFault("Error loading Key store : " + location, gse); @@ -424,9 +418,9 @@ private SSLContext createSSLContext(OMElement keyStoreElt, OMElement trustStoreE keyStoreElt.getFirstChildWithName(new QName("Password"))); String keyPassword = SecureVaultValueReader.getSecureVaultValue(secretResolver, keyStoreElt.getFirstChildWithName(new QName("KeyPassword"))); - - try (FileInputStream fis = new FileInputStream(location)) { - KeyStore keyStore = KeyStore.getInstance(type); + + try (FileInputStream fis = new FileInputStream(location)) { + KeyStore keyStore = KeyStore.getInstance(type); if (log.isDebugEnabled()) { log.debug(name + " Loading Identity Keystore from : " + location); } @@ -475,7 +469,7 @@ private SSLContext createSSLContext(OMElement keyStoreElt, OMElement trustStoreE } catch (IOException ioe) { log.error(name + " Error opening Key store : " + location, ioe); throw new AxisFault("Error opening Key store : " + location, ioe); - } + } } else if (novalidatecert) { if (log.isWarnEnabled()) { log.warn(name + " Server certificate validation (trust) has been disabled. " + diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ServerConnFactoryBuilder.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ServerConnFactoryBuilder.java index 817c11e99b..b8d92ea26c 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ServerConnFactoryBuilder.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ServerConnFactoryBuilder.java @@ -26,11 +26,12 @@ import org.apache.axis2.description.Parameter; import org.apache.axis2.description.TransportInDescription; import org.apache.axis2.transport.base.ParamUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.http.HttpHost; import org.apache.http.params.HttpParams; -import org.apache.synapse.transport.certificatevalidation.RevocationVerificationManager; +import org.apache.synapse.transport.certificatevalidation.CertificateVerificationManager; import org.apache.synapse.transport.http.conn.SSLClientAuth; import org.apache.synapse.transport.http.conn.SSLContextDetails; import org.apache.synapse.transport.http.conn.ServerConnFactory; @@ -40,6 +41,13 @@ import org.wso2.securevault.SecretResolver; import org.wso2.securevault.SecretResolverFactory; +import javax.net.ssl.KeyManager; +import javax.net.ssl.KeyManagerFactory; +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManager; +import javax.net.ssl.TrustManagerFactory; +import javax.net.ssl.X509KeyManager; +import javax.xml.namespace.QName; import java.io.FileInputStream; import java.io.IOException; import java.net.InetSocketAddress; @@ -54,14 +62,6 @@ import java.util.Locale; import java.util.Map; -import javax.net.ssl.KeyManager; -import javax.net.ssl.KeyManagerFactory; -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManager; -import javax.net.ssl.TrustManagerFactory; -import javax.net.ssl.X509KeyManager; -import javax.xml.namespace.QName; - public class ServerConnFactoryBuilder { private final Log log = LogFactory.getLog(ServerConnFactoryBuilder.class); @@ -73,6 +73,7 @@ public class ServerConnFactoryBuilder { protected SSLContextDetails ssl; private Map sslByIPMap = null; private ConfigurationContext configurationContext; + CertificateVerificationManager certificateVerifier = null; public ServerConnFactoryBuilder(final TransportInDescription transportIn, final HttpHost host, ConfigurationContext configurationContext) { @@ -89,13 +90,13 @@ public ServerConnFactoryBuilder(final TransportInDescription transportIn, final } protected SSLContextDetails createSSLContext( - final OMElement keyStoreEl, - final OMElement trustStoreEl, - final OMElement cientAuthEl, - final OMElement httpsProtocolsEl, - final OMElement preferredCiphersEl, - final RevocationVerificationManager verificationManager, - final String sslProtocol) throws AxisFault { + final OMElement keyStoreEl, + final OMElement trustStoreEl, + final OMElement cientAuthEl, + final OMElement httpsProtocolsEl, + final OMElement preferredCiphersEl, + final CertificateVerificationManager verificationManager, + final String sslProtocol) throws AxisFault { SecretResolver secretResolver; if (configurationContext != null && configurationContext.getAxisConfiguration() != null) { @@ -114,7 +115,7 @@ protected SSLContextDetails createSSLContext( final OMElement cientAuthEl, final OMElement httpsProtocolsEl, final OMElement preferredCiphersEl, - final RevocationVerificationManager verificationManager, + final CertificateVerificationManager verificationManager, final String sslProtocol, final SecretResolver secretResolver) throws AxisFault { KeyManager[] keymanagers = null; @@ -145,7 +146,7 @@ protected SSLContextDetails createSSLContext( keyStore.load(fis, storePassword.toCharArray()); KeyManagerFactory kmfactory = KeyManagerFactory.getInstance( - KeyManagerFactory.getDefaultAlgorithm()); + KeyManagerFactory.getDefaultAlgorithm()); kmfactory.init(keyStore, keyPassword.toCharArray()); keymanagers = kmfactory.getKeyManagers(); if (log.isInfoEnabled() && keymanagers != null) { @@ -182,6 +183,7 @@ protected SSLContextDetails createSSLContext( } if (trustStoreEl != null) { + String location = getValueOfElementWithLocalName(trustStoreEl, "Location"); String type = getValueOfElementWithLocalName(trustStoreEl, "Type"); OMElement storePasswordEl = trustStoreEl.getFirstChildWithName(new QName("Password")); @@ -203,7 +205,7 @@ protected SSLContextDetails createSSLContext( TrustManagerFactory.getDefaultAlgorithm()); trustManagerfactory.init(trustStore); trustManagers = trustManagerfactory.getTrustManagers(); - + TrustStoreHolder.getInstance().setClientTrustStore(trustStore); } catch (GeneralSecurityException gse) { log.error(name + " Error loading Key store : " + location, gse); throw new AxisFault("Error loading Key store : " + location, gse); @@ -293,8 +295,7 @@ public ServerConnFactoryBuilder parseSSL() throws AxisFault { final Parameter cvp = transportIn.getParameter("CertificateRevocationVerifier"); final String cvEnable = cvp != null ? - cvp.getParameterElement().getAttribute(new QName("enable")).getAttributeValue() : null; - RevocationVerificationManager revocationVerifier = null; + cvp.getParameterElement().getAttribute(new QName("enable")).getAttributeValue() : null; if ("true".equalsIgnoreCase(cvEnable)) { String cacheSizeString = cvp.getParameterElement().getFirstChildWithName(new QName("CacheSize")).getText(); @@ -305,12 +306,33 @@ public ServerConnFactoryBuilder parseSSL() throws AxisFault { cacheSize = new Integer(cacheSizeString); cacheDelay = new Integer(cacheDelayString); } - catch (NumberFormatException e) {} - revocationVerifier = new RevocationVerificationManager(cacheSize, cacheDelay); + catch (NumberFormatException e) { + throw new AxisFault("Cache size or Cache delay values are malformed", e); + } + + // Checking whether the full certificate chain validation is enabled or not. + boolean isFullCertChainValidationEnabled = true; + boolean isCertExpiryValidationEnabled = false; + OMElement fullCertChainValidationConfig = cvp.getParameterElement() + .getFirstChildWithName(new QName("FullChainValidation")); + OMElement certExpiryValidationConfig = cvp.getParameterElement() + .getFirstChildWithName(new QName("ExpiryValidation")); + + if (fullCertChainValidationConfig != null + && StringUtils.equals("false", fullCertChainValidationConfig.getText())) { + isFullCertChainValidationEnabled = false; + } + + if (certExpiryValidationConfig != null && StringUtils.equals("true", certExpiryValidationConfig.getText())) { + isCertExpiryValidationEnabled = true; + } + + certificateVerifier = new CertificateVerificationManager(cacheSize, cacheDelay, + isFullCertChainValidationEnabled, isCertExpiryValidationEnabled); } ssl = createSSLContext(keyStoreEl, trustStoreEl, clientAuthEl, httpsProtocolsEl, preferredCiphersEl, - revocationVerifier, sslProtocol); + certificateVerifier, sslProtocol); return this; } @@ -341,8 +363,57 @@ public ServerConnFactoryBuilder parseMultiProfileSSL() throws AxisFault { OMElement preferredCiphersEl = profileEl.getFirstChildWithName(new QName(NhttpConstants.PREFERRED_CIPHERS)); final Parameter sslpParameter = transportIn.getParameter("SSLProtocol"); final String sslProtocol = sslpParameter != null ? sslpParameter.getValue().toString() : "TLS"; + + /* If multi SSL profiles are configured, checking whether the certificate revocation verifier is + configured and full certificate chain validation is enabled or not. */ + if (profileEl.getFirstChildWithName(new QName("CertificateRevocationVerifier")) != null) { + + Integer cacheSize; + Integer cacheDelay; + boolean isFullCertChainValidationEnabled = true; + boolean isCertExpiryValidationEnabled = false; + + OMElement revocationVerifierConfig = profileEl + .getFirstChildWithName(new QName("CertificateRevocationVerifier")); + OMElement revocationEnabled = revocationVerifierConfig + .getFirstChildWithName(new QName("Enable")); + + if (revocationEnabled != null && "true".equals(revocationEnabled.getText())) { + String cacheSizeString = revocationVerifierConfig + .getFirstChildWithName(new QName("CacheSize")).getText(); + String cacheDelayString = revocationVerifierConfig + .getFirstChildWithName(new QName("CacheDelay")).getText(); + + try { + cacheSize = new Integer(cacheSizeString); + cacheDelay = new Integer(cacheDelayString); + } catch (NumberFormatException e) { + throw new AxisFault("Cache size or Cache delay values are malformed", e); + } + + OMElement fullCertChainValidationConfig = revocationVerifierConfig + .getFirstChildWithName(new QName("FullChainValidation")); + + OMElement certExpiryValidationConfig = revocationVerifierConfig + .getFirstChildWithName(new QName("ExpiryValidation")); + + if (fullCertChainValidationConfig != null + && StringUtils.equals("false", fullCertChainValidationConfig.getText())) { + isFullCertChainValidationEnabled = false; + } + + if (certExpiryValidationConfig != null + && StringUtils.equals("true", certExpiryValidationConfig.getText())) { + isCertExpiryValidationEnabled = true; + } + + certificateVerifier = new CertificateVerificationManager(cacheSize, cacheDelay, + isFullCertChainValidationEnabled, isCertExpiryValidationEnabled); + } + } + SSLContextDetails ssl = createSSLContext(keyStoreEl, trustStoreEl, clientAuthEl, httpsProtocolsEl, - preferredCiphersEl, null, sslProtocol, secretResolver); + preferredCiphersEl, certificateVerifier, sslProtocol, secretResolver); if (sslByIPMap == null) { sslByIPMap = new HashMap(); } diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/TrustStoreHolder.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/TrustStoreHolder.java new file mode 100644 index 0000000000..697dd6eba6 --- /dev/null +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/TrustStoreHolder.java @@ -0,0 +1,62 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF 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.transport.nhttp.config; + +import java.security.KeyStore; + +/** + * A data holder class to store the client trust store. + */ +public class TrustStoreHolder { + + private static volatile TrustStoreHolder instance; + private KeyStore clientTrustStore; + + private TrustStoreHolder() {} + + public static TrustStoreHolder getInstance() { + + if (instance == null) { + synchronized (TrustStoreHolder.class) { + if (instance == null) { + instance = new TrustStoreHolder(); + } + } + } + return instance; + } + + public KeyStore getClientTrustStore() { + + return clientTrustStore; + } + + public void setClientTrustStore(KeyStore clientTrustStore) { + + this.clientTrustStore = clientTrustStore; + } + + /** + * Reset the instance. + */ + public static void resetInstance() { + + instance = null; + } +} diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpMultiSSLListener.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpMultiSSLListener.java index 208b364178..43fadef786 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpMultiSSLListener.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpMultiSSLListener.java @@ -5,10 +5,12 @@ import org.apache.axis2.description.ParameterInclude; import org.apache.axis2.description.TransportInDescription; import org.apache.http.HttpHost; -import org.apache.synapse.transport.http.conn.Scheme; -import org.apache.synapse.transport.nhttp.config.ServerConnFactoryBuilder; +import org.apache.synapse.transport.certificatevalidation.cache.CertCache; import org.apache.synapse.transport.dynamicconfigurations.ListenerProfileReloader; import org.apache.synapse.transport.dynamicconfigurations.SSLProfileLoader; +import org.apache.synapse.transport.http.conn.Scheme; +import org.apache.synapse.transport.nhttp.config.ServerConnFactoryBuilder; +import org.apache.synapse.transport.nhttp.config.TrustStoreHolder; public class PassThroughHttpMultiSSLListener extends PassThroughHttpListener implements SSLProfileLoader{ @@ -39,6 +41,8 @@ protected ServerConnFactoryBuilder initConnFactoryBuilder(final TransportInDescr * @throws AxisFault */ public void reloadConfig(ParameterInclude transport) throws AxisFault { + CertCache.resetCache(); + TrustStoreHolder.resetInstance(); reloadDynamicSSLConfig((TransportInDescription) transport); } diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpSSLSender.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpSSLSender.java index f14d690efd..5fe55383d0 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpSSLSender.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughHttpSSLSender.java @@ -20,10 +20,12 @@ import org.apache.axis2.context.ConfigurationContext; import org.apache.axis2.description.ParameterInclude; import org.apache.axis2.description.TransportOutDescription; -import org.apache.synapse.transport.http.conn.Scheme; -import org.apache.synapse.transport.nhttp.config.ClientConnFactoryBuilder; +import org.apache.synapse.transport.certificatevalidation.cache.CertCache; import org.apache.synapse.transport.dynamicconfigurations.SSLProfileLoader; import org.apache.synapse.transport.dynamicconfigurations.SenderProfileReloader; +import org.apache.synapse.transport.http.conn.Scheme; +import org.apache.synapse.transport.nhttp.config.ClientConnFactoryBuilder; +import org.apache.synapse.transport.nhttp.config.TrustStoreHolder; public class PassThroughHttpSSLSender extends PassThroughHttpSender implements SSLProfileLoader { @@ -53,6 +55,8 @@ protected ClientConnFactoryBuilder initConnFactoryBuilder( * @throws AxisFault */ public void reloadConfig(ParameterInclude transport) throws AxisFault { + CertCache.resetCache(); + TrustStoreHolder.resetInstance(); reloadDynamicSSLConfig((TransportOutDescription) transport); } diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/core/ssl/SSLServerConnFactoryBuilder.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/core/ssl/SSLServerConnFactoryBuilder.java index 282900b956..8ea5433d4f 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/core/ssl/SSLServerConnFactoryBuilder.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/core/ssl/SSLServerConnFactoryBuilder.java @@ -19,12 +19,11 @@ import org.apache.axiom.om.OMElement; import org.apache.axis2.AxisFault; -import org.apache.axis2.description.Parameter; import org.apache.axis2.description.TransportInDescription; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.http.HttpHost; -import org.apache.synapse.transport.certificatevalidation.RevocationVerificationManager; +import org.apache.synapse.transport.certificatevalidation.CertificateVerificationManager; import org.apache.synapse.transport.nhttp.config.ServerConnFactoryBuilder; import javax.xml.namespace.QName; @@ -46,7 +45,7 @@ public ServerConnFactoryBuilder parseSSL(OMElement keyStoreEl, OMElement trustSt AxisFault { final String cvEnable = cvp != null ? cvp.getAttribute(new QName("enable")).getAttributeValue() : null; - RevocationVerificationManager revocationVerifier = null; + CertificateVerificationManager revocationVerifier = null; if ("true".equalsIgnoreCase(cvEnable)) { Iterator iterator = cvp.getChildElements(); @@ -70,7 +69,7 @@ public ServerConnFactoryBuilder parseSSL(OMElement keyStoreEl, OMElement trustSt } catch (NumberFormatException e) { log.error("Please specify correct Integer numbers for CacheDelay and CacheSize"); } - revocationVerifier = new RevocationVerificationManager(cacheSize, cacheDelay); + revocationVerifier = new CertificateVerificationManager(cacheSize, cacheDelay); } ssl = createSSLContext(keyStoreEl, trustStoreEl, clientAuthEl, httpsProtocolsEl, preferredCiphers, revocationVerifier, diff --git a/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/CRLVerifierTest.java b/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/CRLVerifierTest.java index 38d7964b8a..7f6d8d1bfb 100644 --- a/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/CRLVerifierTest.java +++ b/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/CRLVerifierTest.java @@ -88,7 +88,7 @@ public void testRevokedCertificate() throws Exception { //Create a crl with fakeRevokedCertificate marked as revoked. X509CRL x509CRL = createCRL(fakeCACert, caKeyPair.getPrivate(), revokedSerialNumber); - CRLCache cache = CRLCache.getCache(); + CRLCache cache = CRLCache.getCache(5, 5); cache.init(5, 5); cache.setCacheValue(crlDistributionPointUrl, x509CRL); diff --git a/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/OCSPVerifierTest.java b/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/OCSPVerifierTest.java index 9c2299bb2b..91b607a6bc 100644 --- a/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/OCSPVerifierTest.java +++ b/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/OCSPVerifierTest.java @@ -107,7 +107,7 @@ public void testOCSPVerifier() throws Exception{ OCSPResp response = generateOCSPResponse(request, certificateHolder, caKeyPair.getPrivate(), caKeyPair.getPublic(), revokedID); SingleResp singleResp = ((BasicOCSPResp)response.getResponseObject()).getResponses()[0]; - OCSPCache cache = OCSPCache.getCache(); + OCSPCache cache = OCSPCache.getCache(5, 5); cache.init(5,5); cache.setCacheValue(revokedSerialNumber,singleResp, request, null); diff --git a/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationTest.java b/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationTest.java index 7f282dd86c..eca0d4888b 100644 --- a/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationTest.java +++ b/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationTest.java @@ -116,7 +116,7 @@ public void testOCSPPathValidationWithFakeCerts() throws Exception { private void crlPathValidation(X509Certificate[] certChain) throws Exception { - CRLCache crlCache = CRLCache.getCache(); + CRLCache crlCache = CRLCache.getCache(5, 5); crlCache.init(5, 5); RevocationVerifier verifier = new CRLVerifier(crlCache); CertificatePathValidator pathValidator = new CertificatePathValidator(certChain, verifier); @@ -125,7 +125,7 @@ private void crlPathValidation(X509Certificate[] certChain) throws Exception { private void ocspPathValidation(X509Certificate[] certChain) throws Exception { - OCSPCache ocspCache = OCSPCache.getCache(); + OCSPCache ocspCache = OCSPCache.getCache(5, 5); ocspCache.init(5, 5); RevocationVerifier verifier = new OCSPVerifier(ocspCache); CertificatePathValidator pathValidator = new CertificatePathValidator(certChain, verifier); From fef11b16080c1172b3d46b095df3ea2a32b315a5 Mon Sep 17 00:00:00 2001 From: akila94 Date: Tue, 27 Feb 2024 14:08:29 +0530 Subject: [PATCH 182/308] Break logic to methods and write unit tests --- .../CertificateVerificationManager.java | 157 +++++++++--------- .../cache/CertCache.java | 2 +- .../RevocationVerificationTest.java | 31 ++++ 3 files changed, 115 insertions(+), 75 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 d138dce7a8..b55834cbdb 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 @@ -114,83 +114,12 @@ public void verifyCertificateValidity(javax.security.cert.X509Certificate[] peer X509Certificate[] convertedCertificates = convert(peerCertificates); - Optional peerCertOpt; X509Certificate peerCert = null; X509Certificate issuerCert = null; - String alias; if (!isFullCertChainValidationEnabled) { - - if (log.isDebugEnabled()) { - log.debug("Retrieving the issuer certificate from client truststore since full certificate chain " + - "validation is disabled"); - } - - KeyStore trustStore = TrustStoreHolder.getInstance().getClientTrustStore(); - Enumeration aliases; - - // When full chain validation is disabled, only one cert is expected - peerCertOpt = Arrays.stream(convertedCertificates).findFirst(); - if (peerCertOpt.isPresent()) { - peerCert = peerCertOpt.get(); - } else { - throw new CertificateVerificationException("Peer certificate is not provided"); - } - - // Get cert cache and initialize it - CertCache certCache = CertCache.getCache(); - - if (certCache.getCacheValue(peerCert.getSerialNumber().toString()) == null) { - - try { - aliases = trustStore.aliases(); - } catch (KeyStoreException e) { - throw new CertificateVerificationException("Error while retrieving aliases from truststore", e); - } - - while (aliases.hasMoreElements()) { - - alias = aliases.nextElement(); - try { - issuerCert = (X509Certificate) trustStore.getCertificate(alias); - } catch (KeyStoreException e) { - throw new CertificateVerificationException("Unable to read the certificate from " + - "truststore with the alias: " + alias, e); - } - - if (issuerCert == null) { - throw new CertificateVerificationException("Issuer certificate not found in truststore"); - } - - try { - peerCert.verify(issuerCert.getPublicKey()); - - log.debug("Valid issuer certificate found in the client truststore. Caching.."); - - // Store the valid issuer cert in cache for future use - certCache.setCacheValue(peerCert.getSerialNumber().toString(), issuerCert); - if (log.isDebugEnabled()) { - log.debug("Issuer certificate with serial number: " + issuerCert.getSerialNumber() - .toString() + " has been cached against the serial number: " + peerCert - .getSerialNumber().toString() + " of the peer certificate."); - } - break; - } catch (SignatureException | CertificateException | NoSuchAlgorithmException | - InvalidKeyException | NoSuchProviderException e) { - // Unable to verify the signature. Check with the next certificate in the next loop traversal. - } - } - } else { - X509Certificate cachedIssuerCert = certCache.getCacheValue(peerCert.getSerialNumber().toString()); - try { - peerCert.verify(cachedIssuerCert.getPublicKey()); - } catch (SignatureException | CertificateException | NoSuchAlgorithmException | - InvalidKeyException | - NoSuchProviderException e) { - // Unable to verify the signature. - throw new CertificateVerificationException("Unable to verify the signature of the certificate."); - } - } + peerCert = getPeerCertificate(convertedCertificates); + issuerCert = getVerifiedIssuerCertOfPeerCert(peerCert, CertCache.getCache()); } OCSPCache ocspCache = OCSPCache.getCache(cacheSize, cacheDelayMins); @@ -284,4 +213,84 @@ public boolean isExpired(X509Certificate[] certificates) { } return false; } -} \ No newline at end of file + + public X509Certificate getPeerCertificate(X509Certificate[] convertedCertificates) + throws CertificateVerificationException { + + Optional peerCertOpt = Arrays.stream(convertedCertificates).findFirst(); + if (peerCertOpt.isPresent()) { + return peerCertOpt.get(); + } else { + throw new CertificateVerificationException("Peer certificate is not provided"); + } + } + + public X509Certificate getVerifiedIssuerCertOfPeerCert(X509Certificate peerCert, CertCache certCache) + throws CertificateVerificationException { + + if (certCache.getCacheValue(peerCert.getSerialNumber().toString()) != null) { + + X509Certificate cachedIssuerCert = certCache.getCacheValue(peerCert.getSerialNumber().toString()); + if (!isPeerCertVerified(peerCert, cachedIssuerCert)) { + throw new CertificateVerificationException("Unable to verify the signature of the certificate."); + } else { + return cachedIssuerCert; + } + } else { + KeyStore trustStore = TrustStoreHolder.getInstance().getClientTrustStore(); + Enumeration aliases; + X509Certificate issuerCert = null; + + try { + aliases = trustStore.aliases(); + } catch (KeyStoreException e) { + throw new CertificateVerificationException("Error while retrieving aliases from truststore", e); + } + + while (aliases.hasMoreElements()) { + + String alias = aliases.nextElement(); + try { + issuerCert = (X509Certificate) trustStore.getCertificate(alias); + } catch (KeyStoreException e) { + throw new CertificateVerificationException("Unable to read the certificate from " + + "truststore with the alias: " + alias, e); + } + + if (issuerCert == null) { + throw new CertificateVerificationException("Issuer certificate not found in truststore"); + } + + try { + peerCert.verify(issuerCert.getPublicKey()); + + log.debug("Valid issuer certificate found in the client truststore. Caching.."); + + // Store the valid issuer cert in cache for future use + certCache.setCacheValue(peerCert.getSerialNumber().toString(), issuerCert); + if (log.isDebugEnabled()) { + log.debug("Issuer certificate with serial number: " + issuerCert.getSerialNumber() + .toString() + " has been cached against the serial number: " + peerCert + .getSerialNumber().toString() + " of the peer certificate."); + } + break; + } catch (SignatureException | CertificateException | NoSuchAlgorithmException | + InvalidKeyException | NoSuchProviderException e) { + // Unable to verify the signature. Check with the next certificate in the next loop traversal. + } + } + return issuerCert; + } + } + + public boolean isPeerCertVerified(X509Certificate peerCert, X509Certificate issuerCert) { + + try { + peerCert.verify(issuerCert.getPublicKey()); + return true; + } catch (CertificateException | NoSuchAlgorithmException | InvalidKeyException | NoSuchProviderException + | SignatureException e) { + return false; + } + } +} diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/cache/CertCache.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/cache/CertCache.java index 36772385b4..37c47e7aef 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/cache/CertCache.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/cache/CertCache.java @@ -164,4 +164,4 @@ public void updateCacheWithNewValue() { // No implementation needed since there are no scenarios of the cache value being invalid. } } -} \ No newline at end of file +} diff --git a/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationTest.java b/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationTest.java index eca0d4888b..09aa70b9f9 100644 --- a/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationTest.java +++ b/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/RevocationVerificationTest.java @@ -19,13 +19,21 @@ package org.apache.synapse.transport.certificatevalidation; import junit.framework.TestCase; +import org.apache.synapse.transport.certificatevalidation.cache.CertCache; import org.apache.synapse.transport.certificatevalidation.crl.CRLCache; import org.apache.synapse.transport.certificatevalidation.crl.CRLVerifier; import org.apache.synapse.transport.certificatevalidation.ocsp.OCSPCache; import org.apache.synapse.transport.certificatevalidation.ocsp.OCSPVerifier; import org.apache.synapse.transport.certificatevalidation.pathvalidation.CertificatePathValidator; +import org.mockito.Mockito; +import java.math.BigInteger; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; import java.security.Security; +import java.security.SignatureException; +import java.security.cert.CertificateException; import java.security.cert.X509Certificate; public class RevocationVerificationTest extends TestCase { @@ -114,6 +122,29 @@ public void testOCSPPathValidationWithFakeCerts() throws Exception { assertNotNull(throwable); } + public void testGetPeerCertificate() throws CertificateVerificationException { + + X509Certificate mockCert = Mockito.mock(X509Certificate.class); + X509Certificate[] certArray = {mockCert}; + CertificateVerificationManager verificationManager = new CertificateVerificationManager(5, 5); + Object peerCert = verificationManager.getPeerCertificate(certArray); + assertNotNull(peerCert); + } + + public void testGetVerifiedIssuerCertOfPeerCertCached() + throws CertificateVerificationException, CertificateException, NoSuchAlgorithmException, + SignatureException, InvalidKeyException, NoSuchProviderException { + + CertCache mockCertCache = Mockito.mock(CertCache.class); + X509Certificate peerCert = Mockito.mock(X509Certificate.class); + X509Certificate cachedIssuerCert = Mockito.mock(X509Certificate.class); + Mockito.when(peerCert.getSerialNumber()).thenReturn(BigInteger.valueOf(1L)); + Mockito.when(mockCertCache.getCacheValue(Mockito.anyString())).thenReturn(cachedIssuerCert); + CertificateVerificationManager mockVerificationManager = new CertificateVerificationManager(5, 5); + Mockito.doNothing().when(peerCert).verify(Mockito.any()); + assertNotNull(mockVerificationManager.getVerifiedIssuerCertOfPeerCert(peerCert, mockCertCache)); + } + private void crlPathValidation(X509Certificate[] certChain) throws Exception { CRLCache crlCache = CRLCache.getCache(5, 5); From 83a7566eacebec5199f2c3efa77b1e76d1b49c55 Mon Sep 17 00:00:00 2001 From: akila94 Date: Thu, 29 Feb 2024 14:25:36 +0530 Subject: [PATCH 183/308] Fix issue with issuer cert selection --- .../CertificateVerificationManager.java | 36 +++++++++++-------- 1 file changed, 22 insertions(+), 14 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 b55834cbdb..1a5f4226f2 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 @@ -126,6 +126,7 @@ public void verifyCertificateValidity(javax.security.cert.X509Certificate[] peer CRLCache crlCache = CRLCache.getCache(cacheSize, cacheDelayMins); RevocationVerifier[] verifiers = {new OCSPVerifier(ocspCache), new CRLVerifier(crlCache)}; + RevocationStatus revocationStatus = null; for (RevocationVerifier verifier : verifiers) { try { @@ -142,8 +143,8 @@ public void verifyCertificateValidity(javax.security.cert.X509Certificate[] peer CertificatePathValidator pathValidator = new CertificatePathValidator(convertedCertificates, verifier); pathValidator.validatePath(); + return; } else { - if (isCertExpiryValidationEnabled) { log.debug("Validating the client certificate for expiry"); if (isExpired(convertedCertificates)) { @@ -153,9 +154,11 @@ public void verifyCertificateValidity(javax.security.cert.X509Certificate[] peer log.debug("Validating client certificate with the issuer certificate retrieved from" + "the trust store"); - verifier.checkRevocationStatus(peerCert, issuerCert); + revocationStatus = verifier.checkRevocationStatus(peerCert, issuerCert); + if (!RevocationStatus.GOOD.toString().equals(revocationStatus.toString())) { + return; + } } - return; } catch (Exception e) { log.debug("Certificate verification with " + verifier.getClass().getSimpleName() + " failed. ", e); } @@ -237,6 +240,7 @@ public X509Certificate getVerifiedIssuerCertOfPeerCert(X509Certificate peerCert, return cachedIssuerCert; } } else { + boolean isIssuerCertVerified = false; KeyStore trustStore = TrustStoreHolder.getInstance().getClientTrustStore(); Enumeration aliases; X509Certificate issuerCert = null; @@ -263,23 +267,27 @@ public X509Certificate getVerifiedIssuerCertOfPeerCert(X509Certificate peerCert, try { peerCert.verify(issuerCert.getPublicKey()); - - log.debug("Valid issuer certificate found in the client truststore. Caching.."); - - // Store the valid issuer cert in cache for future use - certCache.setCacheValue(peerCert.getSerialNumber().toString(), issuerCert); - if (log.isDebugEnabled()) { - log.debug("Issuer certificate with serial number: " + issuerCert.getSerialNumber() - .toString() + " has been cached against the serial number: " + peerCert - .getSerialNumber().toString() + " of the peer certificate."); - } + isIssuerCertVerified = true; break; } catch (SignatureException | CertificateException | NoSuchAlgorithmException | InvalidKeyException | NoSuchProviderException e) { // Unable to verify the signature. Check with the next certificate in the next loop traversal. } } - return issuerCert; + + if (isIssuerCertVerified) { + log.debug("Valid issuer certificate found in the client truststore. Caching.."); + // Store the valid issuer cert in cache for future use + certCache.setCacheValue(peerCert.getSerialNumber().toString(), issuerCert); + if (log.isDebugEnabled()) { + log.debug("Issuer certificate with serial number: " + issuerCert.getSerialNumber() + .toString() + " has been cached against the serial number: " + peerCert + .getSerialNumber().toString() + " of the peer certificate."); + } + return issuerCert; + } else { + throw new CertificateVerificationException("Certificate verification failed."); + } } } From 57d8a25f24a719ed9e0e2572a984c9e951cef6b3 Mon Sep 17 00:00:00 2001 From: akila94 Date: Thu, 29 Feb 2024 15:25:31 +0530 Subject: [PATCH 184/308] Format code --- .../tests/transport/Sample10102.java | 49 ++ .../test/resources/axis2Xml/synapse/axis2.xml | 682 ++++++++++++++++++ .../resources/extras/synapse_sample_10102.xml | 30 + .../src/test/resources/sample10102.xml | 38 + .../CertificateVerificationManager.java | 2 +- 5 files changed, 800 insertions(+), 1 deletion(-) create mode 100644 modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/transport/Sample10102.java create mode 100644 modules/integration/src/test/resources/axis2Xml/synapse/axis2.xml create mode 100644 modules/integration/src/test/resources/extras/synapse_sample_10102.xml create mode 100644 modules/integration/src/test/resources/sample10102.xml diff --git a/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/transport/Sample10102.java b/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/transport/Sample10102.java new file mode 100644 index 0000000000..642003a0c1 --- /dev/null +++ b/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/transport/Sample10102.java @@ -0,0 +1,49 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF 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.samples.framework.tests.transport; + +import org.apache.http.HttpHeaders; +import org.apache.http.HttpStatus; +import org.apache.synapse.samples.framework.SynapseTestCase; +import org.apache.synapse.samples.framework.clients.BasicHttpClient; +import org.apache.synapse.samples.framework.clients.HttpResponse; + +import java.util.List; +import java.util.Map; + +public class Sample10102 extends SynapseTestCase { + + public static final byte[] TEST_PAYLOAD = "foo".getBytes(); + + public Sample10102() { + super(10101); + } + + public void testChunking() throws Exception { + BasicHttpClient client = new BasicHttpClient(); + HttpResponse response = client.doPost("http://127.0.0.1:8280/test/order", + TEST_PAYLOAD, "application/json"); + assertEquals(HttpStatus.SC_OK, response.getStatus()); + Map> headers = response.getBodyAsMap(); + assertTrue(headers.containsKey(HttpHeaders.TRANSFER_ENCODING)); + assertFalse(headers.containsKey(HttpHeaders.CONTENT_LENGTH)); + assertEquals("chunked", headers.get(HttpHeaders.TRANSFER_ENCODING).get(0)); + } +} diff --git a/modules/integration/src/test/resources/axis2Xml/synapse/axis2.xml b/modules/integration/src/test/resources/axis2Xml/synapse/axis2.xml new file mode 100644 index 0000000000..5e663f1ff8 --- /dev/null +++ b/modules/integration/src/test/resources/axis2Xml/synapse/axis2.xml @@ -0,0 +1,682 @@ + + + + + + + + + + + true + + true + + + false + + false + + + false + + work/mtom + + 4000 + + + false + + + inmemory + + + + + services + + + axis2services + + + axis2modules + + + WSO2 AM 4.2.0 + WSO2 AM 4.2.0 + + + + false + + + + + + + false + + + true + + + 30000 + + + repository/deployment/server/synapse-configs + + . + + . + + localhost + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.wso2.carbon.mediation.transport.handlers.PassThroughNHttpGetProcessor + true + 8280 + + + + optional + org.wso2.carbon.mediation.transport.handlers.PassThroughNHttpGetProcessor + 8243 + TLSv1,TLSv1.1,TLSv1.2 + true + + + repository/resources/security/wso2carbon.jks + JKS + wso2carbon + wso2carbon + + + + + repository/resources/security/client-truststore.jks + JKS + wso2carbon + + + + + + + + repository/resources/security/listenerprofiles.xml + 600000 + + + 1000 + 1000 + false + false + + + + + + + + + + + + + + true + + + + true + + + + + + true + DefaultAndLocalhost + TLSv1,TLSv1.1,TLSv1.2 + + + repository/resources/security/wso2carbon.jks + JKS + wso2carbon + wso2carbon + + + + + repository/resources/security/client-truststore.jks + JKS + wso2carbon + + + + + + + + repository/resources/security/sslprofiles.xml + 600000 + + + + + true + + + repository/resources/security/wso2carbon.jks + JKS + wso2carbon + wso2carbon + + + + + repository/resources/security/client-truststore.jks + JKS + wso2carbon + + + + + + + {outflow={dispatch={sequence=outflowDispatchSeq, fault={sequence=outflowFaultSeq}}}} + websocket-custom-header + + + websocket-custom-header + {outflow={dispatch={fault={sequence=outflowFaultSeq}, sequence=outflowDispatchSeq}}} + + repository/resources/security/client-truststore.jks + wso2carbon + + + + + + + + + + + + + + + + + + + + + + + true + + + multicast + + + + + wso2.carbon.domain + + + + + + 45564 + + 100 + + 60 + + + + + + 127.0.0.1 + + + + + + 4000 + + + + + + + + + + + + + + + + 127.0.0.1 + 4000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/integration/src/test/resources/extras/synapse_sample_10102.xml b/modules/integration/src/test/resources/extras/synapse_sample_10102.xml new file mode 100644 index 0000000000..fd16792ab8 --- /dev/null +++ b/modules/integration/src/test/resources/extras/synapse_sample_10102.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + diff --git a/modules/integration/src/test/resources/sample10102.xml b/modules/integration/src/test/resources/sample10102.xml new file mode 100644 index 0000000000..6ad2c1ddc0 --- /dev/null +++ b/modules/integration/src/test/resources/sample10102.xml @@ -0,0 +1,38 @@ + + + + + 10102 + Pass Through Transport Certificate Revocation Validation Support + + modules/integration/target/test_repos/synapse + modules/integration/target/test_repos/synapse/conf/axis2.xml + modules/integration/src/test/resources/extras/synapse_sample_10102.xml + + + + 9000 + true + + + + modules/integration/target/test_repos/axis2Client + + 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 1a5f4226f2..edfb6e429c 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 @@ -155,7 +155,7 @@ public void verifyCertificateValidity(javax.security.cert.X509Certificate[] peer log.debug("Validating client certificate with the issuer certificate retrieved from" + "the trust store"); revocationStatus = verifier.checkRevocationStatus(peerCert, issuerCert); - if (!RevocationStatus.GOOD.toString().equals(revocationStatus.toString())) { + if (RevocationStatus.GOOD.toString().equals(revocationStatus.toString())) { return; } } From d639b7be3da4e2506bec4a9dd4b242bb948f62f0 Mon Sep 17 00:00:00 2001 From: akila94 Date: Thu, 29 Feb 2024 15:32:35 +0530 Subject: [PATCH 185/308] Remove unwanted files --- .../tests/transport/Sample10102.java | 49 -- .../test/resources/axis2Xml/synapse/axis2.xml | 682 ------------------ .../resources/extras/synapse_sample_10102.xml | 30 - .../src/test/resources/sample10102.xml | 38 - 4 files changed, 799 deletions(-) delete mode 100644 modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/transport/Sample10102.java delete mode 100644 modules/integration/src/test/resources/axis2Xml/synapse/axis2.xml delete mode 100644 modules/integration/src/test/resources/extras/synapse_sample_10102.xml delete mode 100644 modules/integration/src/test/resources/sample10102.xml diff --git a/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/transport/Sample10102.java b/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/transport/Sample10102.java deleted file mode 100644 index 642003a0c1..0000000000 --- a/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/transport/Sample10102.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF 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.samples.framework.tests.transport; - -import org.apache.http.HttpHeaders; -import org.apache.http.HttpStatus; -import org.apache.synapse.samples.framework.SynapseTestCase; -import org.apache.synapse.samples.framework.clients.BasicHttpClient; -import org.apache.synapse.samples.framework.clients.HttpResponse; - -import java.util.List; -import java.util.Map; - -public class Sample10102 extends SynapseTestCase { - - public static final byte[] TEST_PAYLOAD = "foo".getBytes(); - - public Sample10102() { - super(10101); - } - - public void testChunking() throws Exception { - BasicHttpClient client = new BasicHttpClient(); - HttpResponse response = client.doPost("http://127.0.0.1:8280/test/order", - TEST_PAYLOAD, "application/json"); - assertEquals(HttpStatus.SC_OK, response.getStatus()); - Map> headers = response.getBodyAsMap(); - assertTrue(headers.containsKey(HttpHeaders.TRANSFER_ENCODING)); - assertFalse(headers.containsKey(HttpHeaders.CONTENT_LENGTH)); - assertEquals("chunked", headers.get(HttpHeaders.TRANSFER_ENCODING).get(0)); - } -} diff --git a/modules/integration/src/test/resources/axis2Xml/synapse/axis2.xml b/modules/integration/src/test/resources/axis2Xml/synapse/axis2.xml deleted file mode 100644 index 5e663f1ff8..0000000000 --- a/modules/integration/src/test/resources/axis2Xml/synapse/axis2.xml +++ /dev/null @@ -1,682 +0,0 @@ - - - - - - - - - - - true - - true - - - false - - false - - - false - - work/mtom - - 4000 - - - false - - - inmemory - - - - - services - - - axis2services - - - axis2modules - - - WSO2 AM 4.2.0 - WSO2 AM 4.2.0 - - - - false - - - - - - - false - - - true - - - 30000 - - - repository/deployment/server/synapse-configs - - . - - . - - localhost - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.wso2.carbon.mediation.transport.handlers.PassThroughNHttpGetProcessor - true - 8280 - - - - optional - org.wso2.carbon.mediation.transport.handlers.PassThroughNHttpGetProcessor - 8243 - TLSv1,TLSv1.1,TLSv1.2 - true - - - repository/resources/security/wso2carbon.jks - JKS - wso2carbon - wso2carbon - - - - - repository/resources/security/client-truststore.jks - JKS - wso2carbon - - - - - - - - repository/resources/security/listenerprofiles.xml - 600000 - - - 1000 - 1000 - false - false - - - - - - - - - - - - - - true - - - - true - - - - - - true - DefaultAndLocalhost - TLSv1,TLSv1.1,TLSv1.2 - - - repository/resources/security/wso2carbon.jks - JKS - wso2carbon - wso2carbon - - - - - repository/resources/security/client-truststore.jks - JKS - wso2carbon - - - - - - - - repository/resources/security/sslprofiles.xml - 600000 - - - - - true - - - repository/resources/security/wso2carbon.jks - JKS - wso2carbon - wso2carbon - - - - - repository/resources/security/client-truststore.jks - JKS - wso2carbon - - - - - - - {outflow={dispatch={sequence=outflowDispatchSeq, fault={sequence=outflowFaultSeq}}}} - websocket-custom-header - - - websocket-custom-header - {outflow={dispatch={fault={sequence=outflowFaultSeq}, sequence=outflowDispatchSeq}}} - - repository/resources/security/client-truststore.jks - wso2carbon - - - - - - - - - - - - - - - - - - - - - - - true - - - multicast - - - - - wso2.carbon.domain - - - - - - 45564 - - 100 - - 60 - - - - - - 127.0.0.1 - - - - - - 4000 - - - - - - - - - - - - - - - - 127.0.0.1 - 4000 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/integration/src/test/resources/extras/synapse_sample_10102.xml b/modules/integration/src/test/resources/extras/synapse_sample_10102.xml deleted file mode 100644 index fd16792ab8..0000000000 --- a/modules/integration/src/test/resources/extras/synapse_sample_10102.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - diff --git a/modules/integration/src/test/resources/sample10102.xml b/modules/integration/src/test/resources/sample10102.xml deleted file mode 100644 index 6ad2c1ddc0..0000000000 --- a/modules/integration/src/test/resources/sample10102.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - 10102 - Pass Through Transport Certificate Revocation Validation Support - - modules/integration/target/test_repos/synapse - modules/integration/target/test_repos/synapse/conf/axis2.xml - modules/integration/src/test/resources/extras/synapse_sample_10102.xml - - - - 9000 - true - - - - modules/integration/target/test_repos/axis2Client - - From 1d191dc7e0c46e511551b52e8ee5f385ad5a54f2 Mon Sep 17 00:00:00 2001 From: akila94 Date: Thu, 29 Feb 2024 15:35:42 +0530 Subject: [PATCH 186/308] Add throwable object --- .../certificatevalidation/CertificateVerificationManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 edfb6e429c..9620079eb4 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 @@ -207,10 +207,10 @@ public boolean isExpired(X509Certificate[] certificates) { try { cert.checkValidity(); } catch (CertificateExpiredException e) { - log.error("Peer certificate is expired"); + log.error("Peer certificate is expired", e); return true; } catch (CertificateNotYetValidException e) { - log.error("Peer certificate is not valid yet"); + log.error("Peer certificate is not valid yet", e); return true; } } From 156ef92a8c9131b33e8bbb57eafa585d7e2f9f9b Mon Sep 17 00:00:00 2001 From: tharikaGitHub Date: Fri, 1 Mar 2024 12:00:33 +0530 Subject: [PATCH 187/308] Fix review comments --- .../core/src/main/java/org/apache/synapse/api/ApiUtils.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modules/core/src/main/java/org/apache/synapse/api/ApiUtils.java b/modules/core/src/main/java/org/apache/synapse/api/ApiUtils.java index bf688bb79d..8d81e6c6b2 100644 --- a/modules/core/src/main/java/org/apache/synapse/api/ApiUtils.java +++ b/modules/core/src/main/java/org/apache/synapse/api/ApiUtils.java @@ -195,7 +195,6 @@ public static Set getAcceptableResources(Map resourc public static API getSelectedAPI(MessageContext synCtx) { API selectedApi; - API defaultAPI = null; //getting the API collection from the synapse configuration to find the invoked API Collection apiSet = synCtx.getEnvironment().getSynapseConfiguration().getAPIs(); //Since swapping elements are not possible with sets, Collection is converted to a List @@ -219,10 +218,6 @@ public static API getSelectedAPI(MessageContext synCtx) { return selectedApi; } } - if (defaultAPI != null && defaultAPI.canProcess(synCtx)) { - defaultAPI.setLogSetterValue(); - return defaultAPI; - } return null; } From acc1acd62242916c5311e8315d79375578c6e22d Mon Sep 17 00:00:00 2001 From: tharikaGitHub Date: Fri, 1 Mar 2024 13:20:06 +0530 Subject: [PATCH 188/308] Remove unnecessary variable selectedApi --- .../src/main/java/org/apache/synapse/api/ApiUtils.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/core/src/main/java/org/apache/synapse/api/ApiUtils.java b/modules/core/src/main/java/org/apache/synapse/api/ApiUtils.java index 8d81e6c6b2..faa8e551ee 100644 --- a/modules/core/src/main/java/org/apache/synapse/api/ApiUtils.java +++ b/modules/core/src/main/java/org/apache/synapse/api/ApiUtils.java @@ -194,7 +194,6 @@ public static Set getAcceptableResources(Map resourc } public static API getSelectedAPI(MessageContext synCtx) { - API selectedApi; //getting the API collection from the synapse configuration to find the invoked API Collection apiSet = synCtx.getEnvironment().getSynapseConfiguration().getAPIs(); //Since swapping elements are not possible with sets, Collection is converted to a List @@ -204,8 +203,7 @@ public static API getSelectedAPI(MessageContext synCtx) { //identiy the api using canProcess method for (API api : duplicateApiSet) { if (identifySelectedAPI(api, synCtx, defaultStrategyApiSet)) { - selectedApi = api; - return selectedApi; + return api; } } for (API api : defaultStrategyApiSet) { @@ -214,8 +212,7 @@ public static API getSelectedAPI(MessageContext synCtx) { if (log.isDebugEnabled()) { log.debug("Located specific API: " + api.getName() + " for processing message"); } - selectedApi = api; - return selectedApi; + return api; } } return null; From 66c6de94dabe61d56c3aa5df7fce7cf67f3e2253 Mon Sep 17 00:00:00 2001 From: akila94 Date: Fri, 1 Mar 2024 13:43:47 +0530 Subject: [PATCH 189/308] Fix PR comments --- .../CertificateVerificationManager.java | 15 +-------------- 1 file changed, 1 insertion(+), 14 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 9620079eb4..a1c9a1a831 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 @@ -57,20 +57,7 @@ public class CertificateVerificationManager { public CertificateVerificationManager(Integer cacheAllocatedSize, Integer cacheDelayMins) { - if (cacheAllocatedSize != null && cacheAllocatedSize > Constants.CACHE_MIN_ALLOCATED_SIZE - && cacheAllocatedSize < Constants.CACHE_MAX_ALLOCATED_SIZE) { - this.cacheSize = cacheAllocatedSize; - } else { - log.warn("The cache size is out of range. Hence, using the default cache size value of " - + Constants.CACHE_DEFAULT_ALLOCATED_SIZE + "."); - } - if (cacheDelayMins != null && cacheDelayMins > Constants.CACHE_MIN_DELAY_MINS - && cacheDelayMins < Constants.CACHE_MAX_DELAY_MINS) { - this.cacheDelayMins = cacheDelayMins; - } else { - log.warn("The cache delay is out of range. Hence, using the default cache delay value of " - + Constants.CACHE_DEFAULT_DELAY_MINS + "."); - } + this(cacheAllocatedSize, cacheDelayMins, true, false); } public CertificateVerificationManager(Integer cacheAllocatedSize, Integer cacheDelayMins, From 69179d04fa62be1bf92820f3808d9e8694d7fff6 Mon Sep 17 00:00:00 2001 From: tharikaGitHub Date: Fri, 1 Mar 2024 15:15:19 +0530 Subject: [PATCH 190/308] Fix doc comments --- .../src/main/java/org/apache/synapse/api/ApiUtils.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/core/src/main/java/org/apache/synapse/api/ApiUtils.java b/modules/core/src/main/java/org/apache/synapse/api/ApiUtils.java index faa8e551ee..7533f2b6a2 100644 --- a/modules/core/src/main/java/org/apache/synapse/api/ApiUtils.java +++ b/modules/core/src/main/java/org/apache/synapse/api/ApiUtils.java @@ -193,6 +193,12 @@ public static Set getAcceptableResources(Map resourc return acceptableResources; } + /** + * This method is used to locate the specific API that has been invoked from the collection of all APIs. + * + * @param synCtx MessageContext of the request + * @return Selected API + */ public static API getSelectedAPI(MessageContext synCtx) { //getting the API collection from the synapse configuration to find the invoked API Collection apiSet = synCtx.getEnvironment().getSynapseConfiguration().getAPIs(); @@ -200,7 +206,7 @@ public static API getSelectedAPI(MessageContext synCtx) { List defaultStrategyApiSet = new ArrayList(apiSet); //To avoid apiSet being modified concurrently List duplicateApiSet = new ArrayList<>(apiSet); - //identiy the api using canProcess method + //identify the api using canProcess method for (API api : duplicateApiSet) { if (identifySelectedAPI(api, synCtx, defaultStrategyApiSet)) { return api; @@ -218,7 +224,7 @@ public static API getSelectedAPI(MessageContext synCtx) { return null; } - public static boolean identifySelectedAPI(API api, MessageContext synCtx, List defaultStrategyApiSet) { + private static boolean identifySelectedAPI(API api, MessageContext synCtx, List defaultStrategyApiSet) { API defaultAPI = null; api.setLogSetterValue(); if ("/".equals(api.getContext())) { From 7877ab2cfc874779e157012b7e2b094d9408c4cb Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sat, 2 Mar 2024 04:20:51 +0000 Subject: [PATCH 191/308] [WSO2 Release] [Jenkins #6887] [Release 4.0.0-wso2v94] prepare release v4.0.0-wso2v94 --- 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 438d48e1f3..ceacbe9246 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v94-SNAPSHOT + 4.0.0-wso2v94 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index ad106d7c7c..86df4e1224 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v94-SNAPSHOT + 4.0.0-wso2v94 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 4921007edb..30ae06e844 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-wso2v94-SNAPSHOT + 4.0.0-wso2v94 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 9b8ddc4f9f..ac3119f1aa 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v94-SNAPSHOT + 4.0.0-wso2v94 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 8c3846b949..f1f09a3686 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v94-SNAPSHOT + 4.0.0-wso2v94 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 15b81bb424..3dfb2245dc 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v94-SNAPSHOT + 4.0.0-wso2v94 ../../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 3c716b602f..ea05be47fa 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-wso2v94-SNAPSHOT + 4.0.0-wso2v94 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 edc62f2ab5..6b8eb1672d 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-wso2v94-SNAPSHOT + 4.0.0-wso2v94 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 d820fb81b8..1a791c7f09 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-wso2v94-SNAPSHOT + 4.0.0-wso2v94 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 84bf80f08b..dd0a26ccc5 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-wso2v94-SNAPSHOT + 4.0.0-wso2v94 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 65610e6173..d5b933d2ec 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-wso2v94-SNAPSHOT + 4.0.0-wso2v94 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 f99d5c2079..a969435487 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-wso2v94-SNAPSHOT + 4.0.0-wso2v94 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 f4d9deeaa6..689dc54f85 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-wso2v94-SNAPSHOT + 4.0.0-wso2v94 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 4f4c89e777..79ccd573e5 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v94-SNAPSHOT + 4.0.0-wso2v94 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index dc0dbd17c7..5c71a2ba32 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v94-SNAPSHOT + 4.0.0-wso2v94 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 9828b6280c..cac1afdc8e 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v94-SNAPSHOT + 4.0.0-wso2v94 ../../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-wso2v94 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 63817c4c56..fbc4517d0f 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v94-SNAPSHOT + 4.0.0-wso2v94 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index e06f0abca7..24fc791815 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-wso2v94-SNAPSHOT + 4.0.0-wso2v94 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index f098b986aa..93792360df 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-wso2v94-SNAPSHOT + 4.0.0-wso2v94 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index b476e7b4d0..a47165adad 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v94-SNAPSHOT + 4.0.0-wso2v94 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 2809307890..b2b492f3da 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v94-SNAPSHOT + 4.0.0-wso2v94 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 9060af4810..d970160ccf 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v94-SNAPSHOT + 4.0.0-wso2v94 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 3e559ddb4b..6710144ad0 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v94-SNAPSHOT + 4.0.0-wso2v94 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 3d3eb2992a..b0cf3f7be5 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-wso2v94-SNAPSHOT + 4.0.0-wso2v94 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index fe5fc313f4..f3d42c4c24 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-wso2v94-SNAPSHOT + 4.0.0-wso2v94 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 43b3d5988f..b1c6657b58 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-wso2v94-SNAPSHOT + 4.0.0-wso2v94 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 7c325d17ee..bbb8c33ea0 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-wso2v94-SNAPSHOT + 4.0.0-wso2v94 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 7abd7ee6ce..8d53b712c9 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v94-SNAPSHOT + 4.0.0-wso2v94 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index ce4b905a37..ec4fa31c54 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v94-SNAPSHOT + 4.0.0-wso2v94 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 8f2b3889fc..846df7c833 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-wso2v94-SNAPSHOT + 4.0.0-wso2v94 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index b5ecf1df58..decb416db1 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v94-SNAPSHOT + 4.0.0-wso2v94 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-wso2v94 Apache Software Foundation From eaa611b7f17d3e3be9837473e5e21fae41705d08 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sat, 2 Mar 2024 04:20:54 +0000 Subject: [PATCH 192/308] [WSO2 Release] [Jenkins #6887] [Release 4.0.0-wso2v94] 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 ceacbe9246..63ff315468 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v94 + 4.0.0-wso2v95-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 86df4e1224..81dcf1ca2e 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v94 + 4.0.0-wso2v95-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 30ae06e844..5f574b87cb 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-wso2v94 + 4.0.0-wso2v95-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index ac3119f1aa..adaa623652 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v94 + 4.0.0-wso2v95-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index f1f09a3686..4318fe18f1 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v94 + 4.0.0-wso2v95-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 3dfb2245dc..67ba39731b 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v94 + 4.0.0-wso2v95-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 ea05be47fa..ed88b3acff 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-wso2v94 + 4.0.0-wso2v95-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 6b8eb1672d..6e51356728 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-wso2v94 + 4.0.0-wso2v95-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 1a791c7f09..dd502780d6 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-wso2v94 + 4.0.0-wso2v95-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 dd0a26ccc5..0f1a06649d 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-wso2v94 + 4.0.0-wso2v95-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 d5b933d2ec..a0bd36b010 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-wso2v94 + 4.0.0-wso2v95-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 a969435487..642a15b2d9 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-wso2v94 + 4.0.0-wso2v95-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 689dc54f85..bfce9686ad 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-wso2v94 + 4.0.0-wso2v95-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 79ccd573e5..00c90e35ef 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v94 + 4.0.0-wso2v95-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 5c71a2ba32..c581ff9b86 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v94 + 4.0.0-wso2v95-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index cac1afdc8e..864b925871 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v94 + 4.0.0-wso2v95-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-wso2v94 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index fbc4517d0f..f56e71b54b 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v94 + 4.0.0-wso2v95-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 24fc791815..b73a270139 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-wso2v94 + 4.0.0-wso2v95-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 93792360df..ed8e920341 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-wso2v94 + 4.0.0-wso2v95-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index a47165adad..8e03a74ef2 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v94 + 4.0.0-wso2v95-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index b2b492f3da..834dff51f4 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v94 + 4.0.0-wso2v95-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index d970160ccf..45332f2dd9 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v94 + 4.0.0-wso2v95-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 6710144ad0..3715b91805 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v94 + 4.0.0-wso2v95-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index b0cf3f7be5..656b9f3256 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-wso2v94 + 4.0.0-wso2v95-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index f3d42c4c24..aaf4bccde8 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-wso2v94 + 4.0.0-wso2v95-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index b1c6657b58..b9ba84e4f7 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-wso2v94 + 4.0.0-wso2v95-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index bbb8c33ea0..5d74d8dd94 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-wso2v94 + 4.0.0-wso2v95-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 8d53b712c9..a3a3bf2013 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v94 + 4.0.0-wso2v95-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index ec4fa31c54..0d49b61eda 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v94 + 4.0.0-wso2v95-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 846df7c833..7f8c78fdaa 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-wso2v94 + 4.0.0-wso2v95-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index decb416db1..2da19b5bf8 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v94 + 4.0.0-wso2v95-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-wso2v94 + HEAD Apache Software Foundation From 03879b13fddb19d90d640a4dad61024e706c98b6 Mon Sep 17 00:00:00 2001 From: akila94 Date: Sat, 2 Mar 2024 14:31:01 +0530 Subject: [PATCH 193/308] Write cert revocation integration tests --- .../framework/TestSamplesHandlerSuite.java | 4 + .../framework/clients/BasicHttpClient.java | 38 ++ .../tests/transport/Sample10102.java | 48 ++ .../tests/transport/Sample10103.java | 48 ++ .../axis2Xml/synapse/axis2_cert_revoc.xml | 414 ++++++++++++++++++ .../synapse/axis2_cert_revoc_expiry.xml | 414 ++++++++++++++++++ .../resources/extras/synapse_sample_10102.xml | 30 ++ .../src/test/resources/sample10102.xml | 38 ++ .../src/test/resources/sample10103.xml | 38 ++ .../src/test/resources/transport.jks | Bin 0 -> 4123 bytes .../integration/src/test/resources/trust.jks | Bin 682 -> 4592 bytes .../src/test/resources/wso2carbon.jks | Bin 0 -> 4208 bytes 12 files changed, 1072 insertions(+) create mode 100644 modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/transport/Sample10102.java create mode 100644 modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/transport/Sample10103.java create mode 100644 modules/integration/src/test/resources/axis2Xml/synapse/axis2_cert_revoc.xml create mode 100644 modules/integration/src/test/resources/axis2Xml/synapse/axis2_cert_revoc_expiry.xml create mode 100644 modules/integration/src/test/resources/extras/synapse_sample_10102.xml create mode 100644 modules/integration/src/test/resources/sample10102.xml create mode 100644 modules/integration/src/test/resources/sample10103.xml create mode 100644 modules/integration/src/test/resources/transport.jks create mode 100644 modules/integration/src/test/resources/wso2carbon.jks diff --git a/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java b/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java index fff76f68a2..479d30cfd4 100644 --- a/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java +++ b/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java @@ -87,6 +87,8 @@ import org.apache.synapse.samples.framework.tests.tasks.Sample300; import org.apache.synapse.samples.framework.tests.template.Sample750; import org.apache.synapse.samples.framework.tests.template.Sample751; +import org.apache.synapse.samples.framework.tests.transport.Sample10102; +import org.apache.synapse.samples.framework.tests.transport.Sample10103; import org.apache.synapse.samples.framework.tests.transport.Sample250; import org.apache.synapse.samples.framework.tests.transport.Sample251; import org.apache.synapse.samples.framework.tests.transport.Sample268; @@ -322,5 +324,7 @@ private static void populateTemplateSamples() { private static void populateTransportSamples() { sampleClassRepo.put("268", Sample268.class); + sampleClassRepo.put("10102", Sample10102.class); + sampleClassRepo.put("10103", Sample10103.class); } } diff --git a/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/BasicHttpClient.java b/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/BasicHttpClient.java index 2b02c85635..ec8b3b3ee3 100644 --- a/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/BasicHttpClient.java +++ b/modules/integration/src/test/java/org/apache/synapse/samples/framework/clients/BasicHttpClient.java @@ -25,8 +25,16 @@ import org.apache.http.entity.BasicHttpEntity; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.ssl.SSLContexts; +import javax.net.ssl.KeyManagerFactory; +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManagerFactory; import java.io.ByteArrayInputStream; +import java.io.FileInputStream; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.security.KeyStore; import java.util.Map; /** @@ -112,4 +120,34 @@ public HttpResponse doPost(String url, byte[] payload, } } + public HttpResponse doPostWithCert(String url, byte[] payload, + String contentType, String keyStorePath, + String trustStorePath, String keyStorePass, String trustStorePass) + throws Exception { + + KeyStore testKeyStore = KeyStore.getInstance("JKS"); + testKeyStore.load(Files.newInputStream(Paths.get(keyStorePath)), keyStorePass.toCharArray()); + + KeyStore testTrustStore = KeyStore.getInstance("JKS"); + testTrustStore.load(Files.newInputStream(Paths.get(trustStorePath)), trustStorePass.toCharArray()); + + SSLContext sslContext = SSLContext.getInstance("TLS"); + KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance("SunX509"); + keyManagerFactory.init(testKeyStore, keyStorePass.toCharArray()); + + TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance("SunX509"); + trustManagerFactory.init(testTrustStore); + + sslContext.init(keyManagerFactory.getKeyManagers(), trustManagerFactory.getTrustManagers(), null); + + try (CloseableHttpClient client = HttpClientBuilder.create().setSSLContext(sslContext).build()) { + HttpPost post = new HttpPost(url); + BasicHttpEntity entity = new BasicHttpEntity(); + entity.setContentType(contentType); + entity.setContent(new ByteArrayInputStream(payload)); + post.setEntity(entity); + return new HttpResponse(client.execute(post)); + } + } + } diff --git a/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/transport/Sample10102.java b/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/transport/Sample10102.java new file mode 100644 index 0000000000..9a91371c01 --- /dev/null +++ b/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/transport/Sample10102.java @@ -0,0 +1,48 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF 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.samples.framework.tests.transport; + +import org.apache.commons.io.FilenameUtils; +import org.apache.http.HttpStatus; +import org.apache.synapse.samples.framework.SynapseTestCase; +import org.apache.synapse.samples.framework.clients.BasicHttpClient; +import org.apache.synapse.samples.framework.clients.HttpResponse; + +public class Sample10102 extends SynapseTestCase { + + public static final byte[] TEST_PAYLOAD = "foo".getBytes(); + + public Sample10102() { + super(10102); + } + + public void testSingleClientCertForRevocation() throws Exception { + + BasicHttpClient client = new BasicHttpClient(); + HttpResponse response = client.doPostWithCert("https://localhost:8253/test/order", + TEST_PAYLOAD, "application/xml", + FilenameUtils.normalize(System.getProperty("user.dir") + + "/modules/integration/src/test/resources/transport.jks"), + FilenameUtils.normalize(System.getProperty("user.dir") + + "/modules/integration/src/test/resources/trust.jks"), "wso2carbon", + "password"); + assertEquals(HttpStatus.SC_ACCEPTED, response.getStatus()); + } +} diff --git a/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/transport/Sample10103.java b/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/transport/Sample10103.java new file mode 100644 index 0000000000..2745538298 --- /dev/null +++ b/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/transport/Sample10103.java @@ -0,0 +1,48 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF 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.samples.framework.tests.transport; + +import org.apache.commons.io.FilenameUtils; +import org.apache.http.HttpStatus; +import org.apache.synapse.samples.framework.SynapseTestCase; +import org.apache.synapse.samples.framework.clients.BasicHttpClient; +import org.apache.synapse.samples.framework.clients.HttpResponse; + +public class Sample10103 extends SynapseTestCase { + + public static final byte[] TEST_PAYLOAD = "foo".getBytes(); + + public Sample10103() { + super(10103); + } + + public void testSingleClientCertForRevocationWithExpiryCheck() throws Exception { + + BasicHttpClient client = new BasicHttpClient(); + HttpResponse response = client.doPostWithCert("https://localhost:8253/test/order", + TEST_PAYLOAD, "application/xml", + FilenameUtils.normalize(System.getProperty("user.dir") + + "/modules/integration/src/test/resources/transport.jks"), + FilenameUtils.normalize(System.getProperty("user.dir") + + "/modules/integration/src/test/resources/trust.jks"), "wso2carbon", + "password"); + assertEquals(HttpStatus.SC_ACCEPTED, response.getStatus()); + } +} diff --git a/modules/integration/src/test/resources/axis2Xml/synapse/axis2_cert_revoc.xml b/modules/integration/src/test/resources/axis2Xml/synapse/axis2_cert_revoc.xml new file mode 100644 index 0000000000..ca8208b0a0 --- /dev/null +++ b/modules/integration/src/test/resources/axis2Xml/synapse/axis2_cert_revoc.xml @@ -0,0 +1,414 @@ + + + + + + + + + true + + true + + + false + + false + + + false + + work/mtom + + 4000 + + + false + + + inmemory + + + + + services + + + axis2services + + + axis2modules + + + WSO2 AM 4.2.0 + WSO2 AM 4.2.0 + + + + false + + + + + + + false + + + true + + + 30000 + + + repository/deployment/server/synapse-configs + + . + + . + + localhost + + + true + + + + + + + + + + + + + + + true + 8280 + + + + optional + org.apache.synapse.transport.passthru.api.PassThroughNHttpGetProcessor + 8253 + TLSv1,TLSv1.1,TLSv1.2 + true + + + modules/integration/src/test/resources/wso2carbon.jks + JKS + password + password + + + + + modules/integration/src/test/resources/trust.jks + JKS + password + + + + + + + + 1000 + 1000 + false + false + + + + + + + + + + + true + + + multicast + + + + + wso2.carbon.domain + + + + + + 45564 + + 100 + + 60 + + + + + + 127.0.0.1 + + + + + + 4000 + + + + + + + + + + + + + + + + 127.0.0.1 + 4000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/integration/src/test/resources/axis2Xml/synapse/axis2_cert_revoc_expiry.xml b/modules/integration/src/test/resources/axis2Xml/synapse/axis2_cert_revoc_expiry.xml new file mode 100644 index 0000000000..6f9c1c63de --- /dev/null +++ b/modules/integration/src/test/resources/axis2Xml/synapse/axis2_cert_revoc_expiry.xml @@ -0,0 +1,414 @@ + + + + + + + + + true + + true + + + false + + false + + + false + + work/mtom + + 4000 + + + false + + + inmemory + + + + + services + + + axis2services + + + axis2modules + + + WSO2 AM 4.2.0 + WSO2 AM 4.2.0 + + + + false + + + + + + + false + + + true + + + 30000 + + + repository/deployment/server/synapse-configs + + . + + . + + localhost + + + true + + + + + + + + + + + + + + + true + 8280 + + + + optional + org.apache.synapse.transport.passthru.api.PassThroughNHttpGetProcessor + 8253 + TLSv1,TLSv1.1,TLSv1.2 + true + + + modules/integration/src/test/resources/wso2carbon.jks + JKS + password + password + + + + + modules/integration/src/test/resources/trust.jks + JKS + password + + + + + + + + 1000 + 1000 + false + true + + + + + + + + + + + true + + + multicast + + + + + wso2.carbon.domain + + + + + + 45564 + + 100 + + 60 + + + + + + 127.0.0.1 + + + + + + 4000 + + + + + + + + + + + + + + + + 127.0.0.1 + 4000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/integration/src/test/resources/extras/synapse_sample_10102.xml b/modules/integration/src/test/resources/extras/synapse_sample_10102.xml new file mode 100644 index 0000000000..fd16792ab8 --- /dev/null +++ b/modules/integration/src/test/resources/extras/synapse_sample_10102.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + diff --git a/modules/integration/src/test/resources/sample10102.xml b/modules/integration/src/test/resources/sample10102.xml new file mode 100644 index 0000000000..7827294191 --- /dev/null +++ b/modules/integration/src/test/resources/sample10102.xml @@ -0,0 +1,38 @@ + + + + + 10102 + Pass Through Transport Certificate Revocation Validation Support + + modules/integration/target/test_repos/synapse + modules/integration/target/test_repos/synapse/conf/axis2_cert_revoc.xml + modules/integration/src/test/resources/extras/synapse_sample_10102.xml + + + + 9000 + true + + + + modules/integration/target/test_repos/axis2Server + + diff --git a/modules/integration/src/test/resources/sample10103.xml b/modules/integration/src/test/resources/sample10103.xml new file mode 100644 index 0000000000..b4b7ce1220 --- /dev/null +++ b/modules/integration/src/test/resources/sample10103.xml @@ -0,0 +1,38 @@ + + + + + 10103 + Pass Through Transport Certificate Revocation And Expiry Validation + + modules/integration/target/test_repos/synapse + modules/integration/target/test_repos/synapse/conf/axis2_cert_revoc_expiry.xml + modules/integration/src/test/resources/extras/synapse_sample_10102.xml + + + + 9000 + true + + + + modules/integration/target/test_repos/axis2Server + + diff --git a/modules/integration/src/test/resources/transport.jks b/modules/integration/src/test/resources/transport.jks new file mode 100644 index 0000000000000000000000000000000000000000..f6df90ad6a8eb2390c65c51e331fd86b7696b959 GIT binary patch literal 4123 zcma);2UHW=*2gnxNS6*G5I{t!6R8(0^d=>M^b$j8K}aA8O%VtPiYQM&iZqcXC<;hX zid1QW6e*%0O=(K;0Rnmzzi<^VZ+-8r_hzkGYySJ}GyBY$y?^^`FKsVDAQ0%U8-TD; zeSMW>sbn0H;!7e^ArRp5^)l>z2m}EEBjDdaHYAfY5`Y6zP!0e<9xV^Ot4bsi!F|r?*4HpM0A^XxkxTrIyC>Q)ALP z1cHs89*sp$apW!4+84x2GPk)rfGLs z@yPZ}r2ol*;--!(T@y|gy}{}Iy87Jvdiabo9(QInyzh%Ri)jJDKmE z;gI+WutdRh-{@)%;gBj;DY6=`s8x%UZu7fQq~;&yrnY)2F03&2U8*}RZ>+o5PGNS& za@8d~{OMDB=z(Gp@n@$N5DDe{ISyP=R`r(!;MH(!;9y>Jao=~BgcRNGWCcmVH;}SH zyYuTm;5Fq_CdbQoWR*p_4iu?)p#%>3@v(DRMcUt@CT2GyKN^1%PlVWRx4Pu2Wk?!v zW4p&}$YCfssqG^xgKPhgdZBBYg7omymT3m><5mt0$2nPi(zwFrjZUj)PfVo) zd@hPHEPwN$F)(rKaqxOM=`7qq-I^M^RVW8!RRO{2pNE61s*cFYUme>P2KEGq9wY8HJ_c7AHo5;YUn$CvjQV-7`*x zQi$w_*;O<;j2!Ex<^^x`nfp23^y_o9;A3K*l%l$Zd)N2ZHV8zE+K!|=FI^L<-1oM{ z&7puNL>(>WR2s5yNiAckkYQ3@PP6FqdEFQL`8Dq}*954i3QN~GZKyZ76pA_|y7Fnh z3=mdXSMMrF)y{)p*xw#vWi%=uJpX3;;3K!=ckYeVxv{w zkfI?XhGkKxzEK)vB$_Cy?=M^2fGDeDl>YwbnKaDJOpDWbkv)?O1wrV$Ut)}{Kh5{C!Jq|K?@4esdntjJ}PLM{BsfwZ$z4K^n8erES8Lde!!os}Fg%?+k9qSXvHi>NL+=Bw zDxE8NwTXj#;qxl#WX%!W>U}IK$lWY|x9&v57Zd5JDF#Pu=f2w|9S=%y(V_nNL%pjZ zDV;f$90IqdJ9)o8Ar$#d=4IpWNH$tK)y^8iE>H!PuO>5yN{C(YjH`O}+O`Sn-Sb}3 zP|MHYkn%>69bWA785S8jBLN7)R!#~0gO0=FU<5*yjzm;83<^M@aJ#l@d5{&!C>3oG zy~zpy%yeK{qM1QPB+LqqFsIn-npuMp zfY{zorS}0?1i(&j5C9W20stT>*9cyebfmy&3hZFTC3`-QP|_(81lA-Q#(W}26%?+L z+AoW+yC?NvPqz7OUAOk$Y_WmxT$m^x34+y(z1dpW=rGYP=*uj>YOTilwcPKKo_Je& zmztfHd1211!CM{YbN#dv%WtPd$}$1PFZ1aqykZ{3KTf^VUs*RU%-R8YcoC~!Q~z-Z z-h!7nm$YrRxfr@qIX%=ZFWd;gBf32nUC4xmPchoDc|+swNl}?!T9j!XpM%-Fg{D7C z_k~i_Wai3sqg&4)*P4%4-}f56`;P`$m6n?BMU8SRI9Y$Y*S<^IcSBLCWZiCpq4t1G zAz`ko@7^U3HHrG1dP#6FKawDK{Faippw@jFo5IX?;fWu)>hHwzIqa}7UFUXDD zM{lPH1Op8C{R9PRlRGXbIBf)^4S}?mNanwKZlOO73Alo^W>9L^84BPA7~@OU?0DvpT%Ddty56prY+XUL77%s6@) z(_dvtrN{AcBT_-1-9-Ta90y{-!@C*;q7VH0FCyV7zM#@?KWOyP|KR6>_4UOPepU<~ zCx<6fLA9L?6@e>&Xiz>|He33CpX&{Z?93I1^MkzM+!#uHn<#l8aD5xXiKICO2NO?W z{;C!sHaIVw+b9~F=HCX{bUJyr-OjQkasRjVj=hyahXTD)00_t0!D-6v@Lr+fx@X=q zwh8Fgm6Xy^V!p7|cI+j7nNGC!?0KZHv`bFI?8S_PyTs>b3!miAd8a+ek57}B4x?FT zzw2*)ZoYA3?zwNaSXTL%2HQF0_-NC6Pn-x;p8eQe6CmPwevrzHlBD;KqStJ}2Wp;j z-i#lC^@U_{#X%>f)M9mi^k2KdzrpFCk-(i|I$n19+ojN1?ET9uGNnC|CowuImHP9G zTfAw(4?6XA{d~Nj&g^S?)fXFh?;Ehz7P8L1tRk{mUX)Tfka^{Ci&gEW?ec@=lG1RT z(nnMN$w{|CErgc~A}}xD<6uQ&jG#TGLi19K8Iz$Mtbrq6;jiN+-{0u*^z$R1$Kird zM@TM5>6pF#9Umw2H*3$*S?dT!z;u4HmJt%8=`kxV}aUW z&@3Pm{YSzXSYX;_#%NZMc}Fp^z-=tej_rCfvp~(Xb_MJ&fdYkpL!A-ePbZn>6egRnlt$;==DuaLQ09h5Ji(m3z7Dev@2SEOxkvVoEqmEdeK8i9nG%-A* ztAmyXkM4}&Si~@vI{I3&W?HgV#B)SaAo1_L`i<#d42QA&8;1W^M1M%$tg(+z28#&# zs7Aw}h5(qrp{y%FvH@=byWhvbj`o2-@7qc-y0wmvN)M-$1WC7DxTdj2_?$y+$KTXqbIq~e!c$r}%QPhky#sqG&52ci%4o%^{SKaEJ;674jH`Uk=OIIHHiD=p?NL%@TfZpkT zLK6Q%XXq|=V8EVo@7Ci%r-m$wB*aJ`vN0|H#34iN2WeTmz5onPiw9|OAQut|hs5at zNcw4j;pYwm<35sC_VZCV$UIkUNf)=C;;&eQVGe6e^{z> zR?~1g<6gH&`?u|`bk}+RCG_B*EtzvER|_q^`q!HYUH4(zc5aqG*VJb7_8_-tb$Wa# zq(Y?Ri?Vg*Ez?dh71F!fH;k|(RTssxh7yxq$t$hjR7_PW;zbaAjBKtzecSN1sq988 zB{VF$u?YS(Icm|Wx(zsj_kF2pK5J0} z?-$nV&cM2Su9C+~;ssTe5tAR}-dD8iSnM)Fe7!lgrTae5N5z89R){(yS!N+;wC;7) z70+k;E+r>B{XK5cw7Dv+ON>gj8F2KpTXYi5E2*6zjn4m?V94ZYSabdqu%+6 zD84Z!JKfwznyVLpPS#dyp1IrCyW^e5oFs`n>uW(~0`8qG;!xaPoVibEHJQlufMAD+cT1&)gR8jRu?X&yE$ng_n(D z@N$8ua$LB62%$&5*a(uOo%KuSq39!WCkH+WS1ygl!#LINTsZIh(dSC z(#XEmZOKlJeSK%7ZqM_)&-=dryq{-2pZT26^*h(^T-UkI_k6$Cb+%@rA3l&0UV4hve72d%N$@Z z8v_U+AlLvFM(7zBBOk>45X?4ii3xrUC}75rAz{KH3YU-y{G_|2R2 zh_NjxVY>58{5_!M3Bt*DMunOZ)^9W82oqy);JHprpUr?+IjE5u;&cL0WlFJmHzk`k zkkFR7+$0%Vz<72vS#|1^Yj(e>^m2EQea91TF{!ogtI%7>i*D$qmS^`269NKeZ53*g zfU5f^rQnqrK~##pj9Iim4nu!#Wo4vHgX|WMLXB?MQBjidZ-NWd4o~U^I~2?*FxqdK z7?se-+K1=UL4GpR8SR_HydGI`J8(DcMUIcd`u&km5ix1c%>wP^crW z2~Ii6FwoDrSZgk+&1vb}}EHZ!F7bu($z%tknNdwITU zz1+7q9Pgl|aJ9J8uw!}Drt_1>9_}=R>R^tw7dnPdN%|4KXcnv z*NGkPKOJXT(vip!dPQp$f4VH>tn}y3tr}EK?RKRR>X6F#>++)I5N~lR88RxXb4)); zkJ~G=MK0!5M&(HCw9>Vj3lqoIWPBk|FbKRCA+*NrW|$9D=xt0vYhixnw&>l^qpK*5pg2j3 z)(^)oR0oO2kQ7chZi|bJWQb`R>qm7(e8N~S9^z4{U-Iz0!YP_GXTR9h*%9%wqW&b+ z>Wh(S+1OH_!QAI0YM{&$*Q`6p5!+BL9P9p=q00jPmwJpexwdtBK67tZ85R(Wr!uM1 zWFB>c?=6zE=I;}_}-%Hh+^b>4+Y`ZIP156--7vQF^Lit#H@NOpW=?s`T82FO-eHR%Bww z9$ac0{9vFp8e#Ylc6{nzsDSn$p|rfNe;VcgUVVv@mM-LMzZ}?_@<)GBS3%g?y^{h{ z6kUtWA&IS`FvYE*17_lARBxx$te=(LV*_6YG*!?;w#8 zOCSVb{OLek4XX101w_VuKm;QntsPj;g+jm(2+Xd2(|B)<>Foe|55|o3enN?rj}7IA z!Rfi+&SP<&2sz-$4=73QS%sthF~`vUc=rG|A{LK>TjKFVxIU7OF*=+S6%mTcsw!%9 zt^Z*vA?PMx^?!*d4;=jw@zDPe(Uf-IwDjmfBf$TvmTp8s9-i|7hN8i7(`W_Qm^Ays1W6!jvkYtH_u z=P4Bld%2~G;k2XU?+j2O;1z6)iqR4umL7yK-C zNkK`7Z?wv>7Oc>iYx@A0`+l)4O#BWhc`!XDzQe4*VSd7Re7HZ~cn84w5#V`RMWz8x zT5UzSz~F5djD`%x9r_UEqua~?Bke%bIDqt-?gWRCx&cxLK%y|R$uWXq;70)@MzA|T zdJV`jGSgNV7?>bnK`}2P(N9xB0q-hL^ba5qu>^YCr{IV8!Mb5F1b~$C%NYWYqS;AT z&k!(hya$}l4K_dTaDG_<GaU=KvYV>M~!vKJW>|EJgnSUR^+0W1UR{$SCoW4;C zwjU4-=bu);&els^Rntix40HA#JJ%encNGw&J8;4TVf<*qjYbLo_Mn9=5HBOiF*q1^ z0{u_#`%eE7uwPZYFX4@b5&2u=wQCFS+Eq$Sao3CmrSF=D$jZg*l{|j)py72TGJnJBTB&ftP@Eudjbz4)0;;d>8eby#NWX;rzCJX)1`}(0icArC zmb+;KGPVZir4R6EzaQxn;p*A9K^r%G?H%+a9FRl~_faYuY( zG#9c8pyv$Z5c5YoKVua8?Wdnw^=m(vASiUXd#PR!486D7@VLE-_pejZodYedNe$^T zDZa=G>AXmkSDs16jNI+J?EGO2T)dZ0#DyD^v*uH)yX+`^k0PF-43Ub{b#$8)RpR5NMFt3{THNPSUU$Ztj>tD2uZM^A%AmhL2f> zeH~3xv(s^r5Fx%*KML{7+Od}0R;+eL>bSv>l>7A@)t5ke4euvuuo_oK*zxLpTpRb5 z^%n$XcU0r=u7EBaYrLQBehCNEmnIrmS{HMAS2&o+Hd+4!q`zsLjc?CD_+zNtog%uWLD^aO{|WoQ zsmC*lhxIpdeQFbaCOapjS@v>uQgT*S2yj^1K63IfMX1f!Lo9o|njCl~L1lr33F$HJ z;x*@=Jy`((i9fH#9=I69{xPua2G<@GkbTYWTNtn)7Vm_SFpg5jYMJRkWF$k z!SriPOHXCT@YS;iN}Vsi&y=7h#t*B7>BI%dS;w{E`W!MYeW;&_OJI5nOTQ3vLxbb? z5B1OokbB5R%c>nVbKts&?ldId;J|vebY!p|0H<>i59|Q2F9vpnhO3CbQ5Nyz3IF5Q z2q;~fZLP-BZH;;7(iRK{rN|cqoGcT(r`djYxS**MLoV)RfES%62b+wC4qJ>h4|hMj zoaa8d)llbHng<*5oxDRo0=dGh+sej;&rP4Y-g!Y; ztMIO*0&LdNFTE;2{3~~A{tKdW3&Q{a delta 64 zcmeyMyoy!v-`jt085kItfS3_Xvlmz9B^DH?0{KE^KRg&WFJdia5(!eWbx6APk<0qD OzLDvFNlB?~9K8T}a1+u1 diff --git a/modules/integration/src/test/resources/wso2carbon.jks b/modules/integration/src/test/resources/wso2carbon.jks new file mode 100644 index 0000000000000000000000000000000000000000..6d11c2dd2b5c08fde98854887b54af164b2762b1 GIT binary patch literal 4208 zcma)9S5y-WlTAV(R4JiI6%YtgLvIn4B1MWo0*HW!fQAyPf`lRgLI**SUL##8D!qf0 zNL5fmsL~-6rGp~Bdv?$FoqgJUm@_kX=FZccduHG`7IzSk3XWspq@k0*>*J4@fDm9l zjs*h7vHXRZ&*3=gy8l(8E&=1H34h_dzm`SA@INd@dLSqtM}7S-h=9BN!=Pq@-+`u>ypUVw4nQRipy@ak2=Yg3s_Bb3`Sd5$lNehs+h$a_Aa zaa3?}G**~LoU2=!D|G^{XKqmT&N)$PSBFZ!d=q@val@^ojpUz%T_Ltr}UdD z)2A|4&6pyuK#`uN5Oj)f@1b=b@AB*ru8J*6%`wE{J4ZGuWAyfzmbIB-I^KSVGM|{n*zbY7-M}r2>iHhdGsFo0F)y2&YSOHiS zdw3Fi8lR?7?8ZM`qy^$~vQol;d^Y^z}`;=HQn)-8SV4UOTr@y}5V z@vaR< z4#vp8$%~a5wd|4&%D6Vxyr6?KjTj6=vZxX}+3a9Rs>u<6>Js~&?r(Ucd@@~db5eoO zHOuDFtGM+om#Erz0tyl4)4lZD)(;?&JHss2VbzKfJ%R7^!2l?R-p z`3*C5Z8^OK%V~u1gIPB}itpG}(r!D6bH<~)1MT?bW$FonjC*16WYC$gVc8;Mtj zt$G{!)R`qO3Nt1rc?`44e(j>`0k%7;sy6e&_h zF+j8=D>`%1=-at!5{`E6u2Q>YL?aI&)h}nkZyIdfllDqtsuE94M3Q4S5B%L_u(M>Z z@D=Yqq>RKmM|B5fVE`Fu`hqy!Zyd$SEL2fd!Br;H55*-6F%GTx9`kx?rNge$p*6SK zWJ99VXFSBn{g*s# z-<(?(%IU)||09=l>~fp}>;Qj&FTfKZ4|o8$5AXpv{*5tkp?{k=WMv^F6a3)JjHIL_Ym51FTsx`T-^ip zh#l}&jzeX}2j$fNF@BV&NZQ{g(JSr^x!xD}9LjBI@vP=aK@%(YY`#%<)?Fu59Mq}% zNPwhAw)n;SvG;-y*t*T@PUutrd{^C)k)I9znrkvQJNOW8ythUQM>RaXc|6!@Vi64} z>1da4JM#DgBBZC~8>Raz(rr7W7#8NAImHGl{m@G2y`oCRuj63FjNGw{G4VJ+pRRtB zIBIRrbF6xyO)@KT>;c!w1KhRTH-7#!(Hvw0JX|zYaLPQK50m>6m^eY}O?&4P$0!36 znHjaly-EHeRt4k7j@oGwQHEDZX$;Z3 z!MwIJD<+>Jr7t#g*7#m-bPSUKP#&_AJ9e5e=6WA)^#IQZ`1 zwOj{FyL+B3J1O%Nv-jCSH~a}gDK5e00b*?B}&eB|DYUAj#map=ZWT`^Sdfm;D z4?n&I$x-tjZI{u@wAYo6-_&7ajModouZzppU>92sv4J#AvQ>q_Uej9x>t716wRXnY zjJFKg_!9$>R_e)d^rk$jOxloXZzL{0tB}lc{*cr*; zIX0<_zd;C>$)wxnV`xFeu0faqZMed3vlo^A674oTfi*^}s+LVliWjm5x7;g>X3?N8 zq{m#;1t_-ITIS-2aVNezYj%-diql^}&=tYvXzZ^wj@m5H&dHG(D&SeDy;d3*;@R_U z(Jlb<4+rnGWSmbXTO+zl{Io6ET~so_{G)nq;6!)~y2JKy4h~ zn|kFZP1`6jrv{rZ%xIp0rQO0t13p2@Z6`sk0&}A^YHW}4;Tc7f&mNKtDrNl3lh z;X=LV6Ki2NFO-)}75#|xWNpXz_{$$>i-_Zg!8-BTjGWBrB7a?YbQ^jx7+swRH7f8)*;@CJ2MyyyS~cW z2f0BD6u90B*fn3a!TE-B_D@ICH7i&4#iNK3zjSF zE_vliim*FGz76|@{}ai|nd&pMx#9o#mmKvKct*TZgIh*=7JF=lBI()&-*|De2E8Q= zPHSdOSBLq2(`F=qF2LMFPKZ;7@Tl^c+l0Mt!ojDG&}Q}9plFeoNxwy2`nH7~{Sw{L z9L4Bs?`hCgSGWQin>#KpEM>g9oRvdX;JIv zji^2P!_0cge$Ys_WZ>=0Yk(KgO48(mj8-Ai_bqo~u-e1kjf^iI(z}i$X3@Pq$`jd5 zKDWMka4?RdcCndjBME^Yi{+x5IBbcY`V!K;=kbfBiQBIUo!em3gV;Z1D&Z08E0TO8 z<{2cN?qIc48h7YEdA0vb@`F{^=trcFy3W9^Hv&hAyC%={>_Ui(zxfV7KoTuWbEc0K znm)A#nbWWUMvbiKn);Y?NASSr5^*u55fACNQUdz?8n<`n>f+vO4+%@Yb=M|`&(xVt z^y1Ek60>a{Hcza4c7g*GEeZ}E2mlvs{qhypnoeRW4TYGv=a`1Fj79R_!~l?mEj+Nf z%(fNbkgH^3q#sq8*Rh@`V&OtP3yrd%?UA;sA0tv;>{QP|FvkLxKhAK^rB~1J-DqE0 z=gM^d>hKA~v@)(Q%9G#^gE%8D(FOunapgqT09~sjCr;V}ZqV*;%2HD0{={h3Ljk@b zi}&U5++8xX8vTc#Wz)^1Smz|^XBnME_Y**7-b&RiuY~m1UDvEK&P;Tl^JJVZ0KYV_ zFg!jZ*Q(N>HwsfH zLN;Y7wWmb*y7u=6N;J*$_HStC+{47oK2vgZ3cFLU5Eom$PVwuT>SvBc(TxGWm>2-b zMMOU8rMh9r!rGJWPK^8aSJVZ^mX%Jg+N3^uaVA3CW@`cip$v>z&-gpbBe~v2P3)I0 z@9Zp|fFcnc#&mw(5IF2+7+=ZxHga!u4KG{qC2;@A=Xat!Ed!?f#Ss@U zslxG#C(?jFgiQ#{O(m+|NpG%nZX@1>5I(30{y$jcC;!uw5L zA@ExQVrhvx9*O%Aef3f1I>#QeOIKHz=vj)wTz*uYpmfZs)bwIcXUT74xj5cZW(hay znlpok2KW~-r}VSuT2|s>aSj~8lqI(A#x6%wj&_ zD+*{!K^oQ`YwaJ3^CUNmUBflVngN5xO$m`1$I#{IR~GNF`ZpL~w=fp~)aQmzMi65faRWQIv(51DRg`aEp2aN;lrHBvU*7=XZHnQl-90*M>&Gu*PhfmgsQ)?{{{vl Date: Sat, 2 Mar 2024 17:09:03 +0530 Subject: [PATCH 194/308] Change the port number of tests --- .../tests/transport/Sample10102.java | 2 +- .../tests/transport/Sample10103.java | 2 +- .../axis2Xml/synapse/axis2_cert_revoc.xml | 2 +- .../synapse/axis2_cert_revoc_expiry.xml | 2 +- .../src/test/resources/transport.jks | Bin 4123 -> 2699 bytes .../integration/src/test/resources/trust.jks | Bin 4592 -> 3183 bytes .../src/test/resources/wso2carbon.jks | Bin 4208 -> 2736 bytes 7 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/transport/Sample10102.java b/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/transport/Sample10102.java index 9a91371c01..f6d3eae7ed 100644 --- a/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/transport/Sample10102.java +++ b/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/transport/Sample10102.java @@ -36,7 +36,7 @@ public Sample10102() { public void testSingleClientCertForRevocation() throws Exception { BasicHttpClient client = new BasicHttpClient(); - HttpResponse response = client.doPostWithCert("https://localhost:8253/test/order", + HttpResponse response = client.doPostWithCert("https://localhost:8243/test/order", TEST_PAYLOAD, "application/xml", FilenameUtils.normalize(System.getProperty("user.dir") + "/modules/integration/src/test/resources/transport.jks"), diff --git a/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/transport/Sample10103.java b/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/transport/Sample10103.java index 2745538298..1ee96e73e4 100644 --- a/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/transport/Sample10103.java +++ b/modules/integration/src/test/java/org/apache/synapse/samples/framework/tests/transport/Sample10103.java @@ -36,7 +36,7 @@ public Sample10103() { public void testSingleClientCertForRevocationWithExpiryCheck() throws Exception { BasicHttpClient client = new BasicHttpClient(); - HttpResponse response = client.doPostWithCert("https://localhost:8253/test/order", + HttpResponse response = client.doPostWithCert("https://localhost:8243/test/order", TEST_PAYLOAD, "application/xml", FilenameUtils.normalize(System.getProperty("user.dir") + "/modules/integration/src/test/resources/transport.jks"), diff --git a/modules/integration/src/test/resources/axis2Xml/synapse/axis2_cert_revoc.xml b/modules/integration/src/test/resources/axis2Xml/synapse/axis2_cert_revoc.xml index ca8208b0a0..8fef1f474f 100644 --- a/modules/integration/src/test/resources/axis2Xml/synapse/axis2_cert_revoc.xml +++ b/modules/integration/src/test/resources/axis2Xml/synapse/axis2_cert_revoc.xml @@ -92,7 +92,7 @@ optional org.apache.synapse.transport.passthru.api.PassThroughNHttpGetProcessor - 8253 + 8243 TLSv1,TLSv1.1,TLSv1.2 true diff --git a/modules/integration/src/test/resources/axis2Xml/synapse/axis2_cert_revoc_expiry.xml b/modules/integration/src/test/resources/axis2Xml/synapse/axis2_cert_revoc_expiry.xml index 6f9c1c63de..14b90726c3 100644 --- a/modules/integration/src/test/resources/axis2Xml/synapse/axis2_cert_revoc_expiry.xml +++ b/modules/integration/src/test/resources/axis2Xml/synapse/axis2_cert_revoc_expiry.xml @@ -92,7 +92,7 @@ optional org.apache.synapse.transport.passthru.api.PassThroughNHttpGetProcessor - 8253 + 8243 TLSv1,TLSv1.1,TLSv1.2 true diff --git a/modules/integration/src/test/resources/transport.jks b/modules/integration/src/test/resources/transport.jks index f6df90ad6a8eb2390c65c51e331fd86b7696b959..0d1dc34464e4a6fb9ec5d6933ba58e7429582bcd 100644 GIT binary patch delta 42 xcmbQO&@IaI@9n?03=9lRK+L$2C!0&eg~L!lJ6g#0mwC{3J~V2FBjM z$$dHutPy&q29^vAtO*89tT6^n%q|OL0m2#mhfPIBbZWd z9wvV$7>60mQ818$Tf)gGCYYO;Q=E~Qm+4SmoNuI;oS$nTC(dhRY+!6?Y-ng=W?&fw z@9U}~-4J1K|nRzBNvI$Q%WmBwwHSPPZsEN}IR%W^@9Pq5z zU&bt{GOvSinupjV{=(N+P8`2no-^OH({*>urVVP-*H>sCtL}05ocVQO>R~mbdy;Xl zzIzFLu36LiOIAN9=6LXltMW6F-=-9OTX)_*-jng+zjOL)71z1PT@>EFw`s-?#q&1j z1%i5Jy;)#(Kuc!Dl(Y5IotEV+y4P0eG4)bQfbGR9g885r|ZT7@P5z+AwOvZnY)7v0`-b6ZEo5ssG0lNH>TU0F5hz+B&)V9UDti^j*flc#3AcpAUzgsigk z(w>A9Ry`(vb}CfoZ94zreyjK$u1MF#n;bt?GoIu<8YcRDe(#xyad%?X^F+UVuJD&k zJISN0RU~WC9=>ww+X!Yw=WcHCw?7SzJ+q!Bdu@WLVc*Bak7T%7%H_6rPnp8w5;%wP zX{#j93nt##5>4C6jp{{N-?FmEMc5VIxG^bgX+68h@3hG?jalCKm0!Q6&*A$e{dkJ- zo45OtbXOla;KHX}D#y#!y5LRMlA0%fJr3X4xpwc2@&jwD<9rRBVm<2W-2z#5@vYGBF0z?x>z#F}K##O%ey z$*}3`w}PoHt7aJRvTY4WE#YJo6U3G_+D;huNOjz$0W5L+9V24&~ zgZArdHV(&^@$K0=_5FtBGW*{jz54D){=e1_%U2vfbkkF#;Dg6aIqq-9sW%pT6s0k5 z@0Ol0=c&}`?%%UH@`_(RQ!v<#yLUJ5(;T5Iav?h7-&pH`}_ zU&a>kbb{GyzofZ$Jk`G6D37|jE=x}N*NtZ88IBdn0jJMxSm@eaTKX$|fT{p?zlzT)qZw3Si08t+YKD&4yDA}+kPRGHV2wX$K( z($#kIR*aK%SnuB9`+6YqRal(VCB_b9L=Pq%-y>ImVZ~srP zFzJr}-#_g6y*;=7RzrTYwSM!)Ypz$nKMlKfCGFLWipP3W_`JB)&y?Gxl=}ay?YwH8 zCE9xHZ<)vgfyliF2g-?&aKy*uB3*1RTVTn z@+~dBo=>*F{(aQf>({O}?cQ<3`*ZL^H_vU)zTI|t|DgYKnZ~-LS#unpgjZYVaY?k_ zuM;h*x#?!b|KINB1A+g0T$hz>d_D8C+A2W{mrv)E-uayBww}Cp%4xSgY2|%Nhi_hJ z-?mQOe{;;;%)15*0YaN@9BR3o?X`Z>y;Za4IeiH4`ms!eHK4=0e%%wU3#%P?|L{(@ z{_FkndehZqdB3`zWbc&o+_rb-Hj_OZyb)@Dmfm~fHkax7s|B_jTSQgH$`Sh~e z>}}I-Z?wMg;+^fX_p3~gwVOr9RoD0}QqNti_$&P2u~WX+H7!>EnDt3|W7fVqQEQh- zblOfiDJpPn;Y)ejW&L8C_b&Z=+Vs%Uvs*Xv`16R^$To7eE?SgP8umM2cg79|ksovR F0RYIZd3yi= diff --git a/modules/integration/src/test/resources/wso2carbon.jks b/modules/integration/src/test/resources/wso2carbon.jks index 6d11c2dd2b5c08fde98854887b54af164b2762b1..b9f9581678a7fd4e648f60ad649f555521b92b71 100644 GIT binary patch delta 1200 zcmV;h1W)_$Ag~o8FoFuK0s#Xsf(lj!2`Yw2hW8Bt2LYgh3P%Kj3PUi03O}(TyagNt zfd&aGhDe6@4FLxRpn?Q)FoFbb0s#Opf&^!i`UNW#$8j_C6O{eWTAAET&V$K429JN) zk%}aLxc3R;!P+(S-N0?q#k6pYfPw??u7c=n`zEqt%no$xFRp9Cs+y7yYk(JejM}$@ z$C{S>4x&H}UvSK?Z|}fuVr+6ccEvdt@txrUkEZ84H8hnlH7Oj$ci(j&BTcCcH}S9n z?=)3?8@_2hlK0gE3JoRBQfKv2?6a=2;Akp;5!(ad@SNC@@TYE(knMHewcUT35EB5! zjBk}3>|#or6Q_*i2fq(%d<^1xIptN_sI!6<_rqQ2lZ4lNqP1eAKAHIpJG`g8u(B-K zxbkS;G@o1n2cF_Q=jMMXC+19RSL+T9TeqhLGJGghGbigz8kMkk7f$s*?OPIZX z2P)pVh1YY09l1Tt;fUp2KsFB48_%KueuUkHo5(2^f^O9Ha>i2BLB*=m4S0Z5lwDmw z5CJ{I;K%Lq%+j{h9~)mYY$HB)VyOI0(lNw*FO`sVp{PX?+a9ONZNJvsXG2kRno z;gLbh`CQv=h4f`vHt~Bq4ERUY_qh6h2zI=Xyu2p4i1QQkml-*A$C-5S4SkN_RO>Q7 z)za1kigvP$@v6+!C{@_SM{bc24J3SgcoO!o@hmT(Gjly0%_SkkTHLRDO86pA+b1$f z`*{=x_Y@|fEE!w*nF@8txM!{KDcE-7h^QA-LfMf%$vA7qDC=4NVXfu<0Dp9hT- z*T(S&B}JwJ+m%mku#r_0wdx7RSXyz6P1H(k z?NsYp)E{i@(2+L4=XNxIgQ~p6l^q&OYudt}BRRpgBo0+uCx6e-A+#Bqn*S1PV8-LB)g^7FHBujulfn7r}A$C5Pd=j;*Li5G+ng19vEUhUw-o|DjI zlOYflI>*J@ogn3Ya{DvZ7XjXvni*R9$t1KXv|dA`IYywhWCRpt0_cG}MZWUbv`h)- ON82f{q2M|K0w)mVc11)0 delta 2683 zcmV->3WW8r74RS;FoF-`UNW#&gN_C^wnB*fPx9IMn@)R+^QPN&f64BM`shoUyXDSgF0u6a#du=#Ej6%G}!d?*a|fB&1zvD(SI3AQ-HB{p}G+n-k?mwn_Fa6ixXtS_a4|s z+Ee=*#KsOG1X#XsS$}zVplU^@&+)i-KIkrgM!+0AYa2_?qR=~UaT;wD28ukmRV|2S z*6%Wg^~ndtyw>Z()l_Tlex@gZcbeN00;sgTqsA#X106(QR}WP0U5QR@^=bO&)++bC zzn@~SlS9~1rDDYdwlV;0LTu{s@lHO>5&&o8Pcvki_TYgr(t3{92yqBm$`#NH4cZTX zRpN1v*J9-sH1&(5WcWDV=kg~IlJMU`%tIK6i@#sl9iru0ud_i}kA(Cc&Qg|kR=$J8)!<}U<7up3)h^f5QGV75nqE@#>?9a6D z)_gGq8~5(13NF94sMJP85)6z-e1_>LFR^>$y!Lx~2D&e=qJ41O?aS%Xp?kGmO`Hr% zN)jE8dQ?|Bk&6mX8aNF@2i$Q~5$m_2ozo1wq3zgivGcON>3^QfAQ>q^YX?ey-Q0mH zCwuG7Hg1*I`w;UPC)KP02&)Gw9VlFaAF64B^_wT)Y&CEf!{Q%&LWurcr&KwLirp*D z-x4es`~o~?*^f|C(`g_y!ptX02!k{HQIoEBD!*D9da+FBI99skG!C20?QE{4-f05T z*mV~Lp;Z!!wGXC*)MOl4=v{?>a5UV~0u$ySyNG-H=oPh_0`K|vQB`<=e_leD7d(KF z?j^zi5Aa}dmyv>Uni9Eb!YKN_k!&R^cv8eVo_g1ViD|%GVUf7JAe5r>exlriAMLZMPj=mmSlHuhO2S`;3C<)DQnSOnN1 zI>TTNw{Lb>B5QC}a9Xbl&n?-tz|_=~@crXF_-B3ZCoL9KDM!v#&X)9fsF{D5m7^Eq zN${eQaGc$P`g?ZnUwaFiKEE7PbP~%T8(W^BC)CSgTCMhkznE&s2ZlU^G&Vtc+v%gK zo54J}q3ve8ZVvDbxm6T@KK+mrc?YGnr*Lj_3X$juzuMPn?!WUMH;7~UwmhvUWeZIr zYL=Vy0&5eYGZ(EMUArS%f^&lw$lQntyEIc*H=L>2s4oF*Pt6yPu@FUa>S7L{_{?CN)Q`!NM6Fqw=sxNDi1n-q$fG}u4t9Mq<} zI|^1OFbGjt3AS$GMq1B!33yU%F(DR2qiC*xYu8>yjrGdFf4e$R0*EA(kNhN*bH0K1 z`z7x_&~8XW^X%n+CCRU27W713Lg`e*pV3+@BHU_tWTi)+X#_(@0yIV2^U6EdZoqrY z2HYiBkhxX!3ig_}E64)R!z+4Fnm+)Oh&3(R^_jgP*x~JL$$dFz#_E~UZ7uR*&ryiR zayHkTx^hd_Z50gARq}h9=+BLM#HKNbx)of>Z%8UF#{Z0eaPS_Ou6% zR;Zoa_%pi7y?jyz5CG6jR|&eu51!A40lTLtCNZ`H8MdAq^Sd4b7WPB%rK` z092y98YkbHzUCr+J=)2IbOWhy_(vr?;tsbE1~wpE_d_^z3{)~E`bS_Ool_^E)C*r` z#z#uB(8rg-=G@5V&iMyVu8YTqZ=-i72W31T2zmj3=Yp!q5qL#ck7O1I^%(;4{Ojb8 zuJqT?n`a&zrBk!2FrM<-6R>Ii9T4nmPNqcpkMXGqQ^R%unxE#cOK^>tq{2T}nf*>h zkQ$l#;sMgQ5DRtv+O;?aY3ibt*D@GgLXjEwX7!+@PpSs~@6_YSVhB>lae@(ta1#F6 z)sHZLSJqQ`J`SAgJf5;9jf<-)w;^l8o zrHHwB`wa^Kk)_ET1?0BQ2jb{SXdJ_u_dvAFRRje^mfs*B^s)YU2*_~ z?t(llB6sJn=D0dr=GkMi(SY8Az4Y$}slYu~yo-A3Civo@_TzM}z)uqb z{cN2!cCq!tel?Bd-_xVTcl9`Fy#f%YydK}!!<$7K_vdd)G&}uF?ty%KeWO2rW>k^T z7j>{}2%q_JqFRQMZI%zD72k$a_cE3Xlgn+r1cdA9Y=sd-rp^_gnP^KBi=JA|nh!kJ zLM(LkpP42DhIH8}qa9WNiU`T?ZI1MW$G3-4MEGqlT5_<}wN7qKl8i6IVAcUda1)Em?@*jkhO;*| zP$S-g;>)PzpJhPm00K8JdlOsRDhy-|>b0elVG0#G!7Qe!E-2x$TWMT7S=g2dJRE#Q pQbatX0xnaTWtR#a1Qgp1wL|Ml=Urb3SXgzFiuorT+f@PrClCr)Bg6mz From 622a2bbe0df14347652e49779f37ec05af634ffb Mon Sep 17 00:00:00 2001 From: akila94 Date: Sat, 2 Mar 2024 18:45:06 +0530 Subject: [PATCH 195/308] Remove unwanted keystore --- .../axis2Xml/synapse/axis2_cert_revoc.xml | 2 +- .../axis2Xml/synapse/axis2_cert_revoc_expiry.xml | 2 +- .../src/test/resources/wso2carbon.jks | Bin 2736 -> 0 bytes 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 modules/integration/src/test/resources/wso2carbon.jks diff --git a/modules/integration/src/test/resources/axis2Xml/synapse/axis2_cert_revoc.xml b/modules/integration/src/test/resources/axis2Xml/synapse/axis2_cert_revoc.xml index 8fef1f474f..85e309df5a 100644 --- a/modules/integration/src/test/resources/axis2Xml/synapse/axis2_cert_revoc.xml +++ b/modules/integration/src/test/resources/axis2Xml/synapse/axis2_cert_revoc.xml @@ -97,7 +97,7 @@ true - modules/integration/src/test/resources/wso2carbon.jks + modules/integration/src/test/resources/identity.jks JKS password password diff --git a/modules/integration/src/test/resources/axis2Xml/synapse/axis2_cert_revoc_expiry.xml b/modules/integration/src/test/resources/axis2Xml/synapse/axis2_cert_revoc_expiry.xml index 14b90726c3..ab832dc881 100644 --- a/modules/integration/src/test/resources/axis2Xml/synapse/axis2_cert_revoc_expiry.xml +++ b/modules/integration/src/test/resources/axis2Xml/synapse/axis2_cert_revoc_expiry.xml @@ -97,7 +97,7 @@ true - modules/integration/src/test/resources/wso2carbon.jks + modules/integration/src/test/resources/identity.jks JKS password password diff --git a/modules/integration/src/test/resources/wso2carbon.jks b/modules/integration/src/test/resources/wso2carbon.jks deleted file mode 100644 index b9f9581678a7fd4e648f60ad649f555521b92b71..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2736 zcma)8X*3iJ7oHiz*v7tuETfSOFJorxWNWf38j|FFO_afmwFr?Rgvwe{V@Z~9nC!AI zL-Q8(BFor!HG>cuRIl%R-|0QyukZVD&%O6~?sI?L^PGz$^HzX>97r;+GZzmc-ZFj< z3WNaj$-EX|GOzg&Y>Xsx*8dm9Spp_=79PQQNAZ-4?>{PjULYu+%xQ828X~X#QgA|% zmyo*uwERd_u$Z{6f_C-AZ)0@7?*>7%nZl}z4i+GgvJeQUfaK@m{`W=@4<`UA%f<6Y zyd}_!0}Mofg$^6^;A-al@V+0xCKaKu3@{n|!Rrn(mbzkXJdp!^&pbbshtDWFc9$$ky59p65vvd2=$QQdn}F2Cr$~E#}zDQ zUky=uZSFNKKU4I-{;5#RrX%C-v*X=2 z#sULj_;XrpR`j<9<_h56$;>Z^G5cO&+Zg@ruKnra`xWI$K!;^rSw(J7`qWcbxc!3m zOd#6o=}QOKTu)KUWTZ!(d4V-yy2d`t+iT0NJMLqiyOBb49v1;TqokCdK}En?vE=Eu z7XiW;n)Cx&)2+vx+nAb#jG|KRA0%zjRu4o#4^qBbt12(4)jG-WXVohk8%u_%!9eox zUkQ9EK8?0ztKu4QWA!H*_3^=}Y6>z&ZK=g?g}2t9lnTP+M5p>ieV1I~dnzc@zDv~E z?~mKH+LJ|Q3|xn`*CAtj?f0}~U_Un$7q3ZNJ0ECP0ZCfqs9PoP-{np~KjLM67MpMB z?wtnQuJiDmMY-!&fEBg+^Wc6c1-2#?E9;aX{GfZ4*$hlcU@nGcx+yU-p#LQGV~bJB5)B-T!-pL)bJ zBOrD;un(t>_#{s4V9vkAg`dlyPrk8B5Eg`$SCvb?RDUB%zTeN^za0Ec#@{Sk*@%a5 zdaX?(DnWmWc#^@$CBQ5QS?ICZc_QEPgNwWxP^PW&H=ouekOL&vX-q+)a}Nc~G&(>X zc9oYcX02yBB!w2a#}aO>+1=kYM7Q0DaH3jCf7*W)qtAxyj?OA#`|a^Ll@)Fbyt^_fmpf` z*Td-X|HrNy_jndM8CqYbI*5a`+JKZhWR5SDIX{etvw()1)ZDRZEQ#VZC{m@K50%5hrg%ngMTb}#vL zHmRTujMHtIHiA+5-bW5zsM3Jr^&Ll6O=b10H$r%VWA4kdv9vEGq_otv8`E`D(K$k* z09uNF)^Qfz`l)D1$|9s)&^MBQK3s3fiBVcZ7T@c>vYHV$8u`2q|Kju$HorkjNh`Hl zZM<>Idm5AH2886!8?G!zpHg17^}WaxfL?AW;Y3BA!l9L!w$fSDFiHCzb4=})j7@ec z1To!ocQiOow#le}E^*1tL|b53=KXU(RNU0vr*Bjw$fV(&pkBveQ(D;&H0%y8^U4(y zA)rzBY~R|}yTSTld70nQekV@f#Frl04Qlp8YGkE`6qI5`Cge)~B+_V(Mtb|(5T;_# zT$<@yw%Y{p?pLo%+M5vu{NF4-?ltan-)u>3X*t=HxGlQ4$1=)^v&h%8+^?vT%$O7bhGF&Zp(S)8xyJ{ zQSqoD1<8`mvQiLOK7g>sYQ>}2I>`8S$c@h$mz}-Q>+YSpA4r!??fo5wcivuuQ^bWn zVSINnF9ZxMi6>fJI z$K4z01@Cdt;E>3ej|TrCF)#S%*kr1D^yx)s@6RpR;>rp427geIVqMVdt2682k(p(3 zQhbkY2x8Sojn0e)^>Ua`SFVgZ@+}Db1imC-&$?%4;~uXb|AH|$d{yN!3L3q>e9N&i z2hxA%42-n4FF#aMTG172dG!)~)Jn&&{k;?2T?%tJ@~n0=kEw(Dq3{A*cj-^z+e-z8 zaKHWSG!A18yR9S`a`3XZ26=LO$(7ycl9CB;ejl4ocy3Zt_nD{H#WgU+ZrIvy4aamH zmiJ?QNYn0ExrvD_YoTSyO56A{y7Erw(Sd};^=dXv>L38oFqoJ-W7ibv<^jl^tIsec zNZUJT@pke^pS4s`D__L>jKoU26;#%Imz}b=Un-<@AK0^qe(>g^5seGVv_#W-sN-R- zso-yJmm&~M-z4kfJyok)lGNzBb#FoAJRDX@}HALVta6 zARs3Itk6eeP!yJ;f)3CllECT5Ia03sba<^wt-JXPy|ejso?tOA&}xh!wry*y)|O|* OVnU^=U{?QMmh(5W?B^)} From eae0d6a03c0b310018f3d281b9357337d822f2ec Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sat, 2 Mar 2024 13:42:58 +0000 Subject: [PATCH 196/308] [WSO2 Release] [Jenkins #6891] [Release 4.0.0-wso2v95] prepare release v4.0.0-wso2v95 --- 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 63ff315468..06345de97f 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v95-SNAPSHOT + 4.0.0-wso2v95 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 81dcf1ca2e..9d3115aa45 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v95-SNAPSHOT + 4.0.0-wso2v95 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 5f574b87cb..94b194c604 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-wso2v95-SNAPSHOT + 4.0.0-wso2v95 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index adaa623652..b9bda4db6a 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v95-SNAPSHOT + 4.0.0-wso2v95 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 4318fe18f1..56a1b7bca5 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v95-SNAPSHOT + 4.0.0-wso2v95 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 67ba39731b..bcbb5edff7 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v95-SNAPSHOT + 4.0.0-wso2v95 ../../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 ed88b3acff..91259a217d 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-wso2v95-SNAPSHOT + 4.0.0-wso2v95 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 6e51356728..acb612c8e5 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-wso2v95-SNAPSHOT + 4.0.0-wso2v95 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 dd502780d6..4dceb4574f 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-wso2v95-SNAPSHOT + 4.0.0-wso2v95 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 0f1a06649d..e95dca4f09 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-wso2v95-SNAPSHOT + 4.0.0-wso2v95 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 a0bd36b010..81323cbbd8 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-wso2v95-SNAPSHOT + 4.0.0-wso2v95 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 642a15b2d9..66eb49644d 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-wso2v95-SNAPSHOT + 4.0.0-wso2v95 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 bfce9686ad..4d607f545f 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-wso2v95-SNAPSHOT + 4.0.0-wso2v95 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 00c90e35ef..a62f7a36cd 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v95-SNAPSHOT + 4.0.0-wso2v95 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index c581ff9b86..81a7722bf0 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v95-SNAPSHOT + 4.0.0-wso2v95 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 864b925871..d7d7c8b1a1 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v95-SNAPSHOT + 4.0.0-wso2v95 ../../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-wso2v95 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index f56e71b54b..ae5a706514 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v95-SNAPSHOT + 4.0.0-wso2v95 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index b73a270139..2542f1b70d 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-wso2v95-SNAPSHOT + 4.0.0-wso2v95 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index ed8e920341..d4e3c43337 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-wso2v95-SNAPSHOT + 4.0.0-wso2v95 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 8e03a74ef2..d3469c077b 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v95-SNAPSHOT + 4.0.0-wso2v95 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 834dff51f4..210bbed977 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v95-SNAPSHOT + 4.0.0-wso2v95 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 45332f2dd9..645c928b7b 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v95-SNAPSHOT + 4.0.0-wso2v95 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 3715b91805..2e34775c51 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v95-SNAPSHOT + 4.0.0-wso2v95 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 656b9f3256..372986f1e6 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-wso2v95-SNAPSHOT + 4.0.0-wso2v95 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index aaf4bccde8..5d9b05a49f 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-wso2v95-SNAPSHOT + 4.0.0-wso2v95 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index b9ba84e4f7..65e3bf8ba0 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-wso2v95-SNAPSHOT + 4.0.0-wso2v95 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 5d74d8dd94..5b370f9cc4 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-wso2v95-SNAPSHOT + 4.0.0-wso2v95 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index a3a3bf2013..db94e6ea99 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v95-SNAPSHOT + 4.0.0-wso2v95 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 0d49b61eda..4da31b145f 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v95-SNAPSHOT + 4.0.0-wso2v95 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 7f8c78fdaa..30a2cb67f8 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-wso2v95-SNAPSHOT + 4.0.0-wso2v95 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 2da19b5bf8..bb645f08b1 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v95-SNAPSHOT + 4.0.0-wso2v95 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-wso2v95 Apache Software Foundation From fe97c09330d48950daae66e8b8749bc9c9e78021 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sat, 2 Mar 2024 13:43:00 +0000 Subject: [PATCH 197/308] [WSO2 Release] [Jenkins #6891] [Release 4.0.0-wso2v95] 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 06345de97f..664e144a95 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v95 + 4.0.0-wso2v96-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 9d3115aa45..4cfb08631b 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v95 + 4.0.0-wso2v96-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 94b194c604..2219229460 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-wso2v95 + 4.0.0-wso2v96-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index b9bda4db6a..f1d2d58f43 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v95 + 4.0.0-wso2v96-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 56a1b7bca5..893481dbae 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v95 + 4.0.0-wso2v96-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index bcbb5edff7..31e9a4b4fb 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v95 + 4.0.0-wso2v96-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 91259a217d..52518aa6a2 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-wso2v95 + 4.0.0-wso2v96-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 acb612c8e5..e26cec53d6 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-wso2v95 + 4.0.0-wso2v96-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 4dceb4574f..aee2947738 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-wso2v95 + 4.0.0-wso2v96-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 e95dca4f09..2d7e70dbe2 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-wso2v95 + 4.0.0-wso2v96-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 81323cbbd8..2da77ff006 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-wso2v95 + 4.0.0-wso2v96-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 66eb49644d..3bff82f7f7 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-wso2v95 + 4.0.0-wso2v96-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 4d607f545f..3b5a593348 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-wso2v95 + 4.0.0-wso2v96-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index a62f7a36cd..df2ccdad77 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v95 + 4.0.0-wso2v96-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 81a7722bf0..3cb191299f 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v95 + 4.0.0-wso2v96-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index d7d7c8b1a1..77fa01d612 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v95 + 4.0.0-wso2v96-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-wso2v95 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index ae5a706514..655bcc767d 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v95 + 4.0.0-wso2v96-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 2542f1b70d..a5398c78c8 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-wso2v95 + 4.0.0-wso2v96-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index d4e3c43337..16b248fe10 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-wso2v95 + 4.0.0-wso2v96-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index d3469c077b..88426fc5e1 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v95 + 4.0.0-wso2v96-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 210bbed977..ed20ae1617 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v95 + 4.0.0-wso2v96-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 645c928b7b..1f62a1ecdd 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v95 + 4.0.0-wso2v96-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 2e34775c51..03e793e0a9 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v95 + 4.0.0-wso2v96-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 372986f1e6..52261bc36a 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-wso2v95 + 4.0.0-wso2v96-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 5d9b05a49f..ef78516076 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-wso2v95 + 4.0.0-wso2v96-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 65e3bf8ba0..430b2beedc 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-wso2v95 + 4.0.0-wso2v96-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 5b370f9cc4..f6c9d79b98 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-wso2v95 + 4.0.0-wso2v96-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index db94e6ea99..0e8940ffa3 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v95 + 4.0.0-wso2v96-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 4da31b145f..cbbd079e86 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v95 + 4.0.0-wso2v96-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 30a2cb67f8..c3b654a97b 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-wso2v95 + 4.0.0-wso2v96-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index bb645f08b1..c40fac468f 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v95 + 4.0.0-wso2v96-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-wso2v95 + HEAD Apache Software Foundation From 1e80d6c1b7837d9d101bc844e5d2dc06f5a21cbe Mon Sep 17 00:00:00 2001 From: Thisal Tennakoon Date: Wed, 6 Mar 2024 12:00:14 +0530 Subject: [PATCH 198/308] Fix Revision Deployment failed with an error --- .../synapse/config/SynapseConfiguration.java | 156 ++++++++++-------- 1 file changed, 88 insertions(+), 68 deletions(-) diff --git a/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java b/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java index 341242d5fc..3b6caf4f98 100644 --- a/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java +++ b/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java @@ -84,6 +84,8 @@ import java.util.Set; import java.util.Timer; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.locks.ReadWriteLock; +import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.stream.Stream; import javax.xml.namespace.QName; @@ -194,7 +196,7 @@ public class SynapseConfiguration implements ManagedLifecycle, SynapseArtifact { */ private Map messageProcessors = new ConcurrentHashMap(); - private Map locks = new ConcurrentHashMap(); + private Map locks = new ConcurrentHashMap(); /** * Endpoint templates to create actual endpoints @@ -1015,35 +1017,45 @@ public Object getEntry(String key) { * @return its value */ public Entry getEntryDefinition(String key) { - Object o = localRegistry.get(key); - if (o == null || o instanceof Entry) { - if (o == null) { - // this is not a local definition - synchronized (this) { - o = localRegistry.get(key); + Object lockObj = acquireLock(key); + if (lockObj instanceof ReadWriteLock) { + ReadWriteLock lock = (ReadWriteLock) lockObj; + lock.readLock().lock(); + try { + Object o = localRegistry.get(key); + if (o == null || o instanceof Entry) { if (o == null) { - Entry entry = new Entry(key); - entry.setType(Entry.REMOTE_ENTRY); - addEntry(key, entry); - return entry; - } else { - if (!(o instanceof Entry)) { - if (log.isDebugEnabled()) { - log.debug("There is no local registry entry for key : " + key + - ", Object already exists of type :" + o.getClass().getName()); + // this is not a local definition + synchronized (this) { + o = localRegistry.get(key); + if (o == null) { + Entry entry = new Entry(key); + entry.setType(Entry.REMOTE_ENTRY); + addEntry(key, entry); + return entry; + } else { + if (!(o instanceof Entry)) { + if (log.isDebugEnabled()) { + log.debug("There is no local registry entry for key : " + key + + ", Object already exists of type :" + o.getClass().getName()); + } + return null; + } } - return null; } } + return (Entry) o; + } else { + if (log.isDebugEnabled()) { + log.debug("There is no local registry entry for key : " + key); + } + return null; } + } finally { + lock.readLock().unlock(); } - return (Entry) o; - } else { - if (log.isDebugEnabled()) { - log.debug("There is no local registry entry for key : " + key); - } - return null; } + return null; } /** @@ -1150,12 +1162,12 @@ public Map getDefinedEndpoints() { } public Object acquireLock(String key) { - Object lock = locks.get(key); + ReadWriteLock lock = locks.get(key); if (lock == null) { synchronized (this) { lock = locks.get(key); if (lock == null) { - lock = new Object(); + lock = new ReentrantReadWriteLock(); locks.put(key, lock); } } @@ -1171,60 +1183,68 @@ public Object acquireLock(String key) { */ public Endpoint getEndpoint(String key) { - synchronized (acquireLock(key)) { - Object o = getEntry(key); - if (o != null && o instanceof Endpoint) { - return (Endpoint) o; - } + Object lockObj = acquireLock(key); + if (lockObj instanceof ReadWriteLock) { + ReadWriteLock lock = (ReadWriteLock) lockObj; + lock.readLock().lock(); + try { + Object o = getEntry(key); + if (o != null && o instanceof Endpoint) { + return (Endpoint) o; + } - Entry entry = null; - if (o == null) { - entry = new Entry(key); - entry.setType(Entry.REMOTE_ENTRY); - } else { - Object object = localRegistry.get(key); - if (object instanceof Entry) { - entry = (Entry) object; + Entry entry = null; + if (o == null) { + entry = new Entry(key); + entry.setType(Entry.REMOTE_ENTRY); + } else { + Object object = localRegistry.get(key); + if (object instanceof Entry) { + entry = (Entry) object; + } } - } - assertEntryNull(entry, key); + assertEntryNull(entry, key); - //noinspection ConstantConditions - if (entry.getMapper() == null) { - entry.setMapper(XMLToEndpointMapper.getInstance()); - } + //noinspection ConstantConditions + if (entry.getMapper() == null) { + entry.setMapper(XMLToEndpointMapper.getInstance()); + } - if (entry.getType() == Entry.REMOTE_ENTRY) { - if (registry != null) { - o = registry.getResource(entry, getProperties()); - if (o != null && o instanceof Endpoint) { - localRegistry.put(key, entry); - return (Endpoint) o; - } else if (o instanceof OMNode) { - properties.put(SynapseConstants.SYNAPSE_CONFIGURATION, this); - Endpoint e = (Endpoint) XMLToEndpointMapper.getInstance(). - getObjectFromOMNode((OMNode) o, properties); - if (e != null) { - entry.setValue(e); - return e; + if (entry.getType() == Entry.REMOTE_ENTRY) { + if (registry != null) { + o = registry.getResource(entry, getProperties()); + if (o != null && o instanceof Endpoint) { + localRegistry.put(key, entry); + return (Endpoint) o; + } else if (o instanceof OMNode) { + properties.put(SynapseConstants.SYNAPSE_CONFIGURATION, this); + Endpoint e = (Endpoint) XMLToEndpointMapper.getInstance(). + getObjectFromOMNode((OMNode) o, properties); + if (e != null) { + entry.setValue(e); + return e; + } } } - } - } else { - Object value = entry.getValue(); - if (value instanceof OMNode) { - properties.put(SynapseConstants.SYNAPSE_CONFIGURATION, this); - Object object = entry.getMapper().getObjectFromOMNode( - (OMNode) value, getProperties()); - if (object instanceof Endpoint) { - entry.setValue(object); - return (Endpoint) object; + } else { + Object value = entry.getValue(); + if (value instanceof OMNode) { + properties.put(SynapseConstants.SYNAPSE_CONFIGURATION, this); + Object object = entry.getMapper().getObjectFromOMNode( + (OMNode) value, getProperties()); + if (object instanceof Endpoint) { + entry.setValue(object); + return (Endpoint) object; + } } } + return null; + } finally { + lock.readLock().unlock(); } - return null; } + return null; } /** From 09e4e8fa82f7b9a351f5b2c1c3b1e4cb4a388fce Mon Sep 17 00:00:00 2001 From: Avishka-Shamendra Date: Fri, 8 Mar 2024 11:19:19 +0530 Subject: [PATCH 199/308] Add EOF new line --- modules/extensions/src/test/resources/synapse.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/extensions/src/test/resources/synapse.properties b/modules/extensions/src/test/resources/synapse.properties index 66b38a2e5d..415a9fc867 100644 --- a/modules/extensions/src/test/resources/synapse.properties +++ b/modules/extensions/src/test/resources/synapse.properties @@ -21,3 +21,4 @@ limit_java_class_access_in_scripts.class_prefixes = java.util.ArrayList limit_java_native_object_access_in_scripts.enable = true limit_java_native_object_access_in_scripts.list_type = BLOCK_LIST limit_java_native_object_access_in_scripts.object_names = getClassLoader,loadClass + From 213fa8b0a708de7766639a878fe61525d6341d79 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 11 Mar 2024 06:11:45 +0000 Subject: [PATCH 200/308] [WSO2 Release] [Jenkins #6902] [Release 4.0.0-wso2v96] prepare release v4.0.0-wso2v96 --- 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 664e144a95..6564e503fb 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96-SNAPSHOT + 4.0.0-wso2v96 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 4cfb08631b..590108b73c 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96-SNAPSHOT + 4.0.0-wso2v96 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 2219229460..2068ba98e4 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-wso2v96-SNAPSHOT + 4.0.0-wso2v96 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index f1d2d58f43..35d64314ef 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96-SNAPSHOT + 4.0.0-wso2v96 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 893481dbae..2ecd915e4c 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96-SNAPSHOT + 4.0.0-wso2v96 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 31e9a4b4fb..4a10de51e0 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96-SNAPSHOT + 4.0.0-wso2v96 ../../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 52518aa6a2..2fb966a795 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-wso2v96-SNAPSHOT + 4.0.0-wso2v96 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 e26cec53d6..59ef05c4fd 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-wso2v96-SNAPSHOT + 4.0.0-wso2v96 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 aee2947738..3f2f17e4e2 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-wso2v96-SNAPSHOT + 4.0.0-wso2v96 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 2d7e70dbe2..deaec9097f 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-wso2v96-SNAPSHOT + 4.0.0-wso2v96 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 2da77ff006..d68327d712 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-wso2v96-SNAPSHOT + 4.0.0-wso2v96 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 3bff82f7f7..46116839d1 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-wso2v96-SNAPSHOT + 4.0.0-wso2v96 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 3b5a593348..0da2857093 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-wso2v96-SNAPSHOT + 4.0.0-wso2v96 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index df2ccdad77..78c845d605 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96-SNAPSHOT + 4.0.0-wso2v96 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 3cb191299f..7e5f1d4745 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96-SNAPSHOT + 4.0.0-wso2v96 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 77fa01d612..720e2d60b2 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96-SNAPSHOT + 4.0.0-wso2v96 ../../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-wso2v96 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 655bcc767d..2c15c13662 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96-SNAPSHOT + 4.0.0-wso2v96 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index a5398c78c8..28c7a3e74e 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-wso2v96-SNAPSHOT + 4.0.0-wso2v96 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 16b248fe10..7b1163ed2e 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-wso2v96-SNAPSHOT + 4.0.0-wso2v96 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 88426fc5e1..c66262f66e 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96-SNAPSHOT + 4.0.0-wso2v96 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index ed20ae1617..766aeac32c 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96-SNAPSHOT + 4.0.0-wso2v96 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 1f62a1ecdd..8f34ad8ebf 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96-SNAPSHOT + 4.0.0-wso2v96 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 03e793e0a9..5b43718e5a 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96-SNAPSHOT + 4.0.0-wso2v96 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 52261bc36a..9b44043de8 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-wso2v96-SNAPSHOT + 4.0.0-wso2v96 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index ef78516076..cad6d4b98b 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-wso2v96-SNAPSHOT + 4.0.0-wso2v96 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 430b2beedc..9f8bf04b5e 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-wso2v96-SNAPSHOT + 4.0.0-wso2v96 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index f6c9d79b98..4d616127ce 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-wso2v96-SNAPSHOT + 4.0.0-wso2v96 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 0e8940ffa3..731ff52177 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96-SNAPSHOT + 4.0.0-wso2v96 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index cbbd079e86..f9f2a1750e 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96-SNAPSHOT + 4.0.0-wso2v96 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index c3b654a97b..468ca20ad5 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-wso2v96-SNAPSHOT + 4.0.0-wso2v96 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index c40fac468f..c09988bbf8 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96-SNAPSHOT + 4.0.0-wso2v96 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-wso2v96 Apache Software Foundation From decc5878e27e3101dc2b5f37c292408bc1296c5c Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 11 Mar 2024 06:11:46 +0000 Subject: [PATCH 201/308] [WSO2 Release] [Jenkins #6902] [Release 4.0.0-wso2v96] 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 6564e503fb..48f47c9345 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96 + 4.0.0-wso2v97-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 590108b73c..a886187ce2 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96 + 4.0.0-wso2v97-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 2068ba98e4..ffa93b5f6c 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-wso2v96 + 4.0.0-wso2v97-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 35d64314ef..5701924d0d 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96 + 4.0.0-wso2v97-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 2ecd915e4c..324700befa 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96 + 4.0.0-wso2v97-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 4a10de51e0..27f403818f 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96 + 4.0.0-wso2v97-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 2fb966a795..ff937947fc 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-wso2v96 + 4.0.0-wso2v97-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 59ef05c4fd..b1e11a9cbb 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-wso2v96 + 4.0.0-wso2v97-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 3f2f17e4e2..1d6d9fa1ed 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-wso2v96 + 4.0.0-wso2v97-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 deaec9097f..d79c53e877 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-wso2v96 + 4.0.0-wso2v97-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 d68327d712..be20a149be 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-wso2v96 + 4.0.0-wso2v97-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 46116839d1..75552d532d 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-wso2v96 + 4.0.0-wso2v97-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 0da2857093..8b57bf5c11 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-wso2v96 + 4.0.0-wso2v97-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 78c845d605..4e888000ad 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96 + 4.0.0-wso2v97-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 7e5f1d4745..5f60cb8742 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96 + 4.0.0-wso2v97-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 720e2d60b2..43d7974b1f 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96 + 4.0.0-wso2v97-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-wso2v96 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 2c15c13662..135c7ed046 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96 + 4.0.0-wso2v97-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 28c7a3e74e..537df4a7da 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-wso2v96 + 4.0.0-wso2v97-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 7b1163ed2e..86e383c7d4 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-wso2v96 + 4.0.0-wso2v97-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index c66262f66e..2c0746bad7 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96 + 4.0.0-wso2v97-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 766aeac32c..8b8c06bdd2 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96 + 4.0.0-wso2v97-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 8f34ad8ebf..0214afa10d 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96 + 4.0.0-wso2v97-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 5b43718e5a..f8d72e9e6d 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96 + 4.0.0-wso2v97-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 9b44043de8..08b9769a0f 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-wso2v96 + 4.0.0-wso2v97-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index cad6d4b98b..2b658b03dc 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-wso2v96 + 4.0.0-wso2v97-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 9f8bf04b5e..d5b1214505 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-wso2v96 + 4.0.0-wso2v97-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 4d616127ce..a7d7d80064 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-wso2v96 + 4.0.0-wso2v97-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 731ff52177..283b17fb5a 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96 + 4.0.0-wso2v97-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index f9f2a1750e..71cb76c906 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96 + 4.0.0-wso2v97-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 468ca20ad5..172f95daac 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-wso2v96 + 4.0.0-wso2v97-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index c09988bbf8..276952a86f 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96 + 4.0.0-wso2v97-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-wso2v96 + HEAD Apache Software Foundation From 43e2586ec387fa09d67de4a50aaa4aba42434d71 Mon Sep 17 00:00:00 2001 From: AnuGayan Date: Tue, 12 Mar 2024 20:02:17 +0530 Subject: [PATCH 202/308] Bump 3rd party dependencies --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 276952a86f..2227e3a16b 100644 --- a/pom.xml +++ b/pom.xml @@ -1461,7 +1461,7 @@ 2.0.8 2.2 1.5.4 - 2.9.1 + 2.10.1 1.5.3 2.1.6 ${com.damnhandy.version}.wso2v2 @@ -1481,7 +1481,7 @@ ${hc.httpclient.version}.wso2v1 1.8.5 1.2.8 - 1.12 + 1.16.0 UTF-8 From 9cb3559fa27a7afaea97929f5197d1d5d3ff774c Mon Sep 17 00:00:00 2001 From: Sanoj Punchihewa Date: Thu, 14 Mar 2024 14:16:06 +0530 Subject: [PATCH 203/308] Fix enrich mediator failing continuously when a parse error happens When a JSON parse error happens, the enrich mediator will fail continuously even for valid JSON inputs. To fix this we need to reset the inlineOMNode when an error happens. Git issue: https://github.com/wso2/micro-integrator/issues/3272 --- .../synapse/mediators/elementary/Source.java | 35 ++++++++++--------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/elementary/Source.java b/modules/core/src/main/java/org/apache/synapse/mediators/elementary/Source.java index a43f516570..7200998579 100644 --- a/modules/core/src/main/java/org/apache/synapse/mediators/elementary/Source.java +++ b/modules/core/src/main/java/org/apache/synapse/mediators/elementary/Source.java @@ -321,24 +321,27 @@ public JsonElement evaluateJson(MessageContext synCtx, SynapseLog synLog, case EnrichMediator.INLINE: { assert inlineOMNode != null || inlineKey != null : "inlineJSONNode or key shouldn't be null when type is INLINE"; - if (inlineOMNode instanceof OMText) { - object = JsonPath.parse(((OMTextImpl) inlineOMNode).getText()).json(); - } else if (inlineKey != null && !inlineKey.trim().equals("")) { - Object inlineObj = synCtx.getEntry(inlineKey); - if ((inlineObj instanceof String) && !(((String) inlineObj).trim().equals(""))) { - object = JsonPath.parse(((String) inlineObj)).json(); + try { + if (inlineOMNode instanceof OMText) { + object = JsonPath.parse(((OMTextImpl) inlineOMNode).getText()).json(); + } else if (inlineKey != null && !inlineKey.trim().equals("")) { + Object inlineObj = synCtx.getEntry(inlineKey); + if ((inlineObj instanceof String) && !(((String) inlineObj).trim().equals(""))) { + object = JsonPath.parse(((String) inlineObj)).json(); + } else { + synLog.error("Source failed to get inline JSON" + "inlineKey=" + inlineKey); + } } else { - synLog.error("Source failed to get inline JSON" + "inlineKey=" + inlineKey); + synLog.error("Source failed to get inline JSON" + "inlineJSONNode=" + inlineOMNode + ", inlineKey=" + + inlineKey); + } + } finally { + // If the initialInlineOMNode is not null, it means that inline OM Node has been overridden with the + // inline string containing resolved dynamic values. Therefore, we should set the initial OM Node back + // which contains the original inline value + if (initialInlineOMNode != null) { + this.inlineOMNode = initialInlineOMNode; } - } else { - synLog.error("Source failed to get inline JSON" + "inlineJSONNode=" + inlineOMNode + ", inlineKey=" - + inlineKey); - } - // If the initialInlineOMNode is not null, it means that inline OM Node has been overridden with the - // inline string containing resolved dynamic values. Therefore, we should set the initial OM Node back - // which contains the original inline value - if (initialInlineOMNode != null) { - this.inlineOMNode = initialInlineOMNode; } break; } From 36e8d7e3b952aca7c31df74f513e4aa476e7512c Mon Sep 17 00:00:00 2001 From: Arunan Sugunakumar Date: Fri, 15 Mar 2024 16:27:32 +0530 Subject: [PATCH 204/308] Improve StartupController to delete pending tasks When the TaskScheduler is initialized but TaskManager is not initialized, the task will be added to taskQueue. But when the task gets destroyed before the tTaskManager is not initialized, the taskQueue is not cleared. Resolves wso2/api-manager#2525 --- .../apache/synapse/startup/quartz/StartUpController.java | 2 +- .../main/java/org/apache/synapse/task/TaskScheduler.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/synapse/startup/quartz/StartUpController.java b/modules/core/src/main/java/org/apache/synapse/startup/quartz/StartUpController.java index c0bfefc43e..2d30e2b169 100644 --- a/modules/core/src/main/java/org/apache/synapse/startup/quartz/StartUpController.java +++ b/modules/core/src/main/java/org/apache/synapse/startup/quartz/StartUpController.java @@ -76,7 +76,7 @@ public void destroy(boolean removeTask) { } if (synapseTaskManager.isInitialized()) { TaskScheduler taskScheduler = synapseTaskManager.getTaskScheduler(); - if (taskScheduler != null && taskScheduler.isInitialized() && removeTask) { + if (taskScheduler != null && taskScheduler.isTaskSchedulerInitialized() && removeTask) { taskScheduler.deleteTask(taskDescription.getName(), taskDescription.getTaskGroup()); } TaskDescriptionRepository repository = synapseTaskManager.getTaskDescriptionRepository(); diff --git a/modules/tasks/src/main/java/org/apache/synapse/task/TaskScheduler.java b/modules/tasks/src/main/java/org/apache/synapse/task/TaskScheduler.java index eccea36447..701d7fa87a 100644 --- a/modules/tasks/src/main/java/org/apache/synapse/task/TaskScheduler.java +++ b/modules/tasks/src/main/java/org/apache/synapse/task/TaskScheduler.java @@ -159,6 +159,12 @@ public boolean isInitialized() { } } + public boolean isTaskSchedulerInitialized() { + synchronized (lock) { + return initialized; + } + } + public void deleteTask(String name, String group) { synchronized (lock) { if (!initialized) { From cf9aaa67b4603ce96f05d8de3c9a8e8c1b95f3a4 Mon Sep 17 00:00:00 2001 From: Sanoj Punchihewa Date: Tue, 19 Mar 2024 14:13:50 +0530 Subject: [PATCH 205/308] Fix RevocationVerificationTest failure The latest github certs dont contain the CRL points, therefore replace the expired github certs with WSO2 certs --- .../certificatevalidation/TestConstants.java | 14 ++-- .../github/DigiCertHighAssuranceEVCA-1 | 24 ------ .../github/DigiCertHighAssuranceEVRootCA | 22 ------ .../certificates/github/github.com | 31 -------- .../wso2/DigiCertHighAssuranceEVCA-1 | 29 +++++++ .../wso2/DigiCertHighAssuranceEVRootCA | 22 ++++++ .../certificates/wso2/wso2.com | 77 +++++++++++++++++++ 7 files changed, 135 insertions(+), 84 deletions(-) delete mode 100644 modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/DigiCertHighAssuranceEVCA-1 delete mode 100644 modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/DigiCertHighAssuranceEVRootCA delete mode 100644 modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/github.com create mode 100644 modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/wso2/DigiCertHighAssuranceEVCA-1 create mode 100644 modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/wso2/DigiCertHighAssuranceEVRootCA create mode 100644 modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/wso2/wso2.com diff --git a/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/TestConstants.java b/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/TestConstants.java index 834a9d4c4c..27ed7b75dc 100644 --- a/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/TestConstants.java +++ b/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/TestConstants.java @@ -27,21 +27,21 @@ public interface TestConstants { /** * The certificates in the resources folder will contain the certificates in the certificate chain from - * https://www.github.com + * https://www.wso2.com * These certificates are chosen because the certificate issuers support both CRL and OCSP. Read the certificates for * more details. * * CAUTION: Replace the certificates if they expire or are marked as revoked by their issuers. At the moment they are * valid. The expiry dates of the certificates are as follows: * - * github.com : 3/15/2024 - * DigiCertHighAssuranceEVCA-1 : 4/14/2031 - * DigiCertHighAssuranceEVRootCA : 11/10/2031 + * wso2.com : 19/12/2024 + * DigiCertHighAssuranceEVCA-1 : 24/09/2030 + * DigiCertHighAssuranceEVRootCA : 15/01/2038 */ final static String REAL_PEER_CERT = "/org/apache/synapse/transport/certificatevalidation" + - "/certificates/github/github.com"; + "/certificates/wso2/wso2.com"; final static String INTERMEDIATE_CERT = "/org/apache/synapse/transport/certificatevalidation" + - "/certificates/github/DigiCertHighAssuranceEVCA-1"; + "/certificates/wso2/DigiCertHighAssuranceEVCA-1"; final static String ROOT_CERT = "/org/apache/synapse/transport/certificatevalidation" + - "/certificates/github/DigiCertHighAssuranceEVRootCA"; + "/certificates/wso2/DigiCertHighAssuranceEVRootCA"; } diff --git a/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/DigiCertHighAssuranceEVCA-1 b/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/DigiCertHighAssuranceEVCA-1 deleted file mode 100644 index dc86357b57..0000000000 --- a/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/DigiCertHighAssuranceEVCA-1 +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEFzCCAv+gAwIBAgIQB/LzXIeod6967+lHmTUlvTANBgkqhkiG9w0BAQwFADBh -MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 -d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD -QTAeFw0yMTA0MTQwMDAwMDBaFw0zMTA0MTMyMzU5NTlaMFYxCzAJBgNVBAYTAlVT -MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMDAuBgNVBAMTJ0RpZ2lDZXJ0IFRMUyBI -eWJyaWQgRUNDIFNIQTM4NCAyMDIwIENBMTB2MBAGByqGSM49AgEGBSuBBAAiA2IA -BMEbxppbmNmkKaDp1AS12+umsmxVwP/tmMZJLwYnUcu/cMEFesOxnYeJuq20ExfJ -qLSDyLiQ0cx0NTY8g3KwtdD3ImnI8YDEe0CPz2iHJlw5ifFNkU3aiYvkA8ND5b8v -c6OCAYIwggF+MBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFAq8CCkXjKU5 -bXoOzjPHLrPt+8N6MB8GA1UdIwQYMBaAFAPeUDVW0Uy7ZvCj4hsbw5eyPdFVMA4G -A1UdDwEB/wQEAwIBhjAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwdgYI -KwYBBQUHAQEEajBoMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5j -b20wQAYIKwYBBQUHMAKGNGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdp -Q2VydEdsb2JhbFJvb3RDQS5jcnQwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2Ny -bDMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0R2xvYmFsUm9vdENBLmNybDA9BgNVHSAE -NjA0MAsGCWCGSAGG/WwCATAHBgVngQwBATAIBgZngQwBAgEwCAYGZ4EMAQICMAgG -BmeBDAECAzANBgkqhkiG9w0BAQwFAAOCAQEAR1mBf9QbH7Bx9phdGLqYR5iwfnYr -6v8ai6wms0KNMeZK6BnQ79oU59cUkqGS8qcuLa/7Hfb7U7CKP/zYFgrpsC62pQsY -kDUmotr2qLcy/JUjS8ZFucTP5Hzu5sn4kL1y45nDHQsFfGqXbbKrAjbYwrwsAZI/ -BKOLdRHHuSm8EdCGupK8JvllyDfNJvaGEwwEqonleLHBTnm8dqMLUeTF0J5q/hos -Vq4GNiejcxwIfZMy0MJEGdqN9A57HSgDKwmKdsp33Id6rHtSJlWncg+d0ohP/rEh -xRqhqjn1VtvChMQ1H3Dau0bwhr9kAMQ+959GG50jBbl9s08PqUU643QwmA== ------END CERTIFICATE----- \ No newline at end of file diff --git a/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/DigiCertHighAssuranceEVRootCA b/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/DigiCertHighAssuranceEVRootCA deleted file mode 100644 index 57ba02c6d3..0000000000 --- a/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/DigiCertHighAssuranceEVRootCA +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh -MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 -d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD -QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT -MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j -b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG -9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB -CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97 -nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt -43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P -T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4 -gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO -BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR -TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw -DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr -hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg -06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF -PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls -YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk -CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4= ------END CERTIFICATE----- \ No newline at end of file diff --git a/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/github.com b/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/github.com deleted file mode 100644 index 0d1d1dfd05..0000000000 --- a/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/github.com +++ /dev/null @@ -1,31 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFajCCBPGgAwIBAgIQDNCovsYyz+ZF7KCpsIT7HDAKBggqhkjOPQQDAzBWMQsw -CQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMTAwLgYDVQQDEydEaWdp -Q2VydCBUTFMgSHlicmlkIEVDQyBTSEEzODQgMjAyMCBDQTEwHhcNMjMwMjE0MDAw -MDAwWhcNMjQwMzE0MjM1OTU5WjBmMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2Fs -aWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEVMBMGA1UEChMMR2l0SHVi -LCBJbmMuMRMwEQYDVQQDEwpnaXRodWIuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0D -AQcDQgAEo6QDRgPfRlFWy8k5qyLN52xZlnqToPu5QByQMog2xgl2nFD1Vfd2Xmgg -nO4i7YMMFTAQQUReMqyQodWq8uVDs6OCA48wggOLMB8GA1UdIwQYMBaAFAq8CCkX -jKU5bXoOzjPHLrPt+8N6MB0GA1UdDgQWBBTHByd4hfKdM8lMXlZ9XNaOcmfr3jAl -BgNVHREEHjAcggpnaXRodWIuY29tgg53d3cuZ2l0aHViLmNvbTAOBgNVHQ8BAf8E -BAMCB4AwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMIGbBgNVHR8EgZMw -gZAwRqBEoEKGQGh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydFRMU0h5 -YnJpZEVDQ1NIQTM4NDIwMjBDQTEtMS5jcmwwRqBEoEKGQGh0dHA6Ly9jcmw0LmRp -Z2ljZXJ0LmNvbS9EaWdpQ2VydFRMU0h5YnJpZEVDQ1NIQTM4NDIwMjBDQTEtMS5j -cmwwPgYDVR0gBDcwNTAzBgZngQwBAgIwKTAnBggrBgEFBQcCARYbaHR0cDovL3d3 -dy5kaWdpY2VydC5jb20vQ1BTMIGFBggrBgEFBQcBAQR5MHcwJAYIKwYBBQUHMAGG -GGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBPBggrBgEFBQcwAoZDaHR0cDovL2Nh -Y2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0VExTSHlicmlkRUNDU0hBMzg0MjAy -MENBMS0xLmNydDAJBgNVHRMEAjAAMIIBgAYKKwYBBAHWeQIEAgSCAXAEggFsAWoA -dwDuzdBk1dsazsVct520zROiModGfLzs3sNRSFlGcR+1mwAAAYZQ3Rv6AAAEAwBI -MEYCIQDkFq7T4iy6gp+pefJLxpRS7U3gh8xQymmxtI8FdzqU6wIhALWfw/nLD63Q -YPIwG3EFchINvWUfB6mcU0t2lRIEpr8uAHYASLDja9qmRzQP5WoC+p0w6xxSActW -3SyB2bu/qznYhHMAAAGGUN0cKwAABAMARzBFAiAePGAyfiBR9dbhr31N9ZfESC5G -V2uGBTcyTyUENrH3twIhAPwJfsB8A4MmNr2nW+sdE1n2YiCObW+3DTHr2/UR7lvU -AHcAO1N3dT4tuYBOizBbBv5AO2fYT8P0x70ADS1yb+H61BcAAAGGUN0cOgAABAMA -SDBGAiEAzOBr9OZ0+6OSZyFTiywN64PysN0FLeLRyL5jmEsYrDYCIQDu0jtgWiMI -KU6CM0dKcqUWLkaFE23c2iWAhYAHqrFRRzAKBggqhkjOPQQDAwNnADBkAjAE3A3U -3jSZCpwfqOHBdlxi9ASgKTU+wg0qw3FqtfQ31OwLYFdxh0MlNk/HwkjRSWgCMFbQ -vMkXEPvNvv4t30K6xtpG26qmZ+6OiISBIIXMljWnsiYR1gyZnTzIg3AQSw4Vmw== ------END CERTIFICATE----- \ No newline at end of file diff --git a/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/wso2/DigiCertHighAssuranceEVCA-1 b/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/wso2/DigiCertHighAssuranceEVCA-1 new file mode 100644 index 0000000000..60ee457197 --- /dev/null +++ b/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/wso2/DigiCertHighAssuranceEVCA-1 @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIE9DCCA9ygAwIBAgIQCF+UwC2Fe+jMFP9T7aI+KjANBgkqhkiG9w0BAQsFADBh +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH +MjAeFw0yMDA5MjQwMDAwMDBaFw0zMDA5MjMyMzU5NTlaMFkxCzAJBgNVBAYTAlVT +MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkRpZ2lDZXJ0IEdsb2Jh +bCBHMiBUTFMgUlNBIFNIQTI1NiAyMDIwIENBMTCCASIwDQYJKoZIhvcNAQEBBQAD +ggEPADCCAQoCggEBAMz3EGJPprtjb+2QUlbFbSd7ehJWivH0+dbn4Y+9lavyYEEV +cNsSAPonCrVXOFt9slGTcZUOakGUWzUb+nv6u8W+JDD+Vu/E832X4xT1FE3LpxDy +FuqrIvAxIhFhaZAmunjZlx/jfWardUSVc8is/+9dCopZQ+GssjoP80j812s3wWPc +3kbW20X+fSP9kOhRBx5Ro1/tSUZUfyyIxfQTnJcVPAPooTncaQwywa8WV0yUR0J8 +osicfebUTVSvQpmowQTCd5zWSOTOEeAqgJnwQ3DPP3Zr0UxJqyRewg2C/Uaoq2yT +zGJSQnWS+Jr6Xl6ysGHlHx+5fwmY6D36g39HaaECAwEAAaOCAa4wggGqMB0GA1Ud +DgQWBBR0hYDAZsffN97PvSk3qgMdvu3NFzAfBgNVHSMEGDAWgBROIlQgGJXm427m +D/r6uRLtBhePOTAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0lBBYwFAYIKwYBBQUHAwEG +CCsGAQUFBwMCMBIGA1UdEwEB/wQIMAYBAf8CAQAwdgYIKwYBBQUHAQEEajBoMCQG +CCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wQAYIKwYBBQUHMAKG +NGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEdsb2JhbFJvb3RH +Mi5jcnQwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NybDMuZGlnaWNlcnQuY29t +L0RpZ2lDZXJ0R2xvYmFsUm9vdEcyLmNybDA3oDWgM4YxaHR0cDovL2NybDQuZGln +aWNlcnQuY29tL0RpZ2lDZXJ0R2xvYmFsUm9vdEcyLmNybDAwBgNVHSAEKTAnMAcG +BWeBDAEBMAgGBmeBDAECATAIBgZngQwBAgIwCAYGZ4EMAQIDMA0GCSqGSIb3DQEB +CwUAA4IBAQB1i8A8W+//cFxrivUh76wx5kM9gK/XVakew44YbHnT96xC34+IxZ20 +dfPJCP2K/lHz8p0gGgQ1zvi2QXmv/8yWXpTTmh1wLqIxi/ulzH9W3xc3l7/BjUOG +q4xmfrnti/EPjLXUVa9ciZ7gpyptsqNjMhg7y961n4OzEQGsIA2QlxK3KZw1tdeR +Du9Ab21cO72h2fviyy52QNI6uyy/FgvqvQNbTpg6Ku0FUAcVkzxzOZGUWkgOxtNK +Aa9mObm9QjQc2wgD80D8EuiuPKuK1ftyeWSm4w5VsTuVP61gM2eKrLanXPDtWlIb +1GHhJRLmB7WqlLLwKPZhJl5VHPgB63dx +-----END CERTIFICATE----- \ No newline at end of file diff --git a/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/wso2/DigiCertHighAssuranceEVRootCA b/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/wso2/DigiCertHighAssuranceEVRootCA new file mode 100644 index 0000000000..072601b81c --- /dev/null +++ b/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/wso2/DigiCertHighAssuranceEVRootCA @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBh +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH +MjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVT +MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j +b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkqhkiG +9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI +2/Ou8jqJkTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx +1x7e/dfgy5SDN67sH0NO3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQ +q2EGnI/yuum06ZIya7XzV+hdG82MHauVBJVJ8zUtluNJbd134/tJS7SsVQepj5Wz +tCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyMUNGPHgm+F6HmIcr9g+UQ +vIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQABo0IwQDAP +BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV +5uNu5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY +1Yl9PMWLSn/pvtsrF9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4 +NeF22d+mQrvHRAiGfzZ0JFrabA0UWTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NG +Fdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBHQRFXGU7Aj64GxJUTFy8bJZ91 +8rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/iyK5S9kJRaTe +pLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl +MrY= +-----END CERTIFICATE----- \ No newline at end of file diff --git a/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/wso2/wso2.com b/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/wso2/wso2.com new file mode 100644 index 0000000000..22ad75b287 --- /dev/null +++ b/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/wso2/wso2.com @@ -0,0 +1,77 @@ +-----BEGIN CERTIFICATE----- +MIIOCTCCDPGgAwIBAgIQDYI9mOt2kbRhDJq8bwYLzDANBgkqhkiG9w0BAQsFADBZ +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMTMwMQYDVQQDEypE +aWdpQ2VydCBHbG9iYWwgRzIgVExTIFJTQSBTSEEyNTYgMjAyMCBDQTEwHhcNMjMx +MTI3MDAwMDAwWhcNMjQxMjE4MjM1OTU5WjBkMQswCQYDVQQGEwJVUzETMBEGA1UE +CBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzETMBEGA1UEChMK +V1NPMiwgSW5jLjETMBEGA1UEAwwKKi53c28yLmNvbTCCASIwDQYJKoZIhvcNAQEB +BQADggEPADCCAQoCggEBAKm76aaaT4ryKdKHdzIylkj8ASNGz/FBTYfIvPXNnzzQ +IVRawpSj83yE9uONFAbIwomwIwuWttNshOfmt7/AKsNOCrwStcSjKsUPeWid1Z6o +8NfsFrYdM3VPp+EDCuxpSlifb6LylpYtwA18H+qqblmijuJ5pW+A1L73qFqF4h33 +NY/5mXebZ2TXQjILmEyp25Ouwknr7Le4NOykB3DEJ+YX/ZS2N/1CFsAeR3zlydDE +lPyfFq6fFQNaHPbCWjb0wRudyTKHyAXDCBFe5LmaI6LyR2PFIQwrnDlZEyzYkbR6 +vqYu/tj3k+ZRGKkQSLTtMDwKOOpJJ1ynfj+/AkeCplkCAwEAAaOCCsAwggq8MB8G +A1UdIwQYMBaAFHSFgMBmx9833s+9KTeqAx2+7c0XMB0GA1UdDgQWBBR/6kSodr4S +7EoyozHfsG5Dp6BtkTCCB0sGA1UdEQSCB0Iwggc+ggoqLndzbzIuY29tggh3c28y +LmNvbYIOc3RvcmUud3NvMi5jb22CFGNkbi51cGRhdGVzLndzbzIuY29tghJkLmNv +bnRlbnQud3NvMi5jb22CFnN1YnNjcmlwdGlvbnMud3NvMi5jb22CGXN1YnNjcmlw +dGlvbnMuZHYud3NvMi5jb22CGXN1YnNjcmlwdGlvbnMuc3Qud3NvMi5jb22CGXN0 +YWdpbmctcGFydG5lcnMud3NvMi5jb22CDGFwaS53c28yLmNvbYIQYXBpLWRldi53 +c28yLmNvbYIQYXBpLXN0Zy53c28yLmNvbYIQZWkuZG9jcy53c28yLmNvbYISYXBp +bS5kb2NzLndzbzIuY29tghBpcy5kb2NzLndzbzIuY29tghNjbG91ZC5kb2NzLndz +bzIuY29tghBtZy5kb2NzLndzbzIuY29tghBvYi5kb2NzLndzbzIuY29tghV1cGRh +dGVzLmRvY3Mud3NvMi5jb22CE3VrLm9iLmRvY3Mud3NvMi5jb22CFmludGVybmFs +LmRvY3Mud3NvMi5jb22CF2Jlcmxpbi5vYi5kb2NzLndzbzIuY29tghRjZHMub2Iu +ZG9jcy53c28yLmNvbYIWc2VjdXJpdHkuZG9jcy53c28yLmNvbYIXY2lhbWNsb3Vk +LmRvY3Mud3NvMi5jb22CEWFway5kb2NzLndzbzIuY29tghlpbnRlcm5hbC5zdXBw +b3J0LndzbzIuY29tgg1hcGlzLndzbzIuY29tghFhcGlzLWRldi53c28yLmNvbYIR +YXBpcy1zdGcud3NvMi5jb22CGmFwaXMtZGV2LWludGVybmFsLndzbzIuY29tghph +cGlzLXN0Zy1pbnRlcm5hbC53c28yLmNvbYIWYXBpcy1pbnRlcm5hbC53c28yLmNv +bYIYYXBpLXN0Zy51cGRhdGVzLndzbzIuY29tggx1bXQud3NvMi5jb22CEWFwaS1j +aGF0LndzbzIuY29tgh9zdWJzY3JpcHRpb24tZGFzaGJvYXJkLndzbzIuY29tghxh +ZG1pbi1jZXJ0aWZpY2F0aW9uLndzbzIuY29tghRhbGxvY2F0aW9ucy53c28yLmNv +bYINYXBwcy53c28yLmNvbYIVYmFua2luZy1ocmlzLndzbzIuY29tghZjZXJ0aWZp +Y2F0aW9uLndzbzIuY29tghZkdWUtZGlsaWdlbmNlLndzbzIuY29tggxlbWEud3Nv +Mi5jb22CHGVtYWlsLWdyb3VwLW1hbmFnZXIud3NvMi5jb22CE2xlYXZlLWhyaXMu +d3NvMi5jb22CDG1pcy53c28yLmNvbYIWb3JnY2hhcnQtaHJpcy53c28yLmNvbYIX +cHJvbW90aW9uLWhyaXMud3NvMi5jb22CGnNlY3VyaXR5LWFkdmlzb3J5LndzbzIu +Y29tghZzdXBlcmFwcC1ocmlzLndzbzIuY29tgg90cmF2ZWwud3NvMi5jb22CIGFk +bWluLWNlcnRpZmljYXRpb24tc3RnLndzbzIuY29tghhhbGxvY2F0aW9ucy1zdGcu +d3NvMi5jb22CEWFwcHMtc3RnLndzbzIuY29tghliYW5raW5nLWhyaXMtc3RnLndz +bzIuY29tghpjZXJ0aWZpY2F0aW9uLXN0Zy53c28yLmNvbYIaZHVlLWRpbGlnZW5j +ZS1zdGcud3NvMi5jb22CEGVtYS1zdGcud3NvMi5jb22CIGVtYWlsLWdyb3VwLW1h +bmFnZXItc3RnLndzbzIuY29tghdsZWF2ZS1ocmlzLXN0Zy53c28yLmNvbYIQbWlz +LXN0Zy53c28yLmNvbYIab3JnY2hhcnQtaHJpcy1zdGcud3NvMi5jb22CG3Byb21v +dGlvbi1ocmlzLXN0Zy53c28yLmNvbYIec2VjdXJpdHktYWR2aXNvcnktc3RnLndz +bzIuY29tghpzdXBlcmFwcC1ocmlzLXN0Zy53c28yLmNvbYITdHJhdmVsLXN0Zy53 +c28yLmNvbYIdaW50ZXJuYWwtc3VwcG9ydC1zdGcud3NvMi5jb22CEG1pLmRvY3Mu +d3NvMi5jb22CEmEuY29udGVudC53c28yLmNvbYISYi5jb250ZW50LndzbzIuY29t +ghJjLmNvbnRlbnQud3NvMi5jb22CFGFwaS51cGRhdGVzLndzbzIuY29tgiBtYXN0 +ZXItZGF0YS1maW5hbmNlLXN0Zy53c28yLmNvbYIaZW1wbG95ZWUtaHJpcy1zdGcu +d3NvMi5jb22CFWF0cy1ocmlzLXN0Zy53c28yLmNvbYIacGl0c3RvcC1zYWxlcy1z +dGcud3NvMi5jb22CHG1hc3Rlci1kYXRhLWZpbmFuY2Uud3NvMi5jb22CFmVtcGxv +eWVlLWhyaXMud3NvMi5jb22CEWF0cy1ocmlzLndzbzIuY29tghZwaXRzdG9wLXNh +bGVzLndzbzIuY29tMD4GA1UdIAQ3MDUwMwYGZ4EMAQICMCkwJwYIKwYBBQUHAgEW +G2h0dHA6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAOBgNVHQ8BAf8EBAMCBaAwHQYD +VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMIGfBgNVHR8EgZcwgZQwSKBGoESG +Qmh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEdsb2JhbEcyVExTUlNB +U0hBMjU2MjAyMENBMS0xLmNybDBIoEagRIZCaHR0cDovL2NybDQuZGlnaWNlcnQu +Y29tL0RpZ2lDZXJ0R2xvYmFsRzJUTFNSU0FTSEEyNTYyMDIwQ0ExLTEuY3JsMIGH +BggrBgEFBQcBAQR7MHkwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0 +LmNvbTBRBggrBgEFBQcwAoZFaHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0Rp +Z2lDZXJ0R2xvYmFsRzJUTFNSU0FTSEEyNTYyMDIwQ0ExLTEuY3J0MAwGA1UdEwEB +/wQCMAAwggGABgorBgEEAdZ5AgQCBIIBcASCAWwBagB3AO7N0GTV2xrOxVy3nbTN +E6Iyh0Z8vOzew1FIWUZxH7WbAAABjA8zZSwAAAQDAEgwRgIhAMbCQr7X6g7fO/SV +K6DUDZlNpZyVeQk8Dq+VcjDjM2O3AiEAnqk6utq7C4S+GUYWR6bAZ7tE7N8Gplty +OXopeUwsMY4AdgBIsONr2qZHNA/lagL6nTDrHFIBy1bdLIHZu7+rOdiEcwAAAYwP +M2TJAAAEAwBHMEUCIEm4RHFsiLCvr7soVfg+WAgcKP2RuvMIM2rBp3HAFZmJAiEA ++shmUcDBG77UoSn8ePI8zA+ixsfsKa7D6Tdc+wP+uBEAdwDatr9rP7W2Ip+bwrtc +a+hwkXFsu1GEhTS9pD0wSNf7qwAAAYwPM2TAAAAEAwBIMEYCIQCttU9hgh0dYmv9 +ZqxwlFZQXcIv9KAKh7sYRoI7cUx7YgIhAOHXA8oXl9XYJWJXyjNobtGZ7yijwKGi +Z4Dfv8X2e64FMA0GCSqGSIb3DQEBCwUAA4IBAQC/I+DTL/uuC3PWZGRYt6NGyPQ2 ++F+QbDTAMeFsKvbo8/AQvj58RtbrxTECYFB0T2vZLCwNo15UlN3TO14tc2lrq3qD +fe72BadhXePR4Qe08ozEELJldBv3rd/j297dhSV/SXf6uoh40letK5cK/3+yEWoq +8l1+V3bpiL3FvQFgjZXMK5oXrqtY90fSxSUK70l9+QtWh6tKC2FEThcoJTPZa1NP +ST5IXv5PKAeQZt2G8ZQiGOLanXj0/22oGbMAvJ0Mev+sIOWe9OX2x3fqXwmk9DDF +bYB6Y45RqRfmvj0hAOLtGKQud6qp/09Ifp9I6ekqjrvGXA7Y1mDhYZaVmTaS +-----END CERTIFICATE----- \ No newline at end of file From e0d66c0c732e7a83662051ed2c3f65d3f507af35 Mon Sep 17 00:00:00 2001 From: Sanoj Punchihewa Date: Wed, 20 Mar 2024 10:29:09 +0530 Subject: [PATCH 206/308] Revert "Fix RevocationVerificationTest failure" --- .../certificatevalidation/TestConstants.java | 14 ++-- .../github/DigiCertHighAssuranceEVCA-1 | 24 ++++++ .../github/DigiCertHighAssuranceEVRootCA | 22 ++++++ .../certificates/github/github.com | 31 ++++++++ .../wso2/DigiCertHighAssuranceEVCA-1 | 29 ------- .../wso2/DigiCertHighAssuranceEVRootCA | 22 ------ .../certificates/wso2/wso2.com | 77 ------------------- 7 files changed, 84 insertions(+), 135 deletions(-) create mode 100644 modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/DigiCertHighAssuranceEVCA-1 create mode 100644 modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/DigiCertHighAssuranceEVRootCA create mode 100644 modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/github.com delete mode 100644 modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/wso2/DigiCertHighAssuranceEVCA-1 delete mode 100644 modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/wso2/DigiCertHighAssuranceEVRootCA delete mode 100644 modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/wso2/wso2.com diff --git a/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/TestConstants.java b/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/TestConstants.java index 27ed7b75dc..834a9d4c4c 100644 --- a/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/TestConstants.java +++ b/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/TestConstants.java @@ -27,21 +27,21 @@ public interface TestConstants { /** * The certificates in the resources folder will contain the certificates in the certificate chain from - * https://www.wso2.com + * https://www.github.com * These certificates are chosen because the certificate issuers support both CRL and OCSP. Read the certificates for * more details. * * CAUTION: Replace the certificates if they expire or are marked as revoked by their issuers. At the moment they are * valid. The expiry dates of the certificates are as follows: * - * wso2.com : 19/12/2024 - * DigiCertHighAssuranceEVCA-1 : 24/09/2030 - * DigiCertHighAssuranceEVRootCA : 15/01/2038 + * github.com : 3/15/2024 + * DigiCertHighAssuranceEVCA-1 : 4/14/2031 + * DigiCertHighAssuranceEVRootCA : 11/10/2031 */ final static String REAL_PEER_CERT = "/org/apache/synapse/transport/certificatevalidation" + - "/certificates/wso2/wso2.com"; + "/certificates/github/github.com"; final static String INTERMEDIATE_CERT = "/org/apache/synapse/transport/certificatevalidation" + - "/certificates/wso2/DigiCertHighAssuranceEVCA-1"; + "/certificates/github/DigiCertHighAssuranceEVCA-1"; final static String ROOT_CERT = "/org/apache/synapse/transport/certificatevalidation" + - "/certificates/wso2/DigiCertHighAssuranceEVRootCA"; + "/certificates/github/DigiCertHighAssuranceEVRootCA"; } diff --git a/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/DigiCertHighAssuranceEVCA-1 b/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/DigiCertHighAssuranceEVCA-1 new file mode 100644 index 0000000000..dc86357b57 --- /dev/null +++ b/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/DigiCertHighAssuranceEVCA-1 @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIIEFzCCAv+gAwIBAgIQB/LzXIeod6967+lHmTUlvTANBgkqhkiG9w0BAQwFADBh +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD +QTAeFw0yMTA0MTQwMDAwMDBaFw0zMTA0MTMyMzU5NTlaMFYxCzAJBgNVBAYTAlVT +MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMDAuBgNVBAMTJ0RpZ2lDZXJ0IFRMUyBI +eWJyaWQgRUNDIFNIQTM4NCAyMDIwIENBMTB2MBAGByqGSM49AgEGBSuBBAAiA2IA +BMEbxppbmNmkKaDp1AS12+umsmxVwP/tmMZJLwYnUcu/cMEFesOxnYeJuq20ExfJ +qLSDyLiQ0cx0NTY8g3KwtdD3ImnI8YDEe0CPz2iHJlw5ifFNkU3aiYvkA8ND5b8v +c6OCAYIwggF+MBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFAq8CCkXjKU5 +bXoOzjPHLrPt+8N6MB8GA1UdIwQYMBaAFAPeUDVW0Uy7ZvCj4hsbw5eyPdFVMA4G +A1UdDwEB/wQEAwIBhjAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwdgYI +KwYBBQUHAQEEajBoMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5j +b20wQAYIKwYBBQUHMAKGNGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdp +Q2VydEdsb2JhbFJvb3RDQS5jcnQwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2Ny +bDMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0R2xvYmFsUm9vdENBLmNybDA9BgNVHSAE +NjA0MAsGCWCGSAGG/WwCATAHBgVngQwBATAIBgZngQwBAgEwCAYGZ4EMAQICMAgG +BmeBDAECAzANBgkqhkiG9w0BAQwFAAOCAQEAR1mBf9QbH7Bx9phdGLqYR5iwfnYr +6v8ai6wms0KNMeZK6BnQ79oU59cUkqGS8qcuLa/7Hfb7U7CKP/zYFgrpsC62pQsY +kDUmotr2qLcy/JUjS8ZFucTP5Hzu5sn4kL1y45nDHQsFfGqXbbKrAjbYwrwsAZI/ +BKOLdRHHuSm8EdCGupK8JvllyDfNJvaGEwwEqonleLHBTnm8dqMLUeTF0J5q/hos +Vq4GNiejcxwIfZMy0MJEGdqN9A57HSgDKwmKdsp33Id6rHtSJlWncg+d0ohP/rEh +xRqhqjn1VtvChMQ1H3Dau0bwhr9kAMQ+959GG50jBbl9s08PqUU643QwmA== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/DigiCertHighAssuranceEVRootCA b/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/DigiCertHighAssuranceEVRootCA new file mode 100644 index 0000000000..57ba02c6d3 --- /dev/null +++ b/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/DigiCertHighAssuranceEVRootCA @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD +QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT +MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j +b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG +9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB +CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97 +nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt +43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P +T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4 +gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO +BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR +TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw +DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr +hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg +06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF +PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls +YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk +CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4= +-----END CERTIFICATE----- \ No newline at end of file diff --git a/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/github.com b/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/github.com new file mode 100644 index 0000000000..0d1d1dfd05 --- /dev/null +++ b/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/github.com @@ -0,0 +1,31 @@ +-----BEGIN CERTIFICATE----- +MIIFajCCBPGgAwIBAgIQDNCovsYyz+ZF7KCpsIT7HDAKBggqhkjOPQQDAzBWMQsw +CQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMTAwLgYDVQQDEydEaWdp +Q2VydCBUTFMgSHlicmlkIEVDQyBTSEEzODQgMjAyMCBDQTEwHhcNMjMwMjE0MDAw +MDAwWhcNMjQwMzE0MjM1OTU5WjBmMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2Fs +aWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEVMBMGA1UEChMMR2l0SHVi +LCBJbmMuMRMwEQYDVQQDEwpnaXRodWIuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0D +AQcDQgAEo6QDRgPfRlFWy8k5qyLN52xZlnqToPu5QByQMog2xgl2nFD1Vfd2Xmgg +nO4i7YMMFTAQQUReMqyQodWq8uVDs6OCA48wggOLMB8GA1UdIwQYMBaAFAq8CCkX +jKU5bXoOzjPHLrPt+8N6MB0GA1UdDgQWBBTHByd4hfKdM8lMXlZ9XNaOcmfr3jAl +BgNVHREEHjAcggpnaXRodWIuY29tgg53d3cuZ2l0aHViLmNvbTAOBgNVHQ8BAf8E +BAMCB4AwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMIGbBgNVHR8EgZMw +gZAwRqBEoEKGQGh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydFRMU0h5 +YnJpZEVDQ1NIQTM4NDIwMjBDQTEtMS5jcmwwRqBEoEKGQGh0dHA6Ly9jcmw0LmRp +Z2ljZXJ0LmNvbS9EaWdpQ2VydFRMU0h5YnJpZEVDQ1NIQTM4NDIwMjBDQTEtMS5j +cmwwPgYDVR0gBDcwNTAzBgZngQwBAgIwKTAnBggrBgEFBQcCARYbaHR0cDovL3d3 +dy5kaWdpY2VydC5jb20vQ1BTMIGFBggrBgEFBQcBAQR5MHcwJAYIKwYBBQUHMAGG +GGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBPBggrBgEFBQcwAoZDaHR0cDovL2Nh +Y2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0VExTSHlicmlkRUNDU0hBMzg0MjAy +MENBMS0xLmNydDAJBgNVHRMEAjAAMIIBgAYKKwYBBAHWeQIEAgSCAXAEggFsAWoA +dwDuzdBk1dsazsVct520zROiModGfLzs3sNRSFlGcR+1mwAAAYZQ3Rv6AAAEAwBI +MEYCIQDkFq7T4iy6gp+pefJLxpRS7U3gh8xQymmxtI8FdzqU6wIhALWfw/nLD63Q +YPIwG3EFchINvWUfB6mcU0t2lRIEpr8uAHYASLDja9qmRzQP5WoC+p0w6xxSActW +3SyB2bu/qznYhHMAAAGGUN0cKwAABAMARzBFAiAePGAyfiBR9dbhr31N9ZfESC5G +V2uGBTcyTyUENrH3twIhAPwJfsB8A4MmNr2nW+sdE1n2YiCObW+3DTHr2/UR7lvU +AHcAO1N3dT4tuYBOizBbBv5AO2fYT8P0x70ADS1yb+H61BcAAAGGUN0cOgAABAMA +SDBGAiEAzOBr9OZ0+6OSZyFTiywN64PysN0FLeLRyL5jmEsYrDYCIQDu0jtgWiMI +KU6CM0dKcqUWLkaFE23c2iWAhYAHqrFRRzAKBggqhkjOPQQDAwNnADBkAjAE3A3U +3jSZCpwfqOHBdlxi9ASgKTU+wg0qw3FqtfQ31OwLYFdxh0MlNk/HwkjRSWgCMFbQ +vMkXEPvNvv4t30K6xtpG26qmZ+6OiISBIIXMljWnsiYR1gyZnTzIg3AQSw4Vmw== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/wso2/DigiCertHighAssuranceEVCA-1 b/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/wso2/DigiCertHighAssuranceEVCA-1 deleted file mode 100644 index 60ee457197..0000000000 --- a/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/wso2/DigiCertHighAssuranceEVCA-1 +++ /dev/null @@ -1,29 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE9DCCA9ygAwIBAgIQCF+UwC2Fe+jMFP9T7aI+KjANBgkqhkiG9w0BAQsFADBh -MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 -d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH -MjAeFw0yMDA5MjQwMDAwMDBaFw0zMDA5MjMyMzU5NTlaMFkxCzAJBgNVBAYTAlVT -MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMzAxBgNVBAMTKkRpZ2lDZXJ0IEdsb2Jh -bCBHMiBUTFMgUlNBIFNIQTI1NiAyMDIwIENBMTCCASIwDQYJKoZIhvcNAQEBBQAD -ggEPADCCAQoCggEBAMz3EGJPprtjb+2QUlbFbSd7ehJWivH0+dbn4Y+9lavyYEEV -cNsSAPonCrVXOFt9slGTcZUOakGUWzUb+nv6u8W+JDD+Vu/E832X4xT1FE3LpxDy -FuqrIvAxIhFhaZAmunjZlx/jfWardUSVc8is/+9dCopZQ+GssjoP80j812s3wWPc -3kbW20X+fSP9kOhRBx5Ro1/tSUZUfyyIxfQTnJcVPAPooTncaQwywa8WV0yUR0J8 -osicfebUTVSvQpmowQTCd5zWSOTOEeAqgJnwQ3DPP3Zr0UxJqyRewg2C/Uaoq2yT -zGJSQnWS+Jr6Xl6ysGHlHx+5fwmY6D36g39HaaECAwEAAaOCAa4wggGqMB0GA1Ud -DgQWBBR0hYDAZsffN97PvSk3qgMdvu3NFzAfBgNVHSMEGDAWgBROIlQgGJXm427m -D/r6uRLtBhePOTAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0lBBYwFAYIKwYBBQUHAwEG -CCsGAQUFBwMCMBIGA1UdEwEB/wQIMAYBAf8CAQAwdgYIKwYBBQUHAQEEajBoMCQG -CCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wQAYIKwYBBQUHMAKG -NGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEdsb2JhbFJvb3RH -Mi5jcnQwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NybDMuZGlnaWNlcnQuY29t -L0RpZ2lDZXJ0R2xvYmFsUm9vdEcyLmNybDA3oDWgM4YxaHR0cDovL2NybDQuZGln -aWNlcnQuY29tL0RpZ2lDZXJ0R2xvYmFsUm9vdEcyLmNybDAwBgNVHSAEKTAnMAcG -BWeBDAEBMAgGBmeBDAECATAIBgZngQwBAgIwCAYGZ4EMAQIDMA0GCSqGSIb3DQEB -CwUAA4IBAQB1i8A8W+//cFxrivUh76wx5kM9gK/XVakew44YbHnT96xC34+IxZ20 -dfPJCP2K/lHz8p0gGgQ1zvi2QXmv/8yWXpTTmh1wLqIxi/ulzH9W3xc3l7/BjUOG -q4xmfrnti/EPjLXUVa9ciZ7gpyptsqNjMhg7y961n4OzEQGsIA2QlxK3KZw1tdeR -Du9Ab21cO72h2fviyy52QNI6uyy/FgvqvQNbTpg6Ku0FUAcVkzxzOZGUWkgOxtNK -Aa9mObm9QjQc2wgD80D8EuiuPKuK1ftyeWSm4w5VsTuVP61gM2eKrLanXPDtWlIb -1GHhJRLmB7WqlLLwKPZhJl5VHPgB63dx ------END CERTIFICATE----- \ No newline at end of file diff --git a/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/wso2/DigiCertHighAssuranceEVRootCA b/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/wso2/DigiCertHighAssuranceEVRootCA deleted file mode 100644 index 072601b81c..0000000000 --- a/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/wso2/DigiCertHighAssuranceEVRootCA +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBh -MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 -d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH -MjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVT -MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j -b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkqhkiG -9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI -2/Ou8jqJkTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx -1x7e/dfgy5SDN67sH0NO3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQ -q2EGnI/yuum06ZIya7XzV+hdG82MHauVBJVJ8zUtluNJbd134/tJS7SsVQepj5Wz -tCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyMUNGPHgm+F6HmIcr9g+UQ -vIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQABo0IwQDAP -BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV -5uNu5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY -1Yl9PMWLSn/pvtsrF9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4 -NeF22d+mQrvHRAiGfzZ0JFrabA0UWTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NG -Fdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBHQRFXGU7Aj64GxJUTFy8bJZ91 -8rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/iyK5S9kJRaTe -pLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl -MrY= ------END CERTIFICATE----- \ No newline at end of file diff --git a/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/wso2/wso2.com b/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/wso2/wso2.com deleted file mode 100644 index 22ad75b287..0000000000 --- a/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/wso2/wso2.com +++ /dev/null @@ -1,77 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIOCTCCDPGgAwIBAgIQDYI9mOt2kbRhDJq8bwYLzDANBgkqhkiG9w0BAQsFADBZ -MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMTMwMQYDVQQDEypE -aWdpQ2VydCBHbG9iYWwgRzIgVExTIFJTQSBTSEEyNTYgMjAyMCBDQTEwHhcNMjMx -MTI3MDAwMDAwWhcNMjQxMjE4MjM1OTU5WjBkMQswCQYDVQQGEwJVUzETMBEGA1UE -CBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzETMBEGA1UEChMK -V1NPMiwgSW5jLjETMBEGA1UEAwwKKi53c28yLmNvbTCCASIwDQYJKoZIhvcNAQEB -BQADggEPADCCAQoCggEBAKm76aaaT4ryKdKHdzIylkj8ASNGz/FBTYfIvPXNnzzQ -IVRawpSj83yE9uONFAbIwomwIwuWttNshOfmt7/AKsNOCrwStcSjKsUPeWid1Z6o -8NfsFrYdM3VPp+EDCuxpSlifb6LylpYtwA18H+qqblmijuJ5pW+A1L73qFqF4h33 -NY/5mXebZ2TXQjILmEyp25Ouwknr7Le4NOykB3DEJ+YX/ZS2N/1CFsAeR3zlydDE -lPyfFq6fFQNaHPbCWjb0wRudyTKHyAXDCBFe5LmaI6LyR2PFIQwrnDlZEyzYkbR6 -vqYu/tj3k+ZRGKkQSLTtMDwKOOpJJ1ynfj+/AkeCplkCAwEAAaOCCsAwggq8MB8G -A1UdIwQYMBaAFHSFgMBmx9833s+9KTeqAx2+7c0XMB0GA1UdDgQWBBR/6kSodr4S -7EoyozHfsG5Dp6BtkTCCB0sGA1UdEQSCB0Iwggc+ggoqLndzbzIuY29tggh3c28y -LmNvbYIOc3RvcmUud3NvMi5jb22CFGNkbi51cGRhdGVzLndzbzIuY29tghJkLmNv -bnRlbnQud3NvMi5jb22CFnN1YnNjcmlwdGlvbnMud3NvMi5jb22CGXN1YnNjcmlw -dGlvbnMuZHYud3NvMi5jb22CGXN1YnNjcmlwdGlvbnMuc3Qud3NvMi5jb22CGXN0 -YWdpbmctcGFydG5lcnMud3NvMi5jb22CDGFwaS53c28yLmNvbYIQYXBpLWRldi53 -c28yLmNvbYIQYXBpLXN0Zy53c28yLmNvbYIQZWkuZG9jcy53c28yLmNvbYISYXBp -bS5kb2NzLndzbzIuY29tghBpcy5kb2NzLndzbzIuY29tghNjbG91ZC5kb2NzLndz -bzIuY29tghBtZy5kb2NzLndzbzIuY29tghBvYi5kb2NzLndzbzIuY29tghV1cGRh -dGVzLmRvY3Mud3NvMi5jb22CE3VrLm9iLmRvY3Mud3NvMi5jb22CFmludGVybmFs -LmRvY3Mud3NvMi5jb22CF2Jlcmxpbi5vYi5kb2NzLndzbzIuY29tghRjZHMub2Iu -ZG9jcy53c28yLmNvbYIWc2VjdXJpdHkuZG9jcy53c28yLmNvbYIXY2lhbWNsb3Vk -LmRvY3Mud3NvMi5jb22CEWFway5kb2NzLndzbzIuY29tghlpbnRlcm5hbC5zdXBw -b3J0LndzbzIuY29tgg1hcGlzLndzbzIuY29tghFhcGlzLWRldi53c28yLmNvbYIR -YXBpcy1zdGcud3NvMi5jb22CGmFwaXMtZGV2LWludGVybmFsLndzbzIuY29tghph -cGlzLXN0Zy1pbnRlcm5hbC53c28yLmNvbYIWYXBpcy1pbnRlcm5hbC53c28yLmNv -bYIYYXBpLXN0Zy51cGRhdGVzLndzbzIuY29tggx1bXQud3NvMi5jb22CEWFwaS1j -aGF0LndzbzIuY29tgh9zdWJzY3JpcHRpb24tZGFzaGJvYXJkLndzbzIuY29tghxh -ZG1pbi1jZXJ0aWZpY2F0aW9uLndzbzIuY29tghRhbGxvY2F0aW9ucy53c28yLmNv -bYINYXBwcy53c28yLmNvbYIVYmFua2luZy1ocmlzLndzbzIuY29tghZjZXJ0aWZp -Y2F0aW9uLndzbzIuY29tghZkdWUtZGlsaWdlbmNlLndzbzIuY29tggxlbWEud3Nv -Mi5jb22CHGVtYWlsLWdyb3VwLW1hbmFnZXIud3NvMi5jb22CE2xlYXZlLWhyaXMu -d3NvMi5jb22CDG1pcy53c28yLmNvbYIWb3JnY2hhcnQtaHJpcy53c28yLmNvbYIX -cHJvbW90aW9uLWhyaXMud3NvMi5jb22CGnNlY3VyaXR5LWFkdmlzb3J5LndzbzIu -Y29tghZzdXBlcmFwcC1ocmlzLndzbzIuY29tgg90cmF2ZWwud3NvMi5jb22CIGFk -bWluLWNlcnRpZmljYXRpb24tc3RnLndzbzIuY29tghhhbGxvY2F0aW9ucy1zdGcu -d3NvMi5jb22CEWFwcHMtc3RnLndzbzIuY29tghliYW5raW5nLWhyaXMtc3RnLndz -bzIuY29tghpjZXJ0aWZpY2F0aW9uLXN0Zy53c28yLmNvbYIaZHVlLWRpbGlnZW5j -ZS1zdGcud3NvMi5jb22CEGVtYS1zdGcud3NvMi5jb22CIGVtYWlsLWdyb3VwLW1h -bmFnZXItc3RnLndzbzIuY29tghdsZWF2ZS1ocmlzLXN0Zy53c28yLmNvbYIQbWlz -LXN0Zy53c28yLmNvbYIab3JnY2hhcnQtaHJpcy1zdGcud3NvMi5jb22CG3Byb21v -dGlvbi1ocmlzLXN0Zy53c28yLmNvbYIec2VjdXJpdHktYWR2aXNvcnktc3RnLndz -bzIuY29tghpzdXBlcmFwcC1ocmlzLXN0Zy53c28yLmNvbYITdHJhdmVsLXN0Zy53 -c28yLmNvbYIdaW50ZXJuYWwtc3VwcG9ydC1zdGcud3NvMi5jb22CEG1pLmRvY3Mu -d3NvMi5jb22CEmEuY29udGVudC53c28yLmNvbYISYi5jb250ZW50LndzbzIuY29t -ghJjLmNvbnRlbnQud3NvMi5jb22CFGFwaS51cGRhdGVzLndzbzIuY29tgiBtYXN0 -ZXItZGF0YS1maW5hbmNlLXN0Zy53c28yLmNvbYIaZW1wbG95ZWUtaHJpcy1zdGcu -d3NvMi5jb22CFWF0cy1ocmlzLXN0Zy53c28yLmNvbYIacGl0c3RvcC1zYWxlcy1z -dGcud3NvMi5jb22CHG1hc3Rlci1kYXRhLWZpbmFuY2Uud3NvMi5jb22CFmVtcGxv -eWVlLWhyaXMud3NvMi5jb22CEWF0cy1ocmlzLndzbzIuY29tghZwaXRzdG9wLXNh -bGVzLndzbzIuY29tMD4GA1UdIAQ3MDUwMwYGZ4EMAQICMCkwJwYIKwYBBQUHAgEW -G2h0dHA6Ly93d3cuZGlnaWNlcnQuY29tL0NQUzAOBgNVHQ8BAf8EBAMCBaAwHQYD -VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMIGfBgNVHR8EgZcwgZQwSKBGoESG -Qmh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEdsb2JhbEcyVExTUlNB -U0hBMjU2MjAyMENBMS0xLmNybDBIoEagRIZCaHR0cDovL2NybDQuZGlnaWNlcnQu -Y29tL0RpZ2lDZXJ0R2xvYmFsRzJUTFNSU0FTSEEyNTYyMDIwQ0ExLTEuY3JsMIGH -BggrBgEFBQcBAQR7MHkwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0 -LmNvbTBRBggrBgEFBQcwAoZFaHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0Rp -Z2lDZXJ0R2xvYmFsRzJUTFNSU0FTSEEyNTYyMDIwQ0ExLTEuY3J0MAwGA1UdEwEB -/wQCMAAwggGABgorBgEEAdZ5AgQCBIIBcASCAWwBagB3AO7N0GTV2xrOxVy3nbTN -E6Iyh0Z8vOzew1FIWUZxH7WbAAABjA8zZSwAAAQDAEgwRgIhAMbCQr7X6g7fO/SV -K6DUDZlNpZyVeQk8Dq+VcjDjM2O3AiEAnqk6utq7C4S+GUYWR6bAZ7tE7N8Gplty -OXopeUwsMY4AdgBIsONr2qZHNA/lagL6nTDrHFIBy1bdLIHZu7+rOdiEcwAAAYwP -M2TJAAAEAwBHMEUCIEm4RHFsiLCvr7soVfg+WAgcKP2RuvMIM2rBp3HAFZmJAiEA -+shmUcDBG77UoSn8ePI8zA+ixsfsKa7D6Tdc+wP+uBEAdwDatr9rP7W2Ip+bwrtc -a+hwkXFsu1GEhTS9pD0wSNf7qwAAAYwPM2TAAAAEAwBIMEYCIQCttU9hgh0dYmv9 -ZqxwlFZQXcIv9KAKh7sYRoI7cUx7YgIhAOHXA8oXl9XYJWJXyjNobtGZ7yijwKGi -Z4Dfv8X2e64FMA0GCSqGSIb3DQEBCwUAA4IBAQC/I+DTL/uuC3PWZGRYt6NGyPQ2 -+F+QbDTAMeFsKvbo8/AQvj58RtbrxTECYFB0T2vZLCwNo15UlN3TO14tc2lrq3qD -fe72BadhXePR4Qe08ozEELJldBv3rd/j297dhSV/SXf6uoh40letK5cK/3+yEWoq -8l1+V3bpiL3FvQFgjZXMK5oXrqtY90fSxSUK70l9+QtWh6tKC2FEThcoJTPZa1NP -ST5IXv5PKAeQZt2G8ZQiGOLanXj0/22oGbMAvJ0Mev+sIOWe9OX2x3fqXwmk9DDF -bYB6Y45RqRfmvj0hAOLtGKQud6qp/09Ifp9I6ekqjrvGXA7Y1mDhYZaVmTaS ------END CERTIFICATE----- \ No newline at end of file From 87e3902641c87329229566b7d9cefbfa1874a0bb Mon Sep 17 00:00:00 2001 From: Sanoj Punchihewa Date: Wed, 20 Mar 2024 10:26:16 +0530 Subject: [PATCH 207/308] Fix RevocationVerificationTest failure The latest github certs dont contain the CRL points, therefore replace the expired github certs with digicert.com certs --- .../certificatevalidation/TestConstants.java | 14 +++--- .../digicert/DigiCertHighAssuranceEVCA-1 | 30 +++++++++++++ .../digicert/DigiCertHighAssuranceEVRootCA | 22 ++++++++++ .../certificates/digicert/digicert.com | 43 +++++++++++++++++++ .../github/DigiCertHighAssuranceEVCA-1 | 24 ----------- .../github/DigiCertHighAssuranceEVRootCA | 22 ---------- .../certificates/github/github.com | 31 ------------- 7 files changed, 102 insertions(+), 84 deletions(-) create mode 100644 modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/digicert/DigiCertHighAssuranceEVCA-1 create mode 100644 modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/digicert/DigiCertHighAssuranceEVRootCA create mode 100644 modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/digicert/digicert.com delete mode 100644 modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/DigiCertHighAssuranceEVCA-1 delete mode 100644 modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/DigiCertHighAssuranceEVRootCA delete mode 100644 modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/github.com diff --git a/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/TestConstants.java b/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/TestConstants.java index 834a9d4c4c..a6e52f5749 100644 --- a/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/TestConstants.java +++ b/modules/transports/core/nhttp/src/test/java/org/apache/synapse/transport/certificatevalidation/TestConstants.java @@ -27,21 +27,21 @@ public interface TestConstants { /** * The certificates in the resources folder will contain the certificates in the certificate chain from - * https://www.github.com + * https://www.digicert.com * These certificates are chosen because the certificate issuers support both CRL and OCSP. Read the certificates for * more details. * * CAUTION: Replace the certificates if they expire or are marked as revoked by their issuers. At the moment they are * valid. The expiry dates of the certificates are as follows: * - * github.com : 3/15/2024 - * DigiCertHighAssuranceEVCA-1 : 4/14/2031 - * DigiCertHighAssuranceEVRootCA : 11/10/2031 + * digicert.com : 31/07/2024 + * DigiCertHighAssuranceEVCA-1 : 02/07/2030 + * DigiCertHighAssuranceEVRootCA : 15/01/2038 */ final static String REAL_PEER_CERT = "/org/apache/synapse/transport/certificatevalidation" + - "/certificates/github/github.com"; + "/certificates/digicert/digicert.com"; final static String INTERMEDIATE_CERT = "/org/apache/synapse/transport/certificatevalidation" + - "/certificates/github/DigiCertHighAssuranceEVCA-1"; + "/certificates/digicert/DigiCertHighAssuranceEVCA-1"; final static String ROOT_CERT = "/org/apache/synapse/transport/certificatevalidation" + - "/certificates/github/DigiCertHighAssuranceEVRootCA"; + "/certificates/digicert/DigiCertHighAssuranceEVRootCA"; } diff --git a/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/digicert/DigiCertHighAssuranceEVCA-1 b/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/digicert/DigiCertHighAssuranceEVCA-1 new file mode 100644 index 0000000000..59bea9c019 --- /dev/null +++ b/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/digicert/DigiCertHighAssuranceEVCA-1 @@ -0,0 +1,30 @@ +-----BEGIN CERTIFICATE----- +MIIFPDCCBCSgAwIBAgIQAWePH++IIlXYsKcOa3uyIDANBgkqhkiG9w0BAQsFADBh +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH +MjAeFw0yMDA3MDIxMjQyNTBaFw0zMDA3MDIxMjQyNTBaMEQxCzAJBgNVBAYTAlVT +MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxHjAcBgNVBAMTFURpZ2lDZXJ0IEVWIFJT +QSBDQSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK0eZsx/neTr +f4MXJz0R2fJTIDfN8AwUAu7hy4gI0vp7O8LAAHx2h3bbf8wl+pGMSxaJK9ffDDCD +63FqqFBqE9eTmo3RkgQhlu55a04LsXRLcK6crkBOO0djdonybmhrfGrtBqYvbRat +xenkv0Sg4frhRl4wYh4dnW0LOVRGhbt1G5Q19zm9CqMlq7LlUdAE+6d3a5++ppfG +cnWLmbEVEcLHPAnbl+/iKauQpQlU1Mi+wEBnjE5tK8Q778naXnF+DsedQJ7NEi+b +QoonTHEz9ryeEcUHuQTv7nApa/zCqes5lXn1pMs4LZJ3SVgbkTLj+RbBov/uiwTX +tkBEWawvZH8CAwEAAaOCAgswggIHMB0GA1UdDgQWBBRqTlC/mGidW3sgddRZAXlI +ZpIyBjAfBgNVHSMEGDAWgBROIlQgGJXm427mD/r6uRLtBhePOTAOBgNVHQ8BAf8E +BAMCAYYwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBIGA1UdEwEB/wQI +MAYBAf8CAQAwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb2Nz +cC5kaWdpY2VydC5jb20wewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NybDMuZGln +aWNlcnQuY29tL0RpZ2lDZXJ0R2xvYmFsUm9vdEcyLmNybDA3oDWgM4YxaHR0cDov +L2NybDQuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0R2xvYmFsUm9vdEcyLmNybDCBzgYD +VR0gBIHGMIHDMIHABgRVHSAAMIG3MCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5k +aWdpY2VydC5jb20vQ1BTMIGKBggrBgEFBQcCAjB+DHxBbnkgdXNlIG9mIHRoaXMg +Q2VydGlmaWNhdGUgY29uc3RpdHV0ZXMgYWNjZXB0YW5jZSBvZiB0aGUgUmVseWlu +ZyBQYXJ0eSBBZ3JlZW1lbnQgbG9jYXRlZCBhdCBodHRwczovL3d3dy5kaWdpY2Vy +dC5jb20vcnBhLXVhMA0GCSqGSIb3DQEBCwUAA4IBAQBSMgrCdY2+O9spnYNvwHiG ++9lCJbyELR0UsoLwpzGpSdkHD7pVDDFJm3//B8Es+17T1o5Hat+HRDsvRr7d3MEy +o9iXkkxLhKEgApA2Ft2eZfPrTolc95PwSWnn3FZ8BhdGO4brTA4+zkPSKoMXi/X+ +WLBNN29Z/nbCS7H/qLGt7gViEvTIdU8x+H4l/XigZMUDaVmJ+B5d7cwSK7yOoQdf +oIBGmA5Mp4LhMzo52rf//kXPfE3wYIZVHqVuxxlnTkFYmffCX9/Lon7SWaGdg6Rc +k4RHhHLWtmz2lTZ5CEo2ljDsGzCFGJP7oT4q6Q8oFC38irvdKIJ95cUxYzj4tnOI +-----END CERTIFICATE----- \ No newline at end of file diff --git a/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/digicert/DigiCertHighAssuranceEVRootCA b/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/digicert/DigiCertHighAssuranceEVRootCA new file mode 100644 index 0000000000..072601b81c --- /dev/null +++ b/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/digicert/DigiCertHighAssuranceEVRootCA @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBh +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 +d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH +MjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVT +MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j +b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkqhkiG +9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI +2/Ou8jqJkTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx +1x7e/dfgy5SDN67sH0NO3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQ +q2EGnI/yuum06ZIya7XzV+hdG82MHauVBJVJ8zUtluNJbd134/tJS7SsVQepj5Wz +tCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyMUNGPHgm+F6HmIcr9g+UQ +vIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQABo0IwQDAP +BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV +5uNu5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY +1Yl9PMWLSn/pvtsrF9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4 +NeF22d+mQrvHRAiGfzZ0JFrabA0UWTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NG +Fdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBHQRFXGU7Aj64GxJUTFy8bJZ91 +8rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/iyK5S9kJRaTe +pLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl +MrY= +-----END CERTIFICATE----- \ No newline at end of file diff --git a/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/digicert/digicert.com b/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/digicert/digicert.com new file mode 100644 index 0000000000..0cf8ada0b0 --- /dev/null +++ b/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/digicert/digicert.com @@ -0,0 +1,43 @@ +-----BEGIN CERTIFICATE----- +MIIHhjCCBm6gAwIBAgIQCiHYt41dl8jvQUTy1HbbZTANBgkqhkiG9w0BAQsFADBE +MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMR4wHAYDVQQDExVE +aWdpQ2VydCBFViBSU0EgQ0EgRzIwHhcNMjMxMDA2MDAwMDAwWhcNMjQwNzMwMjM1 +OTU5WjCBwTETMBEGCysGAQQBgjc8AgEDEwJVUzEVMBMGCysGAQQBgjc8AgECEwRV +dGFoMR0wGwYDVQQPDBRQcml2YXRlIE9yZ2FuaXphdGlvbjEVMBMGA1UEBRMMNTI5 +OTUzNy0wMTQyMQswCQYDVQQGEwJVUzENMAsGA1UECBMEVXRhaDENMAsGA1UEBxME +TGVoaTEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xGTAXBgNVBAMTEHd3dy5kaWdp +Y2VydC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCY3zNZwTun +OIxdni/jz8vqUDo2/nenmFJNwsqUeI/m81ddOHfy09drpJBC93EeWGqSDZWRXzJx +sZMc9dvgCtbSqNpvGoA5V03lr5dYUtGsQhjhmS9esL0dO/KMXoytp5n1pVHRYUpl +qRcjnrsQhrU2nqozh4wAbyjsKlzZUU5cNAgkOo9hhaixj2yecn6hi4gxgQfolXUv +KAkOkbT5LBx/xTQVXlm8IRxOo6x/skx25MSc2cHOVvOmBx9D8JrF3Qk/YHcn2A9V +BZuC8vYgQAoFBGG51xHmJomVeNMgxW8JGdib4ZrYzeMyaRHOPwz+NMDKJUmdRdBn +ftl4yQ40lYg5AgMBAAGjggP0MIID8DAfBgNVHSMEGDAWgBRqTlC/mGidW3sgddRZ +AXlIZpIyBjAdBgNVHQ4EFgQU1DiwneJjUpHHggPwHwDO7qD6t5MwgbMGA1UdEQSB +qzCBqIIQd3d3LmRpZ2ljZXJ0LmNvbYIMZGlnaWNlcnQuY29tghJhZG1pbi5kaWdp +Y2VydC5jb22CEGFwaS5kaWdpY2VydC5jb22CFGNvbnRlbnQuZGlnaWNlcnQuY29t +ghJsb2dpbi5kaWdpY2VydC5jb22CEm9yZGVyLmRpZ2ljZXJ0LmNvbYIPd3MuZGln +aWNlcnQuY29tghFjYXJ0LmRpZ2ljZXJ0LmNvbTBKBgNVHSAEQzBBMAsGCWCGSAGG +/WwCATAyBgVngQwBATApMCcGCCsGAQUFBwIBFhtodHRwOi8vd3d3LmRpZ2ljZXJ0 +LmNvbS9DUFMwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr +BgEFBQcDAjB1BgNVHR8EbjBsMDSgMqAwhi5odHRwOi8vY3JsMy5kaWdpY2VydC5j +b20vRGlnaUNlcnRFVlJTQUNBRzIuY3JsMDSgMqAwhi5odHRwOi8vY3JsNC5kaWdp +Y2VydC5jb20vRGlnaUNlcnRFVlJTQUNBRzIuY3JsMHMGCCsGAQUFBwEBBGcwZTAk +BggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMD0GCCsGAQUFBzAC +hjFodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRFVlJTQUNBRzIu +Y3J0MAwGA1UdEwEB/wQCMAAwggGBBgorBgEEAdZ5AgQCBIIBcQSCAW0BawB3AO7N +0GTV2xrOxVy3nbTNE6Iyh0Z8vOzew1FIWUZxH7WbAAABiwZXNrQAAAQDAEgwRgIh +AKisAHa9Fhp0k9OYBHWtCe0Y8BSbCgRvaH+QzfhfatS7AiEA2sb429SqQN8RD+Z4 +Iu5JHElklce8a4FTzG0lDWAuL2oAdwBIsONr2qZHNA/lagL6nTDrHFIBy1bdLIHZ +u7+rOdiEcwAAAYsGVzbkAAAEAwBIMEYCIQCFhGhC3inngXvZk4qIQYti0lst+fvC +nBpI7TNav708RQIhAIbDu40b2Hmizr49xvZrgrvs8YBSqF58EHf/hWCOdVBaAHcA +PxdLT9ciR1iUHWUchL4NEu2QN38fhWrrwb8ohez4ZG4AAAGLBlc3GQAABAMASDBG +AiEAgQsADJ7ot+IAxKqE3U1ET6II9DOsxOK/NylSUZvMxzICIQDGHKJHe+Vh860p +JBOvEFaOxLesbbYbcoiM9Bfkom0UPDANBgkqhkiG9w0BAQsFAAOCAQEADAB18iHj +zEkXqexS87Nvnwdf/wfvx7VBY2lh75pjBcmBwqB6oqwoH8fh7HCW9y98ouqI13mi +zBR8PIyjXf9EKceHbcsrYykg+gW9Ogo9oXdqzyS4Il2JSDg053vQlpkhhh3bSat4 +Yd/5W42YRpoRIGNGer48aVFB5GyX7iJFYzMHZVq4ZwK0g0Nx6JmPhPUd5BgPu+dO +7xlrw2u/t2wihilLlNFoHj0nyrj+AB9Y6MhzK5MLC6k1Yl0olNSTgsG7ZrwsucXC +LBxhhsK4xPIZq/WEnK8z5SwLI65P4w/ypmv4XCVt8IksrsaIUdCZv9lbV1Y7CNtG +d6U1KOkPY/h3VQ== +-----END CERTIFICATE----- \ No newline at end of file diff --git a/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/DigiCertHighAssuranceEVCA-1 b/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/DigiCertHighAssuranceEVCA-1 deleted file mode 100644 index dc86357b57..0000000000 --- a/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/DigiCertHighAssuranceEVCA-1 +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEFzCCAv+gAwIBAgIQB/LzXIeod6967+lHmTUlvTANBgkqhkiG9w0BAQwFADBh -MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 -d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD -QTAeFw0yMTA0MTQwMDAwMDBaFw0zMTA0MTMyMzU5NTlaMFYxCzAJBgNVBAYTAlVT -MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxMDAuBgNVBAMTJ0RpZ2lDZXJ0IFRMUyBI -eWJyaWQgRUNDIFNIQTM4NCAyMDIwIENBMTB2MBAGByqGSM49AgEGBSuBBAAiA2IA -BMEbxppbmNmkKaDp1AS12+umsmxVwP/tmMZJLwYnUcu/cMEFesOxnYeJuq20ExfJ -qLSDyLiQ0cx0NTY8g3KwtdD3ImnI8YDEe0CPz2iHJlw5ifFNkU3aiYvkA8ND5b8v -c6OCAYIwggF+MBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFAq8CCkXjKU5 -bXoOzjPHLrPt+8N6MB8GA1UdIwQYMBaAFAPeUDVW0Uy7ZvCj4hsbw5eyPdFVMA4G -A1UdDwEB/wQEAwIBhjAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwdgYI -KwYBBQUHAQEEajBoMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5j -b20wQAYIKwYBBQUHMAKGNGh0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdp -Q2VydEdsb2JhbFJvb3RDQS5jcnQwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2Ny -bDMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0R2xvYmFsUm9vdENBLmNybDA9BgNVHSAE -NjA0MAsGCWCGSAGG/WwCATAHBgVngQwBATAIBgZngQwBAgEwCAYGZ4EMAQICMAgG -BmeBDAECAzANBgkqhkiG9w0BAQwFAAOCAQEAR1mBf9QbH7Bx9phdGLqYR5iwfnYr -6v8ai6wms0KNMeZK6BnQ79oU59cUkqGS8qcuLa/7Hfb7U7CKP/zYFgrpsC62pQsY -kDUmotr2qLcy/JUjS8ZFucTP5Hzu5sn4kL1y45nDHQsFfGqXbbKrAjbYwrwsAZI/ -BKOLdRHHuSm8EdCGupK8JvllyDfNJvaGEwwEqonleLHBTnm8dqMLUeTF0J5q/hos -Vq4GNiejcxwIfZMy0MJEGdqN9A57HSgDKwmKdsp33Id6rHtSJlWncg+d0ohP/rEh -xRqhqjn1VtvChMQ1H3Dau0bwhr9kAMQ+959GG50jBbl9s08PqUU643QwmA== ------END CERTIFICATE----- \ No newline at end of file diff --git a/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/DigiCertHighAssuranceEVRootCA b/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/DigiCertHighAssuranceEVRootCA deleted file mode 100644 index 57ba02c6d3..0000000000 --- a/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/DigiCertHighAssuranceEVRootCA +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh -MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 -d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD -QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT -MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j -b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG -9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB -CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97 -nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt -43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P -T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4 -gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO -BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR -TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw -DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr -hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg -06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF -PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls -YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk -CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4= ------END CERTIFICATE----- \ No newline at end of file diff --git a/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/github.com b/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/github.com deleted file mode 100644 index 0d1d1dfd05..0000000000 --- a/modules/transports/core/nhttp/src/test/resources/org/apache/synapse/transport/certificatevalidation/certificates/github/github.com +++ /dev/null @@ -1,31 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFajCCBPGgAwIBAgIQDNCovsYyz+ZF7KCpsIT7HDAKBggqhkjOPQQDAzBWMQsw -CQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMTAwLgYDVQQDEydEaWdp -Q2VydCBUTFMgSHlicmlkIEVDQyBTSEEzODQgMjAyMCBDQTEwHhcNMjMwMjE0MDAw -MDAwWhcNMjQwMzE0MjM1OTU5WjBmMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2Fs -aWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEVMBMGA1UEChMMR2l0SHVi -LCBJbmMuMRMwEQYDVQQDEwpnaXRodWIuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0D -AQcDQgAEo6QDRgPfRlFWy8k5qyLN52xZlnqToPu5QByQMog2xgl2nFD1Vfd2Xmgg -nO4i7YMMFTAQQUReMqyQodWq8uVDs6OCA48wggOLMB8GA1UdIwQYMBaAFAq8CCkX -jKU5bXoOzjPHLrPt+8N6MB0GA1UdDgQWBBTHByd4hfKdM8lMXlZ9XNaOcmfr3jAl -BgNVHREEHjAcggpnaXRodWIuY29tgg53d3cuZ2l0aHViLmNvbTAOBgNVHQ8BAf8E -BAMCB4AwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMIGbBgNVHR8EgZMw -gZAwRqBEoEKGQGh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydFRMU0h5 -YnJpZEVDQ1NIQTM4NDIwMjBDQTEtMS5jcmwwRqBEoEKGQGh0dHA6Ly9jcmw0LmRp -Z2ljZXJ0LmNvbS9EaWdpQ2VydFRMU0h5YnJpZEVDQ1NIQTM4NDIwMjBDQTEtMS5j -cmwwPgYDVR0gBDcwNTAzBgZngQwBAgIwKTAnBggrBgEFBQcCARYbaHR0cDovL3d3 -dy5kaWdpY2VydC5jb20vQ1BTMIGFBggrBgEFBQcBAQR5MHcwJAYIKwYBBQUHMAGG -GGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBPBggrBgEFBQcwAoZDaHR0cDovL2Nh -Y2VydHMuZGlnaWNlcnQuY29tL0RpZ2lDZXJ0VExTSHlicmlkRUNDU0hBMzg0MjAy -MENBMS0xLmNydDAJBgNVHRMEAjAAMIIBgAYKKwYBBAHWeQIEAgSCAXAEggFsAWoA -dwDuzdBk1dsazsVct520zROiModGfLzs3sNRSFlGcR+1mwAAAYZQ3Rv6AAAEAwBI -MEYCIQDkFq7T4iy6gp+pefJLxpRS7U3gh8xQymmxtI8FdzqU6wIhALWfw/nLD63Q -YPIwG3EFchINvWUfB6mcU0t2lRIEpr8uAHYASLDja9qmRzQP5WoC+p0w6xxSActW -3SyB2bu/qznYhHMAAAGGUN0cKwAABAMARzBFAiAePGAyfiBR9dbhr31N9ZfESC5G -V2uGBTcyTyUENrH3twIhAPwJfsB8A4MmNr2nW+sdE1n2YiCObW+3DTHr2/UR7lvU -AHcAO1N3dT4tuYBOizBbBv5AO2fYT8P0x70ADS1yb+H61BcAAAGGUN0cOgAABAMA -SDBGAiEAzOBr9OZ0+6OSZyFTiywN64PysN0FLeLRyL5jmEsYrDYCIQDu0jtgWiMI -KU6CM0dKcqUWLkaFE23c2iWAhYAHqrFRRzAKBggqhkjOPQQDAwNnADBkAjAE3A3U -3jSZCpwfqOHBdlxi9ASgKTU+wg0qw3FqtfQ31OwLYFdxh0MlNk/HwkjRSWgCMFbQ -vMkXEPvNvv4t30K6xtpG26qmZ+6OiISBIIXMljWnsiYR1gyZnTzIg3AQSw4Vmw== ------END CERTIFICATE----- \ No newline at end of file From 90bf235117ac8928c4ec767535012c3f02ee1d13 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 20 Mar 2024 05:48:02 +0000 Subject: [PATCH 208/308] [WSO2 Release] [Jenkins #6917] [Release 4.0.0-wso2v97] prepare release v4.0.0-wso2v97 --- 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 48f47c9345..7f51932521 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v97-SNAPSHOT + 4.0.0-wso2v97 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index a886187ce2..79beb99876 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v97-SNAPSHOT + 4.0.0-wso2v97 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index ffa93b5f6c..8d0a14f033 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-wso2v97-SNAPSHOT + 4.0.0-wso2v97 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 5701924d0d..b7daea8f59 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v97-SNAPSHOT + 4.0.0-wso2v97 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 324700befa..0680058bcb 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v97-SNAPSHOT + 4.0.0-wso2v97 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 27f403818f..1a9b7fcfb4 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v97-SNAPSHOT + 4.0.0-wso2v97 ../../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 ff937947fc..70f6137f85 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-wso2v97-SNAPSHOT + 4.0.0-wso2v97 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 b1e11a9cbb..aef14cc96f 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-wso2v97-SNAPSHOT + 4.0.0-wso2v97 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 1d6d9fa1ed..5f6bf7716b 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-wso2v97-SNAPSHOT + 4.0.0-wso2v97 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 d79c53e877..e3b1fd64cb 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-wso2v97-SNAPSHOT + 4.0.0-wso2v97 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 be20a149be..71a452d8db 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-wso2v97-SNAPSHOT + 4.0.0-wso2v97 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 75552d532d..a66fc45ae1 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-wso2v97-SNAPSHOT + 4.0.0-wso2v97 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 8b57bf5c11..5d0224280c 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-wso2v97-SNAPSHOT + 4.0.0-wso2v97 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 4e888000ad..81577438f3 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v97-SNAPSHOT + 4.0.0-wso2v97 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 5f60cb8742..65de86f8bc 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v97-SNAPSHOT + 4.0.0-wso2v97 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 43d7974b1f..87155f0f03 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v97-SNAPSHOT + 4.0.0-wso2v97 ../../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-wso2v97 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 135c7ed046..ce4b47f240 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v97-SNAPSHOT + 4.0.0-wso2v97 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 537df4a7da..1d93a27899 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-wso2v97-SNAPSHOT + 4.0.0-wso2v97 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 86e383c7d4..56d0a1c165 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-wso2v97-SNAPSHOT + 4.0.0-wso2v97 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 2c0746bad7..6f0346525d 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v97-SNAPSHOT + 4.0.0-wso2v97 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 8b8c06bdd2..13da9caae6 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v97-SNAPSHOT + 4.0.0-wso2v97 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 0214afa10d..6cb4e29d2f 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v97-SNAPSHOT + 4.0.0-wso2v97 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index f8d72e9e6d..f0e558481b 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v97-SNAPSHOT + 4.0.0-wso2v97 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 08b9769a0f..5aa579291b 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-wso2v97-SNAPSHOT + 4.0.0-wso2v97 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 2b658b03dc..5ff706869e 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-wso2v97-SNAPSHOT + 4.0.0-wso2v97 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index d5b1214505..ef2e24791d 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-wso2v97-SNAPSHOT + 4.0.0-wso2v97 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index a7d7d80064..eaf49e306e 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-wso2v97-SNAPSHOT + 4.0.0-wso2v97 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 283b17fb5a..7766ed31c8 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v97-SNAPSHOT + 4.0.0-wso2v97 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 71cb76c906..ddeec603b8 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v97-SNAPSHOT + 4.0.0-wso2v97 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 172f95daac..4b8170525a 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-wso2v97-SNAPSHOT + 4.0.0-wso2v97 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 276952a86f..87f8756d1b 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v97-SNAPSHOT + 4.0.0-wso2v97 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-wso2v97 Apache Software Foundation From 7b5375071a9df1f041f88d5da235bf8db321f897 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 20 Mar 2024 05:48:04 +0000 Subject: [PATCH 209/308] [WSO2 Release] [Jenkins #6917] [Release 4.0.0-wso2v97] 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 7f51932521..94e0c1b23a 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v97 + 4.0.0-wso2v98-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 79beb99876..3cbe0eab6e 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v97 + 4.0.0-wso2v98-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 8d0a14f033..a0a4a6d1c6 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-wso2v97 + 4.0.0-wso2v98-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index b7daea8f59..0e79fb2ab5 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v97 + 4.0.0-wso2v98-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 0680058bcb..8a7820b372 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v97 + 4.0.0-wso2v98-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 1a9b7fcfb4..28b9f4fac8 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v97 + 4.0.0-wso2v98-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 70f6137f85..9471f41b14 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-wso2v97 + 4.0.0-wso2v98-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 aef14cc96f..3b9c568b0b 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-wso2v97 + 4.0.0-wso2v98-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 5f6bf7716b..0ca3923247 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-wso2v97 + 4.0.0-wso2v98-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 e3b1fd64cb..15eedf2891 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-wso2v97 + 4.0.0-wso2v98-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 71a452d8db..e90638d95d 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-wso2v97 + 4.0.0-wso2v98-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 a66fc45ae1..4f8976b357 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-wso2v97 + 4.0.0-wso2v98-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 5d0224280c..606f45319e 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-wso2v97 + 4.0.0-wso2v98-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 81577438f3..06e4487c99 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v97 + 4.0.0-wso2v98-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 65de86f8bc..b6c35ab452 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v97 + 4.0.0-wso2v98-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 87155f0f03..aafebda49c 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v97 + 4.0.0-wso2v98-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-wso2v97 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index ce4b47f240..dff35fad86 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v97 + 4.0.0-wso2v98-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 1d93a27899..4525d8c730 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-wso2v97 + 4.0.0-wso2v98-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 56d0a1c165..c9e5a5cc07 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-wso2v97 + 4.0.0-wso2v98-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 6f0346525d..e15f677033 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v97 + 4.0.0-wso2v98-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 13da9caae6..fae46c41e0 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v97 + 4.0.0-wso2v98-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 6cb4e29d2f..6d276ec9fd 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v97 + 4.0.0-wso2v98-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index f0e558481b..b9c4e3df00 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v97 + 4.0.0-wso2v98-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 5aa579291b..7967b964bb 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-wso2v97 + 4.0.0-wso2v98-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 5ff706869e..7a113fe3c6 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-wso2v97 + 4.0.0-wso2v98-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index ef2e24791d..f661a91aa4 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-wso2v97 + 4.0.0-wso2v98-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index eaf49e306e..d820a9a428 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-wso2v97 + 4.0.0-wso2v98-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 7766ed31c8..a8de387ab9 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v97 + 4.0.0-wso2v98-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index ddeec603b8..b6db15e14e 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v97 + 4.0.0-wso2v98-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 4b8170525a..71366abb9e 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-wso2v97 + 4.0.0-wso2v98-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 87f8756d1b..2aaaf6dc73 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v97 + 4.0.0-wso2v98-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-wso2v97 + HEAD Apache Software Foundation From 5f6c9a263b1657ec91caf05cbf982c053c78f18b Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 20 Mar 2024 09:26:24 +0000 Subject: [PATCH 210/308] [WSO2 Release] [Jenkins #6919] [Release 4.0.0-wso2v98] prepare release v4.0.0-wso2v98 --- 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 94e0c1b23a..04e6308a60 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v98-SNAPSHOT + 4.0.0-wso2v98 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 3cbe0eab6e..094740a98f 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v98-SNAPSHOT + 4.0.0-wso2v98 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index a0a4a6d1c6..305ae87733 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-wso2v98-SNAPSHOT + 4.0.0-wso2v98 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 0e79fb2ab5..0165a0747b 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v98-SNAPSHOT + 4.0.0-wso2v98 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 8a7820b372..9f2684b6ac 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v98-SNAPSHOT + 4.0.0-wso2v98 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 28b9f4fac8..c29f36ecd3 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v98-SNAPSHOT + 4.0.0-wso2v98 ../../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 9471f41b14..9ba9795489 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-wso2v98-SNAPSHOT + 4.0.0-wso2v98 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 3b9c568b0b..43b7f23b2b 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-wso2v98-SNAPSHOT + 4.0.0-wso2v98 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 0ca3923247..582c9434f1 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-wso2v98-SNAPSHOT + 4.0.0-wso2v98 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 15eedf2891..7d3bdba6c9 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-wso2v98-SNAPSHOT + 4.0.0-wso2v98 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 e90638d95d..58c4e78ec0 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-wso2v98-SNAPSHOT + 4.0.0-wso2v98 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 4f8976b357..777d2967f4 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-wso2v98-SNAPSHOT + 4.0.0-wso2v98 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 606f45319e..aacd8d11ea 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-wso2v98-SNAPSHOT + 4.0.0-wso2v98 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 06e4487c99..e9191c4775 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v98-SNAPSHOT + 4.0.0-wso2v98 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index b6c35ab452..37dddd1e96 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v98-SNAPSHOT + 4.0.0-wso2v98 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index aafebda49c..2405fca059 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v98-SNAPSHOT + 4.0.0-wso2v98 ../../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-wso2v98 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index dff35fad86..42342c8d04 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v98-SNAPSHOT + 4.0.0-wso2v98 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 4525d8c730..4709373ca8 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-wso2v98-SNAPSHOT + 4.0.0-wso2v98 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index c9e5a5cc07..fc430ad408 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-wso2v98-SNAPSHOT + 4.0.0-wso2v98 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index e15f677033..c2bac87277 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v98-SNAPSHOT + 4.0.0-wso2v98 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index fae46c41e0..f698f1392e 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v98-SNAPSHOT + 4.0.0-wso2v98 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 6d276ec9fd..29b68a80f7 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v98-SNAPSHOT + 4.0.0-wso2v98 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index b9c4e3df00..0549a9f07d 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v98-SNAPSHOT + 4.0.0-wso2v98 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 7967b964bb..56f093defa 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-wso2v98-SNAPSHOT + 4.0.0-wso2v98 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 7a113fe3c6..2ef8f618c0 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-wso2v98-SNAPSHOT + 4.0.0-wso2v98 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index f661a91aa4..9b5388f09a 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-wso2v98-SNAPSHOT + 4.0.0-wso2v98 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index d820a9a428..005e3c9672 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-wso2v98-SNAPSHOT + 4.0.0-wso2v98 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index a8de387ab9..fbf5f56b14 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v98-SNAPSHOT + 4.0.0-wso2v98 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index b6db15e14e..186cb6b1da 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v98-SNAPSHOT + 4.0.0-wso2v98 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 71366abb9e..caf39c5e83 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-wso2v98-SNAPSHOT + 4.0.0-wso2v98 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 2aaaf6dc73..b6811624f6 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v98-SNAPSHOT + 4.0.0-wso2v98 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-wso2v98 Apache Software Foundation From d93d854b5b2bee84f85bb63d1a56ccbf29daddc7 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 20 Mar 2024 09:26:26 +0000 Subject: [PATCH 211/308] [WSO2 Release] [Jenkins #6919] [Release 4.0.0-wso2v98] 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 04e6308a60..4bd96c92a3 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v98 + 4.0.0-wso2v99-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 094740a98f..95f2600669 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v98 + 4.0.0-wso2v99-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 305ae87733..4bae2849ef 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-wso2v98 + 4.0.0-wso2v99-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 0165a0747b..b3b1edc543 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v98 + 4.0.0-wso2v99-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 9f2684b6ac..d3ab7bc0a9 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v98 + 4.0.0-wso2v99-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index c29f36ecd3..748957f467 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v98 + 4.0.0-wso2v99-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 9ba9795489..ff369e3f16 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-wso2v98 + 4.0.0-wso2v99-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 43b7f23b2b..02974bf4cc 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-wso2v98 + 4.0.0-wso2v99-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 582c9434f1..7b99791797 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-wso2v98 + 4.0.0-wso2v99-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 7d3bdba6c9..12960c0ff0 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-wso2v98 + 4.0.0-wso2v99-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 58c4e78ec0..b8b4dd131f 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-wso2v98 + 4.0.0-wso2v99-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 777d2967f4..bcde69e39c 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-wso2v98 + 4.0.0-wso2v99-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 aacd8d11ea..b3ebf9feca 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-wso2v98 + 4.0.0-wso2v99-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index e9191c4775..a5976fef8a 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v98 + 4.0.0-wso2v99-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 37dddd1e96..ca668d187d 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v98 + 4.0.0-wso2v99-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 2405fca059..328d716917 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v98 + 4.0.0-wso2v99-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-wso2v98 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 42342c8d04..2c3977cab9 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v98 + 4.0.0-wso2v99-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 4709373ca8..ed65de47c0 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-wso2v98 + 4.0.0-wso2v99-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index fc430ad408..b1073ea162 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-wso2v98 + 4.0.0-wso2v99-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index c2bac87277..e8374e3206 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v98 + 4.0.0-wso2v99-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index f698f1392e..b06d60d10b 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v98 + 4.0.0-wso2v99-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 29b68a80f7..675ea08bd6 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v98 + 4.0.0-wso2v99-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 0549a9f07d..a9ba3956c1 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v98 + 4.0.0-wso2v99-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 56f093defa..3120d62391 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-wso2v98 + 4.0.0-wso2v99-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 2ef8f618c0..c5d651dd82 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-wso2v98 + 4.0.0-wso2v99-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 9b5388f09a..a05b432d2c 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-wso2v98 + 4.0.0-wso2v99-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 005e3c9672..19afac4511 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-wso2v98 + 4.0.0-wso2v99-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index fbf5f56b14..c0f4181400 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v98 + 4.0.0-wso2v99-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 186cb6b1da..2d4f357871 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v98 + 4.0.0-wso2v99-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index caf39c5e83..8092b48c07 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-wso2v98 + 4.0.0-wso2v99-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index b6811624f6..4d76703e66 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v98 + 4.0.0-wso2v99-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-wso2v98 + HEAD Apache Software Foundation From 1daf8dc693e2c4300d7bdb3e9abd935624c28ef3 Mon Sep 17 00:00:00 2001 From: Thisal Tennakoon Date: Wed, 20 Mar 2024 22:53:33 +0530 Subject: [PATCH 212/308] Revert "Fix Revision Deployment failed with an error" This reverts commit 1e80d6c1b7837d9d101bc844e5d2dc06f5a21cbe. --- .../synapse/config/SynapseConfiguration.java | 156 ++++++++---------- 1 file changed, 68 insertions(+), 88 deletions(-) diff --git a/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java b/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java index 3b6caf4f98..341242d5fc 100644 --- a/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java +++ b/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java @@ -84,8 +84,6 @@ import java.util.Set; import java.util.Timer; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.locks.ReadWriteLock; -import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.stream.Stream; import javax.xml.namespace.QName; @@ -196,7 +194,7 @@ public class SynapseConfiguration implements ManagedLifecycle, SynapseArtifact { */ private Map messageProcessors = new ConcurrentHashMap(); - private Map locks = new ConcurrentHashMap(); + private Map locks = new ConcurrentHashMap(); /** * Endpoint templates to create actual endpoints @@ -1017,45 +1015,35 @@ public Object getEntry(String key) { * @return its value */ public Entry getEntryDefinition(String key) { - Object lockObj = acquireLock(key); - if (lockObj instanceof ReadWriteLock) { - ReadWriteLock lock = (ReadWriteLock) lockObj; - lock.readLock().lock(); - try { - Object o = localRegistry.get(key); - if (o == null || o instanceof Entry) { + Object o = localRegistry.get(key); + if (o == null || o instanceof Entry) { + if (o == null) { + // this is not a local definition + synchronized (this) { + o = localRegistry.get(key); if (o == null) { - // this is not a local definition - synchronized (this) { - o = localRegistry.get(key); - if (o == null) { - Entry entry = new Entry(key); - entry.setType(Entry.REMOTE_ENTRY); - addEntry(key, entry); - return entry; - } else { - if (!(o instanceof Entry)) { - if (log.isDebugEnabled()) { - log.debug("There is no local registry entry for key : " + key + - ", Object already exists of type :" + o.getClass().getName()); - } - return null; - } + Entry entry = new Entry(key); + entry.setType(Entry.REMOTE_ENTRY); + addEntry(key, entry); + return entry; + } else { + if (!(o instanceof Entry)) { + if (log.isDebugEnabled()) { + log.debug("There is no local registry entry for key : " + key + + ", Object already exists of type :" + o.getClass().getName()); } + return null; } } - return (Entry) o; - } else { - if (log.isDebugEnabled()) { - log.debug("There is no local registry entry for key : " + key); - } - return null; } - } finally { - lock.readLock().unlock(); } + return (Entry) o; + } else { + if (log.isDebugEnabled()) { + log.debug("There is no local registry entry for key : " + key); + } + return null; } - return null; } /** @@ -1162,12 +1150,12 @@ public Map getDefinedEndpoints() { } public Object acquireLock(String key) { - ReadWriteLock lock = locks.get(key); + Object lock = locks.get(key); if (lock == null) { synchronized (this) { lock = locks.get(key); if (lock == null) { - lock = new ReentrantReadWriteLock(); + lock = new Object(); locks.put(key, lock); } } @@ -1183,68 +1171,60 @@ public Object acquireLock(String key) { */ public Endpoint getEndpoint(String key) { - Object lockObj = acquireLock(key); - if (lockObj instanceof ReadWriteLock) { - ReadWriteLock lock = (ReadWriteLock) lockObj; - lock.readLock().lock(); - try { - Object o = getEntry(key); - if (o != null && o instanceof Endpoint) { - return (Endpoint) o; - } + synchronized (acquireLock(key)) { + Object o = getEntry(key); + if (o != null && o instanceof Endpoint) { + return (Endpoint) o; + } - Entry entry = null; - if (o == null) { - entry = new Entry(key); - entry.setType(Entry.REMOTE_ENTRY); - } else { - Object object = localRegistry.get(key); - if (object instanceof Entry) { - entry = (Entry) object; - } + Entry entry = null; + if (o == null) { + entry = new Entry(key); + entry.setType(Entry.REMOTE_ENTRY); + } else { + Object object = localRegistry.get(key); + if (object instanceof Entry) { + entry = (Entry) object; } + } - assertEntryNull(entry, key); + assertEntryNull(entry, key); - //noinspection ConstantConditions - if (entry.getMapper() == null) { - entry.setMapper(XMLToEndpointMapper.getInstance()); - } + //noinspection ConstantConditions + if (entry.getMapper() == null) { + entry.setMapper(XMLToEndpointMapper.getInstance()); + } - if (entry.getType() == Entry.REMOTE_ENTRY) { - if (registry != null) { - o = registry.getResource(entry, getProperties()); - if (o != null && o instanceof Endpoint) { - localRegistry.put(key, entry); - return (Endpoint) o; - } else if (o instanceof OMNode) { - properties.put(SynapseConstants.SYNAPSE_CONFIGURATION, this); - Endpoint e = (Endpoint) XMLToEndpointMapper.getInstance(). - getObjectFromOMNode((OMNode) o, properties); - if (e != null) { - entry.setValue(e); - return e; - } - } - } - } else { - Object value = entry.getValue(); - if (value instanceof OMNode) { + if (entry.getType() == Entry.REMOTE_ENTRY) { + if (registry != null) { + o = registry.getResource(entry, getProperties()); + if (o != null && o instanceof Endpoint) { + localRegistry.put(key, entry); + return (Endpoint) o; + } else if (o instanceof OMNode) { properties.put(SynapseConstants.SYNAPSE_CONFIGURATION, this); - Object object = entry.getMapper().getObjectFromOMNode( - (OMNode) value, getProperties()); - if (object instanceof Endpoint) { - entry.setValue(object); - return (Endpoint) object; + Endpoint e = (Endpoint) XMLToEndpointMapper.getInstance(). + getObjectFromOMNode((OMNode) o, properties); + if (e != null) { + entry.setValue(e); + return e; } } } - return null; - } finally { - lock.readLock().unlock(); + } else { + Object value = entry.getValue(); + if (value instanceof OMNode) { + properties.put(SynapseConstants.SYNAPSE_CONFIGURATION, this); + Object object = entry.getMapper().getObjectFromOMNode( + (OMNode) value, getProperties()); + if (object instanceof Endpoint) { + entry.setValue(object); + return (Endpoint) object; + } + } } + return null; } - return null; } /** From 07086faf03e6aec51e29ebcbf724122cfa7ad255 Mon Sep 17 00:00:00 2001 From: Thisal Tennakoon Date: Thu, 21 Mar 2024 09:49:34 +0530 Subject: [PATCH 213/308] Remove acquireLock function to reduce coupling --- .../synapse/config/SynapseConfiguration.java | 102 ++++++++---------- 1 file changed, 42 insertions(+), 60 deletions(-) diff --git a/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java b/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java index 341242d5fc..47ed64af38 100644 --- a/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java +++ b/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java @@ -194,8 +194,6 @@ public class SynapseConfiguration implements ManagedLifecycle, SynapseArtifact { */ private Map messageProcessors = new ConcurrentHashMap(); - private Map locks = new ConcurrentHashMap(); - /** * Endpoint templates to create actual endpoints */ @@ -1149,20 +1147,6 @@ public Map getDefinedEndpoints() { return definedEndpoints; } - public Object acquireLock(String key) { - Object lock = locks.get(key); - if (lock == null) { - synchronized (this) { - lock = locks.get(key); - if (lock == null) { - lock = new Object(); - locks.put(key, lock); - } - } - } - return lock; - } - /** * Get the definition of the endpoint with the given key * @@ -1171,60 +1155,58 @@ public Object acquireLock(String key) { */ public Endpoint getEndpoint(String key) { - synchronized (acquireLock(key)) { - Object o = getEntry(key); - if (o != null && o instanceof Endpoint) { - return (Endpoint) o; - } + Object o = getEntry(key); + if (o != null && o instanceof Endpoint) { + return (Endpoint) o; + } - Entry entry = null; - if (o == null) { - entry = new Entry(key); - entry.setType(Entry.REMOTE_ENTRY); - } else { - Object object = localRegistry.get(key); - if (object instanceof Entry) { - entry = (Entry) object; - } + Entry entry = null; + if (o == null) { + entry = new Entry(key); + entry.setType(Entry.REMOTE_ENTRY); + } else { + Object object = localRegistry.get(key); + if (object instanceof Entry) { + entry = (Entry) object; } + } - assertEntryNull(entry, key); + assertEntryNull(entry, key); - //noinspection ConstantConditions - if (entry.getMapper() == null) { - entry.setMapper(XMLToEndpointMapper.getInstance()); - } + //noinspection ConstantConditions + if (entry.getMapper() == null) { + entry.setMapper(XMLToEndpointMapper.getInstance()); + } - if (entry.getType() == Entry.REMOTE_ENTRY) { - if (registry != null) { - o = registry.getResource(entry, getProperties()); - if (o != null && o instanceof Endpoint) { - localRegistry.put(key, entry); - return (Endpoint) o; - } else if (o instanceof OMNode) { - properties.put(SynapseConstants.SYNAPSE_CONFIGURATION, this); - Endpoint e = (Endpoint) XMLToEndpointMapper.getInstance(). - getObjectFromOMNode((OMNode) o, properties); - if (e != null) { - entry.setValue(e); - return e; - } - } - } - } else { - Object value = entry.getValue(); - if (value instanceof OMNode) { + if (entry.getType() == Entry.REMOTE_ENTRY) { + if (registry != null) { + o = registry.getResource(entry, getProperties()); + if (o != null && o instanceof Endpoint) { + localRegistry.put(key, entry); + return (Endpoint) o; + } else if (o instanceof OMNode) { properties.put(SynapseConstants.SYNAPSE_CONFIGURATION, this); - Object object = entry.getMapper().getObjectFromOMNode( - (OMNode) value, getProperties()); - if (object instanceof Endpoint) { - entry.setValue(object); - return (Endpoint) object; + Endpoint e = (Endpoint) XMLToEndpointMapper.getInstance(). + getObjectFromOMNode((OMNode) o, properties); + if (e != null) { + entry.setValue(e); + return e; } } } - return null; + } else { + Object value = entry.getValue(); + if (value instanceof OMNode) { + properties.put(SynapseConstants.SYNAPSE_CONFIGURATION, this); + Object object = entry.getMapper().getObjectFromOMNode( + (OMNode) value, getProperties()); + if (object instanceof Endpoint) { + entry.setValue(object); + return (Endpoint) object; + } + } } + return null; } /** From 4c4501dbc4058b01f67824d957a54178cfaac1a5 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 21 Mar 2024 07:24:35 +0000 Subject: [PATCH 214/308] [WSO2 Release] [Jenkins #6922] [Release 4.0.0-wso2v99] prepare release v4.0.0-wso2v99 --- 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 4bd96c92a3..7ac3cde332 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v99-SNAPSHOT + 4.0.0-wso2v99 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 95f2600669..0229cd8470 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v99-SNAPSHOT + 4.0.0-wso2v99 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 4bae2849ef..4cfa2d8391 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-wso2v99-SNAPSHOT + 4.0.0-wso2v99 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index b3b1edc543..f181e0d894 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v99-SNAPSHOT + 4.0.0-wso2v99 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index d3ab7bc0a9..99da8617a8 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v99-SNAPSHOT + 4.0.0-wso2v99 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 748957f467..b198aa04fa 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v99-SNAPSHOT + 4.0.0-wso2v99 ../../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 ff369e3f16..ef06070d22 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-wso2v99-SNAPSHOT + 4.0.0-wso2v99 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 02974bf4cc..0b606b9951 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-wso2v99-SNAPSHOT + 4.0.0-wso2v99 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 7b99791797..8f9eda344f 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-wso2v99-SNAPSHOT + 4.0.0-wso2v99 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 12960c0ff0..065b12cdcb 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-wso2v99-SNAPSHOT + 4.0.0-wso2v99 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 b8b4dd131f..ab1463f6a4 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-wso2v99-SNAPSHOT + 4.0.0-wso2v99 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 bcde69e39c..1fd22070b3 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-wso2v99-SNAPSHOT + 4.0.0-wso2v99 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 b3ebf9feca..2abce8c664 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-wso2v99-SNAPSHOT + 4.0.0-wso2v99 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index a5976fef8a..7a27175a29 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v99-SNAPSHOT + 4.0.0-wso2v99 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index ca668d187d..e9cdb4dc68 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v99-SNAPSHOT + 4.0.0-wso2v99 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 328d716917..b9aa0ec26e 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v99-SNAPSHOT + 4.0.0-wso2v99 ../../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-wso2v99 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 2c3977cab9..c5501f7705 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v99-SNAPSHOT + 4.0.0-wso2v99 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index ed65de47c0..015ff51a53 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-wso2v99-SNAPSHOT + 4.0.0-wso2v99 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index b1073ea162..18de86e56e 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-wso2v99-SNAPSHOT + 4.0.0-wso2v99 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index e8374e3206..4c3e949e8e 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v99-SNAPSHOT + 4.0.0-wso2v99 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index b06d60d10b..d20617848e 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v99-SNAPSHOT + 4.0.0-wso2v99 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 675ea08bd6..d95fb39a83 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v99-SNAPSHOT + 4.0.0-wso2v99 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index a9ba3956c1..d2fd657a1e 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v99-SNAPSHOT + 4.0.0-wso2v99 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 3120d62391..3ce5c684d0 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-wso2v99-SNAPSHOT + 4.0.0-wso2v99 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index c5d651dd82..9d230e49bb 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-wso2v99-SNAPSHOT + 4.0.0-wso2v99 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index a05b432d2c..69e7c2b69a 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-wso2v99-SNAPSHOT + 4.0.0-wso2v99 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 19afac4511..806c1d74d2 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-wso2v99-SNAPSHOT + 4.0.0-wso2v99 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index c0f4181400..f37b7af16a 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v99-SNAPSHOT + 4.0.0-wso2v99 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 2d4f357871..d444878fb6 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v99-SNAPSHOT + 4.0.0-wso2v99 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 8092b48c07..dff20c5daf 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-wso2v99-SNAPSHOT + 4.0.0-wso2v99 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 43df656e7b..0126809489 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v99-SNAPSHOT + 4.0.0-wso2v99 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-wso2v99 Apache Software Foundation From 02b357a95ac3bb6865e107f8bebf180925bc9d84 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 21 Mar 2024 07:24:37 +0000 Subject: [PATCH 215/308] [WSO2 Release] [Jenkins #6922] [Release 4.0.0-wso2v99] 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 7ac3cde332..e74f725095 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v99 + 4.0.0-wso2v100-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 0229cd8470..05e44d15a8 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v99 + 4.0.0-wso2v100-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 4cfa2d8391..1d470f30c6 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-wso2v99 + 4.0.0-wso2v100-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index f181e0d894..823e28cae8 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v99 + 4.0.0-wso2v100-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 99da8617a8..752aecf94f 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v99 + 4.0.0-wso2v100-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index b198aa04fa..e24ca60e6c 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v99 + 4.0.0-wso2v100-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 ef06070d22..4d314e29dd 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-wso2v99 + 4.0.0-wso2v100-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 0b606b9951..45b6ad5a3a 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-wso2v99 + 4.0.0-wso2v100-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 8f9eda344f..564390e0d2 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-wso2v99 + 4.0.0-wso2v100-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 065b12cdcb..7b4b89662d 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-wso2v99 + 4.0.0-wso2v100-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 ab1463f6a4..673c4b96b8 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-wso2v99 + 4.0.0-wso2v100-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 1fd22070b3..c5ecc42c74 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-wso2v99 + 4.0.0-wso2v100-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 2abce8c664..31f89204cb 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-wso2v99 + 4.0.0-wso2v100-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 7a27175a29..6e8e523caa 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v99 + 4.0.0-wso2v100-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index e9cdb4dc68..79f00b75ef 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v99 + 4.0.0-wso2v100-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index b9aa0ec26e..0d17726b7f 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v99 + 4.0.0-wso2v100-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-wso2v99 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index c5501f7705..0f063ce0f3 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v99 + 4.0.0-wso2v100-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 015ff51a53..ab862c27f3 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-wso2v99 + 4.0.0-wso2v100-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 18de86e56e..287d64c30a 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-wso2v99 + 4.0.0-wso2v100-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 4c3e949e8e..8259688c34 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v99 + 4.0.0-wso2v100-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index d20617848e..5c74ca25b4 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v99 + 4.0.0-wso2v100-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index d95fb39a83..102a5c6ddd 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v99 + 4.0.0-wso2v100-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index d2fd657a1e..b62d0db259 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v99 + 4.0.0-wso2v100-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 3ce5c684d0..67d17f3117 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-wso2v99 + 4.0.0-wso2v100-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 9d230e49bb..9535bd4713 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-wso2v99 + 4.0.0-wso2v100-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 69e7c2b69a..91489fedcc 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-wso2v99 + 4.0.0-wso2v100-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 806c1d74d2..6f46f8d9a7 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-wso2v99 + 4.0.0-wso2v100-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index f37b7af16a..f30dc04ad6 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v99 + 4.0.0-wso2v100-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index d444878fb6..0774af1589 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v99 + 4.0.0-wso2v100-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index dff20c5daf..b84787ef48 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-wso2v99 + 4.0.0-wso2v100-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 0126809489..42cf18dba7 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v99 + 4.0.0-wso2v100-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-wso2v99 + HEAD Apache Software Foundation From b0ad819a2bf2e9511881c56ac8e379f0ef6d22bc Mon Sep 17 00:00:00 2001 From: Dulanjali Dilmi Date: Fri, 22 Mar 2024 14:31:30 +0530 Subject: [PATCH 216/308] Create ELK metadata for fault events Fix wso2/micro-integrator#3278 --- .../flow/statistics/collectors/FaultStatisticCollector.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/core/src/main/java/org/apache/synapse/aspects/flow/statistics/collectors/FaultStatisticCollector.java b/modules/core/src/main/java/org/apache/synapse/aspects/flow/statistics/collectors/FaultStatisticCollector.java index 8fba86c4c2..24a538b056 100644 --- a/modules/core/src/main/java/org/apache/synapse/aspects/flow/statistics/collectors/FaultStatisticCollector.java +++ b/modules/core/src/main/java/org/apache/synapse/aspects/flow/statistics/collectors/FaultStatisticCollector.java @@ -47,6 +47,7 @@ public static void reportFault(MessageContext messageContext) { dataUnit.setCurrentIndex(StatisticDataCollectionHelper.getParentFlowPosition(messageContext, null)); FaultEvent faultEvent = new FaultEvent(dataUnit); + faultEvent.getDataUnit().generateElasticMetadata(messageContext); addEventAndIncrementCount(messageContext, faultEvent); } } From c37dc654c5084f308f66ecd5c5225532771bb716 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 25 Mar 2024 04:42:23 +0000 Subject: [PATCH 217/308] [WSO2 Release] [Jenkins #6929] [Release 4.0.0-wso2v100] prepare release v4.0.0-wso2v100 --- 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 e74f725095..d4ef8da119 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v100-SNAPSHOT + 4.0.0-wso2v100 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 05e44d15a8..597e1de0d2 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v100-SNAPSHOT + 4.0.0-wso2v100 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 1d470f30c6..defb40bbec 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-wso2v100-SNAPSHOT + 4.0.0-wso2v100 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 823e28cae8..70eed31dc7 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v100-SNAPSHOT + 4.0.0-wso2v100 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 752aecf94f..5d01498a23 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v100-SNAPSHOT + 4.0.0-wso2v100 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index e24ca60e6c..4ff9a0a947 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v100-SNAPSHOT + 4.0.0-wso2v100 ../../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 4d314e29dd..cb8e02a08e 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-wso2v100-SNAPSHOT + 4.0.0-wso2v100 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 45b6ad5a3a..cd71698508 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-wso2v100-SNAPSHOT + 4.0.0-wso2v100 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 564390e0d2..6b3d5cfff4 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-wso2v100-SNAPSHOT + 4.0.0-wso2v100 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 7b4b89662d..1b9f445fa2 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-wso2v100-SNAPSHOT + 4.0.0-wso2v100 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 673c4b96b8..ef8d07307f 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-wso2v100-SNAPSHOT + 4.0.0-wso2v100 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 c5ecc42c74..7a9dd91ebe 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-wso2v100-SNAPSHOT + 4.0.0-wso2v100 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 31f89204cb..2696174c75 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-wso2v100-SNAPSHOT + 4.0.0-wso2v100 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 6e8e523caa..4cdcf83c0a 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v100-SNAPSHOT + 4.0.0-wso2v100 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 79f00b75ef..6cf468b4e6 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v100-SNAPSHOT + 4.0.0-wso2v100 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 0d17726b7f..4b9c7b70ed 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v100-SNAPSHOT + 4.0.0-wso2v100 ../../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-wso2v100 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 0f063ce0f3..5c04a78370 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v100-SNAPSHOT + 4.0.0-wso2v100 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index ab862c27f3..a3fdb5efbc 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-wso2v100-SNAPSHOT + 4.0.0-wso2v100 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 287d64c30a..093710e981 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-wso2v100-SNAPSHOT + 4.0.0-wso2v100 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 8259688c34..2810fffa70 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v100-SNAPSHOT + 4.0.0-wso2v100 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 5c74ca25b4..dc8f066649 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v100-SNAPSHOT + 4.0.0-wso2v100 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 102a5c6ddd..bd63060af3 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v100-SNAPSHOT + 4.0.0-wso2v100 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index b62d0db259..164488e294 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v100-SNAPSHOT + 4.0.0-wso2v100 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 67d17f3117..6be52620f1 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-wso2v100-SNAPSHOT + 4.0.0-wso2v100 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 9535bd4713..f7167c306b 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-wso2v100-SNAPSHOT + 4.0.0-wso2v100 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 91489fedcc..3c74337cfe 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-wso2v100-SNAPSHOT + 4.0.0-wso2v100 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 6f46f8d9a7..44f7904e35 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-wso2v100-SNAPSHOT + 4.0.0-wso2v100 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index f30dc04ad6..98124438a1 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v100-SNAPSHOT + 4.0.0-wso2v100 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 0774af1589..40a90c98fd 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v100-SNAPSHOT + 4.0.0-wso2v100 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index b84787ef48..3c67d0c94d 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-wso2v100-SNAPSHOT + 4.0.0-wso2v100 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 42cf18dba7..83fbc97ca6 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v100-SNAPSHOT + 4.0.0-wso2v100 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-wso2v100 Apache Software Foundation From 6bf31ba2a1d91a3a95a9cc59afbb402c62d4ee9c Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 25 Mar 2024 04:42:24 +0000 Subject: [PATCH 218/308] [WSO2 Release] [Jenkins #6929] [Release 4.0.0-wso2v100] 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 d4ef8da119..c11cc65a3f 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v100 + 4.0.0-wso2v101-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 597e1de0d2..67ec5a64e0 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v100 + 4.0.0-wso2v101-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index defb40bbec..5628fbc0a9 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-wso2v100 + 4.0.0-wso2v101-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 70eed31dc7..76251b8d9d 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v100 + 4.0.0-wso2v101-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 5d01498a23..5cc1090d3d 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v100 + 4.0.0-wso2v101-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 4ff9a0a947..5bc7363b5a 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v100 + 4.0.0-wso2v101-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 cb8e02a08e..723efbb5e7 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-wso2v100 + 4.0.0-wso2v101-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 cd71698508..7fa9ae9977 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-wso2v100 + 4.0.0-wso2v101-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 6b3d5cfff4..869dc5ca69 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-wso2v100 + 4.0.0-wso2v101-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 1b9f445fa2..ba604d63e5 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-wso2v100 + 4.0.0-wso2v101-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 ef8d07307f..fcb9524bf9 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-wso2v100 + 4.0.0-wso2v101-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 7a9dd91ebe..8f5f25e8d0 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-wso2v100 + 4.0.0-wso2v101-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 2696174c75..b55865fff0 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-wso2v100 + 4.0.0-wso2v101-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 4cdcf83c0a..3fbc3a0ed1 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v100 + 4.0.0-wso2v101-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 6cf468b4e6..aa3203df76 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v100 + 4.0.0-wso2v101-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 4b9c7b70ed..15bba14382 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v100 + 4.0.0-wso2v101-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-wso2v100 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 5c04a78370..17c133b7e8 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v100 + 4.0.0-wso2v101-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index a3fdb5efbc..a7d3cca747 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-wso2v100 + 4.0.0-wso2v101-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 093710e981..015dd53d95 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-wso2v100 + 4.0.0-wso2v101-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 2810fffa70..cc1cef05fb 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v100 + 4.0.0-wso2v101-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index dc8f066649..70e1fd034e 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v100 + 4.0.0-wso2v101-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index bd63060af3..ecc070f807 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v100 + 4.0.0-wso2v101-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 164488e294..3e8b320fdd 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v100 + 4.0.0-wso2v101-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 6be52620f1..003720c86e 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-wso2v100 + 4.0.0-wso2v101-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index f7167c306b..4c1cdbd38b 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-wso2v100 + 4.0.0-wso2v101-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 3c74337cfe..1f71013799 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-wso2v100 + 4.0.0-wso2v101-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 44f7904e35..8f4e9469bf 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-wso2v100 + 4.0.0-wso2v101-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 98124438a1..ca0bd6e466 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v100 + 4.0.0-wso2v101-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 40a90c98fd..dc54ccd001 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v100 + 4.0.0-wso2v101-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 3c67d0c94d..bc436f8565 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-wso2v100 + 4.0.0-wso2v101-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 83fbc97ca6..38a7ce462a 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v100 + 4.0.0-wso2v101-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-wso2v100 + HEAD Apache Software Foundation From e585c84a6e444ca76dc8080473d999c8125ced45 Mon Sep 17 00:00:00 2001 From: lasanthaS Date: Tue, 26 Mar 2024 16:04:15 +0530 Subject: [PATCH 219/308] Downgrade Zipkin versions --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 38a7ce462a..5750c6a872 100644 --- a/pom.xml +++ b/pom.xml @@ -1592,9 +1592,9 @@ 1.11.0.wso2v6 4.12.0.wso2v1 3.6.0.wso2v1 - 3.3.0.wso2v1 + 2.17.2.wso2v1 2.27.1 - 3.3.0 + 2.17.2 1.3.2 1.2.4 0.11.3.wso2v1 From 7703e2c31c309239d6eac1355eff003d88d330ca Mon Sep 17 00:00:00 2001 From: AnuGayan Date: Tue, 26 Mar 2024 22:51:26 +0530 Subject: [PATCH 220/308] Bump netty version to 4.1.108.Final to fix CVE-2024-29025 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 38a7ce462a..ffc34f74a6 100644 --- a/pom.xml +++ b/pom.xml @@ -1585,7 +1585,7 @@ 5.9.1 1.5.2 1.17.0 - 4.1.104.Final + 4.1.108.Final 6.3.50 1.1.1.wso2v3 5.20.0 From bf14395e2ee65080a1aa5f552ca21e41a6a7cdee Mon Sep 17 00:00:00 2001 From: AnuGayan Date: Tue, 26 Mar 2024 22:57:36 +0530 Subject: [PATCH 221/308] Bump netty version to 4.1.108.Final to fix CVE-2024-29025 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ffc34f74a6..53469959d2 100644 --- a/pom.xml +++ b/pom.xml @@ -1586,7 +1586,7 @@ 1.5.2 1.17.0 4.1.108.Final - 6.3.50 + 6.3.51 1.1.1.wso2v3 5.20.0 1.11.0.wso2v6 From 941af0e4e6e697d1a9ac9dd7cd0783259891d807 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 27 Mar 2024 02:12:37 +0000 Subject: [PATCH 222/308] [WSO2 Release] [Jenkins #6933] [Release 4.0.0-wso2v101] prepare release v4.0.0-wso2v101 --- 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 c11cc65a3f..cc5f1d8ad1 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v101-SNAPSHOT + 4.0.0-wso2v101 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 67ec5a64e0..1246608050 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v101-SNAPSHOT + 4.0.0-wso2v101 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 5628fbc0a9..9218663d84 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-wso2v101-SNAPSHOT + 4.0.0-wso2v101 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 76251b8d9d..63fcc30351 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v101-SNAPSHOT + 4.0.0-wso2v101 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 5cc1090d3d..5059082856 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v101-SNAPSHOT + 4.0.0-wso2v101 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 5bc7363b5a..597b6c7b3a 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v101-SNAPSHOT + 4.0.0-wso2v101 ../../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 723efbb5e7..16298f60b0 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-wso2v101-SNAPSHOT + 4.0.0-wso2v101 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 7fa9ae9977..a7a46dd423 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-wso2v101-SNAPSHOT + 4.0.0-wso2v101 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 869dc5ca69..1197ef79b8 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-wso2v101-SNAPSHOT + 4.0.0-wso2v101 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 ba604d63e5..a57aa05d20 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-wso2v101-SNAPSHOT + 4.0.0-wso2v101 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 fcb9524bf9..1e1d16e2a2 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-wso2v101-SNAPSHOT + 4.0.0-wso2v101 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 8f5f25e8d0..475b319f55 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-wso2v101-SNAPSHOT + 4.0.0-wso2v101 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 b55865fff0..8cbce49de0 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-wso2v101-SNAPSHOT + 4.0.0-wso2v101 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 3fbc3a0ed1..6e4eee8fb5 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v101-SNAPSHOT + 4.0.0-wso2v101 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index aa3203df76..103952e5b7 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v101-SNAPSHOT + 4.0.0-wso2v101 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 15bba14382..225d46970e 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v101-SNAPSHOT + 4.0.0-wso2v101 ../../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-wso2v101 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 17c133b7e8..d999f58d04 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v101-SNAPSHOT + 4.0.0-wso2v101 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index a7d3cca747..4cf0ff2dce 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-wso2v101-SNAPSHOT + 4.0.0-wso2v101 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 015dd53d95..b50603d7b9 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-wso2v101-SNAPSHOT + 4.0.0-wso2v101 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index cc1cef05fb..5c32a4ca60 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v101-SNAPSHOT + 4.0.0-wso2v101 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 70e1fd034e..df72706365 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v101-SNAPSHOT + 4.0.0-wso2v101 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index ecc070f807..29e8f34131 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v101-SNAPSHOT + 4.0.0-wso2v101 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 3e8b320fdd..dd2ee65586 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v101-SNAPSHOT + 4.0.0-wso2v101 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 003720c86e..2ba50a9922 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-wso2v101-SNAPSHOT + 4.0.0-wso2v101 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 4c1cdbd38b..b1fcbc2031 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-wso2v101-SNAPSHOT + 4.0.0-wso2v101 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 1f71013799..38c0b47892 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-wso2v101-SNAPSHOT + 4.0.0-wso2v101 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 8f4e9469bf..cbefca3481 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-wso2v101-SNAPSHOT + 4.0.0-wso2v101 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index ca0bd6e466..90110b3ef6 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v101-SNAPSHOT + 4.0.0-wso2v101 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index dc54ccd001..c18ee23b27 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v101-SNAPSHOT + 4.0.0-wso2v101 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index bc436f8565..89f9851193 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-wso2v101-SNAPSHOT + 4.0.0-wso2v101 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 5750c6a872..d321819971 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v101-SNAPSHOT + 4.0.0-wso2v101 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-wso2v101 Apache Software Foundation From 6ae097e0c86c1d1665ad51c7e3399e34296a2ef9 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 27 Mar 2024 02:12:38 +0000 Subject: [PATCH 223/308] [WSO2 Release] [Jenkins #6933] [Release 4.0.0-wso2v101] 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 cc5f1d8ad1..408aff21dd 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v101 + 4.0.0-wso2v102-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 1246608050..24918f225f 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v101 + 4.0.0-wso2v102-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 9218663d84..8d791668fc 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-wso2v101 + 4.0.0-wso2v102-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 63fcc30351..5817ed97ec 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v101 + 4.0.0-wso2v102-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 5059082856..5adaf23f9c 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v101 + 4.0.0-wso2v102-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 597b6c7b3a..6d7ad28467 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v101 + 4.0.0-wso2v102-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 16298f60b0..5c3a202965 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-wso2v101 + 4.0.0-wso2v102-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 a7a46dd423..af57bfc6f9 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-wso2v101 + 4.0.0-wso2v102-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 1197ef79b8..662e1a23a9 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-wso2v101 + 4.0.0-wso2v102-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 a57aa05d20..12f05cfcac 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-wso2v101 + 4.0.0-wso2v102-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 1e1d16e2a2..84790eb0c2 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-wso2v101 + 4.0.0-wso2v102-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 475b319f55..741850887a 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-wso2v101 + 4.0.0-wso2v102-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 8cbce49de0..ff15055a6c 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-wso2v101 + 4.0.0-wso2v102-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 6e4eee8fb5..52bad5e8c9 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v101 + 4.0.0-wso2v102-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 103952e5b7..6042ec6fa4 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v101 + 4.0.0-wso2v102-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 225d46970e..d3b018e592 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v101 + 4.0.0-wso2v102-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-wso2v101 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index d999f58d04..1cc68b35ad 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v101 + 4.0.0-wso2v102-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 4cf0ff2dce..eebcc74aa7 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-wso2v101 + 4.0.0-wso2v102-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index b50603d7b9..19ef9610d6 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-wso2v101 + 4.0.0-wso2v102-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 5c32a4ca60..864cea5240 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v101 + 4.0.0-wso2v102-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index df72706365..21c30dd778 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v101 + 4.0.0-wso2v102-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 29e8f34131..a6e64025c7 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v101 + 4.0.0-wso2v102-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index dd2ee65586..3d1d8b43c6 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v101 + 4.0.0-wso2v102-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 2ba50a9922..e0e4f77a90 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-wso2v101 + 4.0.0-wso2v102-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index b1fcbc2031..5e347f70e1 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-wso2v101 + 4.0.0-wso2v102-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 38c0b47892..2c20918daa 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-wso2v101 + 4.0.0-wso2v102-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index cbefca3481..a274e79af1 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-wso2v101 + 4.0.0-wso2v102-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 90110b3ef6..beb833f733 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v101 + 4.0.0-wso2v102-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index c18ee23b27..fb6eee5d83 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v101 + 4.0.0-wso2v102-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 89f9851193..c8fbd5fbd6 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-wso2v101 + 4.0.0-wso2v102-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index d321819971..629b380d92 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v101 + 4.0.0-wso2v102-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-wso2v101 + HEAD Apache Software Foundation From 527d86babb24dc10ae7d9c61fe0336f765ee8137 Mon Sep 17 00:00:00 2001 From: DedunuKarunarathne <46235093+DedunuKarunarathne@users.noreply.github.com> Date: Tue, 26 Mar 2024 11:33:03 +0530 Subject: [PATCH 224/308] Fix enrich mediator not failing when incorrect json is parsed --- .../java/org/apache/synapse/util/InlineExpressionUtil.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/core/src/main/java/org/apache/synapse/util/InlineExpressionUtil.java b/modules/core/src/main/java/org/apache/synapse/util/InlineExpressionUtil.java index e340cc87e3..8b6962c861 100644 --- a/modules/core/src/main/java/org/apache/synapse/util/InlineExpressionUtil.java +++ b/modules/core/src/main/java/org/apache/synapse/util/InlineExpressionUtil.java @@ -106,8 +106,10 @@ private static String replaceValue(MessageContext messageContext, String text, b } // If the string is neither XML or JSON, it is considered a String and must be wrapped in double quotes // If it is an empty string returned from a json-eval expression it must be wrapped in double quotes - if (isInline && ((value.isEmpty() && matchSeq.contains(EXPRESSION_JSON_EVAL)) - || (!isValidXML(value) && !isValidJson(value) && !isSurroundedByQuotes(surroundedString)))) { + if (isInline && ( + (value.isEmpty() && matchSeq.contains(EXPRESSION_JSON_EVAL)) || + (!isValidXML(value) && !isValidJson(value) && (value.isEmpty() || !isSurroundedByQuotes(surroundedString))) + )) { value = "\"" + value + "\""; } text = text.replace(matchSeq, value); From bb042ce6fef91002bfdc5faee5cbcc175edbe225 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 27 Mar 2024 10:33:00 +0000 Subject: [PATCH 225/308] [WSO2 Release] [Jenkins #6936] [Release 4.0.0-wso2v102] prepare release v4.0.0-wso2v102 --- 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 408aff21dd..922e5a591e 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v102-SNAPSHOT + 4.0.0-wso2v102 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 24918f225f..5d3aefdb33 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v102-SNAPSHOT + 4.0.0-wso2v102 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 8d791668fc..468b6c9c77 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-wso2v102-SNAPSHOT + 4.0.0-wso2v102 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 5817ed97ec..4e39b24bbd 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v102-SNAPSHOT + 4.0.0-wso2v102 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 5adaf23f9c..c48cda09b8 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v102-SNAPSHOT + 4.0.0-wso2v102 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 6d7ad28467..9def609028 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v102-SNAPSHOT + 4.0.0-wso2v102 ../../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 5c3a202965..b6e6a34cc4 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-wso2v102-SNAPSHOT + 4.0.0-wso2v102 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 af57bfc6f9..68e79db129 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-wso2v102-SNAPSHOT + 4.0.0-wso2v102 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 662e1a23a9..6d70b98c26 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-wso2v102-SNAPSHOT + 4.0.0-wso2v102 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 12f05cfcac..f2b7852cc1 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-wso2v102-SNAPSHOT + 4.0.0-wso2v102 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 84790eb0c2..0928fadb9e 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-wso2v102-SNAPSHOT + 4.0.0-wso2v102 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 741850887a..0befeb16f2 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-wso2v102-SNAPSHOT + 4.0.0-wso2v102 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 ff15055a6c..cae6c96059 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-wso2v102-SNAPSHOT + 4.0.0-wso2v102 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 52bad5e8c9..54c13d8acf 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v102-SNAPSHOT + 4.0.0-wso2v102 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 6042ec6fa4..8c0f7e16ff 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v102-SNAPSHOT + 4.0.0-wso2v102 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index d3b018e592..c4221a3a39 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v102-SNAPSHOT + 4.0.0-wso2v102 ../../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-wso2v102 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 1cc68b35ad..6e5dba5f01 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v102-SNAPSHOT + 4.0.0-wso2v102 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index eebcc74aa7..6408357d91 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-wso2v102-SNAPSHOT + 4.0.0-wso2v102 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 19ef9610d6..ed330d91b8 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-wso2v102-SNAPSHOT + 4.0.0-wso2v102 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 864cea5240..33670cadbf 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v102-SNAPSHOT + 4.0.0-wso2v102 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 21c30dd778..51814db3f2 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v102-SNAPSHOT + 4.0.0-wso2v102 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index a6e64025c7..cb3c069d0b 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v102-SNAPSHOT + 4.0.0-wso2v102 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 3d1d8b43c6..16a7244108 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v102-SNAPSHOT + 4.0.0-wso2v102 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index e0e4f77a90..cadb20dc2d 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-wso2v102-SNAPSHOT + 4.0.0-wso2v102 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 5e347f70e1..b543655934 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-wso2v102-SNAPSHOT + 4.0.0-wso2v102 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 2c20918daa..9e4b7118ba 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-wso2v102-SNAPSHOT + 4.0.0-wso2v102 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index a274e79af1..c294523a34 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-wso2v102-SNAPSHOT + 4.0.0-wso2v102 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index beb833f733..0bcac2fdc3 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v102-SNAPSHOT + 4.0.0-wso2v102 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index fb6eee5d83..5e032e8124 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v102-SNAPSHOT + 4.0.0-wso2v102 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index c8fbd5fbd6..daaffa7228 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-wso2v102-SNAPSHOT + 4.0.0-wso2v102 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 11a1aa860c..44e00828b8 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v102-SNAPSHOT + 4.0.0-wso2v102 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-wso2v102 Apache Software Foundation From 6d80aa2904cc770141d0d0305cedc90e8c4e43b5 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 27 Mar 2024 10:33:02 +0000 Subject: [PATCH 226/308] [WSO2 Release] [Jenkins #6936] [Release 4.0.0-wso2v102] 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 922e5a591e..17febcebcc 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v102 + 4.0.0-wso2v103-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 5d3aefdb33..4fc56aa1a3 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v102 + 4.0.0-wso2v103-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 468b6c9c77..cef519a124 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-wso2v102 + 4.0.0-wso2v103-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 4e39b24bbd..23e6f89951 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v102 + 4.0.0-wso2v103-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index c48cda09b8..cd4f4e66d0 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v102 + 4.0.0-wso2v103-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 9def609028..d11a22f3e6 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v102 + 4.0.0-wso2v103-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 b6e6a34cc4..fbfad08894 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-wso2v102 + 4.0.0-wso2v103-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 68e79db129..459c690ea6 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-wso2v102 + 4.0.0-wso2v103-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 6d70b98c26..855eefbaad 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-wso2v102 + 4.0.0-wso2v103-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 f2b7852cc1..d82a8b1b14 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-wso2v102 + 4.0.0-wso2v103-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 0928fadb9e..f556eb80a8 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-wso2v102 + 4.0.0-wso2v103-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 0befeb16f2..47af062bec 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-wso2v102 + 4.0.0-wso2v103-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 cae6c96059..92c81179fe 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-wso2v102 + 4.0.0-wso2v103-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 54c13d8acf..42ea72fdf0 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v102 + 4.0.0-wso2v103-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 8c0f7e16ff..5edb98f6a4 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v102 + 4.0.0-wso2v103-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index c4221a3a39..6f5e047305 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v102 + 4.0.0-wso2v103-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-wso2v102 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 6e5dba5f01..a110e51380 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v102 + 4.0.0-wso2v103-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 6408357d91..f810aa31d8 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-wso2v102 + 4.0.0-wso2v103-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index ed330d91b8..7b300fbb15 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-wso2v102 + 4.0.0-wso2v103-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 33670cadbf..a682b9e143 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v102 + 4.0.0-wso2v103-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 51814db3f2..5027b84bf9 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v102 + 4.0.0-wso2v103-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index cb3c069d0b..2a9bbae3c0 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v102 + 4.0.0-wso2v103-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 16a7244108..680c31015c 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v102 + 4.0.0-wso2v103-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index cadb20dc2d..ea3720b541 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-wso2v102 + 4.0.0-wso2v103-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index b543655934..480c868e0c 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-wso2v102 + 4.0.0-wso2v103-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 9e4b7118ba..69c210ea27 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-wso2v102 + 4.0.0-wso2v103-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index c294523a34..2045fe9898 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-wso2v102 + 4.0.0-wso2v103-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 0bcac2fdc3..ee068255a0 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v102 + 4.0.0-wso2v103-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 5e032e8124..b7b4ce65cd 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v102 + 4.0.0-wso2v103-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index daaffa7228..56d83a5e57 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-wso2v102 + 4.0.0-wso2v103-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 44e00828b8..04b37cf9fa 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v102 + 4.0.0-wso2v103-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-wso2v102 + HEAD Apache Software Foundation From 00ebfc5e1ad085fa8358f902b6230a831ee3afdc Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 27 Mar 2024 13:25:38 +0000 Subject: [PATCH 227/308] [WSO2 Release] [Jenkins #6938] [Release 4.0.0-wso2v103] prepare release v4.0.0-wso2v103 --- 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 17febcebcc..5d2920306c 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v103-SNAPSHOT + 4.0.0-wso2v103 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 4fc56aa1a3..f8c68b6399 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v103-SNAPSHOT + 4.0.0-wso2v103 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index cef519a124..ca0f794521 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-wso2v103-SNAPSHOT + 4.0.0-wso2v103 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 23e6f89951..1ede0487de 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v103-SNAPSHOT + 4.0.0-wso2v103 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index cd4f4e66d0..d30c1347f4 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v103-SNAPSHOT + 4.0.0-wso2v103 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index d11a22f3e6..55672d49bc 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v103-SNAPSHOT + 4.0.0-wso2v103 ../../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 fbfad08894..da0b197467 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-wso2v103-SNAPSHOT + 4.0.0-wso2v103 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 459c690ea6..366d97aa2c 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-wso2v103-SNAPSHOT + 4.0.0-wso2v103 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 855eefbaad..f24220da7e 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-wso2v103-SNAPSHOT + 4.0.0-wso2v103 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 d82a8b1b14..407e1481ca 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-wso2v103-SNAPSHOT + 4.0.0-wso2v103 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 f556eb80a8..5b4bafe644 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-wso2v103-SNAPSHOT + 4.0.0-wso2v103 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 47af062bec..4f40b0850f 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-wso2v103-SNAPSHOT + 4.0.0-wso2v103 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 92c81179fe..5f4f7f8f83 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-wso2v103-SNAPSHOT + 4.0.0-wso2v103 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 42ea72fdf0..af0e380f99 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v103-SNAPSHOT + 4.0.0-wso2v103 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 5edb98f6a4..e8b42f7705 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v103-SNAPSHOT + 4.0.0-wso2v103 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 6f5e047305..0514c37017 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v103-SNAPSHOT + 4.0.0-wso2v103 ../../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-wso2v103 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index a110e51380..89398f9bcf 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v103-SNAPSHOT + 4.0.0-wso2v103 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index f810aa31d8..2e7d4d96a3 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-wso2v103-SNAPSHOT + 4.0.0-wso2v103 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 7b300fbb15..607db2720e 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-wso2v103-SNAPSHOT + 4.0.0-wso2v103 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index a682b9e143..cb32e94bb6 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v103-SNAPSHOT + 4.0.0-wso2v103 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 5027b84bf9..3062b81647 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v103-SNAPSHOT + 4.0.0-wso2v103 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 2a9bbae3c0..ec6589bd22 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v103-SNAPSHOT + 4.0.0-wso2v103 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 680c31015c..ac049a38d9 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v103-SNAPSHOT + 4.0.0-wso2v103 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index ea3720b541..6eedc1438b 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-wso2v103-SNAPSHOT + 4.0.0-wso2v103 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 480c868e0c..a22400a2e4 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-wso2v103-SNAPSHOT + 4.0.0-wso2v103 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 69c210ea27..01c2ab69fe 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-wso2v103-SNAPSHOT + 4.0.0-wso2v103 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 2045fe9898..1d61c52486 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-wso2v103-SNAPSHOT + 4.0.0-wso2v103 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index ee068255a0..f2685ccf18 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v103-SNAPSHOT + 4.0.0-wso2v103 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index b7b4ce65cd..5d6579661b 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v103-SNAPSHOT + 4.0.0-wso2v103 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 56d83a5e57..da359075f3 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-wso2v103-SNAPSHOT + 4.0.0-wso2v103 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 04b37cf9fa..33bfb61c64 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v103-SNAPSHOT + 4.0.0-wso2v103 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-wso2v103 Apache Software Foundation From 087a779f7d42d34c61113abfe2969a9a45a93388 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 27 Mar 2024 13:25:39 +0000 Subject: [PATCH 228/308] [WSO2 Release] [Jenkins #6938] [Release 4.0.0-wso2v103] 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 5d2920306c..97d61addbf 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v103 + 4.0.0-wso2v104-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index f8c68b6399..a9926170f5 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v103 + 4.0.0-wso2v104-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index ca0f794521..3d44e8006e 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-wso2v103 + 4.0.0-wso2v104-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 1ede0487de..c008b897da 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v103 + 4.0.0-wso2v104-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index d30c1347f4..1f3f08888c 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v103 + 4.0.0-wso2v104-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 55672d49bc..615d769275 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v103 + 4.0.0-wso2v104-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 da0b197467..ce95568a67 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-wso2v103 + 4.0.0-wso2v104-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 366d97aa2c..b7751ddbab 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-wso2v103 + 4.0.0-wso2v104-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 f24220da7e..64e00d078f 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-wso2v103 + 4.0.0-wso2v104-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 407e1481ca..cd0c94b560 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-wso2v103 + 4.0.0-wso2v104-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 5b4bafe644..94eab73428 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-wso2v103 + 4.0.0-wso2v104-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 4f40b0850f..f782102b66 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-wso2v103 + 4.0.0-wso2v104-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 5f4f7f8f83..56c5898e3d 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-wso2v103 + 4.0.0-wso2v104-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index af0e380f99..bb466f620b 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v103 + 4.0.0-wso2v104-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index e8b42f7705..31db2d625d 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v103 + 4.0.0-wso2v104-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 0514c37017..4121b01320 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v103 + 4.0.0-wso2v104-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-wso2v103 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 89398f9bcf..b9d43e2a61 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v103 + 4.0.0-wso2v104-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 2e7d4d96a3..a27e29059a 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-wso2v103 + 4.0.0-wso2v104-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 607db2720e..f9a7a38da3 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-wso2v103 + 4.0.0-wso2v104-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index cb32e94bb6..1bfefe0b85 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v103 + 4.0.0-wso2v104-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 3062b81647..5db8b01093 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v103 + 4.0.0-wso2v104-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index ec6589bd22..fe101e79a9 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v103 + 4.0.0-wso2v104-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index ac049a38d9..53a22d608d 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v103 + 4.0.0-wso2v104-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 6eedc1438b..8e43cee6a6 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-wso2v103 + 4.0.0-wso2v104-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index a22400a2e4..e7843e0017 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-wso2v103 + 4.0.0-wso2v104-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 01c2ab69fe..f15b1dd5b5 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-wso2v103 + 4.0.0-wso2v104-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 1d61c52486..023327b7bc 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-wso2v103 + 4.0.0-wso2v104-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index f2685ccf18..8f28e7e2c6 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v103 + 4.0.0-wso2v104-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 5d6579661b..5f9b434622 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v103 + 4.0.0-wso2v104-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index da359075f3..66ef99ccca 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-wso2v103 + 4.0.0-wso2v104-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 33bfb61c64..e39a55739a 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v103 + 4.0.0-wso2v104-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-wso2v103 + HEAD Apache Software Foundation From 0ec5d04ff73cb9c2c42b1a43dee1b0b2eb1894dd Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 28 Mar 2024 08:27:21 +0000 Subject: [PATCH 229/308] [WSO2 Release] [Jenkins #6941] [Release 4.0.0-wso2v104] prepare release v4.0.0-wso2v104 --- 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 97d61addbf..c5ccd25a7d 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v104-SNAPSHOT + 4.0.0-wso2v104 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index a9926170f5..40ced2ac2a 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v104-SNAPSHOT + 4.0.0-wso2v104 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 3d44e8006e..27747bec51 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-wso2v104-SNAPSHOT + 4.0.0-wso2v104 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index c008b897da..1ab740d138 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v104-SNAPSHOT + 4.0.0-wso2v104 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 1f3f08888c..b172d399ac 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v104-SNAPSHOT + 4.0.0-wso2v104 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 615d769275..6290715459 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v104-SNAPSHOT + 4.0.0-wso2v104 ../../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 ce95568a67..6669119d4c 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-wso2v104-SNAPSHOT + 4.0.0-wso2v104 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 b7751ddbab..f28738f19b 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-wso2v104-SNAPSHOT + 4.0.0-wso2v104 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 64e00d078f..c5686242c0 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-wso2v104-SNAPSHOT + 4.0.0-wso2v104 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 cd0c94b560..99ecbfb781 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-wso2v104-SNAPSHOT + 4.0.0-wso2v104 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 94eab73428..4b4abc6335 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-wso2v104-SNAPSHOT + 4.0.0-wso2v104 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 f782102b66..b7ddc763d8 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-wso2v104-SNAPSHOT + 4.0.0-wso2v104 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 56c5898e3d..35d9479cb8 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-wso2v104-SNAPSHOT + 4.0.0-wso2v104 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index bb466f620b..7bffc956ef 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v104-SNAPSHOT + 4.0.0-wso2v104 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 31db2d625d..7690d1a6a4 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v104-SNAPSHOT + 4.0.0-wso2v104 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 4121b01320..42b7b97944 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v104-SNAPSHOT + 4.0.0-wso2v104 ../../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-wso2v104 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index b9d43e2a61..2eb7b1b3ff 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v104-SNAPSHOT + 4.0.0-wso2v104 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index a27e29059a..7291e74ded 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-wso2v104-SNAPSHOT + 4.0.0-wso2v104 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index f9a7a38da3..93f5c77748 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-wso2v104-SNAPSHOT + 4.0.0-wso2v104 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 1bfefe0b85..9565d1a40e 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v104-SNAPSHOT + 4.0.0-wso2v104 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 5db8b01093..0fff7d2694 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v104-SNAPSHOT + 4.0.0-wso2v104 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index fe101e79a9..d288ce0d4a 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v104-SNAPSHOT + 4.0.0-wso2v104 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 53a22d608d..89c6b00595 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v104-SNAPSHOT + 4.0.0-wso2v104 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 8e43cee6a6..5ce0f37dd1 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-wso2v104-SNAPSHOT + 4.0.0-wso2v104 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index e7843e0017..d89b74bc4d 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-wso2v104-SNAPSHOT + 4.0.0-wso2v104 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index f15b1dd5b5..c6f30963ef 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-wso2v104-SNAPSHOT + 4.0.0-wso2v104 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 023327b7bc..c023e09748 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-wso2v104-SNAPSHOT + 4.0.0-wso2v104 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 8f28e7e2c6..814b9ba588 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v104-SNAPSHOT + 4.0.0-wso2v104 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 5f9b434622..c177d0d90e 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v104-SNAPSHOT + 4.0.0-wso2v104 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 66ef99ccca..bccdae9c36 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-wso2v104-SNAPSHOT + 4.0.0-wso2v104 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index e39a55739a..386ce2cceb 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v104-SNAPSHOT + 4.0.0-wso2v104 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-wso2v104 Apache Software Foundation From 3331ca56fb9fc608464034f573bacc508b0d4e23 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Thu, 28 Mar 2024 08:27:23 +0000 Subject: [PATCH 230/308] [WSO2 Release] [Jenkins #6941] [Release 4.0.0-wso2v104] 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 c5ccd25a7d..21502ad218 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v104 + 4.0.0-wso2v105-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 40ced2ac2a..3f5ef991f8 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v104 + 4.0.0-wso2v105-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 27747bec51..a90ddf6651 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-wso2v104 + 4.0.0-wso2v105-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 1ab740d138..36b818ed71 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v104 + 4.0.0-wso2v105-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index b172d399ac..e7b2228156 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v104 + 4.0.0-wso2v105-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 6290715459..ac594f78f6 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v104 + 4.0.0-wso2v105-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 6669119d4c..9674dc7b13 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-wso2v104 + 4.0.0-wso2v105-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 f28738f19b..5c09e836c9 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-wso2v104 + 4.0.0-wso2v105-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 c5686242c0..a3b8c465e8 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-wso2v104 + 4.0.0-wso2v105-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 99ecbfb781..20bd278733 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-wso2v104 + 4.0.0-wso2v105-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 4b4abc6335..a19a4c672e 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-wso2v104 + 4.0.0-wso2v105-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 b7ddc763d8..12d119f482 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-wso2v104 + 4.0.0-wso2v105-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 35d9479cb8..fd97d468dc 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-wso2v104 + 4.0.0-wso2v105-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 7bffc956ef..20753999b1 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v104 + 4.0.0-wso2v105-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 7690d1a6a4..ef4445c371 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v104 + 4.0.0-wso2v105-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 42b7b97944..bae337cade 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v104 + 4.0.0-wso2v105-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-wso2v104 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 2eb7b1b3ff..7c0a0affec 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v104 + 4.0.0-wso2v105-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 7291e74ded..aee97fb6df 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-wso2v104 + 4.0.0-wso2v105-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 93f5c77748..db6a018bce 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-wso2v104 + 4.0.0-wso2v105-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 9565d1a40e..75f7b8ac3a 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v104 + 4.0.0-wso2v105-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 0fff7d2694..211da112d7 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v104 + 4.0.0-wso2v105-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index d288ce0d4a..ee0f3c4f27 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v104 + 4.0.0-wso2v105-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 89c6b00595..0900bc7f4e 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v104 + 4.0.0-wso2v105-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 5ce0f37dd1..1e30ffa52b 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-wso2v104 + 4.0.0-wso2v105-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index d89b74bc4d..179866e72e 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-wso2v104 + 4.0.0-wso2v105-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index c6f30963ef..87ccf206b1 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-wso2v104 + 4.0.0-wso2v105-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index c023e09748..d6bf2348c1 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-wso2v104 + 4.0.0-wso2v105-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 814b9ba588..1bd92451be 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v104 + 4.0.0-wso2v105-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index c177d0d90e..c002534a6f 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v104 + 4.0.0-wso2v105-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index bccdae9c36..935421a670 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-wso2v104 + 4.0.0-wso2v105-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 386ce2cceb..f04b73daa2 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v104 + 4.0.0-wso2v105-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-wso2v104 + HEAD Apache Software Foundation From 2dd5ce89fc3113aa5c11c37191af876777e8f60a Mon Sep 17 00:00:00 2001 From: HeshanSudarshana Date: Sat, 6 Apr 2024 20:51:13 +0530 Subject: [PATCH 231/308] Bump the bouncycastle version to 1.77.0 --- modules/commons/pom.xml | 2 +- modules/transports/core/nhttp/pom.xml | 2 +- .../certificatevalidation/crl/CRLVerifier.java | 17 +++++++++++++---- .../ocsp/OCSPVerifier.java | 4 ++-- pom.xml | 4 ++-- 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/modules/commons/pom.xml b/modules/commons/pom.xml index 21502ad218..7aa7479070 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -204,7 +204,7 @@ org.wso2.orbit.org.bouncycastle - bcpkix-jdk15on + bcpkix-jdk18on org.jacoco diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 1e30ffa52b..4a89666eef 100644 --- a/modules/transports/core/nhttp/pom.xml +++ b/modules/transports/core/nhttp/pom.xml @@ -192,7 +192,7 @@ org.wso2.orbit.org.bouncycastle - bcpkix-jdk15on + bcpkix-jdk18on org.wso2.caching diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/crl/CRLVerifier.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/crl/CRLVerifier.java index 3220bd14ef..7a68ddef7e 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/crl/CRLVerifier.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/crl/CRLVerifier.java @@ -20,10 +20,19 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.bouncycastle.asn1.*; -import org.bouncycastle.asn1.x509.*; -import org.apache.synapse.transport.certificatevalidation.*; +import org.apache.synapse.transport.certificatevalidation.CertificateVerificationException; +import org.apache.synapse.transport.certificatevalidation.RevocationVerifier; +import org.apache.synapse.transport.certificatevalidation.RevocationStatus; +import org.bouncycastle.asn1.ASN1IA5String; +import org.bouncycastle.asn1.ASN1InputStream; +import org.bouncycastle.asn1.ASN1Primitive; +import org.bouncycastle.asn1.DEROctetString; +import org.bouncycastle.asn1.x509.CRLDistPoint; +import org.bouncycastle.asn1.x509.DistributionPoint; +import org.bouncycastle.asn1.x509.DistributionPointName; import org.bouncycastle.asn1.x509.Extension; +import org.bouncycastle.asn1.x509.GeneralName; +import org.bouncycastle.asn1.x509.GeneralNames; import java.io.IOException; import java.io.InputStream; @@ -164,7 +173,7 @@ private List getCrlDistributionPoints(X509Certificate cert) if (genName.getTagNo() == GeneralName.uniformResourceIdentifier) { //DERIA5String contains an ascii string. //A IA5String is a restricted character string type in the ASN.1 notation - String url = DERIA5String.getInstance(genName.getName()).getString().trim(); + String url = ASN1IA5String.getInstance(genName.getName()).getString().trim(); crlUrls.add(url); } } diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPVerifier.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPVerifier.java index 4ba283f9e3..87980a668b 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPVerifier.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/certificatevalidation/ocsp/OCSPVerifier.java @@ -31,8 +31,8 @@ import org.apache.synapse.transport.certificatevalidation.Constants; import org.apache.synapse.transport.certificatevalidation.RevocationStatus; import org.apache.synapse.transport.certificatevalidation.RevocationVerifier; +import org.bouncycastle.asn1.ASN1IA5String; import org.bouncycastle.asn1.ASN1InputStream; -import org.bouncycastle.asn1.DERIA5String; import org.bouncycastle.asn1.DEROctetString; import org.bouncycastle.asn1.ocsp.OCSPObjectIdentifiers; import org.bouncycastle.asn1.ocsp.OCSPResponseStatus; @@ -276,7 +276,7 @@ private List getAIALocations(X509Certificate cert) throws CertificateVer GeneralName gn = accessDescription.getAccessLocation(); if (gn.getTagNo() == GeneralName.uniformResourceIdentifier) { - DERIA5String str = DERIA5String.getInstance(gn.getName()); + ASN1IA5String str = ASN1IA5String.getInstance(gn.getName()); String accessLocation = str.getString(); ocspUrlList.add(accessLocation); } diff --git a/pom.xml b/pom.xml index f04b73daa2..7683399eb3 100644 --- a/pom.xml +++ b/pom.xml @@ -658,7 +658,7 @@ org.wso2.orbit.org.bouncycastle - bcpkix-jdk15on + bcpkix-jdk18on ${org.bouncycastle.version} @@ -1471,7 +1471,7 @@ 2.9.0.wso2v1 1.5.3 2.3.1 - 1.69.0.wso2v1 + 1.77.0.wso2v2 [1.52.0,2.0.0) 4.4.16 ${httpcore.version}.wso2v1 From c7bebb95a44e896573e7d0215dcf0c8806c850fc Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sun, 7 Apr 2024 08:45:29 +0000 Subject: [PATCH 232/308] [WSO2 Release] [Jenkins #6950] [Release 4.0.0-wso2v105] prepare release v4.0.0-wso2v105 --- 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 7aa7479070..afec375508 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v105-SNAPSHOT + 4.0.0-wso2v105 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 3f5ef991f8..292fd6bddb 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v105-SNAPSHOT + 4.0.0-wso2v105 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index a90ddf6651..69577d1230 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-wso2v105-SNAPSHOT + 4.0.0-wso2v105 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 36b818ed71..6c8551a56e 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v105-SNAPSHOT + 4.0.0-wso2v105 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index e7b2228156..bedb2a2d8c 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v105-SNAPSHOT + 4.0.0-wso2v105 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index ac594f78f6..44d13307bb 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v105-SNAPSHOT + 4.0.0-wso2v105 ../../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 9674dc7b13..af065784f2 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-wso2v105-SNAPSHOT + 4.0.0-wso2v105 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 5c09e836c9..70f23f12ec 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-wso2v105-SNAPSHOT + 4.0.0-wso2v105 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 a3b8c465e8..2fad638fc3 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-wso2v105-SNAPSHOT + 4.0.0-wso2v105 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 20bd278733..f329749279 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-wso2v105-SNAPSHOT + 4.0.0-wso2v105 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 a19a4c672e..9b0db1d254 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-wso2v105-SNAPSHOT + 4.0.0-wso2v105 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 12d119f482..edaae0de18 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-wso2v105-SNAPSHOT + 4.0.0-wso2v105 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 fd97d468dc..79d38b4c81 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-wso2v105-SNAPSHOT + 4.0.0-wso2v105 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 20753999b1..7f83cc31c3 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v105-SNAPSHOT + 4.0.0-wso2v105 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index ef4445c371..b3743bcb26 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v105-SNAPSHOT + 4.0.0-wso2v105 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index bae337cade..bf6cf735cc 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v105-SNAPSHOT + 4.0.0-wso2v105 ../../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-wso2v105 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 7c0a0affec..e6ae38caff 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v105-SNAPSHOT + 4.0.0-wso2v105 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index aee97fb6df..a84dd1f601 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-wso2v105-SNAPSHOT + 4.0.0-wso2v105 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index db6a018bce..79eb850052 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-wso2v105-SNAPSHOT + 4.0.0-wso2v105 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 75f7b8ac3a..8b4f671e0b 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v105-SNAPSHOT + 4.0.0-wso2v105 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 211da112d7..fc9af34104 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v105-SNAPSHOT + 4.0.0-wso2v105 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index ee0f3c4f27..7d4a32b774 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v105-SNAPSHOT + 4.0.0-wso2v105 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 0900bc7f4e..f7474559db 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v105-SNAPSHOT + 4.0.0-wso2v105 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 4a89666eef..6118752200 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-wso2v105-SNAPSHOT + 4.0.0-wso2v105 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 179866e72e..84abe90e30 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-wso2v105-SNAPSHOT + 4.0.0-wso2v105 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 87ccf206b1..0e2bb4b9f1 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-wso2v105-SNAPSHOT + 4.0.0-wso2v105 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index d6bf2348c1..647380d46a 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-wso2v105-SNAPSHOT + 4.0.0-wso2v105 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 1bd92451be..0a2a2201d7 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v105-SNAPSHOT + 4.0.0-wso2v105 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index c002534a6f..ee3fc3b7e2 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v105-SNAPSHOT + 4.0.0-wso2v105 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 935421a670..d5969129da 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-wso2v105-SNAPSHOT + 4.0.0-wso2v105 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 7683399eb3..87501f51c6 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v105-SNAPSHOT + 4.0.0-wso2v105 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-wso2v105 Apache Software Foundation From 79027631b7e5de55d0e79b109533db862574c793 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Sun, 7 Apr 2024 08:45:31 +0000 Subject: [PATCH 233/308] [WSO2 Release] [Jenkins #6950] [Release 4.0.0-wso2v105] 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 afec375508..420117a22d 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v105 + 4.0.0-wso2v106-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 292fd6bddb..62ce654953 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v105 + 4.0.0-wso2v106-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 69577d1230..5dfade2803 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-wso2v105 + 4.0.0-wso2v106-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 6c8551a56e..48f927ccda 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v105 + 4.0.0-wso2v106-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index bedb2a2d8c..646320483f 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v105 + 4.0.0-wso2v106-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 44d13307bb..1d0a34c84b 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v105 + 4.0.0-wso2v106-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 af065784f2..e3c9d0a088 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-wso2v105 + 4.0.0-wso2v106-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 70f23f12ec..1d28784cf8 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-wso2v105 + 4.0.0-wso2v106-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 2fad638fc3..880f6538e0 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-wso2v105 + 4.0.0-wso2v106-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 f329749279..0c86c19467 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-wso2v105 + 4.0.0-wso2v106-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 9b0db1d254..de21b04835 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-wso2v105 + 4.0.0-wso2v106-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 edaae0de18..cf953512b7 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-wso2v105 + 4.0.0-wso2v106-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 79d38b4c81..0a8d34bc36 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-wso2v105 + 4.0.0-wso2v106-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 7f83cc31c3..4e9abfa71d 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v105 + 4.0.0-wso2v106-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index b3743bcb26..5699563a74 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v105 + 4.0.0-wso2v106-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index bf6cf735cc..ef52dd6736 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v105 + 4.0.0-wso2v106-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-wso2v105 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index e6ae38caff..c7a3d61a50 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v105 + 4.0.0-wso2v106-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index a84dd1f601..a148466ede 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-wso2v105 + 4.0.0-wso2v106-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 79eb850052..947a3f3af0 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-wso2v105 + 4.0.0-wso2v106-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 8b4f671e0b..35a4c70afc 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v105 + 4.0.0-wso2v106-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index fc9af34104..ea2de1e135 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v105 + 4.0.0-wso2v106-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 7d4a32b774..6876b0fee5 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v105 + 4.0.0-wso2v106-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index f7474559db..cc9c3228bc 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v105 + 4.0.0-wso2v106-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 6118752200..d2ec8f67bd 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-wso2v105 + 4.0.0-wso2v106-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 84abe90e30..d92d528121 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-wso2v105 + 4.0.0-wso2v106-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 0e2bb4b9f1..19a11316ed 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-wso2v105 + 4.0.0-wso2v106-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 647380d46a..33d32be1f1 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-wso2v105 + 4.0.0-wso2v106-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 0a2a2201d7..e444adb3fc 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v105 + 4.0.0-wso2v106-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index ee3fc3b7e2..982f531665 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v105 + 4.0.0-wso2v106-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index d5969129da..5cf62f7e66 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-wso2v105 + 4.0.0-wso2v106-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 87501f51c6..d625be4173 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v105 + 4.0.0-wso2v106-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-wso2v105 + HEAD Apache Software Foundation From 90f2bc796235b09f40bb49c96379015132869898 Mon Sep 17 00:00:00 2001 From: malakaganga Date: Mon, 15 Apr 2024 14:53:48 +0530 Subject: [PATCH 234/308] Fix null pointer when publishing events Add main sequence as a outer span. Fixes: https://github.com/wso2/micro-integrator/issues/3302 --- .../opentelemetry/management/handling/span/SpanHandler.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 7e53367d38..2e052f6a1d 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 @@ -280,7 +280,9 @@ private boolean isOuterLevelSpan(StatisticDataUnit statisticDataUnit, SpanStore return spanStore.getOuterLevelSpanWrapper() == null && (statisticDataUnit.getComponentType() == ComponentType.PROXYSERVICE || statisticDataUnit.getComponentType() == ComponentType.API - || statisticDataUnit.getComponentType() == ComponentType.INBOUNDENDPOINT); + || statisticDataUnit.getComponentType() == ComponentType.INBOUNDENDPOINT + || (statisticDataUnit.getComponentType() == ComponentType.SEQUENCE + && SynapseConstants.MAIN_SEQUENCE_KEY.equals(statisticDataUnit.getComponentName()))); } @Override From 7caabf8112afe00b7a4f0d01c13af392ed05cc64 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 17 Apr 2024 04:17:30 +0000 Subject: [PATCH 235/308] [WSO2 Release] [Jenkins #6955] [Release 4.0.0-wso2v106] prepare release v4.0.0-wso2v106 --- 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 420117a22d..9c3db1f709 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v106-SNAPSHOT + 4.0.0-wso2v106 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 62ce654953..5fe12579a8 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v106-SNAPSHOT + 4.0.0-wso2v106 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 5dfade2803..4aa52fc4e5 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-wso2v106-SNAPSHOT + 4.0.0-wso2v106 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 48f927ccda..86cbc04fa5 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v106-SNAPSHOT + 4.0.0-wso2v106 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 646320483f..0f5e8363f2 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v106-SNAPSHOT + 4.0.0-wso2v106 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 1d0a34c84b..a688d2ec67 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v106-SNAPSHOT + 4.0.0-wso2v106 ../../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 e3c9d0a088..9b027e661e 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-wso2v106-SNAPSHOT + 4.0.0-wso2v106 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 1d28784cf8..546e747501 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-wso2v106-SNAPSHOT + 4.0.0-wso2v106 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 880f6538e0..75d28c77e1 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-wso2v106-SNAPSHOT + 4.0.0-wso2v106 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 0c86c19467..423c116f0f 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-wso2v106-SNAPSHOT + 4.0.0-wso2v106 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 de21b04835..ea17097ff0 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-wso2v106-SNAPSHOT + 4.0.0-wso2v106 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 cf953512b7..11ace9d031 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-wso2v106-SNAPSHOT + 4.0.0-wso2v106 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 0a8d34bc36..c814a9aadf 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-wso2v106-SNAPSHOT + 4.0.0-wso2v106 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 4e9abfa71d..8bbc70fe64 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v106-SNAPSHOT + 4.0.0-wso2v106 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 5699563a74..73b965e96e 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v106-SNAPSHOT + 4.0.0-wso2v106 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index ef52dd6736..c71600336b 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v106-SNAPSHOT + 4.0.0-wso2v106 ../../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-wso2v106 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index c7a3d61a50..e79c173d8c 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v106-SNAPSHOT + 4.0.0-wso2v106 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index a148466ede..ee2df9acd4 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-wso2v106-SNAPSHOT + 4.0.0-wso2v106 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 947a3f3af0..afacfd091d 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-wso2v106-SNAPSHOT + 4.0.0-wso2v106 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 35a4c70afc..9b4e6dc440 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v106-SNAPSHOT + 4.0.0-wso2v106 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index ea2de1e135..39ffba2348 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v106-SNAPSHOT + 4.0.0-wso2v106 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 6876b0fee5..21ac6a363a 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v106-SNAPSHOT + 4.0.0-wso2v106 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index cc9c3228bc..a8082f16cc 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v106-SNAPSHOT + 4.0.0-wso2v106 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index d2ec8f67bd..d114a5c7b0 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-wso2v106-SNAPSHOT + 4.0.0-wso2v106 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index d92d528121..65f9df46f5 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-wso2v106-SNAPSHOT + 4.0.0-wso2v106 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 19a11316ed..916f5bf02e 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-wso2v106-SNAPSHOT + 4.0.0-wso2v106 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 33d32be1f1..16b77dc587 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-wso2v106-SNAPSHOT + 4.0.0-wso2v106 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index e444adb3fc..ab42a0cb6b 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v106-SNAPSHOT + 4.0.0-wso2v106 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 982f531665..b33395f6b4 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v106-SNAPSHOT + 4.0.0-wso2v106 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 5cf62f7e66..bf4a9b28ab 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-wso2v106-SNAPSHOT + 4.0.0-wso2v106 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index d625be4173..93ed7f209c 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v106-SNAPSHOT + 4.0.0-wso2v106 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-wso2v106 Apache Software Foundation From 530e0d175d6fb1ea3267355d7a80695e18e1aa7d Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 17 Apr 2024 04:17:31 +0000 Subject: [PATCH 236/308] [WSO2 Release] [Jenkins #6955] [Release 4.0.0-wso2v106] 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 9c3db1f709..b81c959b37 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v106 + 4.0.0-wso2v107-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 5fe12579a8..d1e44e872a 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v106 + 4.0.0-wso2v107-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 4aa52fc4e5..3ce1c92dd8 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-wso2v106 + 4.0.0-wso2v107-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 86cbc04fa5..11b3c228fd 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v106 + 4.0.0-wso2v107-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 0f5e8363f2..83eabdc323 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v106 + 4.0.0-wso2v107-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index a688d2ec67..42806aec62 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v106 + 4.0.0-wso2v107-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 9b027e661e..258ffebcba 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-wso2v106 + 4.0.0-wso2v107-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 546e747501..ddff5e782a 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-wso2v106 + 4.0.0-wso2v107-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 75d28c77e1..76fb2bc653 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-wso2v106 + 4.0.0-wso2v107-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 423c116f0f..06a68d5b21 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-wso2v106 + 4.0.0-wso2v107-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 ea17097ff0..b166215516 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-wso2v106 + 4.0.0-wso2v107-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 11ace9d031..5ce4b789e7 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-wso2v106 + 4.0.0-wso2v107-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 c814a9aadf..163e6607ba 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-wso2v106 + 4.0.0-wso2v107-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 8bbc70fe64..b8d6939393 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v106 + 4.0.0-wso2v107-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 73b965e96e..f0dc88aad8 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v106 + 4.0.0-wso2v107-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index c71600336b..ea1c001357 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v106 + 4.0.0-wso2v107-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-wso2v106 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index e79c173d8c..c279f5df6b 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v106 + 4.0.0-wso2v107-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index ee2df9acd4..ef2d887e7c 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-wso2v106 + 4.0.0-wso2v107-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index afacfd091d..21c97cd438 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-wso2v106 + 4.0.0-wso2v107-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 9b4e6dc440..7b5d322a65 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v106 + 4.0.0-wso2v107-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 39ffba2348..fb46f09fe7 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v106 + 4.0.0-wso2v107-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 21ac6a363a..c287bf8ab1 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v106 + 4.0.0-wso2v107-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index a8082f16cc..006f8401e3 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v106 + 4.0.0-wso2v107-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index d114a5c7b0..91dd9c25eb 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-wso2v106 + 4.0.0-wso2v107-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 65f9df46f5..8fc0b88b15 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-wso2v106 + 4.0.0-wso2v107-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 916f5bf02e..2a85a853ee 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-wso2v106 + 4.0.0-wso2v107-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 16b77dc587..6a0063d532 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-wso2v106 + 4.0.0-wso2v107-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index ab42a0cb6b..c364aa6899 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v106 + 4.0.0-wso2v107-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index b33395f6b4..561cb981e9 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v106 + 4.0.0-wso2v107-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index bf4a9b28ab..f47fda8937 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-wso2v106 + 4.0.0-wso2v107-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 93ed7f209c..153886b442 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v106 + 4.0.0-wso2v107-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-wso2v106 + HEAD Apache Software Foundation From 5c4e8dd3d754d4e9937b20d7bf2eed99f74ab6b1 Mon Sep 17 00:00:00 2001 From: lakith Date: Wed, 17 Apr 2024 14:46:56 +0530 Subject: [PATCH 237/308] Improve passthru warn logs for max payload size exceeding --- .../synapse/transport/passthru/PassThroughConstants.java | 2 ++ .../apache/synapse/transport/passthru/SourceHandler.java | 6 +++++- .../apache/synapse/transport/passthru/TargetHandler.java | 6 +++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughConstants.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughConstants.java index 3770b963b2..1de4b94a7f 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughConstants.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/PassThroughConstants.java @@ -237,6 +237,7 @@ public class PassThroughConstants { public static final String HTTP_PUT = "PUT"; public static final String HTTP_OPTIONS = "OPTIONS"; public static final String HTTP_CONNECT = "CONNECT"; + public static final String HTTP_METHOD = "HTTP_METHOD"; //Constant to specify the socket timeout public static final String HTTP_SOCKET_TIMEOUT = "HTTP_SOCKET_TIMEOUT"; @@ -274,4 +275,5 @@ public class PassThroughConstants { //default header that carries the correlation ID. Header name is configurable at passthru-http.properties public static final String CORRELATION_DEFAULT_HEADER = "activityid"; public static final String TRANSPORT_LATENCY_LOGGER = "transport-latency"; + public static final String TRANSPORT_IN_URL = "TransportInURL"; } diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceHandler.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceHandler.java index a91d282fbb..df569f7f66 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceHandler.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceHandler.java @@ -359,7 +359,11 @@ public void inputReady(NHttpServerConnection conn, if (messageSizeSum > validMaxMessageSize) { log.warn("Payload exceeds valid payload size range, hence discontinuing chunk stream at " - + messageSizeSum + " bytes to prevent OOM."); + + messageSizeSum + " bytes to prevent OOM for" + + " URI : " + request.getUri() + + ", Method : " + request.getMethod() + + ", Correlation ID: " + request.getHeaders().get(PassThroughConstants.CORRELATION_DEFAULT_HEADER) + ); dropSourceConnection(conn); metrics.exceptionOccured(); conn.getContext().setAttribute(PassThroughConstants.SOURCE_CONNECTION_DROPPED, true); diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetHandler.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetHandler.java index b7319cce8f..e3d2e9b48d 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetHandler.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetHandler.java @@ -678,7 +678,11 @@ public void inputReady(NHttpClientConnection conn, ContentDecoder decoder) { if (messageSizeSum > validMaxMessageSize) { log.warn("Payload exceeds valid payload size range, hence discontinuing chunk stream at " - + messageSizeSum + " bytes to prevent OOM."); + + messageSizeSum + " bytes to prevent OOM for" + + " URI : " + msgCtx.getProperty(PassThroughConstants.TRANSPORT_IN_URL) + + ", Method : " + msgCtx.getProperty(PassThroughConstants.HTTP_METHOD) + + ", Correlation ID: " + msgCtx.getProperty(CorrelationConstants.CORRELATION_ID) + ); dropTargetConnection(conn); response.getPipe().forceProducerComplete(decoder); } From fee28d6eb9b5a73d6a41cfbf5fffb117cfa8c10e Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 19 Apr 2024 05:13:42 +0000 Subject: [PATCH 238/308] [WSO2 Release] [Jenkins #6959] [Release 4.0.0-wso2v107] prepare release v4.0.0-wso2v107 --- 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 b81c959b37..f130b8b763 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v107-SNAPSHOT + 4.0.0-wso2v107 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index d1e44e872a..46cf55c52b 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v107-SNAPSHOT + 4.0.0-wso2v107 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 3ce1c92dd8..61bf392720 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-wso2v107-SNAPSHOT + 4.0.0-wso2v107 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 11b3c228fd..7409b1bf3a 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v107-SNAPSHOT + 4.0.0-wso2v107 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 83eabdc323..160811f267 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v107-SNAPSHOT + 4.0.0-wso2v107 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 42806aec62..9f081b088b 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v107-SNAPSHOT + 4.0.0-wso2v107 ../../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 258ffebcba..d44e4dd9b9 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-wso2v107-SNAPSHOT + 4.0.0-wso2v107 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 ddff5e782a..f7d52ae955 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-wso2v107-SNAPSHOT + 4.0.0-wso2v107 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 76fb2bc653..b2c28d7e91 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-wso2v107-SNAPSHOT + 4.0.0-wso2v107 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 06a68d5b21..7e0205f7bd 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-wso2v107-SNAPSHOT + 4.0.0-wso2v107 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 b166215516..a57f62c12e 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-wso2v107-SNAPSHOT + 4.0.0-wso2v107 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 5ce4b789e7..4473b419ec 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-wso2v107-SNAPSHOT + 4.0.0-wso2v107 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 163e6607ba..f61c685f82 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-wso2v107-SNAPSHOT + 4.0.0-wso2v107 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index b8d6939393..5129890552 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v107-SNAPSHOT + 4.0.0-wso2v107 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index f0dc88aad8..35b46cfbce 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v107-SNAPSHOT + 4.0.0-wso2v107 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index ea1c001357..be38616cdb 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v107-SNAPSHOT + 4.0.0-wso2v107 ../../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-wso2v107 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index c279f5df6b..2c4378c91f 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v107-SNAPSHOT + 4.0.0-wso2v107 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index ef2d887e7c..4637aa8c96 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-wso2v107-SNAPSHOT + 4.0.0-wso2v107 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 21c97cd438..076afffbcf 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-wso2v107-SNAPSHOT + 4.0.0-wso2v107 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 7b5d322a65..109de6af34 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v107-SNAPSHOT + 4.0.0-wso2v107 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index fb46f09fe7..8f020ece29 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v107-SNAPSHOT + 4.0.0-wso2v107 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index c287bf8ab1..e4bcffe0dd 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v107-SNAPSHOT + 4.0.0-wso2v107 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 006f8401e3..bdf8ec31e7 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v107-SNAPSHOT + 4.0.0-wso2v107 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 91dd9c25eb..fa8c87447b 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-wso2v107-SNAPSHOT + 4.0.0-wso2v107 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 8fc0b88b15..a6fd4b45cf 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-wso2v107-SNAPSHOT + 4.0.0-wso2v107 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 2a85a853ee..405b4bf539 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-wso2v107-SNAPSHOT + 4.0.0-wso2v107 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 6a0063d532..602004bd80 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-wso2v107-SNAPSHOT + 4.0.0-wso2v107 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index c364aa6899..065be881b3 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v107-SNAPSHOT + 4.0.0-wso2v107 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 561cb981e9..6ab0e8b10f 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v107-SNAPSHOT + 4.0.0-wso2v107 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index f47fda8937..8881a6fe5c 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-wso2v107-SNAPSHOT + 4.0.0-wso2v107 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 153886b442..39f9ab506d 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v107-SNAPSHOT + 4.0.0-wso2v107 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-wso2v107 Apache Software Foundation From 2d86a51bb6857635b1ed0f7dea44e2ed68d8f2d5 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 19 Apr 2024 05:13:44 +0000 Subject: [PATCH 239/308] [WSO2 Release] [Jenkins #6959] [Release 4.0.0-wso2v107] 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 f130b8b763..057a88f04a 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v107 + 4.0.0-wso2v108-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 46cf55c52b..0105b4eba7 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v107 + 4.0.0-wso2v108-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 61bf392720..3eac3fab7d 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-wso2v107 + 4.0.0-wso2v108-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 7409b1bf3a..a940aa2c31 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v107 + 4.0.0-wso2v108-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 160811f267..5223a427e3 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v107 + 4.0.0-wso2v108-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 9f081b088b..0c3d1ca6ab 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v107 + 4.0.0-wso2v108-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 d44e4dd9b9..77d79932fc 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-wso2v107 + 4.0.0-wso2v108-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 f7d52ae955..8454af4115 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-wso2v107 + 4.0.0-wso2v108-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 b2c28d7e91..fc743389b1 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-wso2v107 + 4.0.0-wso2v108-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 7e0205f7bd..aafbdbbb1e 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-wso2v107 + 4.0.0-wso2v108-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 a57f62c12e..80c27cc7b3 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-wso2v107 + 4.0.0-wso2v108-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 4473b419ec..ea68ecca2c 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-wso2v107 + 4.0.0-wso2v108-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 f61c685f82..5a828f1588 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-wso2v107 + 4.0.0-wso2v108-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 5129890552..b3fb16c527 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v107 + 4.0.0-wso2v108-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 35b46cfbce..d75ddb2bc0 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v107 + 4.0.0-wso2v108-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index be38616cdb..a953cbd2e8 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v107 + 4.0.0-wso2v108-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-wso2v107 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 2c4378c91f..acbd65795e 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v107 + 4.0.0-wso2v108-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 4637aa8c96..b52c00b787 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-wso2v107 + 4.0.0-wso2v108-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 076afffbcf..d892b03eb5 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-wso2v107 + 4.0.0-wso2v108-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 109de6af34..cbafeb87d2 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v107 + 4.0.0-wso2v108-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 8f020ece29..237d8c24d0 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v107 + 4.0.0-wso2v108-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index e4bcffe0dd..95c1a21a5a 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v107 + 4.0.0-wso2v108-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index bdf8ec31e7..b741488db6 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v107 + 4.0.0-wso2v108-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index fa8c87447b..1e679a30b5 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-wso2v107 + 4.0.0-wso2v108-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index a6fd4b45cf..1de396aa01 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-wso2v107 + 4.0.0-wso2v108-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 405b4bf539..2fd9d825ff 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-wso2v107 + 4.0.0-wso2v108-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 602004bd80..79735333de 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-wso2v107 + 4.0.0-wso2v108-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 065be881b3..3c8e55dabb 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v107 + 4.0.0-wso2v108-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 6ab0e8b10f..50b65219f7 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v107 + 4.0.0-wso2v108-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 8881a6fe5c..721b69fbd4 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-wso2v107 + 4.0.0-wso2v108-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 39f9ab506d..74ba7cbd72 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v107 + 4.0.0-wso2v108-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-wso2v107 + HEAD Apache Software Foundation From 002f2e485b750a4f41d0fdbf48f6f48a57e5ac11 Mon Sep 17 00:00:00 2001 From: DedunuKarunarathne <46235093+DedunuKarunarathne@users.noreply.github.com> Date: Fri, 19 Apr 2024 14:43:25 +0530 Subject: [PATCH 240/308] Add isMounted query parameter to the destination file object before moving files in VFS Add isMounted query parameter to the destination file object before moving files in VFS Fixes: https://github.com/wso2/micro-integrator/issues/3308 --- .../apache/synapse/transport/vfs/VFSTransportListener.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java b/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java index e73a52ae09..3d618230b8 100644 --- a/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java +++ b/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java @@ -51,6 +51,7 @@ import org.apache.commons.vfs2.FileType; import org.apache.commons.vfs2.impl.DefaultFileSystemManager; import org.apache.commons.vfs2.impl.StandardFileSystemManager; +import org.apache.commons.vfs2.provider.UriParser; import org.apache.synapse.commons.vfs.FileObjectDataSource; import org.apache.synapse.commons.vfs.VFSConstants; import org.apache.synapse.commons.vfs.VFSOutTransportInfo; @@ -138,6 +139,7 @@ public class VFSTransportListener extends AbstractPollingTransportListener queryParam = UriParser.extractQueryParams(moveToDirectoryURI); + dest.setIsMounted(Boolean.parseBoolean(queryParam.get(IS_MOUNTED))); + if (log.isDebugEnabled()) { log.debug("Moving to file :" + VFSUtils.maskURLPassword(dest.getName().getURI())); } From b9f4894588bcd033249dc838898dd0c572c6e134 Mon Sep 17 00:00:00 2001 From: DedunuKarunarathne <46235093+DedunuKarunarathne@users.noreply.github.com> Date: Wed, 24 Apr 2024 09:04:16 +0530 Subject: [PATCH 241/308] Check isMounted for source file location --- .../apache/synapse/commons/vfs/VFSConstants.java | 1 + .../transport/vfs/VFSTransportListener.java | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/vfs/VFSConstants.java b/modules/commons/src/main/java/org/apache/synapse/commons/vfs/VFSConstants.java index 764162f69e..57b947b7ab 100644 --- a/modules/commons/src/main/java/org/apache/synapse/commons/vfs/VFSConstants.java +++ b/modules/commons/src/main/java/org/apache/synapse/commons/vfs/VFSConstants.java @@ -43,6 +43,7 @@ public final class VFSConstants { public static final String TRANSPORT_FILE_CONTENT_TYPE = "transport.vfs.ContentType"; public static final String TRANSPORT_FILE_LOCKING = "transport.vfs.Locking"; public static final String UPDATE_LAST_MODIFIED = "transport.vfs.UpdateLastModified"; + public static final String IS_MOUNTED = "transport.vfs.IsMounted"; public static final String TRANSPORT_FILE_LOCKING_ENABLED = "enable"; public static final String TRANSPORT_FILE_LOCKING_DISABLED = "disable"; diff --git a/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java b/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java index 3d618230b8..c54e39b997 100644 --- a/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java +++ b/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java @@ -139,7 +139,6 @@ public class VFSTransportListener extends AbstractPollingTransportListener queryParams = UriParser.extractQueryParams(fileURI); + fileObject.setIsMounted(Boolean.parseBoolean(queryParams.get(VFSConstants.IS_MOUNTED))); + if (fileObject == null) { log.error("fileObject is null"); throw new FileSystemException("fileObject is null"); @@ -283,6 +286,11 @@ protected void scanFileOrDirectory(final PollTableEntry entry, String fileURI) { FileObject[] children = null; try { children = fileObject.getChildren(); + for (FileObject child : children) { + if (fileObject.getIsMounted()) { + child.setIsMounted(fileObject.getIsMounted()); + } + } } catch (FileNotFolderException ignored) { } catch (FileSystemException ex) { closeFileSystem(fileObject); @@ -729,9 +737,9 @@ protected void moveOrDeleteAfterProcessing(final PollTableEntry entry, FileObjec FileObject dest = moveToDirectory.resolveFile( prefix + fileObject.getName().getBaseName()); - // Get transport.vfs.isMounted query parameter - Map queryParam = UriParser.extractQueryParams(moveToDirectoryURI); - dest.setIsMounted(Boolean.parseBoolean(queryParam.get(IS_MOUNTED))); + // Get if the destination location is volume mounted + Map queryParams = UriParser.extractQueryParams(moveToDirectoryURI); + dest.setIsMounted(Boolean.parseBoolean(queryParams.get(VFSConstants.IS_MOUNTED))); if (log.isDebugEnabled()) { log.debug("Moving to file :" + VFSUtils.maskURLPassword(dest.getName().getURI())); From f549db3a7eb32a92fb29f8fa0af378f3ddc85a14 Mon Sep 17 00:00:00 2001 From: DedunuKarunarathne <46235093+DedunuKarunarathne@users.noreply.github.com> Date: Wed, 24 Apr 2024 09:39:17 +0530 Subject: [PATCH 242/308] Code formatting --- .../apache/synapse/transport/vfs/VFSTransportListener.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java b/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java index c54e39b997..5e799166e9 100644 --- a/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java +++ b/modules/transports/core/vfs/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java @@ -287,9 +287,7 @@ protected void scanFileOrDirectory(final PollTableEntry entry, String fileURI) { try { children = fileObject.getChildren(); for (FileObject child : children) { - if (fileObject.getIsMounted()) { - child.setIsMounted(fileObject.getIsMounted()); - } + child.setIsMounted(fileObject.getIsMounted()); } } catch (FileNotFolderException ignored) { } catch (FileSystemException ex) { From 47ec51b7ec02b924648e82947b82936ccfbedf9d Mon Sep 17 00:00:00 2001 From: DedunuKarunarathne <46235093+DedunuKarunarathne@users.noreply.github.com> Date: Wed, 24 Apr 2024 09:57:44 +0530 Subject: [PATCH 243/308] Bump synapse version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2aaaf6dc73..ebbcdd1860 100644 --- a/pom.xml +++ b/pom.xml @@ -1490,7 +1490,7 @@ ${version.tomcat}.wso2v1 1.3 1.5.0.wso2v1 - 2.2.0-wso2v17 + 2.2.0-wso2v18 6.6 3.9.0 ${commons.net.version}.wso2v1 From 1703b5087568aecc0bfba528eec020435d2ee806 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 24 Apr 2024 04:58:08 +0000 Subject: [PATCH 244/308] [WSO2 Release] [Jenkins #6966] [Release 4.0.0-wso2v108] prepare release v4.0.0-wso2v108 --- 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 057a88f04a..9f0553246f 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v108-SNAPSHOT + 4.0.0-wso2v108 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 0105b4eba7..1760a81b00 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v108-SNAPSHOT + 4.0.0-wso2v108 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 3eac3fab7d..9a95f1d1a0 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-wso2v108-SNAPSHOT + 4.0.0-wso2v108 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index a940aa2c31..c2e5906a0f 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v108-SNAPSHOT + 4.0.0-wso2v108 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 5223a427e3..2321a23faf 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v108-SNAPSHOT + 4.0.0-wso2v108 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 0c3d1ca6ab..38d77c17ac 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v108-SNAPSHOT + 4.0.0-wso2v108 ../../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 77d79932fc..02844dad1c 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-wso2v108-SNAPSHOT + 4.0.0-wso2v108 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 8454af4115..621729a72c 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-wso2v108-SNAPSHOT + 4.0.0-wso2v108 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 fc743389b1..9c4954cc29 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-wso2v108-SNAPSHOT + 4.0.0-wso2v108 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 aafbdbbb1e..7284495666 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-wso2v108-SNAPSHOT + 4.0.0-wso2v108 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 80c27cc7b3..357d1e5f15 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-wso2v108-SNAPSHOT + 4.0.0-wso2v108 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 ea68ecca2c..6e4e8f1a59 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-wso2v108-SNAPSHOT + 4.0.0-wso2v108 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 5a828f1588..7cb5fa4f4e 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-wso2v108-SNAPSHOT + 4.0.0-wso2v108 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index b3fb16c527..e99f63cef0 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v108-SNAPSHOT + 4.0.0-wso2v108 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index d75ddb2bc0..c7562d5773 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v108-SNAPSHOT + 4.0.0-wso2v108 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index a953cbd2e8..39d2b0ef02 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v108-SNAPSHOT + 4.0.0-wso2v108 ../../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-wso2v108 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index acbd65795e..f92f5095af 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v108-SNAPSHOT + 4.0.0-wso2v108 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index b52c00b787..b5b8c43b22 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-wso2v108-SNAPSHOT + 4.0.0-wso2v108 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index d892b03eb5..2f581925d0 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-wso2v108-SNAPSHOT + 4.0.0-wso2v108 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index cbafeb87d2..ea51679b69 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v108-SNAPSHOT + 4.0.0-wso2v108 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 237d8c24d0..69f81917e0 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v108-SNAPSHOT + 4.0.0-wso2v108 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 95c1a21a5a..b5f5cfef44 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v108-SNAPSHOT + 4.0.0-wso2v108 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index b741488db6..53e56453db 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v108-SNAPSHOT + 4.0.0-wso2v108 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 1e679a30b5..e460ac9108 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-wso2v108-SNAPSHOT + 4.0.0-wso2v108 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 1de396aa01..97b742e701 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-wso2v108-SNAPSHOT + 4.0.0-wso2v108 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 2fd9d825ff..50d2575215 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-wso2v108-SNAPSHOT + 4.0.0-wso2v108 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 79735333de..915407e8a9 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-wso2v108-SNAPSHOT + 4.0.0-wso2v108 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 3c8e55dabb..6469a27290 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v108-SNAPSHOT + 4.0.0-wso2v108 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 50b65219f7..795bfd4274 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v108-SNAPSHOT + 4.0.0-wso2v108 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 721b69fbd4..b0ea7d573e 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-wso2v108-SNAPSHOT + 4.0.0-wso2v108 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 265999abb7..aada574e55 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v108-SNAPSHOT + 4.0.0-wso2v108 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-wso2v108 Apache Software Foundation From 41c9b82b436a2f365cdb6ae6dfbc36ca88392384 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 24 Apr 2024 04:58:10 +0000 Subject: [PATCH 245/308] [WSO2 Release] [Jenkins #6966] [Release 4.0.0-wso2v108] 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 9f0553246f..6e5eda5d0b 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v108 + 4.0.0-wso2v109-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 1760a81b00..a165e118bc 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v108 + 4.0.0-wso2v109-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 9a95f1d1a0..7220e669df 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-wso2v108 + 4.0.0-wso2v109-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index c2e5906a0f..3f069aca32 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v108 + 4.0.0-wso2v109-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 2321a23faf..f64b327597 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v108 + 4.0.0-wso2v109-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 38d77c17ac..ec35ca29c0 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v108 + 4.0.0-wso2v109-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 02844dad1c..8e257895af 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-wso2v108 + 4.0.0-wso2v109-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 621729a72c..9e903a8af6 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-wso2v108 + 4.0.0-wso2v109-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 9c4954cc29..141144ac76 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-wso2v108 + 4.0.0-wso2v109-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 7284495666..51a9d75a8c 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-wso2v108 + 4.0.0-wso2v109-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 357d1e5f15..186c66690f 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-wso2v108 + 4.0.0-wso2v109-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 6e4e8f1a59..6e4aa91291 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-wso2v108 + 4.0.0-wso2v109-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 7cb5fa4f4e..0442908772 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-wso2v108 + 4.0.0-wso2v109-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index e99f63cef0..16acd24c15 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v108 + 4.0.0-wso2v109-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index c7562d5773..05e92dabab 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v108 + 4.0.0-wso2v109-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 39d2b0ef02..e4844db810 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v108 + 4.0.0-wso2v109-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-wso2v108 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index f92f5095af..9190455b0b 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v108 + 4.0.0-wso2v109-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index b5b8c43b22..ee77f4aab6 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-wso2v108 + 4.0.0-wso2v109-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 2f581925d0..d275425ee1 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-wso2v108 + 4.0.0-wso2v109-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index ea51679b69..be4caeb6da 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v108 + 4.0.0-wso2v109-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 69f81917e0..288954cab1 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v108 + 4.0.0-wso2v109-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index b5f5cfef44..bf7fbf8284 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v108 + 4.0.0-wso2v109-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 53e56453db..4efe243dd2 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v108 + 4.0.0-wso2v109-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index e460ac9108..9cab65a51c 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-wso2v108 + 4.0.0-wso2v109-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 97b742e701..e78d6a3710 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-wso2v108 + 4.0.0-wso2v109-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 50d2575215..3164e90a84 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-wso2v108 + 4.0.0-wso2v109-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 915407e8a9..ae40dd5a6b 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-wso2v108 + 4.0.0-wso2v109-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 6469a27290..1297355c11 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v108 + 4.0.0-wso2v109-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 795bfd4274..8b30aa9166 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v108 + 4.0.0-wso2v109-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index b0ea7d573e..9c0071ead6 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-wso2v108 + 4.0.0-wso2v109-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index aada574e55..483d969454 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v108 + 4.0.0-wso2v109-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-wso2v108 + HEAD Apache Software Foundation From 78ccac6b7aa7202ec6200a211252860a8c178704 Mon Sep 17 00:00:00 2001 From: malakaganga Date: Wed, 24 Apr 2024 11:47:00 +0530 Subject: [PATCH 246/308] Fix issue of unable to undeploy libs Fixes: https://github.com/wso2/micro-integrator/issues/3312 --- .../java/org/apache/synapse/config/SynapseConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java b/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java index 47ed64af38..ace07c6109 100644 --- a/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java +++ b/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java @@ -2062,7 +2062,7 @@ public static void removeOneDeployedLib(String name) { Map.Entry libraryCountEntry = deployedLibs.get(name); if (libraryCountEntry != null) { Integer count = libraryCountEntry.getValue(); - if (count > 0) { + if (count > 1) { count--; libraryCountEntry.setValue(count); } else { From b9055eed90742c0e714bb4c137a8e5748244d09b Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 24 Apr 2024 08:13:10 +0000 Subject: [PATCH 247/308] [WSO2 Release] [Jenkins #6968] [Release 4.0.0-wso2v109] prepare release v4.0.0-wso2v109 --- 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 6e5eda5d0b..d6e5e15cec 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v109-SNAPSHOT + 4.0.0-wso2v109 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index a165e118bc..fa06595a38 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v109-SNAPSHOT + 4.0.0-wso2v109 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 7220e669df..56255c4700 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-wso2v109-SNAPSHOT + 4.0.0-wso2v109 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 3f069aca32..c9436ff980 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v109-SNAPSHOT + 4.0.0-wso2v109 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index f64b327597..8f0cd0a50b 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v109-SNAPSHOT + 4.0.0-wso2v109 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index ec35ca29c0..007d31aa09 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v109-SNAPSHOT + 4.0.0-wso2v109 ../../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 8e257895af..8c85ab3309 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-wso2v109-SNAPSHOT + 4.0.0-wso2v109 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 9e903a8af6..5e6bbc619a 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-wso2v109-SNAPSHOT + 4.0.0-wso2v109 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 141144ac76..2387e158e9 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-wso2v109-SNAPSHOT + 4.0.0-wso2v109 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 51a9d75a8c..5ccfbb3c5e 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-wso2v109-SNAPSHOT + 4.0.0-wso2v109 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 186c66690f..ca6161e494 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-wso2v109-SNAPSHOT + 4.0.0-wso2v109 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 6e4aa91291..2568af85f9 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-wso2v109-SNAPSHOT + 4.0.0-wso2v109 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 0442908772..1c2f827bb9 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-wso2v109-SNAPSHOT + 4.0.0-wso2v109 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 16acd24c15..ae8b6c89d5 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v109-SNAPSHOT + 4.0.0-wso2v109 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 05e92dabab..7c73ba7b50 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v109-SNAPSHOT + 4.0.0-wso2v109 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index e4844db810..d2e3ebddee 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v109-SNAPSHOT + 4.0.0-wso2v109 ../../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-wso2v109 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 9190455b0b..6b1cd36c31 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v109-SNAPSHOT + 4.0.0-wso2v109 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index ee77f4aab6..c9b7f17298 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-wso2v109-SNAPSHOT + 4.0.0-wso2v109 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index d275425ee1..a88b828280 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-wso2v109-SNAPSHOT + 4.0.0-wso2v109 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index be4caeb6da..da50854b86 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v109-SNAPSHOT + 4.0.0-wso2v109 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 288954cab1..ad5e8b52db 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v109-SNAPSHOT + 4.0.0-wso2v109 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index bf7fbf8284..a6f8b13b0e 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v109-SNAPSHOT + 4.0.0-wso2v109 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 4efe243dd2..c1a4cfa6fb 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v109-SNAPSHOT + 4.0.0-wso2v109 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 9cab65a51c..c7335e808e 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-wso2v109-SNAPSHOT + 4.0.0-wso2v109 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index e78d6a3710..cd604b8263 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-wso2v109-SNAPSHOT + 4.0.0-wso2v109 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 3164e90a84..20bc94fa9a 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-wso2v109-SNAPSHOT + 4.0.0-wso2v109 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index ae40dd5a6b..18a9147deb 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-wso2v109-SNAPSHOT + 4.0.0-wso2v109 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 1297355c11..5baf2e80ec 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v109-SNAPSHOT + 4.0.0-wso2v109 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 8b30aa9166..fb293e2cfb 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v109-SNAPSHOT + 4.0.0-wso2v109 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 9c0071ead6..5b8f60c329 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-wso2v109-SNAPSHOT + 4.0.0-wso2v109 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 483d969454..4b0b4ecdbe 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v109-SNAPSHOT + 4.0.0-wso2v109 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-wso2v109 Apache Software Foundation From 2968e76c71d5cbdc8e94fa3288b64f35b6c39ce1 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Wed, 24 Apr 2024 08:13:11 +0000 Subject: [PATCH 248/308] [WSO2 Release] [Jenkins #6968] [Release 4.0.0-wso2v109] 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 d6e5e15cec..2b4e1a7067 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v109 + 4.0.0-wso2v110-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index fa06595a38..3300558b0e 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v109 + 4.0.0-wso2v110-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 56255c4700..459bf488d6 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-wso2v109 + 4.0.0-wso2v110-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index c9436ff980..e4af45fe86 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v109 + 4.0.0-wso2v110-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 8f0cd0a50b..a47c697d4c 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v109 + 4.0.0-wso2v110-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 007d31aa09..5ca6fd3f61 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v109 + 4.0.0-wso2v110-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 8c85ab3309..705deb4806 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-wso2v109 + 4.0.0-wso2v110-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 5e6bbc619a..e820e53dea 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-wso2v109 + 4.0.0-wso2v110-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 2387e158e9..5b97f5ba99 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-wso2v109 + 4.0.0-wso2v110-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 5ccfbb3c5e..da9a633297 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-wso2v109 + 4.0.0-wso2v110-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 ca6161e494..1c733d21a8 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-wso2v109 + 4.0.0-wso2v110-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 2568af85f9..5d8edfd4f4 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-wso2v109 + 4.0.0-wso2v110-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 1c2f827bb9..e1db5ea57f 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-wso2v109 + 4.0.0-wso2v110-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index ae8b6c89d5..976ce9d290 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v109 + 4.0.0-wso2v110-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 7c73ba7b50..a5fff8d10e 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v109 + 4.0.0-wso2v110-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index d2e3ebddee..fe4e20d2bf 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v109 + 4.0.0-wso2v110-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-wso2v109 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 6b1cd36c31..bb8cb1dd3e 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v109 + 4.0.0-wso2v110-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index c9b7f17298..75b48a1992 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-wso2v109 + 4.0.0-wso2v110-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index a88b828280..3ed8b89bc3 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-wso2v109 + 4.0.0-wso2v110-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index da50854b86..78e1e97d37 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v109 + 4.0.0-wso2v110-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index ad5e8b52db..ec98aabdf1 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v109 + 4.0.0-wso2v110-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index a6f8b13b0e..69d74be2b6 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v109 + 4.0.0-wso2v110-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index c1a4cfa6fb..c6a213b607 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v109 + 4.0.0-wso2v110-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index c7335e808e..be9d12dc96 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-wso2v109 + 4.0.0-wso2v110-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index cd604b8263..f26a68cbc1 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-wso2v109 + 4.0.0-wso2v110-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 20bc94fa9a..fd37c5790d 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-wso2v109 + 4.0.0-wso2v110-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 18a9147deb..070136f32a 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-wso2v109 + 4.0.0-wso2v110-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 5baf2e80ec..4f65d676ac 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v109 + 4.0.0-wso2v110-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index fb293e2cfb..7c1838b77c 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v109 + 4.0.0-wso2v110-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 5b8f60c329..d49c48c4a1 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-wso2v109 + 4.0.0-wso2v110-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 4b0b4ecdbe..db8c79a935 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v109 + 4.0.0-wso2v110-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-wso2v109 + HEAD Apache Software Foundation From cee4945f8d25a5d310653d02e5b21fc4edf90ff2 Mon Sep 17 00:00:00 2001 From: DedunuKarunarathne <46235093+DedunuKarunarathne@users.noreply.github.com> Date: Mon, 29 Apr 2024 10:55:15 +0530 Subject: [PATCH 249/308] Update the json-schema-validator version to 2.2.7.wso2v1 Update the json-schema-validator version to 2.2.7.wso2v1. Fixes: https://github.com/wso2/micro-integrator/issues/3311 --- modules/core/pom.xml | 2 +- modules/extensions/pom.xml | 4 ++-- modules/features/org.apache.synapse.wso2.feature/pom.xml | 4 ++-- pom.xml | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 3cbe0eab6e..2d9f5a5860 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -343,7 +343,7 @@ - org.wso2.orbit.com.github.fge + org.wso2.orbit.com.github.java-json-tools json-schema-validator-all diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 28b9f4fac8..5edf866828 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -131,7 +131,7 @@ synapse-core - org.wso2.orbit.com.github.fge + org.wso2.orbit.com.github.java-json-tools json-schema-validator-all @@ -143,7 +143,7 @@ test - org.wso2.orbit.com.github.fge + org.wso2.orbit.com.github.java-json-tools json-schema-validator-all diff --git a/modules/features/org.apache.synapse.wso2.feature/pom.xml b/modules/features/org.apache.synapse.wso2.feature/pom.xml index 606f45319e..0d4353a26f 100644 --- a/modules/features/org.apache.synapse.wso2.feature/pom.xml +++ b/modules/features/org.apache.synapse.wso2.feature/pom.xml @@ -76,7 +76,7 @@ handy-uri-templates - org.wso2.orbit.com.github.fge + org.wso2.orbit.com.github.java-json-tools json-schema-validator-all @@ -155,7 +155,7 @@ com.google.guava:guava:${google.guava.version} com.google.guava:failureaccess:${failureaccess.version} - org.wso2.orbit.com.github.fge:json-schema-validator-all + org.wso2.orbit.com.github.java-json-tools:json-schema-validator-all org.wso2.orbit.io.opentelemetry:opentelemetry-all:${opentelemetry.all.version} diff --git a/pom.xml b/pom.xml index 2aaaf6dc73..3abd08c5c9 100644 --- a/pom.xml +++ b/pom.xml @@ -1067,9 +1067,9 @@ ${version.org.wso2.orbit.javax.activation} - org.wso2.orbit.com.github.fge + org.wso2.orbit.com.github.java-json-tools json-schema-validator-all - ${fge.json.schema.validator.version} + ${java-json-tools.json.schema.validator.version} com.fasterxml.jackson.core @@ -1565,7 +1565,7 @@ 3.0.1 2.0.9 3.0.0 - 2.2.6.wso2v10 + 2.2.7.wso2v1 2.16.1 2.16.1 33.0.0-jre From 45bb8b66697ce86dabae0a2c7eb6c4761c4200c3 Mon Sep 17 00:00:00 2001 From: Sanoj Punchihewa Date: Tue, 30 Apr 2024 16:20:03 +0530 Subject: [PATCH 250/308] Add option to continue iterations on failure for foreach mediator --- .../config/xml/ForEachMediatorFactory.java | 8 +++ .../mediators/builtin/ForEachMediator.java | 54 +++++++++++++++++-- 2 files changed, 58 insertions(+), 4 deletions(-) diff --git a/modules/core/src/main/java/org/apache/synapse/config/xml/ForEachMediatorFactory.java b/modules/core/src/main/java/org/apache/synapse/config/xml/ForEachMediatorFactory.java index 1fbdf1d83e..ee91de8795 100644 --- a/modules/core/src/main/java/org/apache/synapse/config/xml/ForEachMediatorFactory.java +++ b/modules/core/src/main/java/org/apache/synapse/config/xml/ForEachMediatorFactory.java @@ -54,6 +54,9 @@ public class ForEachMediatorFactory extends AbstractMediatorFactory { private static final QName ID_Q = new QName(XMLConfigConstants.NULL_NAMESPACE, "id"); + private static final QName CONTINUE_IN_FAULT_Q + = new QName(XMLConfigConstants.NULL_NAMESPACE, "continueLoopOnFailure"); + public QName getTagQName() { return FOREACH_Q; } @@ -69,6 +72,11 @@ protected Mediator createSpecificMediator(OMElement elem, mediator.setId(id.getAttributeValue()); } + OMAttribute continueOnFail = elem.getAttribute(CONTINUE_IN_FAULT_Q); + if (continueOnFail != null) { + mediator.setContinueLoopOnFailure(Boolean.parseBoolean(continueOnFail.getAttributeValue())); + } + OMAttribute expression = elem.getAttribute(ATT_EXPRN); if (expression != null) { try { diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ForEachMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ForEachMediator.java index 72b3b3c7c7..01e3264fce 100644 --- a/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ForEachMediator.java +++ b/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ForEachMediator.java @@ -65,6 +65,8 @@ public class ForEachMediator extends AbstractMediator implements ManagedLifecycl private String id; + private boolean continueLoopOnFailure = false; + private static final String FOREACH_ORIGINAL_MESSAGE = "FOREACH_ORIGINAL_MESSAGE"; private static final String FOREACH_COUNTER = "FOREACH_COUNTER"; @@ -142,7 +144,23 @@ public boolean mediate(MessageContext synCtx) { for (JsonElement element : iterableJsonArray) { try { updateIteratedMessage(synCtx, element); - boolean mediateResult = mediateSequence(synCtx); + boolean mediateResult; + if (continueLoopOnFailure) { + try { + mediateResult = mediateSequence(synCtx); + } catch (Exception ex) { + if (log.isDebugEnabled()) { + log.warn("Error occurred while mediating the sequence for the foreach mediator, " + + "Continuing with the remaining.", ex); + } else { + log.warn("Error occurred while mediating the sequence for the foreach mediator, " + + ex.getMessage() + ". Continuing with the remaining."); + } + continue; + } + } else { + mediateResult = mediateSequence(synCtx); + } modifiedPayloadArray.add(EIPUtils.tryParseJsonString(parser, JsonUtil.jsonPayloadToString(((Axis2MessageContext) synCtx).getAxis2MessageContext()))); msgCounter++; @@ -151,10 +169,19 @@ public boolean mediate(MessageContext synCtx) { + msgCounter); } synCtx.setProperty(counterPropName, msgCounter); - if (!mediateResult) { // break the loop if mediate result is false + if (!mediateResult && !continueLoopOnFailure) {// break the loop if mediate result is false break; } } catch (AxisFault axisFault) { + if (continueLoopOnFailure) { + if (log.isDebugEnabled()) { + log.warn("Error occurred in the foreach mediator, Continuing with the remaining.", axisFault); + } else { + log.warn("Error occurred in the foreach mediator, " + axisFault.getMessage() + + ". Continuing with the remaining."); + } + continue; + } handleException("Error updating the stream with iterater element : " + element.toString(), axisFault, synCtx); } @@ -221,7 +248,22 @@ public boolean mediate(MessageContext synCtx) { } catch (AxisFault axisFault) { handleException("Error creating an iterated copy of the message", axisFault, synCtx); } - boolean mediateResult = mediateSequence(iteratedMsgCtx); + boolean mediateResult = false; + if (continueLoopOnFailure) { + try { + mediateResult = mediateSequence(iteratedMsgCtx); + } catch (Exception ex) { + if (log.isDebugEnabled()) { + log.warn("Error occurred while mediating the sequence for the foreach mediator, " + + "Continuing with the remaining.", ex); + } else { + log.warn("Error occurred while mediating the sequence for the foreach mediator, " + + ex.getMessage() + ". Continuing with the remaining."); + } + } + } else { + mediateResult = mediateSequence(iteratedMsgCtx); + } //add the mediated element to the parent from original message context parent.addChild(iteratedMsgCtx.getEnvelope().getBody().getFirstElement()); @@ -232,7 +274,7 @@ public boolean mediate(MessageContext synCtx) { } synCtx.setProperty(counterPropName, msgCounter); - if (!mediateResult) { // break the loop if mediate result is false + if (!mediateResult && !continueLoopOnFailure) { // break the loop if mediate result is false break; } } @@ -474,4 +516,8 @@ public String getId() { public void setId(String id) { this.id = id; } + + public void setContinueLoopOnFailure(boolean continueOnFail) { + this.continueLoopOnFailure = continueOnFail; + } } From ccb7c274a82716ae4cfb7530d9417fc9b570a295 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 6 May 2024 08:44:59 +0000 Subject: [PATCH 251/308] [WSO2 Release] [Jenkins #6982] [Release 4.0.0-wso2v110] prepare release v4.0.0-wso2v110 --- 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 2b4e1a7067..cceb01b81b 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v110-SNAPSHOT + 4.0.0-wso2v110 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 3300558b0e..34f3c1c9dc 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v110-SNAPSHOT + 4.0.0-wso2v110 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 459bf488d6..feef321c87 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-wso2v110-SNAPSHOT + 4.0.0-wso2v110 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index e4af45fe86..3d617d2bc8 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v110-SNAPSHOT + 4.0.0-wso2v110 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index a47c697d4c..99675cd92d 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v110-SNAPSHOT + 4.0.0-wso2v110 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 5ca6fd3f61..7b79e01e14 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v110-SNAPSHOT + 4.0.0-wso2v110 ../../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 705deb4806..82e66b443d 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-wso2v110-SNAPSHOT + 4.0.0-wso2v110 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 e820e53dea..4d7ddb887f 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-wso2v110-SNAPSHOT + 4.0.0-wso2v110 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 5b97f5ba99..79ec6bf38c 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-wso2v110-SNAPSHOT + 4.0.0-wso2v110 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 da9a633297..6b81b24927 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-wso2v110-SNAPSHOT + 4.0.0-wso2v110 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 1c733d21a8..e367443d5b 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-wso2v110-SNAPSHOT + 4.0.0-wso2v110 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 5d8edfd4f4..53100a3184 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-wso2v110-SNAPSHOT + 4.0.0-wso2v110 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 e1db5ea57f..f1fda13b2c 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-wso2v110-SNAPSHOT + 4.0.0-wso2v110 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 976ce9d290..6e27d981c2 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v110-SNAPSHOT + 4.0.0-wso2v110 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index a5fff8d10e..fd61194c8c 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v110-SNAPSHOT + 4.0.0-wso2v110 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index fe4e20d2bf..c6fcc969d1 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v110-SNAPSHOT + 4.0.0-wso2v110 ../../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-wso2v110 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index bb8cb1dd3e..f67f7878d9 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v110-SNAPSHOT + 4.0.0-wso2v110 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 75b48a1992..ede50b3980 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-wso2v110-SNAPSHOT + 4.0.0-wso2v110 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 3ed8b89bc3..e9ca7c5709 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-wso2v110-SNAPSHOT + 4.0.0-wso2v110 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 78e1e97d37..24959cec4c 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v110-SNAPSHOT + 4.0.0-wso2v110 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index ec98aabdf1..c174074add 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v110-SNAPSHOT + 4.0.0-wso2v110 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 69d74be2b6..a5e7c9ebb6 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v110-SNAPSHOT + 4.0.0-wso2v110 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index c6a213b607..b42594f50a 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v110-SNAPSHOT + 4.0.0-wso2v110 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index be9d12dc96..6f2e21f5a1 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-wso2v110-SNAPSHOT + 4.0.0-wso2v110 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index f26a68cbc1..df3c70ee46 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-wso2v110-SNAPSHOT + 4.0.0-wso2v110 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index fd37c5790d..d3d204ac0d 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-wso2v110-SNAPSHOT + 4.0.0-wso2v110 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 070136f32a..61db04d52d 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-wso2v110-SNAPSHOT + 4.0.0-wso2v110 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 4f65d676ac..a755e8fe95 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v110-SNAPSHOT + 4.0.0-wso2v110 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 7c1838b77c..d3094c52f4 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v110-SNAPSHOT + 4.0.0-wso2v110 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index d49c48c4a1..bf6d7cf08a 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-wso2v110-SNAPSHOT + 4.0.0-wso2v110 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index db8c79a935..926193c024 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v110-SNAPSHOT + 4.0.0-wso2v110 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-wso2v110 Apache Software Foundation From c7274375205b56e83801a3989318bacc813f4d5c Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 6 May 2024 08:45:01 +0000 Subject: [PATCH 252/308] [WSO2 Release] [Jenkins #6982] [Release 4.0.0-wso2v110] 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 cceb01b81b..140d3e2894 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v110 + 4.0.0-wso2v111-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 34f3c1c9dc..49cc59c8ca 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v110 + 4.0.0-wso2v111-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index feef321c87..81ae17ed04 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-wso2v110 + 4.0.0-wso2v111-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 3d617d2bc8..fb3998b26e 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v110 + 4.0.0-wso2v111-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 99675cd92d..2c4e3c82cd 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v110 + 4.0.0-wso2v111-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 7b79e01e14..1fba1dd211 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v110 + 4.0.0-wso2v111-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 82e66b443d..e5269cb53c 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-wso2v110 + 4.0.0-wso2v111-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 4d7ddb887f..4ca3dbc677 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-wso2v110 + 4.0.0-wso2v111-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 79ec6bf38c..03b2aca99e 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-wso2v110 + 4.0.0-wso2v111-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 6b81b24927..0c9e638983 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-wso2v110 + 4.0.0-wso2v111-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 e367443d5b..da77304a59 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-wso2v110 + 4.0.0-wso2v111-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 53100a3184..689f8d1204 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-wso2v110 + 4.0.0-wso2v111-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 f1fda13b2c..82f23d4579 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-wso2v110 + 4.0.0-wso2v111-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 6e27d981c2..242d65ffec 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v110 + 4.0.0-wso2v111-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index fd61194c8c..1d97fa95c6 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v110 + 4.0.0-wso2v111-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index c6fcc969d1..40ec6dd8cb 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v110 + 4.0.0-wso2v111-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-wso2v110 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index f67f7878d9..9a988818e5 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v110 + 4.0.0-wso2v111-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index ede50b3980..0126e5de76 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-wso2v110 + 4.0.0-wso2v111-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index e9ca7c5709..561852667e 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-wso2v110 + 4.0.0-wso2v111-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 24959cec4c..d030c40e6d 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v110 + 4.0.0-wso2v111-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index c174074add..c2f372ebf5 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v110 + 4.0.0-wso2v111-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index a5e7c9ebb6..8b8a2af323 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v110 + 4.0.0-wso2v111-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index b42594f50a..19e51a1387 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v110 + 4.0.0-wso2v111-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 6f2e21f5a1..b188c5345c 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-wso2v110 + 4.0.0-wso2v111-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index df3c70ee46..3fdaefebe6 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-wso2v110 + 4.0.0-wso2v111-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index d3d204ac0d..be4c38afac 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-wso2v110 + 4.0.0-wso2v111-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 61db04d52d..4f85cbde0a 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-wso2v110 + 4.0.0-wso2v111-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index a755e8fe95..89fcb9e9b7 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v110 + 4.0.0-wso2v111-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index d3094c52f4..37659c8130 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v110 + 4.0.0-wso2v111-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index bf6d7cf08a..1de3023f44 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-wso2v110 + 4.0.0-wso2v111-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 926193c024..3777c5d578 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v110 + 4.0.0-wso2v111-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-wso2v110 + HEAD Apache Software Foundation From 23d1543dca6fe36392a7c03828a3dcdc37d046e8 Mon Sep 17 00:00:00 2001 From: hiranyakavishani Date: Tue, 7 May 2024 12:46:38 +0530 Subject: [PATCH 253/308] Fixing issue in update Synapse Artifact flow --- .../org/apache/synapse/deployers/EndpointDeployer.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/synapse/deployers/EndpointDeployer.java b/modules/core/src/main/java/org/apache/synapse/deployers/EndpointDeployer.java index 9ad9def453..63c35c53eb 100644 --- a/modules/core/src/main/java/org/apache/synapse/deployers/EndpointDeployer.java +++ b/modules/core/src/main/java/org/apache/synapse/deployers/EndpointDeployer.java @@ -23,6 +23,9 @@ import org.apache.axis2.deployment.DeploymentException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.synapse.commons.jmx.JmxConfigurationConstants; +import org.apache.synapse.commons.util.MiscellaneousUtil; +import org.apache.synapse.config.SynapsePropertiesLoader; import org.apache.synapse.transport.customlogsetter.CustomLogSetter; import org.apache.synapse.commons.jmx.MBeanRegistrar; import org.apache.synapse.config.xml.MultiXMLConfigurationBuilder; @@ -42,6 +45,10 @@ public class EndpointDeployer extends AbstractSynapseArtifactDeployer { private static Log log = LogFactory.getLog(EndpointDeployer.class); + private static final boolean jmxEnabled = Boolean.parseBoolean( + MiscellaneousUtil.getProperty(SynapsePropertiesLoader.loadSynapseProperties(), + JmxConfigurationConstants.PROP_ENDPOINT_VIEW_JMX_ENABLE, "true")); + @Override public String deploySynapseArtifact(OMElement artifactConfig, String fileName, Properties properties) { @@ -126,7 +133,7 @@ public String updateSynapseArtifact(OMElement artifactConfig, String fileName, waitForCompletion(); existingEp.destroy(); - if (existingArtifactName.equals(ep.getName())) { + if (existingArtifactName.equals(ep.getName()) && jmxEnabled) { // If the endpoint name was same as the old one, above method call (destroy) // will unregister the endpoint MBean - So we should register it again. MBeanRegistrar.getInstance().registerMBean( From 97491633c8a2ca65184bc67e516c565f4bac7bfb Mon Sep 17 00:00:00 2001 From: DedunuKarunarathne <46235093+DedunuKarunarathne@users.noreply.github.com> Date: Fri, 10 May 2024 12:31:01 +0530 Subject: [PATCH 254/308] Update version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3abd08c5c9..0ced106d86 100644 --- a/pom.xml +++ b/pom.xml @@ -1565,7 +1565,7 @@ 3.0.1 2.0.9 3.0.0 - 2.2.7.wso2v1 + 2.2.7.wso2v2 2.16.1 2.16.1 33.0.0-jre From 987f511dc21a997e1131121eceef1e8eca80175f Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 10 May 2024 09:30:23 +0000 Subject: [PATCH 255/308] [WSO2 Release] [Jenkins #6988] [Release 4.0.0-wso2v111] prepare release v4.0.0-wso2v111 --- 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 140d3e2894..7fdaf0a7e1 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v111-SNAPSHOT + 4.0.0-wso2v111 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 2ff2746e5c..75513d23ea 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v111-SNAPSHOT + 4.0.0-wso2v111 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 81ae17ed04..2ffbe27450 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-wso2v111-SNAPSHOT + 4.0.0-wso2v111 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index fb3998b26e..e334b807d5 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v111-SNAPSHOT + 4.0.0-wso2v111 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 2c4e3c82cd..bbc4d0867c 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v111-SNAPSHOT + 4.0.0-wso2v111 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index e6a67bb570..d9e0b692e5 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v111-SNAPSHOT + 4.0.0-wso2v111 ../../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 e5269cb53c..62266c7968 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-wso2v111-SNAPSHOT + 4.0.0-wso2v111 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 4ca3dbc677..22a8ae7ba8 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-wso2v111-SNAPSHOT + 4.0.0-wso2v111 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 03b2aca99e..e92a942d4b 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-wso2v111-SNAPSHOT + 4.0.0-wso2v111 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 0c9e638983..3ea5d60a09 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-wso2v111-SNAPSHOT + 4.0.0-wso2v111 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 da77304a59..6962a2188a 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-wso2v111-SNAPSHOT + 4.0.0-wso2v111 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 689f8d1204..6e5bd8db7c 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-wso2v111-SNAPSHOT + 4.0.0-wso2v111 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 e68ac66605..cd8907dc38 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-wso2v111-SNAPSHOT + 4.0.0-wso2v111 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 242d65ffec..6f891fafce 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v111-SNAPSHOT + 4.0.0-wso2v111 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 1d97fa95c6..0433ad5a05 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v111-SNAPSHOT + 4.0.0-wso2v111 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 40ec6dd8cb..d42dd2a895 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v111-SNAPSHOT + 4.0.0-wso2v111 ../../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-wso2v111 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 9a988818e5..56ea575347 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v111-SNAPSHOT + 4.0.0-wso2v111 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 0126e5de76..a9486f2b5a 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-wso2v111-SNAPSHOT + 4.0.0-wso2v111 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 561852667e..9b4aa4efca 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-wso2v111-SNAPSHOT + 4.0.0-wso2v111 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index d030c40e6d..543ec63653 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v111-SNAPSHOT + 4.0.0-wso2v111 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index c2f372ebf5..ab3abbb9f4 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v111-SNAPSHOT + 4.0.0-wso2v111 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 8b8a2af323..0b63e25933 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v111-SNAPSHOT + 4.0.0-wso2v111 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 19e51a1387..d6050c3eca 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v111-SNAPSHOT + 4.0.0-wso2v111 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index b188c5345c..ce4be362b4 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-wso2v111-SNAPSHOT + 4.0.0-wso2v111 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 3fdaefebe6..bd229ff32b 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-wso2v111-SNAPSHOT + 4.0.0-wso2v111 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index be4c38afac..b1d693f21b 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-wso2v111-SNAPSHOT + 4.0.0-wso2v111 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 4f85cbde0a..ecc071d720 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-wso2v111-SNAPSHOT + 4.0.0-wso2v111 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 89fcb9e9b7..7a820dddc6 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v111-SNAPSHOT + 4.0.0-wso2v111 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 37659c8130..00f18b3dce 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v111-SNAPSHOT + 4.0.0-wso2v111 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 1de3023f44..7f16d8c20d 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-wso2v111-SNAPSHOT + 4.0.0-wso2v111 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index bace0bebd6..4aaaae835f 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v111-SNAPSHOT + 4.0.0-wso2v111 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-wso2v111 Apache Software Foundation From 98a8a8f595a840f6d8684368987478140db4dc0f Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 10 May 2024 09:30:25 +0000 Subject: [PATCH 256/308] [WSO2 Release] [Jenkins #6988] [Release 4.0.0-wso2v111] 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 7fdaf0a7e1..b711264d07 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v111 + 4.0.0-wso2v112-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 75513d23ea..e508f0cdc6 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v111 + 4.0.0-wso2v112-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 2ffbe27450..0e972dec80 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-wso2v111 + 4.0.0-wso2v112-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index e334b807d5..26e7a658df 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v111 + 4.0.0-wso2v112-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index bbc4d0867c..ddcb627266 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v111 + 4.0.0-wso2v112-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index d9e0b692e5..40da29d5e7 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v111 + 4.0.0-wso2v112-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 62266c7968..133f70e22a 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-wso2v111 + 4.0.0-wso2v112-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 22a8ae7ba8..c10f5e595f 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-wso2v111 + 4.0.0-wso2v112-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 e92a942d4b..b6e1d9abfa 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-wso2v111 + 4.0.0-wso2v112-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 3ea5d60a09..049573ae81 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-wso2v111 + 4.0.0-wso2v112-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 6962a2188a..9454834db0 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-wso2v111 + 4.0.0-wso2v112-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 6e5bd8db7c..56b08147d0 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-wso2v111 + 4.0.0-wso2v112-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 cd8907dc38..b077c9b741 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-wso2v111 + 4.0.0-wso2v112-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 6f891fafce..230a260a4f 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v111 + 4.0.0-wso2v112-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 0433ad5a05..b02a791788 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v111 + 4.0.0-wso2v112-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index d42dd2a895..e8170454a3 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v111 + 4.0.0-wso2v112-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-wso2v111 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 56ea575347..c8660f7716 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v111 + 4.0.0-wso2v112-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index a9486f2b5a..5db5f761e2 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-wso2v111 + 4.0.0-wso2v112-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 9b4aa4efca..072b72ed88 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-wso2v111 + 4.0.0-wso2v112-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 543ec63653..61a7fdcf03 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v111 + 4.0.0-wso2v112-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index ab3abbb9f4..73533e41c7 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v111 + 4.0.0-wso2v112-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 0b63e25933..6d82389d6a 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v111 + 4.0.0-wso2v112-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index d6050c3eca..4b360a6e50 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v111 + 4.0.0-wso2v112-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index ce4be362b4..49e71ae7dc 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-wso2v111 + 4.0.0-wso2v112-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index bd229ff32b..73ec17098f 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-wso2v111 + 4.0.0-wso2v112-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index b1d693f21b..20f01b1456 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-wso2v111 + 4.0.0-wso2v112-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index ecc071d720..6a27946f71 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-wso2v111 + 4.0.0-wso2v112-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 7a820dddc6..140d89567d 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v111 + 4.0.0-wso2v112-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 00f18b3dce..dfe1cad25e 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v111 + 4.0.0-wso2v112-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 7f16d8c20d..e74fdc087d 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-wso2v111 + 4.0.0-wso2v112-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 4aaaae835f..0a989e8c4a 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v111 + 4.0.0-wso2v112-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-wso2v111 + HEAD Apache Software Foundation From b1168aed9b9fc1eac17a1173e5aedafdf5e653fb Mon Sep 17 00:00:00 2001 From: Isuru Wijesiri Date: Fri, 17 May 2024 18:32:15 +0530 Subject: [PATCH 257/308] Fix wsa message id issue Fix issue of messageID of the responserecognizing as the wsa:RelatesTo instead of the actual MessageIDual MessageID --- .../core/axis2/SynapseCallbackReceiver.java | 34 +++++++++++++------ 1 file changed, 24 insertions(+), 10 deletions(-) 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 77f234583a..69fbb3d212 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 @@ -67,6 +67,7 @@ import org.apache.synapse.util.ResponseAcceptEncodingProcessor; import java.util.Iterator; +import java.util.Objects; import java.util.Stack; import java.util.Timer; @@ -160,16 +161,9 @@ public void receive(MessageContext messageCtx) throws AxisFault { return; } - - if (messageCtx.getOptions() != null && messageCtx.getOptions().getRelatesTo() != null) { - // never take a chance with a NPE at this stage.. so check at each level :-) - Options options = messageCtx.getOptions(); - if (options != null) { - RelatesTo relatesTo = options.getRelatesTo(); - if (relatesTo != null) { - messageID = relatesTo.getValue(); - } - } + String relatesTo = extractRelatesToFromResponse(messageCtx); + if (relatesTo != null && !isRelatesToUnspecified(relatesTo)) { + messageID = relatesTo; } else if (messageCtx.getProperty(SynapseConstants.SANDESHA2_SEQUENCE_KEY) == null) { messageID = (String) messageCtx.getProperty(SynapseConstants.RELATES_TO_FOR_POX); } @@ -229,6 +223,26 @@ public void receive(MessageContext messageCtx) throws AxisFault { } } + private String extractRelatesToFromResponse(MessageContext messageCtx) { + if (messageCtx.getOptions() != null && messageCtx.getOptions().getRelatesTo() != null) { + // never take a chance with a NPE at this stage.. so check at each level :-) + Options options = messageCtx.getOptions(); + if (options != null) { + RelatesTo relatesTo = options.getRelatesTo(); + if (relatesTo != null) { + return relatesTo.getValue(); + } + } + } + return null; + } + + private boolean isRelatesToUnspecified(String relatesTo) { + + return relatesTo.equals("http://schemas.xmlsoap.org/ws/2004/08/addressing/id/unspecified") + || relatesTo.equals("http://www.w3.org/2005/08/addressing/unspecified"); + } + /** * Handle the response or error (during a failed send) message received for an outgoing request * From 047c0c4dd6c4c7c15453b978f631651abf0ae69d Mon Sep 17 00:00:00 2001 From: Isuru Wijesiri Date: Tue, 28 May 2024 18:44:47 +0530 Subject: [PATCH 258/308] Fix ConcurrentModificationException when removing more than 1 swagger --- .../java/org/apache/synapse/config/SynapseConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java b/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java index ace07c6109..3b3870a13f 100644 --- a/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java +++ b/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java @@ -494,7 +494,7 @@ public synchronized void validateSwaggerTable() { while (swaggerIterator.hasNext()) { String name = swaggerIterator.next(); if (!apiTable.containsKey(name)) { - swaggerTable.remove(name); + swaggerIterator.remove(); } } } From 23608ab6b6f60ab57698abc1e02d9adbdeec2604 Mon Sep 17 00:00:00 2001 From: Isuru Wijesiri Date: Tue, 28 May 2024 18:49:12 +0530 Subject: [PATCH 259/308] Handle all malformed channel and connection closing errors --- .../message/store/impl/rabbitmq/RabbitMQProducer.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/core/src/main/java/org/apache/synapse/message/store/impl/rabbitmq/RabbitMQProducer.java b/modules/core/src/main/java/org/apache/synapse/message/store/impl/rabbitmq/RabbitMQProducer.java index eca0a1debc..f1ef3197a5 100644 --- a/modules/core/src/main/java/org/apache/synapse/message/store/impl/rabbitmq/RabbitMQProducer.java +++ b/modules/core/src/main/java/org/apache/synapse/message/store/impl/rabbitmq/RabbitMQProducer.java @@ -112,17 +112,17 @@ public boolean storeMessage(MessageContext synCtx) { if (channel != null) { try { channel.close(); - } catch (IOException | TimeoutException exception) { + } catch (Exception channelCloseException) { log.error("Error occurred while closing the malformed channel Error: " + - exception.getLocalizedMessage()); + channelCloseException.getLocalizedMessage()); } } if (connection != null) { try { connection.close(); - } catch (IOException ioException) { + } catch (Exception connectionCloseException) { log.error("Error occurred while closing the malformed connection Error: " + - ioException.getLocalizedMessage()); + connectionCloseException.getLocalizedMessage()); } } channel = null; From ae03daf9a91d8a6b751874660c721084782fac8f Mon Sep 17 00:00:00 2001 From: Lahiru Madushanka Date: Tue, 11 Jun 2024 10:01:01 +0530 Subject: [PATCH 260/308] Fix NPE in synapse unit tests. Fix NPE in synapse unit testsFix NPE in synapse unit tests. --- .../org/apache/synapse/unittest/SynapseTestcaseDataReader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/synapse/unittest/SynapseTestcaseDataReader.java b/modules/core/src/main/java/org/apache/synapse/unittest/SynapseTestcaseDataReader.java index 5a4329c903..faddf9d260 100755 --- a/modules/core/src/main/java/org/apache/synapse/unittest/SynapseTestcaseDataReader.java +++ b/modules/core/src/main/java/org/apache/synapse/unittest/SynapseTestcaseDataReader.java @@ -259,7 +259,7 @@ ArtifactData readAndStoreArtifactData() throws XMLStreamException, IOException { QName qualifiedRegistryArtifactFile = new QName("", ARTIFACT, ""); OMElement registryArtifactsFileNode = resource.getFirstChildWithName(qualifiedRegistryArtifactFile); String resourceArtifact = registryArtifactsFileNode.getText(); - if (resourceArtifact.isEmpty()) { + if (resourceArtifact.isEmpty() && registryArtifactsFileNode.getFirstOMChild() != null) { resourceArtifact = registryArtifactsFileNode.getFirstOMChild().toString(); } From 20a6846755696bfd73a4312e3008edb1b8e27252 Mon Sep 17 00:00:00 2001 From: Arunan Sugunakumar Date: Tue, 11 Jun 2024 16:28:49 +0530 Subject: [PATCH 261/308] Disable default access logger and utilize log4j2 for http access logs Related to https://github.com/wso2/micro-integrator/issues/3281 Currently, HTTP Access logs use a custom implementation to write the logs to the file. This has a request and response queue to hold the logs and write them to the file using a Timer task. In a high-traffic scenario, this becomes a bottleneck because the Heap memory easily fills up because of the logs added to the queuea. This commit disables the current implementation and utilizes log4j2 to write the access logs to the file system which is more efficient. Also, timer tasks are removed and LinkedBlockingQueue is used to handle logs asynchronously in a timely manner. --- .../synapse/transport/http/access/Access.java | 56 ++++++++++--------- .../transport/http/access/AccessLogger.java | 2 +- 2 files changed, 31 insertions(+), 27 deletions(-) diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/access/Access.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/access/Access.java index cf277f5d4a..4eeed48b3a 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/access/Access.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/access/Access.java @@ -25,6 +25,7 @@ import org.apache.http.HttpRequest; import org.apache.http.HttpResponse; import org.apache.http.params.HttpParams; +import org.apache.synapse.transport.http.conn.LoggingUtils; import org.apache.synapse.transport.http.wrapper.HttpRequestWrapper; import org.apache.synapse.transport.http.wrapper.HttpResponseWrapper; @@ -32,9 +33,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Timer; -import java.util.TimerTask; -import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.LinkedBlockingQueue; /** * The class to handle the HTTP Access Logs, patterns and the major functionality. @@ -43,6 +42,7 @@ */ public class Access { private static Log log = LogFactory.getLog(Access.class); + private final Log accesslog = LogFactory.getLog(LoggingUtils.ACCESS_LOG_ID); /** * Array of AccessLogElement, they will be used to make log message. @@ -53,10 +53,8 @@ public class Access { private static AccessLogger accessLogger; - private static ConcurrentLinkedQueue requestQueue; - private static ConcurrentLinkedQueue responseQueue; - - private static final int LOG_FREQUENCY_IN_SECONDS = 30; + private static LinkedBlockingQueue requestQueue; + private static LinkedBlockingQueue responseQueue; private Date date; @@ -70,8 +68,8 @@ public Access(final Log log, AccessLogger accessLogger) { super(); Access.log = log; Access.accessLogger = accessLogger; - requestQueue = new ConcurrentLinkedQueue(); - responseQueue = new ConcurrentLinkedQueue(); + requestQueue = new LinkedBlockingQueue(); + responseQueue = new LinkedBlockingQueue(); logElements = createLogElements(); logAccesses(); } @@ -104,30 +102,36 @@ public void addAccessToQueue(HttpResponse response) { * logs the request and response accesses. */ public void logAccesses() { - TimerTask logRequests = new LogRequests(); - TimerTask logResponses = new LogResponses(); - Timer requestTimer = new Timer(); - Timer responseTimer = new Timer(); - // Retry in 30 seconds - long retryIn = 1000 * LOG_FREQUENCY_IN_SECONDS; - requestTimer.schedule(logRequests, 0, retryIn); - responseTimer.schedule(logResponses, 0, retryIn); + Thread logRequests = new LogRequests(); + Thread logResponses = new LogResponses(); + logRequests.start(); + logResponses.start(); } - private class LogRequests extends TimerTask { + private class LogRequests extends Thread { public void run() { - while (!requestQueue.isEmpty()) { - HttpRequestWrapper req = requestQueue.poll(); - log(req, null); + while (true) { + HttpRequestWrapper req = null; + try { + req = requestQueue.take(); + log(req, null); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } } } } - private class LogResponses extends TimerTask { + private class LogResponses extends Thread { public void run() { - while (!responseQueue.isEmpty()) { - HttpResponseWrapper res = responseQueue.poll(); - log(null, res); + while (true) { + HttpResponseWrapper res = null; + try { + res = responseQueue.take(); + log(null, res); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } } } } @@ -874,7 +878,7 @@ public void log(HttpRequestWrapper request, HttpResponseWrapper response) { } } String logString = result.toString(); - log.debug(logString); //log to the console + accesslog.info(logString); //log to the console if (accessLogger.isLoggingEnabled) { accessLogger.log(logString); //log to the file } diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/access/AccessLogger.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/access/AccessLogger.java index 46d525d9bb..e2304c707a 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/access/AccessLogger.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/access/AccessLogger.java @@ -121,7 +121,7 @@ public AccessLogger(final Log log) { /** * Enable logging. */ - public boolean isLoggingEnabled = getBooleanValue(CONFIG_ENABLE_LOGGING, true); + public boolean isLoggingEnabled = getBooleanValue(CONFIG_ENABLE_LOGGING, false); /** * Log the specified message to the log file, switching files if the date From 0232f990784cff0b466dc21755dda37ea1dfc358 Mon Sep 17 00:00:00 2001 From: malakaganga Date: Thu, 13 Jun 2024 10:36:30 +0530 Subject: [PATCH 262/308] Fix using stale channel when broker is down Fixes: https://github.com/wso2/api-manager/issues/2935 --- .../synapse/message/store/impl/rabbitmq/RabbitMQStore.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/synapse/message/store/impl/rabbitmq/RabbitMQStore.java b/modules/core/src/main/java/org/apache/synapse/message/store/impl/rabbitmq/RabbitMQStore.java index 40ed201e98..1727ad0824 100644 --- a/modules/core/src/main/java/org/apache/synapse/message/store/impl/rabbitmq/RabbitMQStore.java +++ b/modules/core/src/main/java/org/apache/synapse/message/store/impl/rabbitmq/RabbitMQStore.java @@ -351,12 +351,15 @@ public void destroy() { @Override public MessageProducer getProducer() { RabbitMQProducer producer = new RabbitMQProducer(this); + boolean producerConnectionInvalidated = false; producer.setId(nextProducerId()); producer.setExchangeName(exchangeName); producer.setRoutingKey(routingKey); if (producerConnection == null) { + producerConnectionInvalidated = true; producerConnection = createConnection(); } else if (!producerConnection.isOpen()) { + producerConnectionInvalidated = true; producerConnection.abort(); producerConnection = createConnection(); } @@ -365,7 +368,7 @@ public MessageProducer getProducer() { if (log.isDebugEnabled()) { log.debug(nameString() + " created message producer " + producer.getId()); } - if (channel == null) { + if (channel == null || producerConnectionInvalidated) { channel = createChannel(producerConnection); } producer.setChannel(channel); From 381dd3ee688ff26db9b37933422bb8cddf061327 Mon Sep 17 00:00:00 2001 From: Shavindu Senadheera Date: Thu, 13 Jun 2024 15:05:13 +0530 Subject: [PATCH 263/308] Improving debug logs for the custom SSL Profile --- .../synapse/transport/http/conn/ClientConnFactory.java | 6 ++++++ .../transport/nhttp/config/ClientConnFactoryBuilder.java | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/conn/ClientConnFactory.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/conn/ClientConnFactory.java index 61ebc3ceff..1f27e997f2 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/conn/ClientConnFactory.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/conn/ClientConnFactory.java @@ -40,6 +40,8 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import javax.net.ssl.SSLContext; @@ -49,6 +51,7 @@ * particular server from the specified map it uses the default SSLContext. */ public class ClientConnFactory { + protected Log log = LogFactory.getLog(ClientConnFactory.class);; private final HttpResponseFactory responseFactory; private final ByteBufferAllocator allocator; @@ -113,6 +116,9 @@ private SSLContext getSSLContextForHost(String host) { if (customContext != null) { return customContext; } else { + if (log.isDebugEnabled()) { + log.debug("The sslByHostMap is null or Custom SSL context is null for the host : " + host); + } return ssl != null ? ssl.getContext() : null; } } diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ClientConnFactoryBuilder.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ClientConnFactoryBuilder.java index f076479c7d..a3564baaa1 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ClientConnFactoryBuilder.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/config/ClientConnFactoryBuilder.java @@ -60,6 +60,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Arrays; public class ClientConnFactoryBuilder { @@ -251,6 +252,9 @@ private Map getCustomSSLContexts(TransportOutDescription tra } String[] servers = serversElt.getText().split(","); + if (log.isDebugEnabled()) { + log.debug("Servers list of the custom SSL profile : " + Arrays.toString(servers)); + } OMElement ksElt = profile.getFirstChildWithName(new QName("KeyStore")); OMElement trElt = profile.getFirstChildWithName(new QName("TrustStore")); String noValCert = profile.getAttributeValue(new QName("novalidatecert")); @@ -268,6 +272,9 @@ private Map getCustomSSLContexts(TransportOutDescription tra server = server.trim(); if (!contextMap.containsKey(server)) { contextMap.put(server, sslContext); + if (log.isDebugEnabled()) { + log.debug("Update the SSL context map for the server: " + server); + } } else { if (log.isWarnEnabled()) { log.warn(name + " Multiple SSL profiles were found for the server : " + From ce02a0b876247b90822eb2771843a6af55aec825 Mon Sep 17 00:00:00 2001 From: Arunan Sugunakumar Date: Fri, 14 Jun 2024 15:09:52 +0530 Subject: [PATCH 264/308] Update http reference to https in root pom.xml --- pom.xml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 0a989e8c4a..35a0a97225 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ ~ specific language governing permissions and limitations ~ under the License. --> - + 4.0.0 org.wso2 @@ -30,9 +30,9 @@ Apache Synapse Apache Synapse pom - http://synapse.apache.org/ + https://synapse.apache.org/ - http://issues.apache.org/jira/browse/SYNAPSE + https://issues.apache.org/jira/browse/SYNAPSE @@ -40,28 +40,28 @@ dev-subscribe@synapse.apache.org dev-unsubscribe@synapse.apache.org dev@synapse.apache.org - http://mail-archives.apache.org/mod_mbox/synapse-dev/ + https://mail-archives.apache.org/mod_mbox/synapse-dev/ Apache Synapse User List user-subscribe@synapse.apache.org user-unsubscribe@synapse.apache.org user@synapse.apache.org - http://mail-archives.apache.org/mod_mbox/synapse-user/ + https://mail-archives.apache.org/mod_mbox/synapse-user/ Apache Synapse Commits List commits-subscribe@synapse.apache.org commits-unsubscribe@synapse.apache.org commits@synapse.apache.org - http://mail-archives.apache.org/mod_mbox/synapse-commits/ + https://mail-archives.apache.org/mod_mbox/synapse-commits/ 2005 The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt + https://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -73,7 +73,7 @@ Apache Software Foundation - http://www.apache.org/ + https://www.apache.org/ @@ -1624,21 +1624,21 @@ azeez azeez AT wso2.com WSO2 - http://afkham.org/ + https://afkham.org/ Paul Fremantle pzf paul AT wso2.com WSO2 - http://pzf.fremantle.org/ + https://pzf.fremantle.org/ Eran Chinthaka chinthaka chinthaka AT wso2.com WSO2 - http://www.apache.org/~chinthaka + https://www.apache.org/~chinthaka Ant Elder @@ -1657,7 +1657,7 @@ deepal deepal AT wso2.com WSO2 - http://www.apache.org/~deepal + https://www.apache.org/~deepal Davanum Srinivas @@ -1711,7 +1711,7 @@ asankha asankha AT apache.org AdroitLogic - http://adroitlogic.org + https://adroitlogic.org Upul Godage @@ -1729,7 +1729,7 @@ Andreas Veithen veithen veithen AT apache.org - http://www.linkedin.com/in/aveithen + https://www.linkedin.com/in/aveithen Asanka Abeysinghe @@ -1760,7 +1760,7 @@ heshan heshan AT apache.org WSO2 - http://heshans.blogspot.com/ + https://heshans.blogspot.com/ From 01e124ade2378e6776d1a3784c9360d0691092e5 Mon Sep 17 00:00:00 2001 From: Arunan Sugunakumar Date: Fri, 14 Jun 2024 15:45:58 +0530 Subject: [PATCH 265/308] Revert "Update http reference to https in root pom.xml" --- pom.xml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 35a0a97225..0a989e8c4a 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ ~ specific language governing permissions and limitations ~ under the License. --> - + 4.0.0 org.wso2 @@ -30,9 +30,9 @@ Apache Synapse Apache Synapse pom - https://synapse.apache.org/ + http://synapse.apache.org/ - https://issues.apache.org/jira/browse/SYNAPSE + http://issues.apache.org/jira/browse/SYNAPSE @@ -40,28 +40,28 @@ dev-subscribe@synapse.apache.org dev-unsubscribe@synapse.apache.org dev@synapse.apache.org - https://mail-archives.apache.org/mod_mbox/synapse-dev/ + http://mail-archives.apache.org/mod_mbox/synapse-dev/ Apache Synapse User List user-subscribe@synapse.apache.org user-unsubscribe@synapse.apache.org user@synapse.apache.org - https://mail-archives.apache.org/mod_mbox/synapse-user/ + http://mail-archives.apache.org/mod_mbox/synapse-user/ Apache Synapse Commits List commits-subscribe@synapse.apache.org commits-unsubscribe@synapse.apache.org commits@synapse.apache.org - https://mail-archives.apache.org/mod_mbox/synapse-commits/ + http://mail-archives.apache.org/mod_mbox/synapse-commits/ 2005 The Apache Software License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt + http://www.apache.org/licenses/LICENSE-2.0.txt repo @@ -73,7 +73,7 @@ Apache Software Foundation - https://www.apache.org/ + http://www.apache.org/ @@ -1624,21 +1624,21 @@ azeez azeez AT wso2.com WSO2 - https://afkham.org/ + http://afkham.org/ Paul Fremantle pzf paul AT wso2.com WSO2 - https://pzf.fremantle.org/ + http://pzf.fremantle.org/ Eran Chinthaka chinthaka chinthaka AT wso2.com WSO2 - https://www.apache.org/~chinthaka + http://www.apache.org/~chinthaka Ant Elder @@ -1657,7 +1657,7 @@ deepal deepal AT wso2.com WSO2 - https://www.apache.org/~deepal + http://www.apache.org/~deepal Davanum Srinivas @@ -1711,7 +1711,7 @@ asankha asankha AT apache.org AdroitLogic - https://adroitlogic.org + http://adroitlogic.org Upul Godage @@ -1729,7 +1729,7 @@ Andreas Veithen veithen veithen AT apache.org - https://www.linkedin.com/in/aveithen + http://www.linkedin.com/in/aveithen Asanka Abeysinghe @@ -1760,7 +1760,7 @@ heshan heshan AT apache.org WSO2 - https://heshans.blogspot.com/ + http://heshans.blogspot.com/ From cba36fca501ce48c57181606d59d3aa97e0c10b0 Mon Sep 17 00:00:00 2001 From: akila94 Date: Mon, 17 Jun 2024 10:52:45 +0530 Subject: [PATCH 266/308] Extend the expiry date of transport.jks --- .../src/test/resources/transport.jks | Bin 2699 -> 3358 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/modules/integration/src/test/resources/transport.jks b/modules/integration/src/test/resources/transport.jks index 0d1dc34464e4a6fb9ec5d6933ba58e7429582bcd..bbdc2b45c08908149d6eda224e3994a63146a409 100644 GIT binary patch literal 3358 zcma)9XE+-Uw-=3=sZcemMrSrw|p4-ToTVAr>$N!~@50MtX5QjzjlT`hvIG?kkC#l-k|ETHigrG~3~5 zb@_!+7@Kk^(}!NkuheqHnpR;8waccwI)MIb7jjHD&1_I1ce+=qtM_heSb0?dDh$Dm(`0n znkUVkxlB%|vXWvL{c>M6XM>pW&R5loEi+=|3J%tOo$`N?`MRGtcob?W1wvklo;5;%2~lKQM5Y5J~+h8t?UAG6Zn zR&>(aw|TEAb;6MGfs>Gv_f8w^h|3cSe?U*N{u8{%p*|#bjAVarB#m6MId~OXMVb@# zl)I<&s5YR0$SNzullhY!@vLWP5#m95g+6R#hcCPy^SKjD@+cAB2T4jZ9j8Bg< zQCtae{Sp;Kqi5{eJnrVUt72*0GvYS=<%Qd{TT|1VB!CkRxaq(MjA~eLzs9Milodu? zF=+F`t{pxB>oHvjn4$I@pG{2)d_jpz@utBXIg>4gh*HH)0plDUDE_tU60~8)O}zGL zvlE8lZUibr?AqAA|Lut4pDLP93GFMP*svcM=k=Z;V(+Hobj_|su-wtTtU+yh_nG)7 z13dLXVr3L>W@f|*_1o2cJyiO6kdUf$=IiPyl@yn>Tmpg-vr-R2?)W(Zp1c<~&7DcV zXL{0iFo0|1*=W;Qk9`@$K$^5ozg=1P)%{1?;)Z5f-ksrr7F#&?^~tTTa7sy8GZChU zs6SW&S|q42QDYC<318hUSUM{XdFg7b+{^Omd~N{BUA!tj1LM==Z3!81qFpMo(cn0TDEp2|=GE>#Qh`Axt`y>L>_$0@ytRNA@ zFR*j{gf&ZrmrKD-o}*@Xx6d%P^zx`H&E6)V{io3IR_u{8mC)dboQf%#ra|?gj&eDZ zm9UT*-8F@`DRK?W-9C|exa_(L%CU`cz1@?nhk=Sfus6Gi=eOhGea%7WmYj{B-RRHD zB#qCt#v@(|YF90I@=}=AVD`y{4~uvrCt3&>TYArI`c)P_1~{MOT%^B} zu&XrSM{W6gl z@A->5$%*cP-B20poG5{cKvsa^rLT7+)}-)z{n3kVhg`2%gDmLCK6a@-vrkvG2=Win z=!+L4y=AT7|E$^7BVRg;lzCaJuey?b(b*t(IvN|h_Sn8VM|C?g9MM9);kPZ5@o7&u z`4m#Y1f^h=Lc;j|kxN<@DVFQZ6c~yC3I_@w3N(cuh40@O^M6~eO0fW$E!@3Pyi#&f za0OYo3>+@2AOpjL_Wqee4a&uXNPnS4N&v-QH}kIw;NOXLCfa#!6k+pwlc%ec%hvfB zGBA7MKN0J9dY>9bL^{**7-g$rCXtMxc#yp?BL5io`$2N$%JcNj1*d205oYIA3S{kF z{W@|ndTdsSDc{YZqFM)fu7_szK61V$o;H-!@it{_vyopBy3xSYLyd@H_JC#mn z#s(>IEqn2*va~T)mB4LBvo16PZSgzCpi_4D{Bc|IkJ*pOrq7-CbZ6wHK85p-8H=BH zt<{3neu$@FPN?0~Lxn_NPGq$pFN|JDIVQ{xDFX!KoHuUy@szR4OP$3j&Y;Lc7~#tX z!=-#NgQx3xMu+G*qFuw!Jl!@4jF>!2Fpjq0aIwVna(hl7xv|E$^=Vn7$Q-86^@y^( zY`S7!zHZq3jJHTmws7yjH1vp^r}o{Zb`rmKR~dk3nXg%C6Ml2aDMmraCNZ?$dXpYK z*lcqY^rb`(G#VO$?KN54EwU@nDKLOgVV^&J)gK(4kwUjZen=nFaIdhdPX>?+z-7e zSr(EP!I8j0U5|<;U{tgml{W z@buj;kI5Z^YRyF{st<<@X;0{9In0mwd5u0t*X6pQL;V^@*2UIzgv4#E%xVIQ2rD{* zi-pjtu(|+WyVOu+l*F{TR&LfTcmA-cURtvEvZ3JFyqVB!fJBlj9>s0EcV|mX^qt5( z{^f$W(4+H|yArmx3DXm@lKwIUgECGS-I&OPGoQD*y+Z!8&1xd_i|2EZlvvdJ0t_)l7GHG33W@wWtVHiF4%z%8DP5JnG|8~2Qf ze|N97g`pYULcgz*|AT|X@!901@-eZ6d^cE6MMP_HjO6OOD0PF4)))fVLE0>i zD%($bd76k5)jbOvQSshiu;F9 zU^FWr6Mw!{v`iX}POq1a+Pt5ZgYBe9$~x{i>c>)`a8JsKi`@fVC_y9rYuhK2t=_R2_1C$_QR4MuLaa z<2zSUFrcLOg=O+Cgyv?*7RW&LcghE}&PO>_$`ARMn8dCWnZJGIa{KTMFugf}*e+q~ zzWLsk>%9!2Hgv|Bxk)fyTDB%jbEn#FKgvPgaN%dMgaXeLPtsjyQTg+IolRTxU}Sd> zYi$8ElLLm;e!3iLeqGk&F7cu#3Bh_3g_gNYr5c>Icja%j19gdzbOW!$rFWL(fGZ?g8ILP0q2vC@unK2$O<=|M?jx z0aO$~-hQ|h#9VpMLxC?3BC7%B2!6E}1J;UT6i**?-fkRY1G1<@@kzpNYm?zWY2BPT O1Jmm1zd-)`#QhiLPa
`M;n;|8qj>sB9)+mJR zgtBMJk`7^H$;r}3wm#{M&T{p~_g&X{uj{$4_jkX)`?;Uzy?*!a-dWsPgg_ur?gG9o z0Va*6qt2ugC=42v&g6!#-zvoyLLdkT$cAr&0!Us}Bmf66P$2+7K;Ufn`*M}K&sXj% zwl7KkpyrYvQI22!>^^+#oy@rJBASYI_D@>WqlSERN+QMWwV$ z23Xbq7>(r!nSE*sU4BK&#^q%59Z2a`l=Un; z!3#4rjT<^h3y3Z9@w{2|LQdea!|LmF8BJoFxGmv72M*-|HwX)=)<^`ZL8r>ty1TS! zWM?Ma&v2lqsr^RRgu7jDz`cI+N<(FO;OWa_n|!e)PK}PgeF=cdxV7?2P@2 zM_5>Wy$e*TNKWzjv3W#nnM9VW$Tf$C>yq$lIR5frc5_kR7mwIP^X>#K73tp~rGw6a zpT5Ft$~dQvmWrwC$aP5-=z60im3+koMI6Fil9_QC&BzZYw-w_cPCG9=9_Xd2Sc&4h z$Ij40(HfYYgUf@fzhYjR+X;_^FB?!Ff84ZAMOD5KGIE4=^}iIX zz_YY{fyKisY9WO3b~l^PL??5`lJhly^rt|;y|v+hr%w;6Yu+5&kqqjdPt6<>JaA&F zZ}{54Epgu-A-|^h>j{OaTBW(kLzgk)>g0*D@q;&Yq-%$BUQdl;R9;`TUiz3ZJL%9; zVP-C1oz0#WOnbe$KcrIE7mIlKlZot)Z&Qrn^wRM~c7o+h9!FjU!k9?*# zH8gru-h6)fm~O!ip;?8E?Qc@o@OpNyW?<1c?HZm%SeO_EhM(}(84}WOd8QhMFerjQ z2fs$c$lIt6z(&F<&y@Se%}+$-3;t*DcjTPeQ)ZSkSXNk#STX$yvh z$U_{i!11b=eaH*PXUG_rENm#Jn*XR?LR=F2B-}o>Tl&a@+it&uYfnm|4}LgjlI%U9 zeeQId=B8#~b0gU7s-?hSPf8ZHwqI`{w|8f(Mjq!I`zCC zkx8af(3T8_AD4_aH3ntH`44G=q|JQ0d&d-!K6f#6TG@uQmS(*122F6K6lARAEl{;J$L z0AmA!+yMdbLfHTSN&JQE&A5k@98H8BD35Rv2g$`9%2&Xe1k0$8^lQ2KE7Z2@a)O@m zJ$S=b-_2W&J{v7(AYxZ1ibk%$YQ}!soL_H0Wt!WUR(8`-kN$esC+Sg z$7W+8WVvE$s9RI^831Q@Us&*}Y5b%+iT2t){Vd$yN zm6=DrIE`FwK3ZMqJ)HMzqq=TOP4|LPnFE}De5co?OO>{M7*qVod4i`_N-du}*VXqh z;)0%XLqfeXrxpqWAix7Q6b`bX5bnr?ImieCz*jgN2IUC@(YsiA7o$K?Eob8L__HTb`|GrbWroinK03x({V2W`+tXHO}?zzv5Q!Mtya$?CS zB}dj_CptnxtpjU18;F!u^~h?R4Ni^Cqja9jugaP8NvX=YlcGEo%5uzj*WcV}yMA!4 zla`^7UN&YVa1l8^+BEG&kb`Op9?Clfusd_E=+0=X_ zbP}T%ZT_|Yml%n4VOOJA(M0R<((Bt1A+z|x>-*G7dQ=Q?X1W!}-!E*UQUV@z95?s9 zS(izq$l%r+V9 Date: Mon, 17 Jun 2024 10:54:07 +0530 Subject: [PATCH 267/308] Fix CPU spinning issue When back-end connection is closed (RST sent) while handling the response if the protocol state is already marked as RESPONSE_DONE in the TargetHandler exception patch we have omitted to close the connection so the connection remain intact and it will continue to hit the inputReady method and when trying to read from the SSLIOSession it will throws a I/O Exception but since in the exception patch we are omitting the error this will loop. Fixed this issue by moving the connection close logic to finally block. Fixes: https://github.com/wso2/micro-integrator/issues/3363 --- .../transport/passthru/TargetHandler.java | 177 +++++++++--------- 1 file changed, 89 insertions(+), 88 deletions(-) diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetHandler.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetHandler.java index e3d2e9b48d..c26167f5ed 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetHandler.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetHandler.java @@ -1064,100 +1064,101 @@ public void endOfInput(NHttpClientConnection conn) throws IOException { public void exception(NHttpClientConnection conn, Exception ex) { ProtocolState state = TargetContext.getState(conn); MessageContext requestMsgCtx = TargetContext.get(conn).getRequestMsgCtx(); - Map logDetails = getLoggingInfo(conn, state, requestMsgCtx, ex); - - if (state == ProtocolState.REQUEST_HEAD || state == ProtocolState.REQUEST_BODY) { - informWriterError(conn); - log.warn("ERROR_CODE = " + logDetails.get("error_code") + ", STATE_DESCRIPTION = Exception occurred " - + logDetails.get("state_description") + ", INTERNAL_STATE = " + state + ", DIRECTION = " - + logDetails.get("direction") + ", " + "CAUSE_OF_ERROR = " + logDetails.get("cause_of_error") - + ", TARGET_HOST = " + logDetails.get("host") + ", TARGET_PORT = " + logDetails.get("port") - + ", TARGET_CONTEXT = " + logDetails.get("url") + ", " + "HTTP_METHOD = " + logDetails.get("method") - + ", TRIGGER_TYPE = " + logDetails.get("trigger_type") + ", TRIGGER_NAME = " + logDetails - .get("trigger_name") + ", REMOTE_ADDRESS = " + getBackEndConnectionInfo(conn) - + ", CORRELATION_ID" + " = " + conn.getContext().getAttribute(CorrelationConstants.CORRELATION_ID) - + ", CONNECTION = " + conn); - } else if (state == ProtocolState.RESPONSE_HEAD || state == ProtocolState.RESPONSE_BODY) { - informReaderError(conn); - log.warn("ERROR_CODE = " + logDetails.get("error_code") + ", STATE_DESCRIPTION = Exception occurred " - + logDetails.get("state_description") + ", INTERNAL_STATE = " + state + ", DIRECTION = " - + logDetails.get("direction") + ", " + "CAUSE_OF_ERROR = " + logDetails.get("cause_of_error") - + ", TARGET_HOST = " + logDetails.get("host") + ", TARGET_PORT = " + logDetails.get("port") - + ", TARGET_CONTEXT = " + logDetails.get("url") + ", " + "HTTP_METHOD = " + logDetails.get("method") - + ", TRIGGER_TYPE = " + logDetails.get("trigger_type") + ", TRIGGER_NAME = " + logDetails - .get("trigger_name") + ", REMOTE_ADDRESS = " + getBackEndConnectionInfo(conn) - + ", CORRELATION_ID" + " = " + conn.getContext().getAttribute(CorrelationConstants.CORRELATION_ID) - + ", CONNECTION = " + conn); - } else if (state == ProtocolState.REQUEST_DONE) { - log.warn("ERROR_CODE = " + logDetails.get("error_code") + ", STATE_DESCRIPTION = Exception occurred " - + logDetails.get("state_description") + ", INTERNAL_STATE = " + state + ", DIRECTION = " - + logDetails.get("direction") + ", " + "CAUSE_OF_ERROR = " + logDetails.get("cause_of_error") - + ", TARGET_HOST = " + logDetails.get("host") + ", TARGET_PORT = " + logDetails.get("port") - + ", TARGET_CONTEXT = " + logDetails.get("url") + ", " + "HTTP_METHOD = " + logDetails.get("method") - + ", TRIGGER_TYPE = " + logDetails.get("trigger_type") + ", TRIGGER_NAME = " + logDetails - .get("trigger_name") + ", REMOTE_ADDRESS = " + getBackEndConnectionInfo(conn) - + ", CORRELATION_ID" + " = " + conn.getContext().getAttribute(CorrelationConstants.CORRELATION_ID) - + ", CONNECTION = " + conn); - } else if (state == ProtocolState.REQUEST_READY) { - log.warn("ERROR_CODE = " + logDetails.get("error_code") + ", STATE_DESCRIPTION = Exception occurred " - + logDetails.get("state_description") + ", INTERNAL_STATE = " + state + ", DIRECTION = " - + logDetails.get("direction") + ", " + "CAUSE_OF_ERROR = " + logDetails.get("cause_of_error") - + ", TARGET_HOST = " + logDetails.get("host") + ", TARGET_PORT = " + logDetails.get("port") - + ", TARGET_CONTEXT = " + logDetails.get("url") + ", " + "HTTP_METHOD = " + logDetails.get("method") - + ", TRIGGER_TYPE = " + logDetails.get("trigger_type") + ", TRIGGER_NAME = " + logDetails - .get("trigger_name") + ", REMOTE_ADDRESS = " + getBackEndConnectionInfo(conn) - + ", CORRELATION_ID" + " = " + conn.getContext().getAttribute(CorrelationConstants.CORRELATION_ID) - + ", CONNECTION = " + conn); - } else if (state == ProtocolState.RESPONSE_DONE) { - return; - } - - if (ex instanceof IOException) { - - logIOException(conn, (IOException) ex); - if (PassThroughCorrelationConfigDataHolder.isEnable()){ - logHttpRequestErrorInCorrelationLog(conn, "IO Exception in " + state.name()); - } - if (state != ProtocolState.RESPONSE_DONE && requestMsgCtx != null) { - requestMsgCtx.setProperty(PassThroughConstants.INTERNAL_EXCEPTION_ORIGIN, - PassThroughConstants.INTERNAL_ORIGIN_ERROR_HANDLER); - targetErrorHandler.handleError(requestMsgCtx, - ErrorCodes.SND_IO_ERROR, - "Error in Sender", - ex, - state); + try { + Map logDetails = getLoggingInfo(conn, state, requestMsgCtx, ex); + if (state == ProtocolState.REQUEST_HEAD || state == ProtocolState.REQUEST_BODY) { + informWriterError(conn); + log.warn("ERROR_CODE = " + logDetails.get("error_code") + ", STATE_DESCRIPTION = Exception occurred " + + logDetails.get("state_description") + ", INTERNAL_STATE = " + state + ", DIRECTION = " + + logDetails.get("direction") + ", " + "CAUSE_OF_ERROR = " + logDetails.get("cause_of_error") + + ", TARGET_HOST = " + logDetails.get("host") + ", TARGET_PORT = " + logDetails.get("port") + + ", TARGET_CONTEXT = " + logDetails.get("url") + ", " + "HTTP_METHOD = " + logDetails.get("method") + + ", TRIGGER_TYPE = " + logDetails.get("trigger_type") + ", TRIGGER_NAME = " + logDetails + .get("trigger_name") + ", REMOTE_ADDRESS = " + getBackEndConnectionInfo(conn) + + ", CORRELATION_ID" + " = " + conn.getContext().getAttribute(CorrelationConstants.CORRELATION_ID) + + ", CONNECTION = " + conn); + } else if (state == ProtocolState.RESPONSE_HEAD || state == ProtocolState.RESPONSE_BODY) { + informReaderError(conn); + log.warn("ERROR_CODE = " + logDetails.get("error_code") + ", STATE_DESCRIPTION = Exception occurred " + + logDetails.get("state_description") + ", INTERNAL_STATE = " + state + ", DIRECTION = " + + logDetails.get("direction") + ", " + "CAUSE_OF_ERROR = " + logDetails.get("cause_of_error") + + ", TARGET_HOST = " + logDetails.get("host") + ", TARGET_PORT = " + logDetails.get("port") + + ", TARGET_CONTEXT = " + logDetails.get("url") + ", " + "HTTP_METHOD = " + logDetails.get("method") + + ", TRIGGER_TYPE = " + logDetails.get("trigger_type") + ", TRIGGER_NAME = " + logDetails + .get("trigger_name") + ", REMOTE_ADDRESS = " + getBackEndConnectionInfo(conn) + + ", CORRELATION_ID" + " = " + conn.getContext().getAttribute(CorrelationConstants.CORRELATION_ID) + + ", CONNECTION = " + conn); + } else if (state == ProtocolState.REQUEST_DONE) { + log.warn("ERROR_CODE = " + logDetails.get("error_code") + ", STATE_DESCRIPTION = Exception occurred " + + logDetails.get("state_description") + ", INTERNAL_STATE = " + state + ", DIRECTION = " + + logDetails.get("direction") + ", " + "CAUSE_OF_ERROR = " + logDetails.get("cause_of_error") + + ", TARGET_HOST = " + logDetails.get("host") + ", TARGET_PORT = " + logDetails.get("port") + + ", TARGET_CONTEXT = " + logDetails.get("url") + ", " + "HTTP_METHOD = " + logDetails.get("method") + + ", TRIGGER_TYPE = " + logDetails.get("trigger_type") + ", TRIGGER_NAME = " + logDetails + .get("trigger_name") + ", REMOTE_ADDRESS = " + getBackEndConnectionInfo(conn) + + ", CORRELATION_ID" + " = " + conn.getContext().getAttribute(CorrelationConstants.CORRELATION_ID) + + ", CONNECTION = " + conn); + } else if (state == ProtocolState.REQUEST_READY) { + log.warn("ERROR_CODE = " + logDetails.get("error_code") + ", STATE_DESCRIPTION = Exception occurred " + + logDetails.get("state_description") + ", INTERNAL_STATE = " + state + ", DIRECTION = " + + logDetails.get("direction") + ", " + "CAUSE_OF_ERROR = " + logDetails.get("cause_of_error") + + ", TARGET_HOST = " + logDetails.get("host") + ", TARGET_PORT = " + logDetails.get("port") + + ", TARGET_CONTEXT = " + logDetails.get("url") + ", " + "HTTP_METHOD = " + logDetails.get("method") + + ", TRIGGER_TYPE = " + logDetails.get("trigger_type") + ", TRIGGER_NAME = " + logDetails + .get("trigger_name") + ", REMOTE_ADDRESS = " + getBackEndConnectionInfo(conn) + + ", CORRELATION_ID" + " = " + conn.getContext().getAttribute(CorrelationConstants.CORRELATION_ID) + + ", CONNECTION = " + conn); } + } finally { + if (ex instanceof IOException) { - TargetContext.updateState(conn, ProtocolState.CLOSING); - } else if (ex instanceof HttpException) { - String message = getErrorMessage("HTTP protocol violation : " + ex.getMessage(), conn); - log.error(message, ex); - if (PassThroughCorrelationConfigDataHolder.isEnable()){ - logHttpRequestErrorInCorrelationLog(conn, "HTTP Exception in " + state.name()); - } - if (state != ProtocolState.RESPONSE_DONE && requestMsgCtx != null) { - requestMsgCtx.setProperty(PassThroughConstants.INTERNAL_EXCEPTION_ORIGIN, - PassThroughConstants.INTERNAL_ORIGIN_ERROR_HANDLER); - targetErrorHandler.handleError(requestMsgCtx, - ErrorCodes.PROTOCOL_VIOLATION, - "Error in Sender", - null, - state); - } + logIOException(conn, (IOException) ex); + if (PassThroughCorrelationConfigDataHolder.isEnable()){ + logHttpRequestErrorInCorrelationLog(conn, "IO Exception in " + state.name()); + } + if (state != ProtocolState.RESPONSE_DONE && requestMsgCtx != null) { + requestMsgCtx.setProperty(PassThroughConstants.INTERNAL_EXCEPTION_ORIGIN, + PassThroughConstants.INTERNAL_ORIGIN_ERROR_HANDLER); + targetErrorHandler.handleError(requestMsgCtx, + ErrorCodes.SND_IO_ERROR, + "Error in Sender", + ex, + state); + } - TargetContext.updateState(conn, ProtocolState.CLOSED); - } else { - if(null != ex && null != ex.getMessage()) { - log.error("Unexpected error: " + ex.getMessage(), ex); + TargetContext.updateState(conn, ProtocolState.CLOSING); + } else if (ex instanceof HttpException) { + String message = getErrorMessage("HTTP protocol violation : " + ex.getMessage(), conn); + log.error(message, ex); + if (PassThroughCorrelationConfigDataHolder.isEnable()){ + logHttpRequestErrorInCorrelationLog(conn, "HTTP Exception in " + state.name()); + } + if (state != ProtocolState.RESPONSE_DONE && requestMsgCtx != null) { + requestMsgCtx.setProperty(PassThroughConstants.INTERNAL_EXCEPTION_ORIGIN, + PassThroughConstants.INTERNAL_ORIGIN_ERROR_HANDLER); + targetErrorHandler.handleError(requestMsgCtx, + ErrorCodes.PROTOCOL_VIOLATION, + "Error in Sender", + null, + state); + } + + TargetContext.updateState(conn, ProtocolState.CLOSED); } else { - log.error("Unexpected error."); - } - if (PassThroughCorrelationConfigDataHolder.isEnable()) { - logHttpRequestErrorInCorrelationLog(conn, "Unexpected error"); + if (null != ex && null != ex.getMessage()) { + log.error("Unexpected error: " + ex.getMessage(), ex); + } else { + log.error("Unexpected error."); + } + if (PassThroughCorrelationConfigDataHolder.isEnable()) { + logHttpRequestErrorInCorrelationLog(conn, "Unexpected error"); + } + TargetContext.updateState(conn, ProtocolState.CLOSED); } - TargetContext.updateState(conn, ProtocolState.CLOSED); + + targetConfiguration.getConnections().shutdownConnection(conn, true); } - targetConfiguration.getConnections().shutdownConnection(conn, true); + } public void setConnFactory(ClientConnFactory connFactory) { From 6144b1b5bec804506ad06d3333641e51ba75f4fa Mon Sep 17 00:00:00 2001 From: Arunan Sugunakumar Date: Mon, 17 Jun 2024 16:24:01 +0530 Subject: [PATCH 268/308] Temporarily disable unstable testcases --- .../synapse/samples/framework/TestSamplesHandlerSuite.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java b/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java index 479d30cfd4..80b269162c 100644 --- a/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java +++ b/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java @@ -324,7 +324,7 @@ private static void populateTemplateSamples() { private static void populateTransportSamples() { sampleClassRepo.put("268", Sample268.class); - sampleClassRepo.put("10102", Sample10102.class); - sampleClassRepo.put("10103", Sample10103.class); +// sampleClassRepo.put("10102", Sample10102.class); +// sampleClassRepo.put("10103", Sample10103.class); } } From 816f2cf270cb061abbf5c0afbc103e58cd73e852 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 17 Jun 2024 12:07:27 +0000 Subject: [PATCH 269/308] [WSO2 Release] [Jenkins #7019] [Release 4.0.0-wso2v112] prepare release v4.0.0-wso2v112 --- 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 b711264d07..935ab735d4 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v112-SNAPSHOT + 4.0.0-wso2v112 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index e508f0cdc6..376a516de5 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v112-SNAPSHOT + 4.0.0-wso2v112 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 0e972dec80..49b017a2b2 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-wso2v112-SNAPSHOT + 4.0.0-wso2v112 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 26e7a658df..849268102c 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v112-SNAPSHOT + 4.0.0-wso2v112 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index ddcb627266..8aeb53aeac 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v112-SNAPSHOT + 4.0.0-wso2v112 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 40da29d5e7..028aed4e18 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v112-SNAPSHOT + 4.0.0-wso2v112 ../../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 133f70e22a..1595945683 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-wso2v112-SNAPSHOT + 4.0.0-wso2v112 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 c10f5e595f..47cb9867cd 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-wso2v112-SNAPSHOT + 4.0.0-wso2v112 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 b6e1d9abfa..147b6b9b0e 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-wso2v112-SNAPSHOT + 4.0.0-wso2v112 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 049573ae81..a2f092eddf 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-wso2v112-SNAPSHOT + 4.0.0-wso2v112 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 9454834db0..b75fe11133 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-wso2v112-SNAPSHOT + 4.0.0-wso2v112 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 56b08147d0..7b368f3d29 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-wso2v112-SNAPSHOT + 4.0.0-wso2v112 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 b077c9b741..ed60fed15a 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-wso2v112-SNAPSHOT + 4.0.0-wso2v112 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 230a260a4f..4364c5d58b 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v112-SNAPSHOT + 4.0.0-wso2v112 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index b02a791788..b5b44366d7 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v112-SNAPSHOT + 4.0.0-wso2v112 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index e8170454a3..5bb87bb732 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v112-SNAPSHOT + 4.0.0-wso2v112 ../../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-wso2v112 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index c8660f7716..1cfbef6f4a 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v112-SNAPSHOT + 4.0.0-wso2v112 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 5db5f761e2..48fbee05e7 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-wso2v112-SNAPSHOT + 4.0.0-wso2v112 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 072b72ed88..fea0421e45 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-wso2v112-SNAPSHOT + 4.0.0-wso2v112 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 61a7fdcf03..005a6bdc20 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v112-SNAPSHOT + 4.0.0-wso2v112 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 73533e41c7..816f0cd3d9 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v112-SNAPSHOT + 4.0.0-wso2v112 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 6d82389d6a..b50b3bc4da 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v112-SNAPSHOT + 4.0.0-wso2v112 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 4b360a6e50..735795119b 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v112-SNAPSHOT + 4.0.0-wso2v112 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 49e71ae7dc..76e5a592cb 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-wso2v112-SNAPSHOT + 4.0.0-wso2v112 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 73ec17098f..a56a1f9d9f 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-wso2v112-SNAPSHOT + 4.0.0-wso2v112 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 20f01b1456..710006587b 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-wso2v112-SNAPSHOT + 4.0.0-wso2v112 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 6a27946f71..51ad466661 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-wso2v112-SNAPSHOT + 4.0.0-wso2v112 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 140d89567d..40e695ec45 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v112-SNAPSHOT + 4.0.0-wso2v112 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index dfe1cad25e..72de73f520 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v112-SNAPSHOT + 4.0.0-wso2v112 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index e74fdc087d..63decc011c 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-wso2v112-SNAPSHOT + 4.0.0-wso2v112 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 0a989e8c4a..5cff6cd0a3 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v112-SNAPSHOT + 4.0.0-wso2v112 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-wso2v112 Apache Software Foundation From 15940bd5ba6f8af5a81e6769c69ee6d5c5e1c459 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 17 Jun 2024 12:07:29 +0000 Subject: [PATCH 270/308] [WSO2 Release] [Jenkins #7019] [Release 4.0.0-wso2v112] 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 935ab735d4..0a19ce733c 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v112 + 4.0.0-wso2v113-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 376a516de5..fc946c44dd 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v112 + 4.0.0-wso2v113-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 49b017a2b2..b743f36839 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-wso2v112 + 4.0.0-wso2v113-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 849268102c..c7eb68d79b 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v112 + 4.0.0-wso2v113-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 8aeb53aeac..19ad27f418 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v112 + 4.0.0-wso2v113-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 028aed4e18..bce25811d0 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v112 + 4.0.0-wso2v113-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 1595945683..461195e5ef 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-wso2v112 + 4.0.0-wso2v113-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 47cb9867cd..725fe3233e 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-wso2v112 + 4.0.0-wso2v113-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 147b6b9b0e..30db91175e 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-wso2v112 + 4.0.0-wso2v113-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 a2f092eddf..71b864453c 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-wso2v112 + 4.0.0-wso2v113-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 b75fe11133..7a1667cd44 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-wso2v112 + 4.0.0-wso2v113-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 7b368f3d29..94d01b3f78 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-wso2v112 + 4.0.0-wso2v113-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 ed60fed15a..ff63b4a85f 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-wso2v112 + 4.0.0-wso2v113-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 4364c5d58b..2bdb77d5f8 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v112 + 4.0.0-wso2v113-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index b5b44366d7..f47d12ca61 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v112 + 4.0.0-wso2v113-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 5bb87bb732..b52bfee10a 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v112 + 4.0.0-wso2v113-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-wso2v112 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 1cfbef6f4a..6f10891b6c 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v112 + 4.0.0-wso2v113-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 48fbee05e7..31befc8f75 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-wso2v112 + 4.0.0-wso2v113-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index fea0421e45..f65a145ce7 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-wso2v112 + 4.0.0-wso2v113-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 005a6bdc20..7ee4e6f0a3 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v112 + 4.0.0-wso2v113-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 816f0cd3d9..5b834f12df 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v112 + 4.0.0-wso2v113-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index b50b3bc4da..b5c598571c 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v112 + 4.0.0-wso2v113-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 735795119b..bdedd5a04b 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v112 + 4.0.0-wso2v113-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 76e5a592cb..fe834f725c 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-wso2v112 + 4.0.0-wso2v113-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index a56a1f9d9f..56f27dc834 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-wso2v112 + 4.0.0-wso2v113-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 710006587b..219e5dc323 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-wso2v112 + 4.0.0-wso2v113-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index 51ad466661..fb87f22a91 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-wso2v112 + 4.0.0-wso2v113-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 40e695ec45..cc3a480883 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v112 + 4.0.0-wso2v113-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 72de73f520..751ed6690a 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v112 + 4.0.0-wso2v113-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 63decc011c..0d4f92b5c8 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-wso2v112 + 4.0.0-wso2v113-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 5cff6cd0a3..a59dd8750d 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v112 + 4.0.0-wso2v113-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-wso2v112 + HEAD Apache Software Foundation From 24b4a8d8acd495247c80893f02214027c3feb2e3 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 17 Jun 2024 15:57:53 +0000 Subject: [PATCH 271/308] [WSO2 Release] [Jenkins #7023] [Release 4.0.0-wso2v113] prepare release v4.0.0-wso2v113 --- 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 0a19ce733c..32f24f6ab5 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v113-SNAPSHOT + 4.0.0-wso2v113 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index fc946c44dd..0706f518a3 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v113-SNAPSHOT + 4.0.0-wso2v113 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index b743f36839..02f65c90b1 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-wso2v113-SNAPSHOT + 4.0.0-wso2v113 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index c7eb68d79b..0787d98719 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v113-SNAPSHOT + 4.0.0-wso2v113 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 19ad27f418..9885a6b5d9 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v113-SNAPSHOT + 4.0.0-wso2v113 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index bce25811d0..0e6b368327 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v113-SNAPSHOT + 4.0.0-wso2v113 ../../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 461195e5ef..72a5bb341b 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-wso2v113-SNAPSHOT + 4.0.0-wso2v113 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 725fe3233e..c55b6d1afe 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-wso2v113-SNAPSHOT + 4.0.0-wso2v113 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 30db91175e..e7a0d003aa 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-wso2v113-SNAPSHOT + 4.0.0-wso2v113 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 71b864453c..13d6fef9d2 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-wso2v113-SNAPSHOT + 4.0.0-wso2v113 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 7a1667cd44..35db81fd13 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-wso2v113-SNAPSHOT + 4.0.0-wso2v113 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 94d01b3f78..788b4217e6 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-wso2v113-SNAPSHOT + 4.0.0-wso2v113 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 ff63b4a85f..d20e62cc51 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-wso2v113-SNAPSHOT + 4.0.0-wso2v113 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 2bdb77d5f8..94220fd208 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v113-SNAPSHOT + 4.0.0-wso2v113 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index f47d12ca61..e8795622c8 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v113-SNAPSHOT + 4.0.0-wso2v113 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index b52bfee10a..d954506400 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v113-SNAPSHOT + 4.0.0-wso2v113 ../../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-wso2v113 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 6f10891b6c..69317cc71f 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v113-SNAPSHOT + 4.0.0-wso2v113 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 31befc8f75..347960b8e9 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-wso2v113-SNAPSHOT + 4.0.0-wso2v113 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index f65a145ce7..68e6883c3d 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-wso2v113-SNAPSHOT + 4.0.0-wso2v113 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 7ee4e6f0a3..bcdb4fae94 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v113-SNAPSHOT + 4.0.0-wso2v113 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 5b834f12df..b81228ca8a 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v113-SNAPSHOT + 4.0.0-wso2v113 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index b5c598571c..2290957d6e 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v113-SNAPSHOT + 4.0.0-wso2v113 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index bdedd5a04b..48bea7d04d 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v113-SNAPSHOT + 4.0.0-wso2v113 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index fe834f725c..2ad5e6c7d1 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-wso2v113-SNAPSHOT + 4.0.0-wso2v113 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 56f27dc834..0e84dbefe0 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-wso2v113-SNAPSHOT + 4.0.0-wso2v113 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 219e5dc323..07aaaa8b92 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-wso2v113-SNAPSHOT + 4.0.0-wso2v113 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index fb87f22a91..b568c6f69c 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-wso2v113-SNAPSHOT + 4.0.0-wso2v113 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index cc3a480883..1f89a8a42d 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v113-SNAPSHOT + 4.0.0-wso2v113 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 751ed6690a..a6ae508a54 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v113-SNAPSHOT + 4.0.0-wso2v113 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 0d4f92b5c8..858cc7ba55 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-wso2v113-SNAPSHOT + 4.0.0-wso2v113 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index a59dd8750d..4df3e247ee 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v113-SNAPSHOT + 4.0.0-wso2v113 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-wso2v113 Apache Software Foundation From 08e504e187211dd552eef3741b79a720159d3b6d Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 17 Jun 2024 15:57:55 +0000 Subject: [PATCH 272/308] [WSO2 Release] [Jenkins #7023] [Release 4.0.0-wso2v113] 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 32f24f6ab5..321dfdc7a4 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v113 + 4.0.0-wso2v114-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 0706f518a3..8ff3e9ce3c 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v113 + 4.0.0-wso2v114-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 02f65c90b1..f2076a08ed 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-wso2v113 + 4.0.0-wso2v114-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 0787d98719..430a5a9875 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v113 + 4.0.0-wso2v114-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 9885a6b5d9..b00b62901b 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v113 + 4.0.0-wso2v114-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 0e6b368327..c6a6aab599 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v113 + 4.0.0-wso2v114-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 72a5bb341b..0dc02a9b54 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-wso2v113 + 4.0.0-wso2v114-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 c55b6d1afe..59d4ea2b01 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-wso2v113 + 4.0.0-wso2v114-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 e7a0d003aa..229eb7864f 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-wso2v113 + 4.0.0-wso2v114-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 13d6fef9d2..be687c8d06 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-wso2v113 + 4.0.0-wso2v114-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 35db81fd13..c2bf5db7bb 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-wso2v113 + 4.0.0-wso2v114-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 788b4217e6..9597ccf656 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-wso2v113 + 4.0.0-wso2v114-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 d20e62cc51..c7d5a07e98 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-wso2v113 + 4.0.0-wso2v114-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 94220fd208..6b02c50e22 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v113 + 4.0.0-wso2v114-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index e8795622c8..7a115292a0 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v113 + 4.0.0-wso2v114-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index d954506400..16c409cbd4 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v113 + 4.0.0-wso2v114-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-wso2v113 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 69317cc71f..140a40fb02 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v113 + 4.0.0-wso2v114-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 347960b8e9..aad8c037bd 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-wso2v113 + 4.0.0-wso2v114-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 68e6883c3d..035e284621 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-wso2v113 + 4.0.0-wso2v114-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index bcdb4fae94..8560cfe26d 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v113 + 4.0.0-wso2v114-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index b81228ca8a..8b71709831 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v113 + 4.0.0-wso2v114-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 2290957d6e..e720a3c68e 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v113 + 4.0.0-wso2v114-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 48bea7d04d..6827c92a5b 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v113 + 4.0.0-wso2v114-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 2ad5e6c7d1..b88b6f79a9 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-wso2v113 + 4.0.0-wso2v114-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 0e84dbefe0..99c908bad0 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-wso2v113 + 4.0.0-wso2v114-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 07aaaa8b92..87a0a6841d 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-wso2v113 + 4.0.0-wso2v114-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index b568c6f69c..ea1ca0c9cb 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-wso2v113 + 4.0.0-wso2v114-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 1f89a8a42d..31ee1decf4 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v113 + 4.0.0-wso2v114-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index a6ae508a54..99946e9130 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v113 + 4.0.0-wso2v114-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 858cc7ba55..2c3f810b29 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-wso2v113 + 4.0.0-wso2v114-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 4df3e247ee..34581893b3 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v113 + 4.0.0-wso2v114-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-wso2v113 + HEAD Apache Software Foundation From ac54e828b1aa6a91044c7d085a465866ff804e15 Mon Sep 17 00:00:00 2001 From: Sanoj Punchihewa Date: Fri, 9 Feb 2024 07:48:08 +0530 Subject: [PATCH 273/308] Explicitly convert decimals to int or short as XPAth functions return numbers with decimal In the property mediator we can set the value type as INTEGER or SHORT, but since the underline XPATH evaluation library returns numbers with decimal, we need to explicitly cast them. Git issue: https://github.com/wso2/micro-integrator/issues/3087 --- .../mediators/builtin/PropertyMediator.java | 38 ++++++++++++++++--- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java b/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java index ad75421ee2..8f217ac438 100644 --- a/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java +++ b/modules/core/src/main/java/org/apache/synapse/mediators/builtin/PropertyMediator.java @@ -345,7 +345,7 @@ public void setValue(String value) { public void setValue(String value, String type) { this.type = type; // Convert the value into specified type - this.value = convertValue(value, type); + this.value = convertValue(value, type, false); } public String getType() { @@ -422,14 +422,14 @@ private Object getResultValue(MessageContext synCtx) { return valueElement.cloneOMElement(); } else { if(expression != null) { - return convertValue(expression.stringValueOf(synCtx), type); + return convertValue(expression.stringValueOf(synCtx), type, true); } } return null; } - private Object convertValue(String value, String type) { + private Object convertValue(String value, String type, boolean isExpression) { if (type == null) { // If no type is set we simply return the string value return value; @@ -441,10 +441,10 @@ private Object convertValue(String value, String type) { case BOOLEAN : return JavaUtils.isTrueExplicitly(value); case DOUBLE : return Double.parseDouble(value); case FLOAT : return Float.parseFloat(value); - case INTEGER : return Integer.parseInt(value); + case INTEGER : return parseInteger(value, isExpression); case LONG : return Long.parseLong(value); case OM : return buildOMElement(value); - case SHORT : return Short.parseShort(value); + case SHORT : return parseShort(value, isExpression); case JSON : return buildJSONElement(value); default : return value; } @@ -456,6 +456,34 @@ private Object convertValue(String value, String type) { } } + /** + * 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); + } + /** * Apply the Regular expression on to the String value and choose the matching group. * If a matching not found same string passed in to this method will be returned. From b4c0d093ce5bc767a75c9bf4761914b8bc883702 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 28 Jun 2024 05:38:35 +0000 Subject: [PATCH 274/308] [WSO2 Release] [Jenkins #7033] [Release 4.0.0-wso2v114] prepare release v4.0.0-wso2v114 --- 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 321dfdc7a4..0356a988d9 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v114-SNAPSHOT + 4.0.0-wso2v114 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 8ff3e9ce3c..b38c3faa0e 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v114-SNAPSHOT + 4.0.0-wso2v114 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index f2076a08ed..4598f556a0 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-wso2v114-SNAPSHOT + 4.0.0-wso2v114 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 430a5a9875..e0a58eb3bd 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v114-SNAPSHOT + 4.0.0-wso2v114 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index b00b62901b..450f6f9e5c 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v114-SNAPSHOT + 4.0.0-wso2v114 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index c6a6aab599..f6930cc555 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v114-SNAPSHOT + 4.0.0-wso2v114 ../../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 0dc02a9b54..be107db23e 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-wso2v114-SNAPSHOT + 4.0.0-wso2v114 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 59d4ea2b01..93d3564f47 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-wso2v114-SNAPSHOT + 4.0.0-wso2v114 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 229eb7864f..b2ad2eb49d 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-wso2v114-SNAPSHOT + 4.0.0-wso2v114 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 be687c8d06..474f631293 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-wso2v114-SNAPSHOT + 4.0.0-wso2v114 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 c2bf5db7bb..728d44e7f0 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-wso2v114-SNAPSHOT + 4.0.0-wso2v114 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 9597ccf656..22d64dbbdb 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-wso2v114-SNAPSHOT + 4.0.0-wso2v114 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 c7d5a07e98..b887fbe0cc 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-wso2v114-SNAPSHOT + 4.0.0-wso2v114 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 6b02c50e22..633da6ab54 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v114-SNAPSHOT + 4.0.0-wso2v114 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 7a115292a0..394c48755d 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v114-SNAPSHOT + 4.0.0-wso2v114 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 16c409cbd4..7ac768b9a1 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v114-SNAPSHOT + 4.0.0-wso2v114 ../../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-wso2v114 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 140a40fb02..6470f711a5 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v114-SNAPSHOT + 4.0.0-wso2v114 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index aad8c037bd..7c2870298c 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-wso2v114-SNAPSHOT + 4.0.0-wso2v114 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 035e284621..0b842f12bf 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-wso2v114-SNAPSHOT + 4.0.0-wso2v114 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 8560cfe26d..5c98b53fb2 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v114-SNAPSHOT + 4.0.0-wso2v114 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index 8b71709831..d0f813a43f 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v114-SNAPSHOT + 4.0.0-wso2v114 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index e720a3c68e..966271ac1e 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v114-SNAPSHOT + 4.0.0-wso2v114 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 6827c92a5b..882f655fc0 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v114-SNAPSHOT + 4.0.0-wso2v114 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index b88b6f79a9..53cb4310ba 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-wso2v114-SNAPSHOT + 4.0.0-wso2v114 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 99c908bad0..815d38c65b 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-wso2v114-SNAPSHOT + 4.0.0-wso2v114 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 87a0a6841d..7c54ccc9c9 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-wso2v114-SNAPSHOT + 4.0.0-wso2v114 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index ea1ca0c9cb..a23b33c349 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-wso2v114-SNAPSHOT + 4.0.0-wso2v114 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 31ee1decf4..9fcb779f88 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v114-SNAPSHOT + 4.0.0-wso2v114 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 99946e9130..4f88ee02a6 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v114-SNAPSHOT + 4.0.0-wso2v114 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 2c3f810b29..6e3cdce7f1 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-wso2v114-SNAPSHOT + 4.0.0-wso2v114 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 34581893b3..99efe6949d 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v114-SNAPSHOT + 4.0.0-wso2v114 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-wso2v114 Apache Software Foundation From 33b740619470219bae1fd3bb82b33c1e38125b8a Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Fri, 28 Jun 2024 05:38:36 +0000 Subject: [PATCH 275/308] [WSO2 Release] [Jenkins #7033] [Release 4.0.0-wso2v114] 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 0356a988d9..e862fd51de 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v114 + 4.0.0-wso2v115-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index b38c3faa0e..cddf4ea991 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v114 + 4.0.0-wso2v115-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 4598f556a0..ec345321c2 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-wso2v114 + 4.0.0-wso2v115-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index e0a58eb3bd..73fb1869cd 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v114 + 4.0.0-wso2v115-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 450f6f9e5c..2f4d099ba3 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v114 + 4.0.0-wso2v115-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index f6930cc555..5f2f497c17 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v114 + 4.0.0-wso2v115-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 be107db23e..1aa98d7493 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-wso2v114 + 4.0.0-wso2v115-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 93d3564f47..41efdaa8ff 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-wso2v114 + 4.0.0-wso2v115-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 b2ad2eb49d..f14eba8522 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-wso2v114 + 4.0.0-wso2v115-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 474f631293..c18e4f7a43 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-wso2v114 + 4.0.0-wso2v115-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 728d44e7f0..3b93abdc26 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-wso2v114 + 4.0.0-wso2v115-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 22d64dbbdb..cb6f6ee4a5 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-wso2v114 + 4.0.0-wso2v115-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 b887fbe0cc..ef49bc70d8 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-wso2v114 + 4.0.0-wso2v115-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index 633da6ab54..b587759eff 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v114 + 4.0.0-wso2v115-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 394c48755d..c9ece015e2 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v114 + 4.0.0-wso2v115-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 7ac768b9a1..47ddeea37c 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v114 + 4.0.0-wso2v115-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-wso2v114 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 6470f711a5..39cfa00c52 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v114 + 4.0.0-wso2v115-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 7c2870298c..0d1f189709 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-wso2v114 + 4.0.0-wso2v115-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index 0b842f12bf..cbff4d440a 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-wso2v114 + 4.0.0-wso2v115-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 5c98b53fb2..5fc7a2f07e 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v114 + 4.0.0-wso2v115-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index d0f813a43f..d9e05afdab 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v114 + 4.0.0-wso2v115-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 966271ac1e..f6c70d0eb7 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v114 + 4.0.0-wso2v115-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 882f655fc0..ea3c60ac6e 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v114 + 4.0.0-wso2v115-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 53cb4310ba..8956b2239b 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-wso2v114 + 4.0.0-wso2v115-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 815d38c65b..da9e6dd1e2 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-wso2v114 + 4.0.0-wso2v115-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 7c54ccc9c9..7051abfb54 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-wso2v114 + 4.0.0-wso2v115-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index a23b33c349..abd87b1974 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-wso2v114 + 4.0.0-wso2v115-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 9fcb779f88..720580423e 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v114 + 4.0.0-wso2v115-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 4f88ee02a6..b9a1b93447 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v114 + 4.0.0-wso2v115-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 6e3cdce7f1..487cd487a6 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-wso2v114 + 4.0.0-wso2v115-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 99efe6949d..d4f8d241b5 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v114 + 4.0.0-wso2v115-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-wso2v114 + HEAD Apache Software Foundation From 38f50edfa161a304fe5b956216c6259ba78da70f Mon Sep 17 00:00:00 2001 From: AnuGayan Date: Fri, 28 Jun 2024 07:59:11 +0530 Subject: [PATCH 276/308] Make connection reset error log a debug log From JDK 17 onword, the Connection Reset by peer error log has been replaced by Connection Reset. Hence contains check has to be changed to check the string as in this commit --- .../transport/http/conn/LoggingNHttpServiceHandler.java | 2 +- .../org/apache/synapse/transport/nhttp/ServerHandler.java | 4 ++-- .../org/apache/synapse/transport/passthru/SourceHandler.java | 2 +- .../org/apache/synapse/transport/passthru/TargetHandler.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/conn/LoggingNHttpServiceHandler.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/conn/LoggingNHttpServiceHandler.java index 8a9665b095..bf5990fe4f 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/conn/LoggingNHttpServiceHandler.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/http/conn/LoggingNHttpServiceHandler.java @@ -70,7 +70,7 @@ public void exception(final NHttpServerConnection conn, final Exception ex) { msg = ""; } if (ex instanceof ConnectionClosedException || - msg.contains("Connection reset by peer") || + msg.contains("Connection reset") || msg.contains("forcibly closed")) { if (this.log.isDebugEnabled()) { this.log.debug(conn + ": " + msg + diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerHandler.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerHandler.java index b9c2fb8984..9551b3f762 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerHandler.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerHandler.java @@ -619,7 +619,7 @@ public void exception(NHttpServerConnection conn, Exception e) { commitResponseHideExceptions(conn, response); } catch (Exception ignore) {} } else if (e instanceof ConnectionClosedException || (e.getMessage() != null && - (e.getMessage().contains("Connection reset by peer") || + (e.getMessage().contains("Connection reset") || e.getMessage().contains("forcibly closed")))) { if (log.isDebugEnabled()) { errMsg = "I/O error (Probably the keepalive connection " + @@ -658,7 +658,7 @@ public void exception(NHttpServerConnection conn, IOException e) { String errMsg = "I/O error : " + e.getMessage(); if (e instanceof ConnectionClosedException || (e.getMessage() != null && - (e.getMessage().contains("Connection reset by peer") || + (e.getMessage().contains("Connection reset") || e.getMessage().contains("forcibly closed")))) { if (log.isDebugEnabled()) { errMsg = "I/O error (Probably the keepalive connection " + diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceHandler.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceHandler.java index a91d282fbb..64f1f33f70 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceHandler.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/SourceHandler.java @@ -645,7 +645,7 @@ public void logIOException(NHttpServerConnection conn, IOException e) { return; } if (e instanceof ConnectionClosedException || (e.getMessage() != null && ( - e.getMessage().toLowerCase().contains("connection reset by peer") || + e.getMessage().toLowerCase().contains("connection reset") || e.getMessage().toLowerCase().contains("forcibly closed")))) { if (log.isDebugEnabled()) { log.debug(conn + ": I/O error (Probably the keepalive connection " diff --git a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetHandler.java b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetHandler.java index b7319cce8f..b7bc99cc97 100644 --- a/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetHandler.java +++ b/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/passthru/TargetHandler.java @@ -840,7 +840,7 @@ private void logIOException(NHttpClientConnection conn, IOException e) { String message = getErrorMessage("I/O error : " + e.getMessage(), conn); if (e.getMessage() != null && (e instanceof ConnectionClosedException - || e.getMessage().toLowerCase().contains("connection reset by peer") + || e.getMessage().toLowerCase().contains("connection reset") || e.getMessage().toLowerCase().contains("forcibly closed"))) { if (log.isDebugEnabled()) { log.debug(conn + ": I/O error (Probably the keep-alive connection " From 145d1279f400b19b629658fa717d0d5d6b985b92 Mon Sep 17 00:00:00 2001 From: akila94 Date: Mon, 8 Jul 2024 10:56:37 +0530 Subject: [PATCH 277/308] Change test jks type from PKCS to JKS --- .../framework/TestSamplesHandlerSuite.java | 4 ++-- .../src/test/resources/transport.jks | Bin 3358 -> 2860 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java b/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java index 80b269162c..479d30cfd4 100644 --- a/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java +++ b/modules/integration/src/test/java/org/apache/synapse/samples/framework/TestSamplesHandlerSuite.java @@ -324,7 +324,7 @@ private static void populateTemplateSamples() { private static void populateTransportSamples() { sampleClassRepo.put("268", Sample268.class); -// sampleClassRepo.put("10102", Sample10102.class); -// sampleClassRepo.put("10103", Sample10103.class); + sampleClassRepo.put("10102", Sample10102.class); + sampleClassRepo.put("10103", Sample10103.class); } } diff --git a/modules/integration/src/test/resources/transport.jks b/modules/integration/src/test/resources/transport.jks index bbdc2b45c08908149d6eda224e3994a63146a409..a5dbd02b6796f5024196dccdf2dc678f3dac44a1 100644 GIT binary patch literal 2860 zcma)83pAAL8lHb*oaajxonMGV}8jKv^OnRFV1B}5VvpGtW^AR-Wu1OEnYM2PQ10B}GXx(NV8AaD+R3bZr@MWgHj+I<&$h#FV#@ zEnWvvxLI}FZBprRJfi$)T_sXgaMuH|RA;WQ)X%t595hPdyXJ;+*SzWi>LWR|N zx>czONm{q@IlsXYoovii3@&_?N~mrwPg1XsP#SUI`;^#{IOBUQ-$|oH;wp2BeC(V> z?x@lqgdAx7Xy$+Na&sZ=DEUH<$zxTQL*I~f7n(=D`ZEVVAM&Zk;cHXAIPfY07ZG85 zV>OANn_nd9LMwMWKTBN{?{&=OB@N#8e24Cw3pc*0*sNIE?zNSMj%@V7#x%si8e5CK zLUJ$bB_7RxbWp{HKLy%5epV~LH{q95>aPQB^?&{~&*XYkThhSw!H0ZkxU(CR4>a0iUC;IE=Np znx|TCayF={`orD=T_;L@TCSdyjE!9Rn~58dTS5ynvZyy5C}OAO1W_^S)5~vj=cjK! zolb;8MzaIWUt|9WEG%5ikT!qWuIzdZHCMx*^j8 zHPO^t;z#TURSl8#OD$q!ZX-Lr9niTwN2A*OaF=GYUwW0*-I5INCoX61lPKlE>rH)v zWdOl~=c$|T;o7|-iOah(zC|QGH6T2k?Hf-{kJ+qUJX&2kASyT~Do^a4Nx~d)tc>l&|*OK-FxvZVJoqPM&TXV~n#19}iER3sm;@p7+-}9&(IW<5nlF=B9SW zsylo*BucYNWzRhdI$U&oo={Z~30(pCp%URZ^a$; zV^Y9YNYml0SMPL=h?@CiNBrC^IG`4HeS7-Bkl_(z?np=3^ z+qCg(r7JErW_3+Qt zD?o^hc$nUg#%vXIJ%MXjH%a>!w4HA~zEo4X{BB&e-*jJnLrsfK_aR&QMigxhuUK@g z{MEBJW~ks0%bd8#9R#tHnwAUP*d1WzoVt=?u~-efs<8-> zp9t=ZFG^|Zz86nAP~57tBYx7hH{oSpL|;eh+*wXiRM?G>GT+lY>){WcXwyEQKahqS zuaHZa^UHs>MiCEPBhW^ecdel?l=?apgJ+O*@C;f&D3L{` zQ8D&RW~h*i!C8S@w`|Zi1da4fKm!9Keb7s28iB?_a}5N&K<2+ERRra~C*5?!%|#!h z>F%h7ak4*Pf5>JZb|QWgiwQ9*Y8lLr zMwbF~D>2Lh-T8c51v4(nHF4~5mX`pVYL^ur-+RArvc+k}xG6O5OnW3sP~vn4{y<)( z6Mf8}BsfqZDF5p9g7~Wg1yYiZh&0_NeC*~7XA{q=CUaTuM^7|obem%*mU$%CGyCKx zZFL=sPW5P#x>OrO7Zf?O7KD*Seq_T~*KZ1sjil-4t}nXR)qR}{9mr#Vt_~N(cHf>w zX1X^S-aBaH5r0&yuXah$=^#*vLdD_lw@bsIFaQGZIM57`15FVQQJA~36acKk;V`IZ zG{{auAca#^L_`#T!P)0QHXB4C5O7F>Er1YSAkpt{F!010$j;aS1^qx1aMPMYXaP`3 z1l|qri?{z51p5wIt%Km-A$y!8+LlZuP>EzhFa}4Xu3a&VRVXWn#vrr8BoV@UU@N?4 zn6(~@62pMM5-LfHr)0A$yJ+CRupKyGUg zi$yop)1&$8vKXOE7MZC_q*3(fv|uukOk#rU(wi4T|)H&5OsOm7{Q!Taxk>BcIk-KQS_x4-+=8ZYi zjb-yfCdFBBMXVi@_e>;wE-`GLvFDt3(V*1p&ZOe!1v@(OTEmrMKfyyj{5p#`J7UT; zBfWEXFUvz1`)O?HPN=8os|cQST@C+Z<)Ld%z1}mIiiC9Jq3LU;Ozqxo`AxQCL)h|Y z-`LYfFHPrBbEoW9f5H9gkM2jxumX%SGa80VT817G#^yUYyGmO3cWP%(8a$XvbrehY z^62{9=NoUhdaWU6^jVxw1$&ZaoE`r``_;z?gvqgOOylGD=hC(&kCMMWd4a4w({qcg MgqB$1>2c}*1n4@JvH$=8 literal 3358 zcma)9XE+-Uw-=3=sZcemMrSrw|p4-ToTVAr>$N!~@50MtX5QjzjlT`hvIG?kkC#l-k|ETHigrG~3~5 zb@_!+7@Kk^(}!NkuheqHnpR;8waccwI)MIb7jjHD&1_I1ce+=qtM_heSb0?dDh$Dm(`0n znkUVkxlB%|vXWvL{c>M6XM>pW&R5loEi+=|3J%tOo$`N?`MRGtcob?W1wvklo;5;%2~lKQM5Y5J~+h8t?UAG6Zn zR&>(aw|TEAb;6MGfs>Gv_f8w^h|3cSe?U*N{u8{%p*|#bjAVarB#m6MId~OXMVb@# zl)I<&s5YR0$SNzullhY!@vLWP5#m95g+6R#hcCPy^SKjD@+cAB2T4jZ9j8Bg< zQCtae{Sp;Kqi5{eJnrVUt72*0GvYS=<%Qd{TT|1VB!CkRxaq(MjA~eLzs9Milodu? zF=+F`t{pxB>oHvjn4$I@pG{2)d_jpz@utBXIg>4gh*HH)0plDUDE_tU60~8)O}zGL zvlE8lZUibr?AqAA|Lut4pDLP93GFMP*svcM=k=Z;V(+Hobj_|su-wtTtU+yh_nG)7 z13dLXVr3L>W@f|*_1o2cJyiO6kdUf$=IiPyl@yn>Tmpg-vr-R2?)W(Zp1c<~&7DcV zXL{0iFo0|1*=W;Qk9`@$K$^5ozg=1P)%{1?;)Z5f-ksrr7F#&?^~tTTa7sy8GZChU zs6SW&S|q42QDYC<318hUSUM{XdFg7b+{^Omd~N{BUA!tj1LM==Z3!81qFpMo(cn0TDEp2|=GE>#Qh`Axt`y>L>_$0@ytRNA@ zFR*j{gf&ZrmrKD-o}*@Xx6d%P^zx`H&E6)V{io3IR_u{8mC)dboQf%#ra|?gj&eDZ zm9UT*-8F@`DRK?W-9C|exa_(L%CU`cz1@?nhk=Sfus6Gi=eOhGea%7WmYj{B-RRHD zB#qCt#v@(|YF90I@=}=AVD`y{4~uvrCt3&>TYArI`c)P_1~{MOT%^B} zu&XrSM{W6gl z@A->5$%*cP-B20poG5{cKvsa^rLT7+)}-)z{n3kVhg`2%gDmLCK6a@-vrkvG2=Win z=!+L4y=AT7|E$^7BVRg;lzCaJuey?b(b*t(IvN|h_Sn8VM|C?g9MM9);kPZ5@o7&u z`4m#Y1f^h=Lc;j|kxN<@DVFQZ6c~yC3I_@w3N(cuh40@O^M6~eO0fW$E!@3Pyi#&f za0OYo3>+@2AOpjL_Wqee4a&uXNPnS4N&v-QH}kIw;NOXLCfa#!6k+pwlc%ec%hvfB zGBA7MKN0J9dY>9bL^{**7-g$rCXtMxc#yp?BL5io`$2N$%JcNj1*d205oYIA3S{kF z{W@|ndTdsSDc{YZqFM)fu7_szK61V$o;H-!@it{_vyopBy3xSYLyd@H_JC#mn z#s(>IEqn2*va~T)mB4LBvo16PZSgzCpi_4D{Bc|IkJ*pOrq7-CbZ6wHK85p-8H=BH zt<{3neu$@FPN?0~Lxn_NPGq$pFN|JDIVQ{xDFX!KoHuUy@szR4OP$3j&Y;Lc7~#tX z!=-#NgQx3xMu+G*qFuw!Jl!@4jF>!2Fpjq0aIwVna(hl7xv|E$^=Vn7$Q-86^@y^( zY`S7!zHZq3jJHTmws7yjH1vp^r}o{Zb`rmKR~dk3nXg%C6Ml2aDMmraCNZ?$dXpYK z*lcqY^rb`(G#VO$?KN54EwU@nDKLOgVV^&J)gK(4kwUjZen=nFaIdhdPX>?+z-7e zSr(EP!I8j0U5|<;U{tgml{W z@buj;kI5Z^YRyF{st<<@X;0{9In0mwd5u0t*X6pQL;V^@*2UIzgv4#E%xVIQ2rD{* zi-pjtu(|+WyVOu+l*F{TR&LfTcmA-cURtvEvZ3JFyqVB!fJBlj9>s0EcV|mX^qt5( z{^f$W(4+H|yArmx3DXm@lKwIUgECGS-I&OPGoQD*y+Z!8&1xd_i|2EZlvvdJ0t_)l7GHG33W@wWtVHiF4%z%8DP5JnG|8~2Qf ze|N97g`pYULcgz*|AT|X@!901@-eZ6d^cE6MMP_HjO6OOD0PF4)))fVLE0>i zD%($bd76k5)jbOvQSshiu;F9 zU^FWr6Mw!{v`iX}POq1a+Pt5ZgYBe9$~x{i>c>)`a8JsKi`@fVC_y9rYuhK2t=_R2_1C$_QR4MuLaa z<2zSUFrcLOg=O+Cgyv?*7RW&LcghE}&PO>_$`ARMn8dCWnZJGIa{KTMFugf}*e+q~ zzWLsk>%9!2Hgv|Bxk)fyTDB%jbEn#FKgvPgaN%dMgaXeLPtsjyQTg+IolRTxU}Sd> zYi$8ElLLm;e!3iLeqGk&F7cu#3Bh_3g_gNYr5c>Icja%j19gdzbOW!$rFWL(fGZ?g8ILP0q2vC@unK2$O<=|M?jx z0aO$~-hQ|h#9VpMLxC?3BC7%B2!6E}1J;UT6i**?-fkRY1G1<@@kzpNYm?zWY2BPT O1Jmm1zd-)`#QhiLPa
Date: Mon, 8 Jul 2024 15:28:15 +0530 Subject: [PATCH 278/308] Integrate GraalVM JS to script mediator This will replace existing rhinoJS and be an alternative to deprecated nashornJs --- modules/extensions/pom.xml | 29 + ....java => ExtendedJavaScriptXmlHelper.java} | 2 +- .../bsf/GraalVMJavaScriptMessageContext.java | 923 ++++++++++++++++++ .../mediators/bsf/JavaScriptXmlHelper.java | 2 +- .../bsf/NashornJavaScriptMessageContext.java | 1 + .../bsf/OpenJDKNashornFactoryWrapper.java | 1 + ...penJDKNashornJavaScriptMessageContext.java | 1 + .../synapse/mediators/bsf/ScriptMediator.java | 92 +- .../bsf/ScriptMediatorSerializationTest.java | 2 +- .../mediators/bsf/ScriptMediatorTest.java | 22 +- ...ava => GraalVMJavaScriptMediatorTest.java} | 16 +- .../javascript/JavaScriptMediatorTest.java | 11 +- pom.xml | 32 + 13 files changed, 1080 insertions(+), 54 deletions(-) rename modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/{NashornJavaScriptXmlHelper.java => ExtendedJavaScriptXmlHelper.java} (98%) create mode 100644 modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/GraalVMJavaScriptMessageContext.java rename modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/javascript/{NashornJavaScriptMediatorTest.java => GraalVMJavaScriptMediatorTest.java} (91%) diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 40da29d5e7..41df655397 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -341,6 +341,35 @@ org.openjdk.nashorn nashorn-core + + org.graalvm.sdk + graal-sdk + + + org.graalvm.js + js + + + org.graalvm.truffle + truffle-api + + + org.graalvm.regex + regex + + + com.ibm.icu + icu4j + + + org.apache.bsf.wso2 + bsf-all + + + org.graalvm.js + js-scriptengine + + diff --git a/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/NashornJavaScriptXmlHelper.java b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ExtendedJavaScriptXmlHelper.java similarity index 98% rename from modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/NashornJavaScriptXmlHelper.java rename to modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ExtendedJavaScriptXmlHelper.java index d2c113eafa..d1a2c60f62 100644 --- a/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/NashornJavaScriptXmlHelper.java +++ b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ExtendedJavaScriptXmlHelper.java @@ -32,7 +32,7 @@ /** * This class will provide the operations to convert between xml elements of scripts and OMElements. */ -public class NashornJavaScriptXmlHelper extends DefaultXMLHelper { +public class ExtendedJavaScriptXmlHelper extends DefaultXMLHelper { /** * This method will convert the message payload in to xml. 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 new file mode 100644 index 0000000000..92b3e57d49 --- /dev/null +++ b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/GraalVMJavaScriptMessageContext.java @@ -0,0 +1,923 @@ +/* + * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.org) All Rights Reserved. + * + * WSO2 Inc. 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.bsf; + +import org.apache.axiom.om.OMAttribute; +import org.apache.axiom.om.OMElement; +import org.apache.axiom.om.OMException; +import org.apache.axiom.om.OMNode; +import org.apache.axiom.om.OMXMLBuilderFactory; +import org.apache.axiom.om.OMXMLParserWrapper; +import org.apache.axiom.om.xpath.AXIOMXPath; +import org.apache.axiom.soap.SOAPBody; +import org.apache.axiom.soap.SOAPEnvelope; +import org.apache.axiom.soap.SOAPFactory; +import org.apache.axiom.soap.SOAPHeader; +import org.apache.axiom.soap.SOAPHeaderBlock; +import org.apache.axis2.AxisFault; +import org.apache.axis2.addressing.EndpointReference; +import org.apache.axis2.addressing.RelatesTo; +import org.apache.axis2.context.OperationContext; +import org.apache.bsf.xml.XMLHelper; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.http.protocol.HTTP; +import org.apache.synapse.ContinuationState; +import org.apache.synapse.FaultHandler; +import org.apache.synapse.Mediator; +import org.apache.synapse.MessageContext; +import org.apache.synapse.SynapseConstants; +import org.apache.synapse.commons.json.JsonUtil; +import org.apache.synapse.config.SynapseConfiguration; +import org.apache.synapse.config.xml.XMLConfigConstants; +import org.apache.synapse.core.SynapseEnvironment; +import org.apache.synapse.core.axis2.Axis2MessageContext; +import org.apache.synapse.endpoints.Endpoint; +import org.apache.xerces.parsers.DOMParser; +import org.graalvm.polyglot.Context; +import org.graalvm.polyglot.Value; +import org.jaxen.JaxenException; +import org.w3c.dom.Document; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; +import java.util.Stack; + +import javax.script.ScriptEngine; +import javax.script.ScriptException; + +public class GraalVMJavaScriptMessageContext implements ScriptMessageContext { + + private static final Log logger = LogFactory.getLog(GraalVMJavaScriptMessageContext.class.getName()); + + private static final String JSON_OBJECT = "JSON_OBJECT"; + private static final String JSON_TEXT = "JSON_TEXT"; + + /** + * The actual Synapse message context reference. + */ + private final MessageContext mc; + + /** + * The OMElement to scripting language object converter for the selected language. + */ + private final XMLHelper xmlHelper; + + /** + * To keep Script Engine instance. + */ + private ScriptEngine scriptEngine; + + /** + * Reference to an empty JSON object. + */ + private Object emptyJsonObject; + + /** + * Reference to JSON object which is used to serialize json. + */ + private Value jsonSerializer; + + public GraalVMJavaScriptMessageContext(MessageContext mc, XMLHelper xmlHelper, Context context) throws + ScriptException { + this.mc = mc; + this.xmlHelper = xmlHelper; + this.emptyJsonObject = context.eval("js", "({})"); + this.jsonSerializer = context.eval("js", "JSON"); + } + + public Object jsonSerializerCallMember(String key, String value) { + return jsonSerializer.invokeMember(key, value); + } + + /** + * Get the XML representation of SOAP Body payload. + * The payload is the first element inside the SOAP tags + * + * @return the XML SOAP Body + */ + public Object getPayloadXML() throws ScriptException { + return xmlHelper.toScriptXML(mc.getEnvelope().getBody().getFirstElement()); +// return mc.getEnvelope().getBody().getFirstElement(); + } + + /** + * Set the SOAP body payload from XML. + * + * @param payload Message payload + * @throws ScriptException For errors in converting xml To OM + * @throws OMException For errors in OM manipulation + */ + public void setPayloadXML(Object payload) throws OMException, ScriptException { + SOAPBody body = mc.getEnvelope().getBody(); + OMElement firstChild = body.getFirstElement(); + OMElement omElement = xmlHelper.toOMElement(payload); + if (firstChild == null) { + body.addChild(omElement); + } else { + firstChild.insertSiblingAfter(omElement); + firstChild.detach(); + } + } + + /** + * Get the JSON object representation of the JSON message body of the request. + * + * @return JSON object of the message body + */ + public Object getPayloadJSON() { + return jsonObject(mc); + } + + /** + * Saves the payload of this message context as a JSON payload. + * + * @param jsonPayload Javascript native object to be set as the message body + * @throws ScriptException in case of creating a JSON object out of the javascript native object. + */ + public void setPayloadJSON(Object jsonPayload) throws ScriptException { + try { + String jsonString = jsonSerializer.invokeMember("stringify", jsonPayload).toString(); + InputStream stream = new ByteArrayInputStream(jsonString.getBytes(StandardCharsets.UTF_8)); + org.apache.axis2.context.MessageContext messageContext; + messageContext = ((Axis2MessageContext) mc).getAxis2MessageContext(); + JsonUtil.getNewJsonPayload(messageContext, stream, true, true); + messageContext.setProperty(JSON_OBJECT, jsonPayload); + } catch (AxisFault axisFault) { + throw new ScriptException(axisFault); + } + } + + /** + * Get the Message Payload as a text. + * + * @return Payload as text + */ + public Object getJsonText() { + if (mc == null) { + return ""; + } + Object text = mc.getProperty(JSON_TEXT); + return text == null ? "{}" : text; + } + + /** + * Get the Message Payload as a text. + * + * @return Payload as text + */ + public String getPayloadText() { + if (JsonUtil.hasAJsonPayload(((Axis2MessageContext) mc).getAxis2MessageContext())) { + return JsonUtil.jsonPayloadToString(((Axis2MessageContext) mc).getAxis2MessageContext()); + } else { + return mc.getEnvelope().toString(); + } + } + + /** + * Saves the JavaScript Object to the message context. + * + * @param messageContext The message context of the sequence + * @param jsonObject JavaScript Object which is passed to be saved in message context + * @return true + */ + public boolean setJsonObject(MessageContext messageContext, Object jsonObject) { + messageContext.setProperty(JSON_OBJECT, jsonObject); + return true; + } + + /** + * Saves the JSON String to the message context. + * + * @param messageContext The message context of the sequence + * @param jsonObject JavaScript string which is passed to be saved in message context + * @return false if messageContext is null return true otherwise + */ + public boolean setJsonText(MessageContext messageContext, Object jsonObject) { + if (messageContext == null) { + return false; + } + messageContext.setProperty(JSON_TEXT, jsonObject); + return true; + } + + /** + * Returns the JavaScript Object saved in this message context. + * + * @param messageContext The message context of the sequence + * @return o JavaScript Object saved in this message context + */ + public Object jsonObject(MessageContext messageContext) { + if (messageContext == null) { + return null; + } + Object jsonObject = messageContext.getProperty(JSON_OBJECT); + if (jsonObject == null) { + return emptyJsonObject; + } + return jsonObject; + } + + /** + * Set a script engine. + * + * @param scriptEngine a ScriptEngine instance + */ + public void setScriptEngine(ScriptEngine scriptEngine) { + this.scriptEngine = scriptEngine; + } + + /** + * Returns the parsed xml document. + * + * @param text xml string or document needed to be parser + * @return parsed document + */ + public Document parseXml(String text) throws ScriptException { + InputSource sax = new InputSource(new java.io.StringReader(text)); + DOMParser parser = new DOMParser(); + Document doc; + try { + parser.parse(sax); + doc = parser.getDocument(); + doc.getDocumentElement().normalize(); + } catch (SAXException | IOException e) { + ScriptException scriptException = new ScriptException("Failed to parse provided xml"); + scriptException.initCause(e); + throw scriptException; + } + + return doc; + } + + /** + * Returns the parsed xml document. + * + * @param stream input stream of xml string or document needed to be parsed + * @return parsed document + */ + public OMElement getParsedOMElement(InputStream stream) { + OMXMLParserWrapper builder = OMXMLBuilderFactory.createOMBuilder(stream); + return builder.getDocumentElement(); + } + + /** + * Returns the Axiom xpath. + * + * @param expression Xpath expression + * @return Axiom xpath is returned + */ + public AXIOMXPath getXpathResult(String expression) throws JaxenException { + return new AXIOMXPath(expression); + } + + /** + * Add a new SOAP header to the message. + * + * @param mustUnderstand the value for the soapenv:mustUnderstand attribute + * @param content the XML for the new header + * @throws ScriptException if an error occurs when converting the XML to OM + */ + public void addHeader(boolean mustUnderstand, Object content) throws ScriptException { + SOAPEnvelope envelope = mc.getEnvelope(); + SOAPFactory factory = (SOAPFactory) envelope.getOMFactory(); + SOAPHeader header = envelope.getHeader(); + if (header == null) { + header = factory.createSOAPHeader(envelope); + } + + OMElement element = xmlHelper.toOMElement(content); + // We can't add the element directly to the SOAPHeader. Instead, we need to copy the + // information over to a SOAPHeaderBlock. + SOAPHeaderBlock headerBlock = header.addHeaderBlock(element.getLocalName(), element.getNamespace()); + for (Iterator it = element.getAllAttributes(); it.hasNext(); ) { + headerBlock.addAttribute((OMAttribute) it.next()); + } + headerBlock.setMustUnderstand(mustUnderstand); + OMNode child = element.getFirstOMChild(); + while (child != null) { + // Get the next child before addChild will detach the node from its original place. + OMNode next = child.getNextOMSibling(); + headerBlock.addChild(child); + child = next; + } + } + + /** + * Get the XML representation of the complete SOAP envelope. + * + * @return return an object that represents the payload in the current scripting language + * @throws ScriptException in-case of an error in getting + * the XML representation of SOAP envelope + */ + public Object getEnvelopeXML() throws ScriptException { + SOAPEnvelope envelope = mc.getEnvelope(); + return envelope.toString(); + } + + /** + * {@inheritDoc} + */ + public SynapseConfiguration getConfiguration() { + return mc.getConfiguration(); + } + + /** + * {@inheritDoc} + */ + public void setConfiguration(SynapseConfiguration cfg) { + mc.setConfiguration(cfg); + } + + /** + * {@inheritDoc} + */ + public SynapseEnvironment getEnvironment() { + return mc.getEnvironment(); + } + + /** + * {@inheritDoc} + */ + public void setEnvironment(SynapseEnvironment se) { + mc.setEnvironment(se); + } + + /** + * {@inheritDoc} + */ + public Map getContextEntries() { + return mc.getContextEntries(); + } + + /** + * {@inheritDoc} + */ + public void setContextEntries(Map entries) { + mc.setContextEntries(entries); + } + + /** + * {@inheritDoc} + */ + public Object getProperty(String key) { + return mc.getProperty(key); + } + + /** + * {@inheritDoc} + */ + public Object getEntry(String key) { + return mc.getEntry(key); + } + + /** + * {@inheritDoc} + */ + public Object getLocalEntry(String key) { + return mc.getLocalEntry(key); + } + + /** + * Add a new property to the message. + * + * @param key unique identifier of property + * @param value value of property + */ + public void setProperty(String key, Object value) { + try { + OMElement omElement = xmlHelper.toOMElement(value); + mc.setProperty(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.setProperty(key, value); + } + } + + /** + * Add a new property to the message. + * + * @param key unique identifier of property + * @param value value of property + * @param scope scope of the property + */ + public void setProperty(String key, Object value, String scope) { + if (scope == null || XMLConfigConstants.SCOPE_DEFAULT.equals(scope)) { + setProperty(key, value); + } else if (XMLConfigConstants.SCOPE_AXIS2.equals(scope)) { + //Setting property into the Axis2 Message Context + Axis2MessageContext axis2smc = (Axis2MessageContext) mc; + org.apache.axis2.context.MessageContext axis2MessageCtx = axis2smc.getAxis2MessageContext(); + axis2MessageCtx.setProperty(key, value); + handleSpecialProperties(key, value, axis2MessageCtx); + + } else if (XMLConfigConstants.SCOPE_TRANSPORT.equals(scope)) { + //Setting Transport Headers + Axis2MessageContext axis2smc = (Axis2MessageContext) mc; + org.apache.axis2.context.MessageContext axis2MessageCtx = axis2smc.getAxis2MessageContext(); + Object headers = axis2MessageCtx.getProperty(org.apache.axis2.context.MessageContext.TRANSPORT_HEADERS); + + if (headers != null && headers instanceof Map) { + Map headersMap = (Map) headers; + headersMap.put(key, value); + } + if (headers == null) { + Map headersMap = new HashMap(); + headersMap.put(key, value); + axis2MessageCtx.setProperty(org.apache.axis2.context.MessageContext.TRANSPORT_HEADERS, headersMap); + } + } else if (XMLConfigConstants.SCOPE_OPERATION.equals(scope)) { + Axis2MessageContext axis2smc = (Axis2MessageContext) mc; + org.apache.axis2.context.MessageContext axis2MessageCtx = axis2smc.getAxis2MessageContext(); + axis2MessageCtx.getOperationContext().setProperty(key, value); + } + } + + /** + * Remove property from the message. + * + * @param key unique identifier of property + * @param scope scope of the property + */ + public void removeProperty(String key, String scope) { + if (scope == null || XMLConfigConstants.SCOPE_DEFAULT.equals(scope)) { + Set pros = mc.getPropertyKeySet(); + if (pros != null) { + pros.remove(key); + } + } else if (XMLConfigConstants.SCOPE_AXIS2.equals(scope)) { + //Removing property from the Axis2 Message Context + Axis2MessageContext axis2smc = (Axis2MessageContext) mc; + org.apache.axis2.context.MessageContext axis2MessageCtx = axis2smc.getAxis2MessageContext(); + axis2MessageCtx.removeProperty(key); + + } else if (XMLConfigConstants.SCOPE_TRANSPORT.equals(scope)) { + // Removing transport headers + Axis2MessageContext axis2smc = (Axis2MessageContext) mc; + org.apache.axis2.context.MessageContext axis2MessageCtx = axis2smc.getAxis2MessageContext(); + Object headers = axis2MessageCtx.getProperty(org.apache.axis2.context.MessageContext.TRANSPORT_HEADERS); + if (headers != null && headers instanceof Map) { + Map headersMap = (Map) headers; + headersMap.remove(key); + } + } else if (XMLConfigConstants.SCOPE_OPERATION.equals(scope)) { + // Removing operation scope headers + Axis2MessageContext axis2smc = (Axis2MessageContext) mc; + org.apache.axis2.context.MessageContext axis2MessageCtx = axis2smc.getAxis2MessageContext(); + OperationContext axis2oc = axis2MessageCtx.getOperationContext(); + axis2oc.removeProperty(key); + } + + } + + /** + * Add special properties such as content type to the message context. + * + * @param key unique identifier of property + * @param value value of property + * @param messageContext Axis2 message context + */ + private void handleSpecialProperties(String key, Object value, + org.apache.axis2.context.MessageContext messageContext) { + if (org.apache.axis2.Constants.Configuration.MESSAGE_TYPE.equals(key)) { + messageContext.setProperty(org.apache.axis2.Constants.Configuration.CONTENT_TYPE, value); + Object o = messageContext.getProperty(org.apache.axis2.context.MessageContext.TRANSPORT_HEADERS); + Map headers = (Map) o; + if (headers != null) { + headers.put(HTTP.CONTENT_TYPE, value); + } + } + } + + /** + * {@inheritDoc} + */ + public Set getPropertyKeySet() { + return mc.getPropertyKeySet(); + } + + /** + * {@inheritDoc} + */ + public Mediator getMainSequence() { + return mc.getMainSequence(); + } + + /** + * {@inheritDoc} + */ + public Mediator getFaultSequence() { + return mc.getFaultSequence(); + } + + /** + * {@inheritDoc} + */ + public Mediator getSequence(String key) { + return mc.getSequence(key); + } + + /** + * {@inheritDoc} + */ + public OMElement getFormat(String s) { + return mc.getFormat(s); + } + + /** + * {@inheritDoc} + */ + public Endpoint getEndpoint(String key) { + return mc.getEndpoint(key); + } + + /** + * {@inheritDoc} + */ + public SOAPEnvelope getEnvelope() { + return mc.getEnvelope(); + } + + /** + * {@inheritDoc} + */ + public void setEnvelope(SOAPEnvelope envelope) throws AxisFault { + mc.setEnvelope(envelope); + } + + /** + * {@inheritDoc} + */ + public EndpointReference getFaultTo() { + return mc.getFaultTo(); + } + + /** + * This is used to set the value which specifies the receiver of the faults relating to the message. + * + * @param reference specifies the receiver of the faults relating to the message + */ + public void setFaultTo(String reference) { + mc.setFaultTo(new EndpointReference(reference)); + } + + /** + * {@inheritDoc} + */ + public void setFaultTo(EndpointReference reference) { + mc.setFaultTo(reference); + } + + /** + * {@inheritDoc} + */ + public EndpointReference getFrom() { + return mc.getFrom(); + } + + /** + * This is used to set the value which specifies the sender of the message. + * + * @param reference specifies the sender of the message + */ + public void setFrom(String reference) { + mc.setFrom(new EndpointReference(reference)); + } + + /** + * {@inheritDoc} + */ + public void setFrom(EndpointReference reference) { + mc.setFrom(reference); + } + + /** + * {@inheritDoc} + */ + public String getMessageID() { + return mc.getMessageID(); + } + + /** + * {@inheritDoc} + */ + public void setMessageID(String string) { + mc.setMessageID(string); + } + + /** + * {@inheritDoc} + */ + public RelatesTo getRelatesTo() { + return mc.getRelatesTo(); + } + + /** + * {@inheritDoc} + */ + public void setRelatesTo(RelatesTo[] reference) { + mc.setRelatesTo(reference); + } + + /** + * {@inheritDoc} + */ + public EndpointReference getReplyTo() { + return mc.getReplyTo(); + } + + /** + * This is used to set the value which specifies the receiver of the replies to the message. + * + * @param reference specifies the receiver of the replies to the message + */ + public void setReplyTo(String reference) { + mc.setReplyTo(new EndpointReference(reference)); + } + + /** + * {@inheritDoc} + */ + public void setReplyTo(EndpointReference reference) { + mc.setReplyTo(reference); + } + + /** + * {@inheritDoc} + */ + public EndpointReference getTo() { + return mc.getTo(); + } + + /** + * This is used to set the value which specifies the receiver of the message. + * + * @param reference specifies the receiver of the message + */ + public void setTo(String reference) { + mc.setTo(new EndpointReference(reference)); + } + + /** + * {@inheritDoc} + */ + public void setTo(EndpointReference reference) { + mc.setTo(reference); + } + + /** + * {@inheritDoc} + */ + public String getWSAAction() { + return mc.getWSAAction(); + } + + /** + * {@inheritDoc} + */ + public void setWSAAction(String actionURI) { + mc.setWSAAction(actionURI); + } + + /** + * {@inheritDoc} + */ + public String getSoapAction() { + return mc.getSoapAction(); + } + + /** + * {@inheritDoc} + */ + public void setSoapAction(String string) { + mc.setSoapAction(string); + } + + /** + * {@inheritDoc} + */ + public String getWSAMessageID() { + return mc.getWSAMessageID(); + } + + /** + * {@inheritDoc} + */ + public void setWSAMessageID(String messageID) { + mc.setWSAMessageID(messageID); + } + + /** + * {@inheritDoc} + */ + public boolean isDoingMTOM() { + return mc.isDoingMTOM(); + } + + /** + * {@inheritDoc} + */ + public void setDoingMTOM(boolean b) { + mc.setDoingMTOM(b); + } + + /** + * {@inheritDoc} + */ + public boolean isDoingSWA() { + return mc.isDoingSWA(); + } + + /** + * {@inheritDoc} + */ + public void setDoingSWA(boolean b) { + mc.setDoingSWA(b); + } + + /** + * {@inheritDoc} + */ + public boolean isDoingPOX() { + return mc.isDoingPOX(); + } + + /** + * {@inheritDoc} + */ + public void setDoingPOX(boolean b) { + mc.setDoingPOX(b); + } + + /** + * {@inheritDoc} + */ + public boolean isDoingGET() { + return mc.isDoingGET(); + } + + /** + * {@inheritDoc} + */ + public void setDoingGET(boolean b) { + mc.setDoingGET(b); + } + + /** + * {@inheritDoc} + */ + public boolean isSOAP11() { + return mc.isSOAP11(); + } + + /** + * {@inheritDoc} + */ + public boolean isResponse() { + return mc.isResponse(); + } + + /** + * {@inheritDoc} + */ + public void setResponse(boolean b) { + mc.setResponse(b); + } + + /** + * {@inheritDoc} + */ + public boolean isFaultResponse() { + return mc.isFaultResponse(); + } + + /** + * {@inheritDoc} + */ + public void setFaultResponse(boolean b) { + mc.setFaultResponse(b); + } + + /** + * {@inheritDoc} + */ + public int getTracingState() { + return mc.getTracingState(); + } + + /** + * {@inheritDoc} + */ + public void setTracingState(int tracingState) { + mc.setTracingState(tracingState); + } + + /** + * {@inheritDoc} + */ + public Stack getFaultStack() { + return mc.getFaultStack(); + } + + /** + * {@inheritDoc} + */ + public void pushFaultHandler(FaultHandler fault) { + mc.pushFaultHandler(fault); + } + + /** + * {@inheritDoc} + */ + public void pushContinuationState(ContinuationState continuationState) { + mc.pushContinuationState(continuationState); + } + + /** + * {@inheritDoc} + */ + public Stack getContinuationStateStack() { + return mc.getContinuationStateStack(); + } + + /** + * {@inheritDoc} + */ + public boolean isContinuationEnabled() { + return false; + } + + /** + * {@inheritDoc} + */ + public void setContinuationEnabled(boolean contStateStackEnabled) { + } + + /** + * {@inheritDoc} + */ + public Log getServiceLog() { + return LogFactory.getLog(GraalVMJavaScriptMessageContext.class); + } + + /** + * {@inheritDoc} + */ + public Mediator getSequenceTemplate(String key) { + return mc.getSequenceTemplate(key); + } + + /** + * {@inheritDoc} + */ + public Mediator getDefaultConfiguration(String arg0) { + return mc.getDefaultConfiguration(arg0); + } + + /** + * {@inheritDoc} + */ + public String getMessageString() { + return mc.getMessageString(); + } + + /** + * {@inheritDoc} + */ + public int getMessageFlowTracingState() { + return SynapseConstants.TRACING_OFF; + } + + /** + * {@inheritDoc} + */ + public void setMessageFlowTracingState(int state) { + mc.setMessageFlowTracingState(state); + } + +} diff --git a/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/JavaScriptXmlHelper.java b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/JavaScriptXmlHelper.java index f075c80598..1131086dae 100644 --- a/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/JavaScriptXmlHelper.java +++ b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/JavaScriptXmlHelper.java @@ -36,7 +36,7 @@ * since there is an api change in rhino17,This class is provided instead of getting Helper class by * XMLHelper.getArgHelper(engine) in bsf */ - +@Deprecated public class JavaScriptXmlHelper extends DefaultXMLHelper { private final Scriptable scope; 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 284ecc8617..7141bc3437 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 @@ -70,6 +70,7 @@ /** * NashornJavaScriptMessageContext implements the ScriptMessageContext specific to Nashorn java script engine. */ +@Deprecated @SuppressWarnings({"UnusedDeclaration"}) public class NashornJavaScriptMessageContext implements ScriptMessageContext { private static final Log logger = LogFactory.getLog(NashornJavaScriptMessageContext.class.getName()); diff --git a/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/OpenJDKNashornFactoryWrapper.java b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/OpenJDKNashornFactoryWrapper.java index e714b4fffd..e009650731 100644 --- a/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/OpenJDKNashornFactoryWrapper.java +++ b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/OpenJDKNashornFactoryWrapper.java @@ -21,6 +21,7 @@ import javax.script.ScriptEngineFactory; +@Deprecated public class OpenJDKNashornFactoryWrapper { public static ScriptEngineFactory getOpenJDKNashornFactory() { return new NashornScriptEngineFactory(); 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 424441e758..a63a36bf77 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 @@ -55,6 +55,7 @@ * NashornJavaScriptMessageContext implements the ScriptMessageContext specific to Nashorn java script engine. */ @SuppressWarnings({"UnusedDeclaration"}) +@Deprecated public class OpenJDKNashornJavaScriptMessageContext implements ScriptMessageContext { private static final Log logger = LogFactory.getLog(OpenJDKNashornJavaScriptMessageContext.class.getName()); diff --git a/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java index befa753553..ce405ee1cd 100644 --- a/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java +++ b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java @@ -19,6 +19,7 @@ package org.apache.synapse.mediators.bsf; import com.google.gson.JsonParser; +import com.oracle.truffle.js.scriptengine.GraalJSEngineFactory; import com.sun.phobos.script.javascript.RhinoScriptEngineFactory; import com.sun.script.groovy.GroovyScriptEngineFactory; import com.sun.script.jruby.JRubyScriptEngineFactory; @@ -42,8 +43,8 @@ import org.apache.synapse.mediators.bsf.access.control.config.AccessControlConfig; import org.apache.synapse.mediators.bsf.access.control.config.AccessControlListType; import org.apache.synapse.mediators.eip.EIPUtils; +import org.graalvm.polyglot.Context; import org.mozilla.javascript.ClassShutter; -import org.mozilla.javascript.Context; import org.mozilla.javascript.ContextFactory; import javax.activation.DataHandler; @@ -103,11 +104,21 @@ public class ScriptMediator extends AbstractMediator { */ private static final String NASHORN_JAVA_SCRIPT = "nashornJs"; + /** + * + */ + private static final String RHINO_JAVA_SCRIPT = "rhinoJs"; + /** * Name of the nashorn java script engine. */ private static final String NASHORN = "nashorn"; + /** + * Name of the graalvm js engine. + */ + private static final String GRAALVM = "graal.js"; + /** * Factory Name for Oracle Nashorn Engine. Built-in Nashorn engine in JDK 8 to JDK 11 */ @@ -296,22 +307,26 @@ public boolean mediate(MessageContext synCtx) { private boolean invokeScript(MessageContext synCtx) { boolean returnValue; + Context context = null; try { //if the engine is Rhino then needs to set the class loader specifically - if (language.equals("js")) { - Context cx = Context.enter(); + if (language.equals(RHINO_JAVA_SCRIPT)) { + org.mozilla.javascript.Context cx = org.mozilla.javascript.Context.enter(); if (classAccessControlConfig != null && classAccessControlConfig.isAccessControlEnabled()) { cx.setClassShutter(createClassShutter()); } cx.setApplicationClassLoader(this.loader); - + } + if (language.equals(JAVA_SCRIPT)) { + context = Context.newBuilder("js").allowExperimentalOptions(true).build(); + context.enter(); } Object returnObject; if (key != null) { - returnObject = mediateWithExternalScript(synCtx); + returnObject = mediateWithExternalScript(synCtx, context); } else { - returnObject = mediateForInlineScript(synCtx); + returnObject = mediateForInlineScript(synCtx, context); } returnValue = !(returnObject != null && returnObject instanceof Boolean) || (Boolean) returnObject; @@ -332,8 +347,13 @@ private boolean invokeScript(MessageContext synCtx) { (function != null ? " function " + function : ""), e, synCtx); returnValue = false; } finally { + if (language.equals(RHINO_JAVA_SCRIPT)) { + org.mozilla.javascript.Context.exit(); + } if (language.equals("js")) { - Context.exit(); + if (context != null) { + context.leave(); + } } } @@ -344,24 +364,26 @@ private boolean invokeScript(MessageContext synCtx) { * Mediation implementation when the script to be executed should be loaded from the registry * * @param synCtx the message context + * @param context the context of script engine * @return script result * @throws ScriptException For any errors , when compile, run the script * @throws NoSuchMethodException If the function is not defined in the script */ - private Object mediateWithExternalScript(MessageContext synCtx) + private Object mediateWithExternalScript(MessageContext synCtx, Context context) throws ScriptException, NoSuchMethodException { ScriptEngineWrapper sew = null; Object obj; try { sew = prepareExternalScript(synCtx); XMLHelper helper; - if (language.equalsIgnoreCase(JAVA_SCRIPT) || language.equals(NASHORN_JAVA_SCRIPT)) { + if (language.equalsIgnoreCase(JAVA_SCRIPT) || language.equals(NASHORN_JAVA_SCRIPT) || + language.equals(RHINO_JAVA_SCRIPT)) { helper = xmlHelper; } else { helper = XMLHelper.getArgHelper(sew.getEngine()); } ScriptMessageContext scriptMC; - scriptMC = getScriptMessageContext(synCtx, helper); + scriptMC = getScriptMessageContext(synCtx, helper, context); processJSONPayload(synCtx, scriptMC); Invocable invocableScript = (Invocable) sew.getEngine(); @@ -384,9 +406,11 @@ private Object mediateWithExternalScript(MessageContext synCtx) * @param helper Object which help to convert xml into OMelemnt * @return Nashorn or Common script message context according to language attribute */ - private ScriptMessageContext getScriptMessageContext(MessageContext synCtx, XMLHelper helper) { + private ScriptMessageContext getScriptMessageContext(MessageContext synCtx, XMLHelper helper, + Context context) { ScriptMessageContext scriptMC; if (language.equals(NASHORN_JAVA_SCRIPT)) { + // nashorn is deprecated and will be removed in the future in favor of graal.js try { if(isJDKContainNashorn()) { scriptMC = new NashornJavaScriptMessageContext(synCtx, helper, jsEngine); @@ -397,6 +421,12 @@ private ScriptMessageContext getScriptMessageContext(MessageContext synCtx, XMLH throw new SynapseException("Error occurred while evaluating empty json object", e); } + } else if (language.equals(JAVA_SCRIPT)) { + try { + scriptMC = new GraalVMJavaScriptMessageContext(synCtx, helper, context); + } catch (ScriptException e) { + throw new SynapseException("Error occurred while evaluating empty json object", e); + } } else { scriptMC = new CommonScriptMessageContext(synCtx, helper); } @@ -410,9 +440,9 @@ private ScriptMessageContext getScriptMessageContext(MessageContext synCtx, XMLH * @return true, or the script return value * @throws ScriptException For any errors , when compile , run the script */ - private Object mediateForInlineScript(MessageContext synCtx) throws ScriptException { + private Object mediateForInlineScript(MessageContext synCtx, Context context) throws ScriptException { ScriptMessageContext scriptMC; - scriptMC = getScriptMessageContext(synCtx, xmlHelper); + scriptMC = getScriptMessageContext(synCtx, xmlHelper, context); processJSONPayload(synCtx, scriptMC); Bindings bindings = scriptEngine.createBindings(); bindings.put(MC_VAR_NAME, scriptMC); @@ -443,6 +473,8 @@ private void processJSONPayload(MessageContext synCtx, ScriptMessageContext scri } else { jsonObject = ((OpenJDKNashornJavaScriptMessageContext) scriptMC).jsonSerializerCallMember("parse", jsonPayload); } + } else if (JAVA_SCRIPT.equals(language)) { + jsonObject = ((GraalVMJavaScriptMessageContext) scriptMC).jsonSerializerCallMember("parse", jsonPayload); } else { String scriptWithJsonParser = "JSON.parse(JSON.stringify(" + jsonPayload + "))"; jsonObject = this.jsEngine.eval('(' + scriptWithJsonParser + ')'); @@ -618,13 +650,15 @@ protected void initScriptEngine() { if (log.isDebugEnabled()) { log.debug("Initializing script mediator for language : " + language); } - + System.setProperty("polyglot.engine.WarnInterpreterOnly", "false"); + System.setProperty("polyglot.js.nashorn-compat", "true"); engineManager = new ScriptEngineManager(); - if (!language.equals(NASHORN_JAVA_SCRIPT)) { + if (language.equals(JAVA_SCRIPT)) { + engineManager.registerEngineExtension("jsEngine", new GraalJSEngineFactory()); + } + if (language.equals(RHINO_JAVA_SCRIPT)) { engineManager.registerEngineExtension("jsEngine", new RhinoScriptEngineFactory()); } - - engineManager.registerEngineExtension("js", new RhinoScriptEngineFactory()); engineManager.registerEngineExtension("groovy", new GroovyScriptEngineFactory()); engineManager.registerEngineExtension("rb", new JRubyScriptEngineFactory()); engineManager.registerEngineExtension("py", new JythonScriptEngineFactory()); @@ -638,6 +672,8 @@ protected void initScriptEngine() { } if (language.equals(NASHORN_JAVA_SCRIPT)) { this.scriptEngine = engineManager.getEngineByName(NASHORN); + } else if (language.equals(RHINO_JAVA_SCRIPT)) { + this.scriptEngine = engineManager.getEngineByExtension("jsEngine"); } else { this.scriptEngine = engineManager.getEngineByExtension(language); } @@ -661,11 +697,11 @@ protected void initScriptEngine() { if (scriptEngine == null) { handleException("No script engine found for language: " + language); } - //Invoking a custom Helper class for api change in rhino17 and also for Nashorn engine based implimentation - if (language.equalsIgnoreCase(JAVA_SCRIPT)) { + if (language.equalsIgnoreCase(JAVA_SCRIPT) || language.equals(NASHORN_JAVA_SCRIPT)) { + xmlHelper = new ExtendedJavaScriptXmlHelper(); + } else if (language.equals(RHINO_JAVA_SCRIPT)) { + // this will be removed in the future in favor of graal.js xmlHelper = new JavaScriptXmlHelper(); - } else if (language.equals(NASHORN_JAVA_SCRIPT)) { - xmlHelper = new NashornJavaScriptXmlHelper(); } else { xmlHelper = XMLHelper.getArgHelper(scriptEngine); } @@ -675,10 +711,12 @@ protected void initScriptEngine() { log.debug("Script mediator for language : " + language + " supports multithreading? : " + multiThreadedEngine); - readAccessControlConfigurations(MiscellaneousUtil.loadProperties("synapse.properties")); - if (nativeObjectAccessControlConfig != null && nativeObjectAccessControlConfig.isAccessControlEnabled() && - !ContextFactory.hasExplicitGlobal()) { - ContextFactory.initGlobal(new SandboxContextFactory(nativeObjectAccessControlConfig)); + if (language.equals(RHINO_JAVA_SCRIPT)) { + readAccessControlConfigurations(MiscellaneousUtil.loadProperties("synapse.properties")); + if (nativeObjectAccessControlConfig != null && nativeObjectAccessControlConfig.isAccessControlEnabled() && + !ContextFactory.hasExplicitGlobal()) { + ContextFactory.initGlobal(new SandboxContextFactory(nativeObjectAccessControlConfig)); + } } } @@ -722,7 +760,7 @@ public ScriptEngineWrapper getNewScriptEngine() { if (language.equals(NASHORN_JAVA_SCRIPT)) { scriptEngineWrapper = new ScriptEngineWrapper(engineManager.getEngineByName(NASHORN)); } else { - scriptEngineWrapper = new ScriptEngineWrapper(engineManager.getEngineByExtension(language)); + scriptEngineWrapper = new ScriptEngineWrapper(engineManager.getEngineByExtension(GRAALVM)); } } // fall back @@ -752,11 +790,13 @@ private ScriptEngineFactory getOracleNashornFactory() { } /** + * @deprecated This method is deprecated and will be removed in a future release in favour of GraalVM JS engine. * Creates a class shutter, which will be used inside the context that executes the script. * This class shutter will be used to control the visibility of classes specified in the access control config, * to the script. * @return */ + @Deprecated private ClassShutter createClassShutter() { return new ClassShutter() { public boolean visibleToScripts(String className) { diff --git a/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorSerializationTest.java b/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorSerializationTest.java index 4346ed088a..10f4b7fc2f 100644 --- a/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorSerializationTest.java +++ b/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorSerializationTest.java @@ -44,7 +44,7 @@ public void testScriptMediatorSerializationScenarioTwo() throws XMLComparisonExc } public void testInlineScriptMediatorSerializationScenarioOne() throws XMLComparisonException { - String inputXml = "" + + String inputXml = "" + "\n" + "{symbol});]]> "; assertTrue(serialization(inputXml, mediatorFactory, scriptMediatorSerializer)); diff --git a/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorTest.java b/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorTest.java index 329697d287..0121ce88f7 100644 --- a/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorTest.java +++ b/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/ScriptMediatorTest.java @@ -43,10 +43,10 @@ public class ScriptMediatorTest extends TestCase { private static final String inlinescript = "var state=5;"; - private String threadsafetyscript = "var rno = mc.getPayloadXML().toString(); rno=rno*2; mc.setPayloadXML" + private String threadsafetyscriptForRhinoJS = "var rno = mc.getPayloadXML().toString(); rno=rno*2; mc.setPayloadXML" + "({rno})"; - private String threadSafetyScriptForNashorn = "var rno = mc.getPayloadXML().toString(); var st1 = mc.getEnvelope" + private String threadSafetyScript = "var rno = mc.getPayloadXML().toString(); var st1 = mc.getEnvelope" + "().getBody().getFirstElement().getText();mc.getEnvelope().getBody().getFirstElement().setText" + "(st1 * 2);"; @@ -58,13 +58,13 @@ public void testInlineMediator() throws Exception { } /** - * Test functionality of mediate with inline script in nashornJS. + * Test functionality of mediate with inline script in rhinoJs. * * @throws Exception */ public void testInlineMediatorOnNashornEngine() throws Exception { MessageContext mc = TestUtils.getTestContext("", null); - ScriptMediator mediator = new ScriptMediator("nashornJs", inlinescript,null); + ScriptMediator mediator = new ScriptMediator("rhinoJs", inlinescript,null); boolean responese = mediator.mediate(mc); assertTrue(responese); } @@ -74,23 +74,23 @@ public void testThreadSafety() throws Exception { Random rand = new Random(); String randomno = Integer.toString(rand.nextInt(200)); mc.getEnvelope().getBody().getFirstElement().setText(randomno); - ScriptMediator mediator = new ScriptMediator("js", threadsafetyscript,null); + ScriptMediator mediator = new ScriptMediator("js", threadSafetyScript,null); mediator.mediate(mc); assertEquals(Integer.parseInt(mc.getEnvelope().getBody().getFirstElement().getText()), Integer.parseInt(randomno) * 2); } /** - * Test functionality of mediate with multiple threads in nashornJS. + * Test functionality of mediate with multiple threads in rhinoJS. * * @throws Exception */ - public void testThreadSafetyOnNashornEngine() throws Exception { + public void testThreadSafetyOnRhinoEngine() throws Exception { MessageContext mc = TestUtils.getTestContext("", null); Random rand = new Random(); String randomno = Integer.toString(rand.nextInt(200)); mc.getEnvelope().getBody().getFirstElement().setText(randomno); - ScriptMediator mediator = new ScriptMediator("nashornJs", threadSafetyScriptForNashorn,null); + ScriptMediator mediator = new ScriptMediator("rhinoJs", threadsafetyscriptForRhinoJS,null); mediator.mediate(mc); assertEquals(Integer.parseInt(mc.getEnvelope().getBody().getFirstElement().getText()), Integer.parseInt(randomno) * 2); @@ -191,9 +191,9 @@ public void testExternalScriptWithComments() throws Exception { ScriptMediator mediator = new ScriptMediator("js", new LinkedHashMap(), v, "transform", null); boolean result = mediator.mediate(mc); String response = JsonUtil.jsonPayloadToString(((Axis2MessageContext) mc).getAxis2MessageContext()); - String expectedResponse = "[{\"name\":\"Biaggio Cafe\", \"tags\":[\"bar\", \"restaurant\", \"food\"," - + " \"establishment\"], \"id\":\"ID:7eaf7\"}, {\"name\":\"Doltone House\", \"tags\":[\"food\"," - + " \"establishment\"], \"id\":\"ID:3ef98\"}]"; + String expectedResponse = "[{\"name\":\"Biaggio Cafe\",\"tags\":[\"bar\",\"restaurant\",\"food\"," + + "\"establishment\"],\"id\":\"ID:7eaf7\"},{\"name\":\"Doltone House\",\"tags\":[\"food\"," + + "\"establishment\"],\"id\":\"ID:3ef98\"}]"; assertEquals(expectedResponse, response); assertEquals(true, result); diff --git a/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/javascript/NashornJavaScriptMediatorTest.java b/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/javascript/GraalVMJavaScriptMediatorTest.java similarity index 91% rename from modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/javascript/NashornJavaScriptMediatorTest.java rename to modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/javascript/GraalVMJavaScriptMediatorTest.java index 94b3b43968..f86c860f17 100644 --- a/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/javascript/NashornJavaScriptMediatorTest.java +++ b/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/javascript/GraalVMJavaScriptMediatorTest.java @@ -35,18 +35,18 @@ import java.util.LinkedHashMap; /** - * Test functions of Nashorn Java Script Mediator + * Test functions of GraalVM Java Script Mediator */ -public class NashornJavaScriptMediatorTest extends TestCase { +public class GraalVMJavaScriptMediatorTest extends TestCase { private static final String INLINE_SCRIPT = "var state=5;"; /** - * Test functionality of mediate with external script in nashornJS. + * Test functionality of mediate with external script in graalVMJs. * * @throws Exception */ - public void testExternalScriptWithCommentsOnNashornEngine() throws Exception { + public void testExternalScriptWithCommentsOnGraalVMEngine() throws Exception { String request = "{\n" + " \"results\": [\n" + " {\n" @@ -133,7 +133,7 @@ public void testExternalScriptWithCommentsOnNashornEngine() throws Exception { e.setValue(text); mc.getConfiguration().addEntry(scriptSrcKey, e); Value v = new Value(scriptSrcKey); - ScriptMediator mediator = new ScriptMediator("nashornJs", new LinkedHashMap(), v, "transform", + ScriptMediator mediator = new ScriptMediator("js", new LinkedHashMap(), v, "transform", null); boolean result = mediator.mediate(mc); String response = JsonUtil.jsonPayloadToString(((Axis2MessageContext) mc).getAxis2MessageContext()); @@ -146,13 +146,13 @@ public void testExternalScriptWithCommentsOnNashornEngine() throws Exception { } /** - * Test functionality of mediate with inline script in nashornJS. + * Test functionality of mediate with inline script in graalVMJs. * * @throws Exception */ - public void testInlineMediatorOnNashornEngine() throws Exception { + public void testInlineMediatorOnGraalVMEngine() throws Exception { MessageContext mc = TestUtils.getTestContext("", null); - ScriptMediator mediator = new ScriptMediator("nashornJs", INLINE_SCRIPT,null); + ScriptMediator mediator = new ScriptMediator("js", INLINE_SCRIPT,null); boolean responese = mediator.mediate(mc); assertTrue(responese); } diff --git a/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/javascript/JavaScriptMediatorTest.java b/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/javascript/JavaScriptMediatorTest.java index e61b299668..86c6070839 100644 --- a/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/javascript/JavaScriptMediatorTest.java +++ b/modules/extensions/src/test/java/org/apache/synapse/mediators/bsf/javascript/JavaScriptMediatorTest.java @@ -28,7 +28,7 @@ public class JavaScriptMediatorTest extends TestCase { public void testInlineMediator() throws Exception { - ScriptMediator mediator = new ScriptMediator("js", "mc.getPayloadXML().b == 'petra';",null); + ScriptMediator mediator = new ScriptMediator("rhinoJs", "mc.getPayloadXML().b == 'petra';",null); MessageContext mc = TestUtils.getTestContext("petra", null); assertTrue(mediator.mediate(mc)); @@ -41,7 +41,7 @@ public void testInlineMediator() throws Exception { } public void testInlineMediator2() throws Exception { - ScriptMediator mediator = new ScriptMediator("js", "mc.getPayloadXML().b == 'petra';",null); + ScriptMediator mediator = new ScriptMediator("rhinoJs", "mc.getPayloadXML().b == 'petra';",null); MessageContext mc = TestUtils.getTestContext("petra", null); assertTrue(mediator.mediate(mc)); @@ -55,8 +55,7 @@ public void testInlineMediator2() throws Exception { public void testInlineMediatorWithImports() throws Exception { - String scriptSourceCode = "importClass(Packages.java.util.UUID);\n" + - "var uuid = java.util.UUID.randomUUID().toString().replace('-','');\n"; + String scriptSourceCode = "var uuid = java.util.UUID.randomUUID().toString().replace('-','');\n"; MessageContext mc = TestUtils.getTestContext("", null); ScriptMediator mediator = new ScriptMediator("js", scriptSourceCode, null); @@ -73,7 +72,7 @@ public void testJavaClassAccessControl() throws Exception { String scriptSourceCode = "var s = new java.util.ArrayList();\n"; MessageContext mc = TestUtils.getTestContext("", null); - ScriptMediator mediator = new ScriptMediator("js", scriptSourceCode, null); + ScriptMediator mediator = new ScriptMediator("rhinoJs", scriptSourceCode, null); System.setProperty("properties.file.path", System.getProperty("user.dir") + "/src/test/resources/file.properties"); @@ -98,7 +97,7 @@ public void testJavaMethodAccessControl() throws Exception { "var hashmapConstructors = c.getClassLoader().loadClass(\"java.util.HashMap\").getDeclaredConstructors();\n"; MessageContext mc = TestUtils.getTestContext("", null); - ScriptMediator mediator = new ScriptMediator("js", scriptSourceCode, null); + ScriptMediator mediator = new ScriptMediator("rhinoJs", scriptSourceCode, null); System.setProperty("properties.file.path", System.getProperty("user.dir") + "/src/test/resources/file.properties"); diff --git a/pom.xml b/pom.xml index 0a989e8c4a..fb8d9892d1 100644 --- a/pom.xml +++ b/pom.xml @@ -1391,6 +1391,36 @@ nashorn-core ${nashorn.core.version} + + org.graalvm.sdk + graal-sdk + ${graalvm.version} + + + org.graalvm.js + js-scriptengine + ${graalvm.version} + + + org.graalvm.js + js + ${graalvm.version} + + + org.graalvm.truffle + truffle-api + ${graalvm.version} + + + org.graalvm.regex + regex + ${graalvm.version} + + + com.ibm.icu + icu4j + ${icu.version} + @@ -1610,6 +1640,8 @@ 3.1.2 2.3.0 15.4 + 22.3.4 + 72.1 From bcf3a6c7a42cc5a9b56d6533b49006fbc013464b Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 8 Jul 2024 10:01:27 +0000 Subject: [PATCH 279/308] [WSO2 Release] [Jenkins #7042] [Release 4.0.0-wso2v115] prepare release v4.0.0-wso2v115 --- 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 e862fd51de..941b85c84e 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v115-SNAPSHOT + 4.0.0-wso2v115 ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index cddf4ea991..8f191ac190 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v115-SNAPSHOT + 4.0.0-wso2v115 ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index ec345321c2..7dbc51cd36 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-wso2v115-SNAPSHOT + 4.0.0-wso2v115 ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 73fb1869cd..a09e93e0c9 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v115-SNAPSHOT + 4.0.0-wso2v115 ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 2f4d099ba3..de66310cf8 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v115-SNAPSHOT + 4.0.0-wso2v115 ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 5f2f497c17..671cac7cbd 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v115-SNAPSHOT + 4.0.0-wso2v115 ../../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 1aa98d7493..b3fd8801e2 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-wso2v115-SNAPSHOT + 4.0.0-wso2v115 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 41efdaa8ff..91253afc60 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-wso2v115-SNAPSHOT + 4.0.0-wso2v115 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 f14eba8522..c51a6183d2 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-wso2v115-SNAPSHOT + 4.0.0-wso2v115 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 c18e4f7a43..e93f0c1e09 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-wso2v115-SNAPSHOT + 4.0.0-wso2v115 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 3b93abdc26..aab8195c98 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-wso2v115-SNAPSHOT + 4.0.0-wso2v115 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 cb6f6ee4a5..9cad1f5f90 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-wso2v115-SNAPSHOT + 4.0.0-wso2v115 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 ef49bc70d8..f8aad1824d 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-wso2v115-SNAPSHOT + 4.0.0-wso2v115 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index b587759eff..ec99f5fd95 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v115-SNAPSHOT + 4.0.0-wso2v115 ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index c9ece015e2..f735953edf 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v115-SNAPSHOT + 4.0.0-wso2v115 ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 47ddeea37c..e377c04e10 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v115-SNAPSHOT + 4.0.0-wso2v115 ../../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-wso2v115 diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 39cfa00c52..8e1c3bf6ed 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v115-SNAPSHOT + 4.0.0-wso2v115 ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 0d1f189709..240b80301d 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-wso2v115-SNAPSHOT + 4.0.0-wso2v115 ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index cbff4d440a..cf6b10951e 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-wso2v115-SNAPSHOT + 4.0.0-wso2v115 ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 5fc7a2f07e..04d08d4fd6 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v115-SNAPSHOT + 4.0.0-wso2v115 ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index d9e05afdab..f2bf857959 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v115-SNAPSHOT + 4.0.0-wso2v115 ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index f6c70d0eb7..15ed5b9cd3 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v115-SNAPSHOT + 4.0.0-wso2v115 ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index ea3c60ac6e..30d3ddf160 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v115-SNAPSHOT + 4.0.0-wso2v115 ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 8956b2239b..53f1d20d84 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-wso2v115-SNAPSHOT + 4.0.0-wso2v115 ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index da9e6dd1e2..508af87cc4 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-wso2v115-SNAPSHOT + 4.0.0-wso2v115 ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 7051abfb54..84c9a8a10c 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-wso2v115-SNAPSHOT + 4.0.0-wso2v115 ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index abd87b1974..cffa758a9b 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-wso2v115-SNAPSHOT + 4.0.0-wso2v115 ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 720580423e..556a4dc441 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v115-SNAPSHOT + 4.0.0-wso2v115 ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index b9a1b93447..78f03093c8 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v115-SNAPSHOT + 4.0.0-wso2v115 ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 487cd487a6..7f56fb161e 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-wso2v115-SNAPSHOT + 4.0.0-wso2v115 ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index d4f8d241b5..32a6259467 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v115-SNAPSHOT + 4.0.0-wso2v115 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-wso2v115 Apache Software Foundation From bccc41f0a15eccb4bcdabb8f3794cd310550fb29 Mon Sep 17 00:00:00 2001 From: WSO2 Builder Date: Mon, 8 Jul 2024 10:01:29 +0000 Subject: [PATCH 280/308] [WSO2 Release] [Jenkins #7042] [Release 4.0.0-wso2v115] 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 941b85c84e..750c8452d9 100644 --- a/modules/commons/pom.xml +++ b/modules/commons/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v115 + 4.0.0-wso2v116-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 8f191ac190..3259437d0e 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -16,7 +16,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v115 + 4.0.0-wso2v116-SNAPSHOT ../../pom.xml diff --git a/modules/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 7dbc51cd36..874df9a538 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-wso2v115 + 4.0.0-wso2v116-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index a09e93e0c9..a2ec76132c 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v115 + 4.0.0-wso2v116-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index de66310cf8..f73f38dd86 100644 --- a/modules/experimental/pom.xml +++ b/modules/experimental/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v115 + 4.0.0-wso2v116-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 671cac7cbd..80932b39e8 100644 --- a/modules/extensions/pom.xml +++ b/modules/extensions/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v115 + 4.0.0-wso2v116-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 b3fd8801e2..371e78b514 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-wso2v115 + 4.0.0-wso2v116-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 91253afc60..dd391d0281 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-wso2v115 + 4.0.0-wso2v116-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 c51a6183d2..bd8d9d9e70 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-wso2v115 + 4.0.0-wso2v116-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 e93f0c1e09..150e413f6d 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-wso2v115 + 4.0.0-wso2v116-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 aab8195c98..eddcda90c7 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-wso2v115 + 4.0.0-wso2v116-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 9cad1f5f90..d130262a66 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-wso2v115 + 4.0.0-wso2v116-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 f8aad1824d..5ec4182b62 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-wso2v115 + 4.0.0-wso2v116-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index ec99f5fd95..848986ae6e 100644 --- a/modules/features/pom.xml +++ b/modules/features/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v115 + 4.0.0-wso2v116-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index f735953edf..d0a07e39fc 100644 --- a/modules/handler/pom.xml +++ b/modules/handler/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v115 + 4.0.0-wso2v116-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index e377c04e10..e8e5794bad 100644 --- a/modules/integration/pom.xml +++ b/modules/integration/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v115 + 4.0.0-wso2v116-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-wso2v115 + HEAD diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 8e1c3bf6ed..b1ec409e7c 100644 --- a/modules/migrator/pom.xml +++ b/modules/migrator/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v115 + 4.0.0-wso2v116-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index 240b80301d..47d8a75b77 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-wso2v115 + 4.0.0-wso2v116-SNAPSHOT ../../../pom.xml synapse-package-archetype diff --git a/modules/packaging/package-skeleton/pom.xml b/modules/packaging/package-skeleton/pom.xml index cf6b10951e..d986975fb2 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-wso2v115 + 4.0.0-wso2v116-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 04d08d4fd6..d29efa4c3e 100644 --- a/modules/patches/pom.xml +++ b/modules/patches/pom.xml @@ -22,7 +22,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v115 + 4.0.0-wso2v116-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index f2bf857959..49dacd6542 100644 --- a/modules/samples/pom.xml +++ b/modules/samples/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v115 + 4.0.0-wso2v116-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 15ed5b9cd3..84ae13dacf 100644 --- a/modules/securevault/pom.xml +++ b/modules/securevault/pom.xml @@ -24,7 +24,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v115 + 4.0.0-wso2v116-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 30d3ddf160..350545bd2a 100644 --- a/modules/tasks/pom.xml +++ b/modules/tasks/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v115 + 4.0.0-wso2v116-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 53f1d20d84..d6df616aba 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-wso2v115 + 4.0.0-wso2v116-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index 508af87cc4..618cf77986 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-wso2v115 + 4.0.0-wso2v116-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 84c9a8a10c..975bc70b70 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-wso2v115 + 4.0.0-wso2v116-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index cffa758a9b..71ff3b08fc 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-wso2v115 + 4.0.0-wso2v116-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 556a4dc441..ae758f628a 100644 --- a/modules/transports/pom.xml +++ b/modules/transports/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v115 + 4.0.0-wso2v116-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index 78f03093c8..906c7beccd 100644 --- a/modules/war/pom.xml +++ b/modules/war/pom.xml @@ -23,7 +23,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v115 + 4.0.0-wso2v116-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index 7f56fb161e..9256ad18f9 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-wso2v115 + 4.0.0-wso2v116-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index 32a6259467..670469c749 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v115 + 4.0.0-wso2v116-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-wso2v115 + HEAD Apache Software Foundation From 8bbf0117f918fbc61e6d7ed78319dd9453b9738c Mon Sep 17 00:00:00 2001 From: Arunan Sugunakumar Date: Tue, 9 Jul 2024 10:49:33 +0530 Subject: [PATCH 281/308] Fix issues with external scripts for rhinoJs --- .../org/apache/synapse/mediators/bsf/ScriptMediator.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java index ce405ee1cd..24fbaaa3cb 100644 --- a/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java +++ b/modules/extensions/src/main/java/org/apache/synapse/mediators/bsf/ScriptMediator.java @@ -684,6 +684,8 @@ protected void initScriptEngine() { ScriptEngineWrapper sew; if (language.equals(NASHORN_JAVA_SCRIPT)) { sew = new ScriptEngineWrapper(engineManager.getEngineByName(NASHORN)); + } else if (language.equals(RHINO_JAVA_SCRIPT)) { + sew = new ScriptEngineWrapper(engineManager.getEngineByExtension("jsEngine")); } else { sew = new ScriptEngineWrapper(engineManager.getEngineByExtension(language)); } @@ -708,6 +710,9 @@ protected void initScriptEngine() { this.multiThreadedEngine = scriptEngine.getFactory().getParameter("THREADING") != null; + if (language.equals(JAVA_SCRIPT)) { + this.multiThreadedEngine = true; + } log.debug("Script mediator for language : " + language + " supports multithreading? : " + multiThreadedEngine); @@ -759,8 +764,10 @@ public ScriptEngineWrapper getNewScriptEngine() { if (scriptEngineWrapper == null) { if (language.equals(NASHORN_JAVA_SCRIPT)) { scriptEngineWrapper = new ScriptEngineWrapper(engineManager.getEngineByName(NASHORN)); + } else if (language.equals(RHINO_JAVA_SCRIPT)) { + scriptEngineWrapper = new ScriptEngineWrapper(engineManager.getEngineByExtension("jsEngine")); } else { - scriptEngineWrapper = new ScriptEngineWrapper(engineManager.getEngineByExtension(GRAALVM)); + scriptEngineWrapper = new ScriptEngineWrapper(engineManager.getEngineByExtension(language)); } } // fall back From 070716e0c0d510f223c7baed0ccb5ad384a37d9b Mon Sep 17 00:00:00 2001 From: Isuru Wijesiri Date: Tue, 9 Jul 2024 12:03:08 +0530 Subject: [PATCH 282/308] Fix failing of requeue on rollback if auth endpoint gives 401 --- .../OAuthConfiguredHTTPEndpoint.java | 4 ++-- .../senders/blocking/BlockingMsgSender.java | 20 ++++++++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/modules/core/src/main/java/org/apache/synapse/endpoints/OAuthConfiguredHTTPEndpoint.java b/modules/core/src/main/java/org/apache/synapse/endpoints/OAuthConfiguredHTTPEndpoint.java index 2e218b2983..ad7a165661 100644 --- a/modules/core/src/main/java/org/apache/synapse/endpoints/OAuthConfiguredHTTPEndpoint.java +++ b/modules/core/src/main/java/org/apache/synapse/endpoints/OAuthConfiguredHTTPEndpoint.java @@ -57,8 +57,8 @@ public void send(MessageContext synCtx) { } // Clone the original MessageContext and save it to do a retry after a token refresh - MessageContext cloneMessageContext = MessageHelper.cloneMessageContext(synCtx); - MessageCache.getInstance().addMessageContext(synCtx.getMessageID(), cloneMessageContext); + MessageContext clonedMessageContext = MessageHelper.cloneMessageContext(synCtx); + MessageCache.getInstance().addMessageContext(synCtx.getMessageID(), clonedMessageContext); super.send(synCtx); diff --git a/modules/core/src/main/java/org/apache/synapse/message/senders/blocking/BlockingMsgSender.java b/modules/core/src/main/java/org/apache/synapse/message/senders/blocking/BlockingMsgSender.java index dd7b582e2e..82e5df42d0 100644 --- a/modules/core/src/main/java/org/apache/synapse/message/senders/blocking/BlockingMsgSender.java +++ b/modules/core/src/main/java/org/apache/synapse/message/senders/blocking/BlockingMsgSender.java @@ -475,9 +475,10 @@ public void send(EndpointDefinition endpointDefinition, MessageContext synapseIn if (originalMC != null && OAuthUtils.retryOnOAuthFailure(httpEndpoint, synapseInMsgCtx, synapseInMsgCtx)) { - MessageContext messageContext = httpEndpoint.retryCallWithNewToken(originalMC); - ((Axis2MessageContext) synapseInMsgCtx).setAxis2MessageContext( - ((Axis2MessageContext) messageContext).getAxis2MessageContext()); + originalMC.getEnvelope().build(); + + resetMessageContext((Axis2MessageContext) synapseInMsgCtx, (Axis2MessageContext) originalMC); + httpEndpoint.retryCallWithNewToken(synapseInMsgCtx); } } @@ -489,6 +490,19 @@ public void send(EndpointDefinition endpointDefinition, MessageContext synapseIn } } + private static void resetMessageContext(Axis2MessageContext synapseInMsgCtx, Axis2MessageContext originalMC) throws AxisFault { + // Replace envelope and headers with original envelope and headers before retrying + org.apache.axis2.context.MessageContext originalAxisMC = + originalMC.getAxis2MessageContext(); + + org.apache.axis2.context.MessageContext synapseInAxisMC = + synapseInMsgCtx.getAxis2MessageContext(); + + synapseInAxisMC.setEnvelope(originalAxisMC.getEnvelope()); + synapseInAxisMC.setProperty(org.apache.axis2.context.MessageContext.TRANSPORT_HEADERS, + originalAxisMC.getProperty(org.apache.axis2.context.MessageContext.TRANSPORT_HEADERS)); + } + private void sendRobust(org.apache.axis2.context.MessageContext axisOutMsgCtx, Options clientOptions, AxisService anonymousService, ServiceContext serviceCtx, MessageContext synapseInMsgCtx) throws AxisFault { From 978aa9bc2a774e83ab38bbbebb586f11bfcece50 Mon Sep 17 00:00:00 2001 From: Arunan Sugunakumar Date: Tue, 9 Jul 2024 13:16:19 +0530 Subject: [PATCH 283/308] Fix test failures by replacing with rhinoJs --- .../conf/mediator/scriptInlineFunctionSynapseConfig.xml | 4 ++-- repository/conf/sample/synapse_sample_252.xml | 2 +- repository/conf/sample/synapse_sample_350.xml | 4 ++-- repository/conf/sample/synapse_sample_351.xml | 4 ++-- repository/conf/sample/synapse_sample_352.xml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/repository/conf/mediator/scriptInlineFunctionSynapseConfig.xml b/repository/conf/mediator/scriptInlineFunctionSynapseConfig.xml index b26b6baa27..a1b170663e 100644 --- a/repository/conf/mediator/scriptInlineFunctionSynapseConfig.xml +++ b/repository/conf/mediator/scriptInlineFunctionSynapseConfig.xml @@ -22,7 +22,7 @@ -