You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by sd...@apache.org on 2017/04/21 22:10:53 UTC
[1/2] struts git commit: WW-4780 fixed logging in the
struts2-cdi-plugin tests
Repository: struts
Updated Branches:
refs/heads/master 11cccb68a -> b465791dc
WW-4780 fixed logging in the struts2-cdi-plugin tests
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/defaf43a
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/defaf43a
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/defaf43a
Branch: refs/heads/master
Commit: defaf43a4c27ca62b9ec8db5749ef4a6f80fc719
Parents: 11cccb6
Author: Stefaan Dutry <st...@gmail.com>
Authored: Fri Apr 21 23:49:43 2017 +0200
Committer: Stefaan Dutry <st...@gmail.com>
Committed: Fri Apr 21 23:49:43 2017 +0200
----------------------------------------------------------------------
plugins/cdi/pom.xml | 5 +++--
plugins/cdi/src/test/resources/log4j.properties | 11 -----------
plugins/cdi/src/test/resources/log4j2.xml | 14 ++++++++++++++
3 files changed, 17 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/defaf43a/plugins/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/cdi/pom.xml b/plugins/cdi/pom.xml
index fee24ca..90239f3 100644
--- a/plugins/cdi/pom.xml
+++ b/plugins/cdi/pom.xml
@@ -59,8 +59,9 @@
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j2.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/struts/blob/defaf43a/plugins/cdi/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/plugins/cdi/src/test/resources/log4j.properties b/plugins/cdi/src/test/resources/log4j.properties
deleted file mode 100644
index 77d9939..0000000
--- a/plugins/cdi/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# Set root logger level to WARN and append to stdout
-log4j.rootLogger=INFO, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-
-# Pattern to output the caller's file name and line number.
-log4j.appender.stdout.layout.ConversionPattern=%d %5p (%c:%L) - %m%n
-
-# Print only messages of level ERROR or above in the package noModule.
-log4j.logger.noModule=FATAL
http://git-wip-us.apache.org/repos/asf/struts/blob/defaf43a/plugins/cdi/src/test/resources/log4j2.xml
----------------------------------------------------------------------
diff --git a/plugins/cdi/src/test/resources/log4j2.xml b/plugins/cdi/src/test/resources/log4j2.xml
new file mode 100644
index 0000000..3edabe1
--- /dev/null
+++ b/plugins/cdi/src/test/resources/log4j2.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration>
+ <Appenders>
+ <Console name="STDOUT" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d %5p (%c:%L) - %m%n"/>
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Logger name="noModule" level="fatal"/>
+ <Root level="info">
+ <AppenderRef ref="STDOUT"/>
+ </Root>
+ </Loggers>
+</Configuration>
[2/2] struts git commit: WW-4780 fixed logging in the
struts2-portlet-plugin tests
Posted by sd...@apache.org.
WW-4780 fixed logging in the struts2-portlet-plugin tests
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/b465791d
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/b465791d
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/b465791d
Branch: refs/heads/master
Commit: b465791dc2097b24991da4b61245278a7b48c88c
Parents: defaf43
Author: Stefaan Dutry <st...@gmail.com>
Authored: Sat Apr 22 00:05:41 2017 +0200
Committer: Stefaan Dutry <st...@gmail.com>
Committed: Sat Apr 22 00:05:41 2017 +0200
----------------------------------------------------------------------
plugins/portlet/pom.xml | 5 +++--
plugins/portlet/src/test/resources/log4j2.xml | 13 +++++++++++++
2 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/b465791d/plugins/portlet/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet/pom.xml b/plugins/portlet/pom.xml
index 33957d7..7a04cda 100644
--- a/plugins/portlet/pom.xml
+++ b/plugins/portlet/pom.xml
@@ -94,8 +94,9 @@
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j2.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/struts/blob/b465791d/plugins/portlet/src/test/resources/log4j2.xml
----------------------------------------------------------------------
diff --git a/plugins/portlet/src/test/resources/log4j2.xml b/plugins/portlet/src/test/resources/log4j2.xml
new file mode 100644
index 0000000..395e01b
--- /dev/null
+++ b/plugins/portlet/src/test/resources/log4j2.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration>
+ <Appenders>
+ <Console name="STDOUT" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d %5p (%c:%L) - %m%n"/>
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Root level="info">
+ <AppenderRef ref="STDOUT"/>
+ </Root>
+ </Loggers>
+</Configuration>