From 7136d2690313c0393310d38f89385a34edf87dc7 Mon Sep 17 00:00:00 2001
From: Gonzalo Gallotti <gonzalogallotti@gmail.com>
Date: Thu, 20 Oct 2022 13:36:28 -0300
Subject: [PATCH 1/8] Log4J maven version refactoring. Bump version

---
 java/pom.xml          | 24 ++++++++++++------------
 pom.xml               |  1 +
 wrappercommon/pom.xml |  2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/java/pom.xml b/java/pom.xml
index a341c6daa..552ba952c 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -44,12 +44,12 @@
 			<artifactId>commons-collections4</artifactId>
 			<version>4.1</version>
 		</dependency>
-    <dependency>
-        <groupId>org.apache.logging.log4j</groupId>
-        <artifactId>log4j-1.2-api</artifactId>
-        <version>2.17.1</version>
-    </dependency>		
-		<dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
+        <dependency>
 			<groupId>javax.ejb</groupId>
 			<artifactId>ejb-api</artifactId>
 			<version>3.0</version>
@@ -149,14 +149,14 @@
 		</dependency>        
 		<dependency>
 			<groupId>jakarta.ws.rs</groupId>
-    	<artifactId>jakarta.ws.rs-api</artifactId>
-    	<version>3.0.0</version>
+    	    <artifactId>jakarta.ws.rs-api</artifactId>
+    	    <version>3.0.0</version>
 		</dependency>
 		<dependency>
-    	<groupId>org.xerial</groupId>
-    	<artifactId>sqlite-jdbc</artifactId>
-    	<version>3.36.0.3</version>
-    	<scope>test</scope>
+    	    <groupId>org.xerial</groupId>
+    	    <artifactId>sqlite-jdbc</artifactId>
+    	    <version>3.36.0.3</version>
+    	    <scope>test</scope>
 		</dependency>
     </dependencies>
 	
diff --git a/pom.xml b/pom.xml
index 86b99183c..7b222f82e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,6 +26,7 @@
         <junit.version>4.13.2</junit.version>
         <com.amazonaws.version>1.12.93</com.amazonaws.version>
         <software.awssdk.version>2.17.272</software.awssdk.version>
+        <log4j.version>2.19.0</log4j.version>
     </properties>
 
 	<organization>
