From d8274bd04b6f3bafdb714ea3d29c32e7c2e5cfee Mon Sep 17 00:00:00 2001
From: Domenico Sibilio <domenicosibilio@gmail.com>
Date: Tue, 6 Dec 2022 12:02:15 +0100
Subject: [PATCH] ACS-3160 Upgrade to Log4j2 (#1491)

* ACS-3160 Link to other Log4j2-migrated repos

* ACS-3160 Migrate Log4j1 leftovers to Log4j2

* Update pom.xml

* [ACS-3160] fix parent version

Co-authored-by: Aleksandra Onych <Aleksandra.Onych@hyland.com>
---
 dev/README.md                                 |  4 +--
 .../extension/custom-log4j.properties         | 20 -----------
 .../extension/custom-log4j2.properties        | 36 +++++++++++++++++++
 pom.xml                                       |  4 +--
 4 files changed, 40 insertions(+), 24 deletions(-)
 delete mode 100644 dev/dev-tomcat/src/main/tomcat/shared/classes/alfresco/extension/custom-log4j.properties
 create mode 100644 dev/dev-tomcat/src/main/tomcat/shared/classes/alfresco/extension/custom-log4j2.properties

diff --git a/dev/README.md b/dev/README.md
index e87a4a6eb..0a2b48c40 100644
--- a/dev/README.md
+++ b/dev/README.md
@@ -81,7 +81,7 @@ cd ..
 Set any alfresco-global.properties or log4j properties you may need in the following files. They will be copied
 to the `dev/dev-acs-amps-overlay/target` directory. Other customisations may also be placed in the `extension` directory. 
 ~~~
-dev/dev-tomcat/src/main/tomcat/shared/classes/alfresco/extension/custom-log4j.properties
+dev/dev-tomcat/src/main/tomcat/shared/classes/alfresco/extension/custom-log4j2.properties
 dev/dev-tomcat/src/main/tomcat/shared/classes/alfresco-global.properties
 ~~~
 
@@ -139,6 +139,6 @@ If you have not removed the containers, it is possible to restart the tomcat ins
 a `mvn install` (no `clean`), but this may result in failures if there are incompatibilities
 between the code, database and content in `dev/dev-acs-amps-overlay/target/dev-instance/runtime/alf_data`.
 Any changes made to alfresco-global properties or log4j will not be picked up, unless you
-directly edit `dev/dev-acs-amps-overlay/target/dev-instance/tomcat/shared/classes/alfresco/extension/custom-log4j.properties`
+directly edit `dev/dev-acs-amps-overlay/target/dev-instance/tomcat/shared/classes/alfresco/extension/custom-log4j2.properties`
 and `dev/dev-acs-amps-overlay/target/dev-instance/tomcat/shared/classes/alfresco-global.properties`, but they will be thrown away
 on the next `mvn clean`.
diff --git a/dev/dev-tomcat/src/main/tomcat/shared/classes/alfresco/extension/custom-log4j.properties b/dev/dev-tomcat/src/main/tomcat/shared/classes/alfresco/extension/custom-log4j.properties
deleted file mode 100644
index 106d21f10..000000000
--- a/dev/dev-tomcat/src/main/tomcat/shared/classes/alfresco/extension/custom-log4j.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-log4j.logger.org.alfresco.repo.content.transform.TransformerDebug=debug
-
-#log4j.logger.org.alfresco.util.exec.RuntimeExecBootstrapBean=debug
-#log4j.logger.org.alfresco.util.exec.RuntimeExec=debug
-
-#log4j.logger.org.alfresco.repo.rendition2=debug
-#log4j.logger.org.alfresco.repo.content.metadata=debug
-#log4j.logger.org.alfresco.repo.rendition2.LocalTransformClient=debug
-#log4j.logger.org.alfresco.repo.rendition.RenditionServiceImpl=debug
-#log4j.logger.org.alfresco.enterprise.repo.rendition2.RemoteTransformClient=debug
-
-#log4j.logger.org.alfresco.repo.content.transform.LocalTransformServiceRegistry=debug
-#log4j.logger.org.alfresco.repo.rendition2.RenditionDefinitionRegistry2Impl=debug
-#log4j.logger.org.alfresco.repo.content.MimetypeMap=debug
-#log4j.logger.org.alfresco.repo.content.transform.LocalTransform=debug
-
-#log4j.logger.org.alfresco.repo.rawevents=debug
-
-#log4j.logger.org.alfresco.repo.jscript.RhinoScriptProcessor=debug
-#log4j.logger.RhinoScriptProcessor.calls=debug
diff --git a/dev/dev-tomcat/src/main/tomcat/shared/classes/alfresco/extension/custom-log4j2.properties b/dev/dev-tomcat/src/main/tomcat/shared/classes/alfresco/extension/custom-log4j2.properties
new file mode 100644
index 000000000..f5ed942a3
--- /dev/null
+++ b/dev/dev-tomcat/src/main/tomcat/shared/classes/alfresco/extension/custom-log4j2.properties
@@ -0,0 +1,36 @@
+
+logger.alfresco-repo-content-transform-TransformerDebug.name=org.alfresco.repo.content.transform.TransformerDebug
+logger.alfresco-repo-content-transform-TransformerDebug.level=debug
+
+#logger.alfresco-util-exec-RuntimeExecBootstrapBean.name=org.alfresco.util.exec.RuntimeExecBootstrapBean
+#logger.alfresco-util-exec-RuntimeExecBootstrapBean.level=debug
+#logger.alfresco-util-exec-RuntimeExec.name=org.alfresco.util.exec.RuntimeExec
+#logger.alfresco-util-exec-RuntimeExec.level=debug
+
+#logger.alfresco-repo-rendition2.name=org.alfresco.repo.rendition2
+#logger.alfresco-repo-rendition2.level=debug
+#logger.alfresco-repo-content-metadata.name=org.alfresco.repo.content.metadata
+#logger.alfresco-repo-content-metadata.level=debug
+#logger.alfresco-repo-rendition2-LocalTransformClient.name=org.alfresco.repo.rendition2.LocalTransformClient
+#logger.alfresco-repo-rendition2-LocalTransformClient.level=debug
+#logger.alfresco-repo-rendition-RenditionServiceImpl.name=org.alfresco.repo.rendition.RenditionServiceImpl
+#logger.alfresco-repo-rendition-RenditionServiceImpl.level=debug
+#logger.alfresco-enterprise-repo-rendition2-RemoteTransformClient.name=org.alfresco.enterprise.repo.rendition2.RemoteTransformClient
+#logger.alfresco-enterprise-repo-rendition2-RemoteTransformClient.level=debug
+
+#logger.alfresco-repo-content-transform-LocalTransformServiceRegistry.name=org.alfresco.repo.content.transform.LocalTransformServiceRegistry
+#logger.alfresco-repo-content-transform-LocalTransformServiceRegistry.level=debug
+#logger.alfresco-repo-rendition2-RenditionDefinitionRegistry2Impl.name=org.alfresco.repo.rendition2.RenditionDefinitionRegistry2Impl
+#logger.alfresco-repo-rendition2-RenditionDefinitionRegistry2Impl.level=debug
+#logger.alfresco-repo-content-MimetypeMap.name=org.alfresco.repo.content.MimetypeMap
+#logger.alfresco-repo-content-MimetypeMap.level=debug
+#logger.alfresco-repo-content-transform-LocalTransform.name=org.alfresco.repo.content.transform.LocalTransform
+#logger.alfresco-repo-content-transform-LocalTransform.level=debug
+
+#logger.alfresco-repo-rawevents.name=org.alfresco.repo.rawevents
+#logger.alfresco-repo-rawevents.level=debug
+
+#logger.alfresco-repo-jscript-RhinoScriptProcessor.name=org.alfresco.repo.jscript.RhinoScriptProcessor
+#logger.alfresco-repo-jscript-RhinoScriptProcessor.level=debug
+#logger.calls.name=RhinoScriptProcessor.calls
+#logger.calls.level=debug
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 9422f98f9..6069e8276 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,11 +9,11 @@
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
         <relativePath>../alfresco-community-repo/pom.xml</relativePath>
-        <version>20.29</version>
+        <version>20.30</version>
     </parent>
 
     <properties>
-        <dependency.alfresco-community-repo.version>20.29</dependency.alfresco-community-repo.version>
+        <dependency.alfresco-community-repo.version>20.30</dependency.alfresco-community-repo.version>
         <dependency.alfresco-community-share.version>20.27</dependency.alfresco-community-share.version>
         <dependency.acs-packaging.version>7.4.0-M1</dependency.acs-packaging.version> <!-- for Share distribution zip -->