diff --git a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml index b00811586..ff31ad8f4 100644 --- a/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/pom.xml @@ -47,11 +47,6 @@ \${struts2.version} - - org.apache.logging.log4j - log4j-api - \${log4j2.version} - org.apache.logging.log4j log4j-core diff --git a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml index 87883a7fa..e6f625ce1 100644 --- a/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/struts2-archetype-blank/src/main/resources/archetype-resources/pom.xml @@ -35,12 +35,6 @@ test - - - org.apache.logging.log4j - log4j-api - \${log4j2.version} - org.apache.logging.log4j log4j-core diff --git a/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml b/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml index ebfb0dec8..584450930 100644 --- a/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/struts2-archetype-convention/src/main/resources/archetype-resources/pom.xml @@ -41,11 +41,6 @@ \${struts2.version} - - org.apache.logging.log4j - log4j-api - \${log4j2.version} - org.apache.logging.log4j log4j-core diff --git a/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml b/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml index c254752e5..62a0e8fc1 100644 --- a/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/pom.xml @@ -92,6 +92,12 @@ provided + + org.apache.logging.log4j + log4j-core + \${log4j2.version} + + diff --git a/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/resources/log4j2.xml b/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/resources/log4j2.xml new file mode 100644 index 000000000..6d27d1215 --- /dev/null +++ b/archetypes/struts2-archetype-dbportlet/src/main/resources/archetype-resources/src/main/resources/log4j2.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml b/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml index 007a2d637..6ab632913 100644 --- a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/pom.xml @@ -70,16 +70,11 @@ 1.3 + - commons-logging - commons-logging - 1.1.3 - - - - log4j - log4j - 1.2.17 + org.apache.logging.log4j + log4j-core + \${log4j2.version} diff --git a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/log4j.properties b/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/log4j.properties deleted file mode 100644 index cfd02d83c..000000000 --- a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/log4j.properties +++ /dev/null @@ -1,20 +0,0 @@ - -log4j.rootLogger = DEBUG, stdout - - -log4j.category.com.opensymphony.sitemesh=DEBUG -log4j.category.org.apache.struts2=INFO -log4j.category.org.apache=INFO -log4j.category.catalia=INFO - - - - -log4j.appender.stdout = org.apache.log4j.ConsoleAppender -log4j.appender.stdout.Threshold = DEBUG -log4j.appender.stdout.Target = System.out -log4j.appender.stdout.layout = org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern = %d{ISO8601} %-5p [%F:%L] : %m%n - - - diff --git a/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/log4j2.xml b/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/log4j2.xml new file mode 100644 index 000000000..d0cdc6d47 --- /dev/null +++ b/archetypes/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/log4j2.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file