From 9156c2f0e5662fc6c331f6352ef1f71bd73ba92b Mon Sep 17 00:00:00 2001 From: RakhithaRR Date: Fri, 20 Sep 2024 16:31:56 +0530 Subject: [PATCH] Bump synapse version and dependency versions --- .../product/src/main/conf/log4j2.properties | 26 +++++++++++++++++-- .../src/main/resources/conf/default.json | 1 + pom.xml | 14 +++++----- 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/modules/distribution/product/src/main/conf/log4j2.properties b/modules/distribution/product/src/main/conf/log4j2.properties index 7ebd747e4f..a422846323 100644 --- a/modules/distribution/product/src/main/conf/log4j2.properties +++ b/modules/distribution/product/src/main/conf/log4j2.properties @@ -1,6 +1,6 @@ # list of all appenders #add entry "syslog" to use the syslog appender -appenders=CARBON_CONSOLE, APIM_METRICS_APPENDER, CARBON_LOGFILE, AUDIT_LOGFILE, ATOMIKOS_LOGFILE, CARBON_TRACE_LOGFILE, ERROR_LOGFILE, OPEN_TRACING,SERVICE_APPENDER, TRACE_APPENDER, osgi, CORRELATION, BOTDATA_APPENDER, API_LOGFILE +appenders=CARBON_CONSOLE, APIM_METRICS_APPENDER, CARBON_LOGFILE, AUDIT_LOGFILE, ATOMIKOS_LOGFILE, CARBON_TRACE_LOGFILE, ERROR_LOGFILE, OPEN_TRACING,SERVICE_APPENDER, TRACE_APPENDER, osgi, CORRELATION, BOTDATA_APPENDER, API_LOGFILE, APIM_GATEWAY_ACCESS_APPENDER #, syslog # CARBON_CONSOLE is set to be a ConsoleAppender using a PatternLayout. @@ -196,11 +196,28 @@ appender.APIM_METRICS_APPENDER.policies.size.size=1000MB appender.APIM_METRICS_APPENDER.strategy.type = DefaultRolloverStrategy appender.APIM_METRICS_APPENDER.strategy.max = 10 +appender.APIM_GATEWAY_ACCESS_APPENDER.type = RollingFile +appender.APIM_GATEWAY_ACCESS_APPENDER.name = APIM_GATEWAY_ACCESS_APPENDER +appender.APIM_GATEWAY_ACCESS_APPENDER.fileName = ${sys:carbon.home}/repository/logs/http_access.log +appender.APIM_GATEWAY_ACCESS_APPENDER.filePattern = ${sys:carbon.home}/repository/logs/http_access_%d{MM-dd-yyyy}-%i.log +appender.APIM_GATEWAY_ACCESS_APPENDER.layout.type = PatternLayout +appender.APIM_GATEWAY_ACCESS_APPENDER.layout.pattern = %msg%n +appender.APIM_GATEWAY_ACCESS_APPENDER.policies.type = Policies +appender.APIM_GATEWAY_ACCESS_APPENDER.policies.time.type = TimeBasedTriggeringPolicy +appender.APIM_GATEWAY_ACCESS_APPENDER.policies.time.interval = 1 +appender.APIM_GATEWAY_ACCESS_APPENDER.policies.time.modulate = true +appender.APIM_GATEWAY_ACCESS_APPENDER.policies.size.type = SizeBasedTriggeringPolicy +appender.APIM_GATEWAY_ACCESS_APPENDER.policies.size.size=1000MB +appender.APIM_GATEWAY_ACCESS_APPENDER.strategy.type = DefaultRolloverStrategy +appender.APIM_GATEWAY_ACCESS_APPENDER.strategy.max = 10 +appender.APIM_GATEWAY_ACCESS_APPENDER.filter.threshold.type = ThresholdFilter +appender.APIM_GATEWAY_ACCESS_APPENDER.filter.threshold.level = DEBUG + appender.osgi.type = PaxOsgi appender.osgi.name = PaxOsgi appender.osgi.filter = * -loggers = AUDIT_LOG, reporter, trace-messages, org-apache-coyote, com-hazelcast, Owasp-CsrfGuard, org-apache-axis2-wsdl-codegen-writer-PrettyPrinter, org-apache-axis2-clustering, org-apache-catalina, org-apache-tomcat, org-wso2-carbon-apacheds, org-apache-directory-server-ldap, org-apache-directory-server-core-event, com-atomikos, org-quartz, org-apache-jackrabbit-webdav, org-apache-juddi, org-apache-commons-digester-Digester, org-apache-jasper-compiler-TldLocationsCache, org-apache-qpid, org-apache-qpid-server-Main, qpid-message, qpid-message-broker-listening, org-apache-tiles, org-apache-commons-httpclient, org-apache-solr, me-prettyprint-cassandra-hector-TimingLogger, org-apache-axis-enterprise, org-apache-directory-shared-ldap, org-apache-directory-server-ldap-handlers, org-apache-directory-shared-ldap-entry-DefaultServerAttribute, org-apache-directory-server-core-DefaultDirectoryService, org-apache-directory-shared-ldap-ldif-LdifReader, org-apache-directory-server-ldap-LdapProtocolHandler, org-apache-directory-server-core, org-apache-directory-server-ldap-LdapSession, DataNucleus, Datastore, Datastore-Schema, JPOX-Datastore, JPOX-Plugin, JPOX-MetaData, JPOX-Query, JPOX-General, JPOX-Enhancer, org-apache-hadoop-hive, hive, ExecMapper, ExecReducer, net-sf-ehcache-config-ConfigurationFactory, axis2Deployment, equinox, tomcat2, StAXDialectDetector, trace, synapse, synapse_transport, axis2, axis2_transport, org-wso2-carbon, hunsicker, thrift-publisher, service_logger, trace_logger, org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator, correlation, API_LOG +loggers = AUDIT_LOG, reporter, trace-messages, org-apache-coyote, com-hazelcast, Owasp-CsrfGuard, org-apache-axis2-wsdl-codegen-writer-PrettyPrinter, org-apache-axis2-clustering, org-apache-catalina, org-apache-tomcat, org-wso2-carbon-apacheds, org-apache-directory-server-ldap, org-apache-directory-server-core-event, com-atomikos, org-quartz, org-apache-jackrabbit-webdav, org-apache-juddi, org-apache-commons-digester-Digester, org-apache-jasper-compiler-TldLocationsCache, org-apache-qpid, org-apache-qpid-server-Main, qpid-message, qpid-message-broker-listening, org-apache-tiles, org-apache-commons-httpclient, org-apache-solr, me-prettyprint-cassandra-hector-TimingLogger, org-apache-axis-enterprise, org-apache-directory-shared-ldap, org-apache-directory-server-ldap-handlers, org-apache-directory-shared-ldap-entry-DefaultServerAttribute, org-apache-directory-server-core-DefaultDirectoryService, org-apache-directory-shared-ldap-ldif-LdifReader, org-apache-directory-server-ldap-LdapProtocolHandler, org-apache-directory-server-core, org-apache-directory-server-ldap-LdapSession, DataNucleus, Datastore, Datastore-Schema, JPOX-Datastore, JPOX-Plugin, JPOX-MetaData, JPOX-Query, JPOX-General, JPOX-Enhancer, org-apache-hadoop-hive, hive, ExecMapper, ExecReducer, net-sf-ehcache-config-ConfigurationFactory, axis2Deployment, equinox, tomcat2, StAXDialectDetector, trace, synapse, synapse_transport, axis2, axis2_transport, org-wso2-carbon, hunsicker, thrift-publisher, service_logger, trace_logger, org-wso2-carbon-apimgt-gateway-mediators-BotDetectionMediator, correlation, API_LOG, GatewayAccessLogger logger.API_LOG.name = API_LOG logger.API_LOG.level = INFO @@ -412,6 +429,11 @@ logger.trace.appenderRef.OPEN_TRACING.ref = OPEN_TRACING logger.synapse.name = org.apache.synapse logger.synapse.level = INFO +logger.GatewayAccessLogger.name = org.apache.synapse.transport.http.access.logs +logger.GatewayAccessLogger.level = DEBUG +logger.GatewayAccessLogger.appenderRef.APIM_GATEWAY_ACCESS_APPENDER.ref = APIM_GATEWAY_ACCESS_APPENDER +logger.GatewayAccessLogger.additivity = false + logger.synapse_transport.name = org.apache.synapse.transport logger.synapse_transport.level = INFO diff --git a/modules/distribution/product/src/main/resources/conf/default.json b/modules/distribution/product/src/main/resources/conf/default.json index c87c3539d7..ed7883bc40 100644 --- a/modules/distribution/product/src/main/resources/conf/default.json +++ b/modules/distribution/product/src/main/resources/conf/default.json @@ -175,6 +175,7 @@ "synapse_properties.'synapse.main.xml.location'": "repository/resources/apim-synapse-config/main.xml", "synapse_properties.'synapse.fault.xml.location'": "repository/resources/apim-synapse-config/fault.xml", "synapse_properties.'synapse.registry.xml.location'": "repository/resources/apim-synapse-config/registry.xml", + "synapse_properties.'synapse.script.mediator.default.engine'": "rhinoJs", "passthru_http.'http.socket.timeout'": "180000", "passthru_http.worker_pool_size_core": "400", "passthru_http.worker_pool_size_max": "500", diff --git a/pom.xml b/pom.xml index bf6d8610e8..74c4cbc69b 100644 --- a/pom.xml +++ b/pom.xml @@ -1288,7 +1288,7 @@ - 9.29.202 + 9.29.204 [9.0.0, 10.0.0) @@ -1310,10 +1310,10 @@ [4.5.0, 5.0.0) - 4.7.204 + 4.7.218 - 5.25.711 + 5.25.713 1.8.107 1.8.14 1.7.33 @@ -1337,7 +1337,7 @@ [1.0.0,2.0.0) - 4.11.14 + 4.11.16 4.9.27 @@ -1354,7 +1354,7 @@ 1.8 3.0-FINAL 1.0.0.M8-wso2v1 - 4.0.0-wso2v105 + 4.0.0-wso2v125 1.0.2 1.6.1-wso2v99 1.2.11-wso2v29 @@ -1397,7 +1397,7 @@ 4.4.10 4.5.3 6.11 - 3.6.3 + 3.6.4 2.0.0-wso2v66 5.1.13.RELEASE 7.0.96 @@ -1482,7 +1482,7 @@ 1.0.7 1.0.7 1.1.5 - 1.2.18 + 1.2.19 3.4.2.wso2v1 1.6.0-wso2v7 4.0.23