PLUTO-787 Migrate from Log4j 1.x to Log4j 2.x due to CVE-2019-17571
diff --git a/maven-archetypes/bean-portlet-archetype/src/main/resources/archetype-resources/src/main/resources/log4j.properties b/maven-archetypes/bean-portlet-archetype/src/main/resources/archetype-resources/src/main/resources/log4j.properties
deleted file mode 100755
index b6e4e39..0000000
--- a/maven-archetypes/bean-portlet-archetype/src/main/resources/archetype-resources/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-log4j.rootLogger=INFO, CONSOLE
-
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
-
-log4j.logger.${package}.HelloWorldPortlet=DEBUG
diff --git a/maven-archetypes/bean-portlet-archetype/src/main/resources/archetype-resources/src/main/resources/log4j2.properties b/maven-archetypes/bean-portlet-archetype/src/main/resources/archetype-resources/src/main/resources/log4j2.properties
new file mode 100644
index 0000000..f54099f
--- /dev/null
+++ b/maven-archetypes/bean-portlet-archetype/src/main/resources/archetype-resources/src/main/resources/log4j2.properties
@@ -0,0 +1,17 @@
+status=error
+name=PropertiesConfig
+
+appender.console.name=STDOUT
+appender.console.layout.pattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+appender.console.layout.type=PatternLayout
+appender.console.target=SYSTEM_OUT
+appender.console.type=Console
+
+logger.javapkg.name=${package}
+logger.javapkg.level=debug
+logger.javapkg.additivity=false
+logger.javapkg.appenderRef.console.ref=STDOUT
+
+rootLogger.level=error
+rootLogger.additivity=false
+rootLogger.appenderRef.console.ref=STDOUT
\ No newline at end of file
diff --git a/maven-archetypes/generic-portlet-archetype/src/main/resources/archetype-resources/src/main/resources/log4j.properties b/maven-archetypes/generic-portlet-archetype/src/main/resources/archetype-resources/src/main/resources/log4j.properties
deleted file mode 100755
index b6e4e39..0000000
--- a/maven-archetypes/generic-portlet-archetype/src/main/resources/archetype-resources/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-log4j.rootLogger=INFO, CONSOLE
-
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
-
-log4j.logger.${package}.HelloWorldPortlet=DEBUG
diff --git a/maven-archetypes/generic-portlet-archetype/src/main/resources/archetype-resources/src/main/resources/log4j2.properties b/maven-archetypes/generic-portlet-archetype/src/main/resources/archetype-resources/src/main/resources/log4j2.properties
new file mode 100644
index 0000000..f54099f
--- /dev/null
+++ b/maven-archetypes/generic-portlet-archetype/src/main/resources/archetype-resources/src/main/resources/log4j2.properties
@@ -0,0 +1,17 @@
+status=error
+name=PropertiesConfig
+
+appender.console.name=STDOUT
+appender.console.layout.pattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+appender.console.layout.type=PatternLayout
+appender.console.target=SYSTEM_OUT
+appender.console.type=Console
+
+logger.javapkg.name=${package}
+logger.javapkg.level=debug
+logger.javapkg.additivity=false
+logger.javapkg.appenderRef.console.ref=STDOUT
+
+rootLogger.level=error
+rootLogger.additivity=false
+rootLogger.appenderRef.console.ref=STDOUT
\ No newline at end of file
diff --git a/maven-archetypes/mvcbean-jsp-portlet-archetype/src/main/resources/archetype-resources/src/main/resources/log4j.properties b/maven-archetypes/mvcbean-jsp-portlet-archetype/src/main/resources/archetype-resources/src/main/resources/log4j.properties
deleted file mode 100755
index 5b2d310..0000000
--- a/maven-archetypes/mvcbean-jsp-portlet-archetype/src/main/resources/archetype-resources/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-log4j.rootLogger=INFO, CONSOLE
-
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
-
-log4j.logger.${package}=DEBUG
diff --git a/maven-archetypes/mvcbean-jsp-portlet-archetype/src/main/resources/archetype-resources/src/main/resources/log4j2.properties b/maven-archetypes/mvcbean-jsp-portlet-archetype/src/main/resources/archetype-resources/src/main/resources/log4j2.properties
new file mode 100644
index 0000000..f54099f
--- /dev/null
+++ b/maven-archetypes/mvcbean-jsp-portlet-archetype/src/main/resources/archetype-resources/src/main/resources/log4j2.properties
@@ -0,0 +1,17 @@
+status=error
+name=PropertiesConfig
+
+appender.console.name=STDOUT
+appender.console.layout.pattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+appender.console.layout.type=PatternLayout
+appender.console.target=SYSTEM_OUT
+appender.console.type=Console
+
+logger.javapkg.name=${package}
+logger.javapkg.level=debug
+logger.javapkg.additivity=false
+logger.javapkg.appenderRef.console.ref=STDOUT
+
+rootLogger.level=error
+rootLogger.additivity=false
+rootLogger.appenderRef.console.ref=STDOUT
\ No newline at end of file
diff --git a/maven-archetypes/mvcbean-thymeleaf-portlet-archetype/src/main/resources/archetype-resources/src/main/resources/log4j.properties b/maven-archetypes/mvcbean-thymeleaf-portlet-archetype/src/main/resources/archetype-resources/src/main/resources/log4j.properties
deleted file mode 100755
index 5b2d310..0000000
--- a/maven-archetypes/mvcbean-thymeleaf-portlet-archetype/src/main/resources/archetype-resources/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-log4j.rootLogger=INFO, CONSOLE
-
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
-
-log4j.logger.${package}=DEBUG
diff --git a/maven-archetypes/mvcbean-thymeleaf-portlet-archetype/src/main/resources/archetype-resources/src/main/resources/log4j2.properties b/maven-archetypes/mvcbean-thymeleaf-portlet-archetype/src/main/resources/archetype-resources/src/main/resources/log4j2.properties
new file mode 100644
index 0000000..f54099f
--- /dev/null
+++ b/maven-archetypes/mvcbean-thymeleaf-portlet-archetype/src/main/resources/archetype-resources/src/main/resources/log4j2.properties
@@ -0,0 +1,17 @@
+status=error
+name=PropertiesConfig
+
+appender.console.name=STDOUT
+appender.console.layout.pattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
+appender.console.layout.type=PatternLayout
+appender.console.target=SYSTEM_OUT
+appender.console.type=Console
+
+logger.javapkg.name=${package}
+logger.javapkg.level=debug
+logger.javapkg.additivity=false
+logger.javapkg.appenderRef.console.ref=STDOUT
+
+rootLogger.level=error
+rootLogger.additivity=false
+rootLogger.appenderRef.console.ref=STDOUT
\ No newline at end of file
