diff --git a/modules/commons/pom.xml b/modules/commons/pom.xml index 664e144a95..4bd96c92a3 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-wso2v99-SNAPSHOT ../../pom.xml diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 4cfb08631b..95f2600669 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-wso2v99-SNAPSHOT ../../pom.xml 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; } 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/coverage-report/pom.xml b/modules/coverage-report/pom.xml index 2219229460..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-wso2v96-SNAPSHOT + 4.0.0-wso2v99-SNAPSHOT ../../pom.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index f1d2d58f43..b3b1edc543 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-wso2v99-SNAPSHOT ../../pom.xml diff --git a/modules/experimental/pom.xml b/modules/experimental/pom.xml index 893481dbae..d3ab7bc0a9 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-wso2v99-SNAPSHOT ../../pom.xml diff --git a/modules/extensions/pom.xml b/modules/extensions/pom.xml index 31e9a4b4fb..748957f467 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-wso2v99-SNAPSHOT ../../pom.xml 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 + diff --git a/modules/features/org.apache.synapse.samples.feature/pom.xml b/modules/features/org.apache.synapse.samples.feature/pom.xml index 52518aa6a2..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-wso2v96-SNAPSHOT + 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 e26cec53d6..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-wso2v96-SNAPSHOT + 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 aee2947738..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-wso2v96-SNAPSHOT + 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 2d7e70dbe2..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-wso2v96-SNAPSHOT + 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 2da77ff006..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-wso2v96-SNAPSHOT + 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 3bff82f7f7..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-wso2v96-SNAPSHOT + 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 3b5a593348..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-wso2v96-SNAPSHOT + 4.0.0-wso2v99-SNAPSHOT 4.0.0 diff --git a/modules/features/pom.xml b/modules/features/pom.xml index df2ccdad77..a5976fef8a 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-wso2v99-SNAPSHOT ../../pom.xml diff --git a/modules/handler/pom.xml b/modules/handler/pom.xml index 3cb191299f..ca668d187d 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-wso2v99-SNAPSHOT ../../pom.xml diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml index 77fa01d612..328d716917 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-wso2v99-SNAPSHOT ../../pom.xml diff --git a/modules/migrator/pom.xml b/modules/migrator/pom.xml index 655bcc767d..2c3977cab9 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-wso2v99-SNAPSHOT ../../pom.xml diff --git a/modules/packaging/package-archetype/pom.xml b/modules/packaging/package-archetype/pom.xml index a5398c78c8..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-wso2v96-SNAPSHOT + 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 16b248fe10..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-wso2v96-SNAPSHOT + 4.0.0-wso2v99-SNAPSHOT ../../../pom.xml synapse-package-skeleton diff --git a/modules/patches/pom.xml b/modules/patches/pom.xml index 88426fc5e1..e8374e3206 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-wso2v99-SNAPSHOT ../../pom.xml synapse-patches diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml index ed20ae1617..b06d60d10b 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-wso2v99-SNAPSHOT ../../pom.xml diff --git a/modules/securevault/pom.xml b/modules/securevault/pom.xml index 1f62a1ecdd..675ea08bd6 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-wso2v99-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/modules/tasks/pom.xml b/modules/tasks/pom.xml index 03e793e0a9..a9ba3956c1 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-wso2v99-SNAPSHOT ../../pom.xml 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) { diff --git a/modules/transports/core/nhttp/pom.xml b/modules/transports/core/nhttp/pom.xml index 52261bc36a..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-wso2v96-SNAPSHOT + 4.0.0-wso2v99-SNAPSHOT ../../pom.xml 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 diff --git a/modules/transports/core/pipe/pom.xml b/modules/transports/core/pipe/pom.xml index ef78516076..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-wso2v96-SNAPSHOT + 4.0.0-wso2v99-SNAPSHOT ../../pom.xml diff --git a/modules/transports/core/vfs/pom.xml b/modules/transports/core/vfs/pom.xml index 430b2beedc..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-wso2v96-SNAPSHOT + 4.0.0-wso2v99-SNAPSHOT ../../pom.xml diff --git a/modules/transports/optional/fix/pom.xml b/modules/transports/optional/fix/pom.xml index f6c9d79b98..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-wso2v96-SNAPSHOT + 4.0.0-wso2v99-SNAPSHOT ../../pom.xml diff --git a/modules/transports/pom.xml b/modules/transports/pom.xml index 0e8940ffa3..c0f4181400 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-wso2v99-SNAPSHOT ../../pom.xml diff --git a/modules/war/pom.xml b/modules/war/pom.xml index cbbd079e86..2d4f357871 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-wso2v99-SNAPSHOT ../../pom.xml diff --git a/modules/xar-maven-plugin/pom.xml b/modules/xar-maven-plugin/pom.xml index c3b654a97b..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-wso2v96-SNAPSHOT + 4.0.0-wso2v99-SNAPSHOT ../../pom.xml org.apache.synapse diff --git a/pom.xml b/pom.xml index c40fac468f..4d76703e66 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.synapse Apache-Synapse - 4.0.0-wso2v96-SNAPSHOT + 4.0.0-wso2v99-SNAPSHOT Apache Synapse Apache Synapse pom