Merge pull request #4492 from ashanthamara/4.12.x

Author: ashanthamara

distribution/kernel/carbon-home/repository/conf/log4j2.properties

@@ -80,21 +80,21 @@ appender.CARBON_TRACE_LOGFILE.strategy.type = DefaultRolloverStrategy
 appender.CARBON_TRACE_LOGFILE.strategy.max = 20
 
 # Appender config to put correlation Log.
-appender.CORRELATION.type = RollingFile
-appender.CORRELATION.name = CORRELATION
-appender.CORRELATION.fileName =${carbon.home}/repository/logs/${instance.log}/correlation.log
-appender.CORRELATION.layout.type = PatternLayout
-appender.CORRELATION.layout.pattern = %d{yyyy-MM-dd HH:mm:ss,SSS}|%X{Correlation-ID}|%t|%mm%n
-appender.CORRELATION.policies.type = Policies
-appender.CORRELATION.policies.time.type = TimeBasedTriggeringPolicy
-appender.CORRELATION.policies.time.interval = 1
-appender.CORRELATION.policies.time.modulate = true
-appender.CORRELATION.policies.size.type = SizeBasedTriggeringPolicy
-appender.CORRELATION.policies.size.size=10MB
-appender.CORRELATION.strategy.type = DefaultRolloverStrategy
-appender.CORRELATION.strategy.max = 20
-appender.CORRELATION.filter.threshold.type = ThresholdFilter
-appender.CORRELATION.filter.threshold.level = INFO
+#appender.CORRELATION.type = RollingFile
+#appender.CORRELATION.name = CORRELATION
+#appender.CORRELATION.fileName =${carbon.home}/repository/logs/${instance.log}/correlation.log
+#appender.CORRELATION.layout.type = PatternLayout
+#appender.CORRELATION.layout.pattern = %d{yyyy-MM-dd HH:mm:ss,SSS}|%X{Correlation-ID}|%t|%mm%n
+#appender.CORRELATION.policies.type = Policies
+#appender.CORRELATION.policies.time.type = TimeBasedTriggeringPolicy
+#appender.CORRELATION.policies.time.interval = 1
+#appender.CORRELATION.policies.time.modulate = true
+#appender.CORRELATION.policies.size.type = SizeBasedTriggeringPolicy
+#appender.CORRELATION.policies.size.size=10MB
+#appender.CORRELATION.strategy.type = DefaultRolloverStrategy
+#appender.CORRELATION.strategy.max = 20
+#appender.CORRELATION.filter.threshold.type = ThresholdFilter
+#appender.CORRELATION.filter.threshold.level = INFO
 
 # Uncomment the below lines to use the Syslog Appender
 #appender.syslog.type = Syslog
@@ -134,10 +134,10 @@ logger.org-apache-axis2-clustering.name = org.apache.axis2.clustering
 logger.org-apache-axis2-clustering.level = INFO
 logger.org-apache-axis2-clustering.additivity = false
 
-logger.org-apache.name = org.apache
-logger.org-apache.level = INFO
-logger.org-apache.additivity = false
-logger.org-apache.appenderRef.CARBON_LOGFILE.ref = CARBON_LOGFILE
+#logger.org-apache.name = org.apache
+#logger.org-apache.level = INFO
+#logger.org-apache.additivity = false
+#logger.org-apache.appenderRef.CARBON_LOGFILE.ref = CARBON_LOGFILE
 
 logger.org-apache-catalina.name = org.apache.catalina
 logger.org-apache-catalina.level = ERROR
@@ -198,8 +198,8 @@ logger.org-apache-solr.level = ERROR
 logger.me-prettyprint-cassandra-hector-TimingLogger.name = me.prettyprint.cassandra.hector.TimingLogger
 logger.me-prettyprint-cassandra-hector-TimingLogger.level = ERROR
 
-logger.org-wso2.name = org.wso2
-logger.org-wso2.level = ERROR
+#logger.org-wso2.name = org.wso2
+#logger.org-wso2.level = ERROR
 
 logger.org-apache-axis-enterprise.name = org.apache.axis2.enterprise
 logger.org-apache-axis-enterprise.level = FATAL
@@ -238,10 +238,10 @@ logger.org-apache-directory-server-ldap-LdapSession.name = org.apache.directory.
 logger.org-apache-directory-server-ldap-LdapSession.level = Error
 logger.org-apache-directory-server-ldap-LdapSession.appenderRef.CARBON_LOGFILE.ref = CARBON_LOGFILE
 
-logger.correlation.name = correlation
-logger.correlation.level = INFO
-logger.correlation.appenderRef.CORRELATION.ref = CORRELATION
-logger.correlation.additivity = false
+#logger.correlation.name = correlation
+#logger.correlation.level = INFO
+#logger.correlation.appenderRef.CORRELATION.ref = CORRELATION
+#logger.correlation.additivity = false
 
 #Hive Related Log configurations
 logger.DataNucleus.name = DataNucleus

parent/pom.xml

@@ -521,8 +521,8 @@
         <version.commons.logging>1.2</version.commons.logging>
 
         <!--PAX Logging related dependency versions-->
-        <pax.logging.api.version>2.1.0-wso2v5</pax.logging.api.version>
-        <pax.logging.log4j2.version>2.1.0-wso2v5</pax.logging.log4j2.version>
+        <pax.logging.api.version>2.2.9-wso2v2</pax.logging.api.version>
+        <pax.logging.log4j2.version>2.2.9-wso2v2</pax.logging.log4j2.version>
 
         <!--<version.opensaml2>2.4.1.wso2v1</version.opensaml2>-->
 
@@ -554,8 +554,8 @@
         <version.drools>5.1.1</version.drools>
         <version.jsr94>1.1</version.jsr94>
 
-        <version.log4j.core>2.17.1</version.log4j.core>
-        <version.log4j.jul>2.17.1</version.log4j.jul>
+        <version.log4j.core>2.25.3</version.log4j.core>
+        <version.log4j.jul>2.25.3</version.log4j.jul>
         <version.commons.logging>1.2</version.commons.logging>
         <version.xmlunit>1.1</version.xmlunit>
         <version.jaxen>1.1.1</version.jaxen>