diff --git a/wrappercommon/pom.xml b/wrappercommon/pom.xml
index c940d4079..dae35e8c2 100644
--- a/wrappercommon/pom.xml
+++ b/wrappercommon/pom.xml
@@ -27,7 +27,7 @@
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-core</artifactId>
-			<version>2.17.1</version>
+			<version>${log4j.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>

From 43110f40238f3f7e8974b964a119eeebbe3b3e50 Mon Sep 17 00:00:00 2001
From: Gonzalo Gallotti <gonzalogallotti@gmail.com>
Date: Thu, 20 Oct 2022 13:38:37 -0300
Subject: [PATCH 2/8] Add log4j json pattern layout support

---
 java/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/java/pom.xml b/java/pom.xml
index 552ba952c..123f70bd9 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -49,6 +49,12 @@
             <artifactId>log4j-api</artifactId>
             <version>${log4j.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-layout-template-json</artifactId>
+            <version>${log4j.version}</version>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
 			<groupId>javax.ejb</groupId>
 			<artifactId>ejb-api</artifactId>

From 41092c8b6284710addfb37ee86440a4656b4b744 Mon Sep 17 00:00:00 2001
From: Gonzalo Gallotti <gonzalogallotti@gmail.com>
Date: Thu, 20 Oct 2022 14:55:16 -0300
Subject: [PATCH 3/8] Fix build error

---
 java/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/java/pom.xml b/java/pom.xml
index 123f70bd9..b9598276e 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -53,7 +53,6 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-layout-template-json</artifactId>
             <version>${log4j.version}</version>
-            <scope>runtime</scope>
         </dependency>
         <dependency>
 			<groupId>javax.ejb</groupId>

From 0dca8fe2cf5f2e1b75d24cf669033be1f4ab09e4 Mon Sep 17 00:00:00 2001
From: Gonzalo Gallotti <gonzalogallotti@gmail.com>
Date: Thu, 20 Oct 2022 15:55:24 -0300
Subject: [PATCH 4/8] Fix build

---
 gxawsserverless/src/test/java/log4j2.xml | 32 ++++++++++++++++++------
 java/pom.xml                             |  4 +--
 wrappercommon/pom.xml                    | 10 ++++----
 3 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/gxawsserverless/src/test/java/log4j2.xml b/gxawsserverless/src/test/java/log4j2.xml
index 412bab990..2ff3a3346 100644
--- a/gxawsserverless/src/test/java/log4j2.xml
+++ b/gxawsserverless/src/test/java/log4j2.xml
@@ -1,20 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Configuration status="warn">
     <Properties>
-        <Property name="logPath">logs</Property>
+        <Property name="logBaseDir">${main:0:-.}${sys:file.separator}logs${sys:file.separator}</Property>
+
+        <Property name="logFile">${logBaseDir}client.log</Property>
     </Properties>
+
     <Appenders>
-        <Console name="GeneXusDefaultLogger" target="SYSTEM_OUT">
-            <PatternLayout pattern="%p\t%d{ISO8601}\t%r\t%c\t[%t]\t%m%n"/>
+        <RollingFile name="RollingFile" fileName="${logFile}" filePattern="${logBaseDir}old${sys:file.separator}app-%d{yyyy-MM-dd-HH}-%i.log.gz">
+            <PatternLayout pattern="%d{ISO8601} [%t] %-5p %c - %m%n"/>
+
+            <Policies>
+                <TimeBasedTriggeringPolicy />
+                <SizeBasedTriggeringPolicy size="10 MB"/>
+            </Policies>
+        </RollingFile>
+
+        <Console name="ConsoleAppender" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{ISO8601} [%t] %-5p %c - %m%n"/>
+
         </Console>
 
     </Appenders>
+
     <Loggers>
-        <Root level="DEBUG">
+        <Root level="${env:LOG_LEVEL:-INFO}">
+            <AppenderRef ref="${env:LOG_OUTPUT:-ConsoleAppender}"/>
         </Root>
-        <!-- For compatibility reasons. All GeneXus Standard Classes log goes to standard output unless Logging Property is enabled -->
-        <logger name="com.genexus" level="DEBUG" additivity="false">
-            <AppenderRef ref="GeneXusDefaultLogger"/>
+        <logger name="com.genexus" level="${env:LOG_LEVEL:-INFO}" additivity="false">
+            <AppenderRef ref="${env:LOG_OUTPUT:-ConsoleAppender}"/>
+        </logger>
+        <!-- User custom Logging !-->
+        <logger name="GeneXusUserLog" level="${env:LOG_LEVEL_USER:-ALL}" additivity="false">
+            <AppenderRef ref="${env:LOG_OUTPUT:-ConsoleAppender}"/>
         </logger>
 
     </Loggers>
diff --git a/java/pom.xml b/java/pom.xml
index b9598276e..be666c8fb 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -46,12 +46,12 @@
 		</dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
+            <artifactId>log4j-core</artifactId>
             <version>${log4j.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-layout-template-json</artifactId>
+            <artifactId>log4j-api</artifactId>
             <version>${log4j.version}</version>
         </dependency>
         <dependency>
diff --git a/wrappercommon/pom.xml b/wrappercommon/pom.xml
index dae35e8c2..15428dc98 100644
--- a/wrappercommon/pom.xml
+++ b/wrappercommon/pom.xml
@@ -23,12 +23,12 @@
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-core</artifactId>
 			<version>2.11.0</version>
-		</dependency>			
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-core</artifactId>
-			<version>${log4j.version}</version>
 		</dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>

From 59cb65c445a98626adace1c5014a3eb1ff75bd53 Mon Sep 17 00:00:00 2001
From: Gonzalo Gallotti <gonzalogallotti@gmail.com>
Date: Thu, 20 Oct 2022 16:04:21 -0300
Subject: [PATCH 5/8] Keep using current log4j version in order not to break
 fullgx comparison

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7b222f82e..1f446274a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
         <junit.version>4.13.2</junit.version>
         <com.amazonaws.version>1.12.93</com.amazonaws.version>
         <software.awssdk.version>2.17.272</software.awssdk.version>
-        <log4j.version>2.19.0</log4j.version>
+        <log4j.version>2.17.1</log4j.version>
     </properties>
 
 	<organization>

From 099e62a020d261e80e31f01af43f74455b0ef045 Mon Sep 17 00:00:00 2001
From: Gonzalo Gallotti <gonzalogallotti@gmail.com>
Date: Thu, 20 Oct 2022 17:09:23 -0300
Subject: [PATCH 6/8] Add OpenTelemetry API

---
 java/pom.xml | 5 +++++
 pom.xml      | 1 +
 2 files changed, 6 insertions(+)

diff --git a/java/pom.xml b/java/pom.xml
index be666c8fb..d44fe663a 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -163,6 +163,11 @@
     	    <version>3.36.0.3</version>
     	    <scope>test</scope>
 		</dependency>
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+            <version>${io.opentelemetry.version}</version>
+        </dependency>
     </dependencies>
 	
 	<build>
diff --git a/pom.xml b/pom.xml
index 1f446274a..c7fa30543 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,7 @@
         <com.amazonaws.version>1.12.93</com.amazonaws.version>
         <software.awssdk.version>2.17.272</software.awssdk.version>
         <log4j.version>2.17.1</log4j.version>
+        <io.opentelemetry.version>1.19.0</io.opentelemetry.version>
     </properties>
 
 	<organization>

From d7eaecbae0b4807feec7b2397eae99d3d777f609 Mon Sep 17 00:00:00 2001
From: Gonzalo Gallotti <gonzalogallotti@gmail.com>
Date: Tue, 1 Nov 2022 10:08:39 -0300
Subject: [PATCH 7/8] Bump Log4J version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c7fa30543..8d829bad6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
         <junit.version>4.13.2</junit.version>
         <com.amazonaws.version>1.12.93</com.amazonaws.version>
         <software.awssdk.version>2.17.272</software.awssdk.version>
-        <log4j.version>2.17.1</log4j.version>
+        <log4j.version>2.19.0</log4j.version>
         <io.opentelemetry.version>1.19.0</io.opentelemetry.version>
     </properties>
 

From 5fce21f041b77c714b995ac9c6bd5a50fff9d1a1 Mon Sep 17 00:00:00 2001
From: Gonzalo Gallotti <gonzalogallotti@gmail.com>
Date: Thu, 17 Nov 2022 15:12:19 -0300
Subject: [PATCH 8/8] Restore logj2 1.2 API

---
 java/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/java/pom.xml b/java/pom.xml
index d44fe663a..4d2fbb9b2 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -54,6 +54,11 @@
             <artifactId>log4j-api</artifactId>
             <version>${log4j.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-1.2-api</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
         <dependency>
 			<groupId>javax.ejb</groupId>
 			<artifactId>ejb-api</artifactId>