branch pollen-udpate-1.6 updated (9618a34 -> 77fa61f)
This is an automated email from the git hooks/post-receive script. New change to branch pollen-udpate-1.6 in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git from 9618a34 Oups new 77fa61f Update to log4j2 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 77fa61f67bd9de996bfee372b275034c1ba9d1d8 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Sun Nov 15 23:03:16 2015 +0100 Update to log4j2 Summary of changes: pollen-persistence/pom.xml | 16 +++++--- .../src/test/resources/log4j.properties | 32 --------------- pollen-persistence/src/test/resources/log4j2.xml | 14 +++++++ pollen-services/pom.xml | 16 +++++--- .../src/test/resources/log4j.properties | 32 --------------- pollen-services/src/test/resources/log4j2.xml | 14 +++++++ pollen-ui-struts2/pom.xml | 21 ++++++---- pollen-ui-struts2/src/it/createPoll/pom.xml | 8 ---- pollen-ui-struts2/src/main/resources/log4j2.xml | 31 ++++++++++++++ .../src/test/resources/log4j.properties | 30 -------------- pollen-ui-struts2/src/test/resources/log4j2.xml | 14 +++++++ pollen-votecounting-api/pom.xml | 16 +++++++- .../src/test/resources/log4j.properties | 30 -------------- .../src/test/resources/log4j2.xml | 14 +++++++ pollen-votecounting-borda/pom.xml | 16 +++++++- .../src/test/resources/log4j.properties | 30 -------------- .../src/test/resources/log4j2.xml | 14 +++++++ pollen-votecounting-condorcet/pom.xml | 16 +++++++- .../src/test/resources/log4j.properties | 30 -------------- .../src/test/resources/log4j2.xml | 14 +++++++ pollen-votecounting-coombs/pom.xml | 16 +++++++- .../src/test/resources/log4j.properties | 30 -------------- .../src/test/resources/log4j2.xml | 14 +++++++ pollen-votecounting-instant-runoff/pom.xml | 16 +++++++- .../src/test/resources/log4j.properties | 30 -------------- .../src/test/resources/log4j2.xml | 14 +++++++ pollen-votecounting-normal/pom.xml | 16 +++++++- .../src/test/resources/log4j.properties | 30 -------------- .../src/test/resources/log4j2.xml | 14 +++++++ pollen-votecounting-number/pom.xml | 16 +++++++- .../src/test/resources/log4j.properties | 30 -------------- .../src/test/resources/log4j2.xml | 14 +++++++ pollen-votecounting-percentage/pom.xml | 16 +++++++- .../src/test/resources/log4j.properties | 30 -------------- .../src/test/resources/log4j2.xml | 14 +++++++ pom.xml | 48 ++++++++++++++++------ 36 files changed, 366 insertions(+), 390 deletions(-) delete mode 100644 pollen-persistence/src/test/resources/log4j.properties create mode 100644 pollen-persistence/src/test/resources/log4j2.xml delete mode 100644 pollen-services/src/test/resources/log4j.properties create mode 100644 pollen-services/src/test/resources/log4j2.xml create mode 100644 pollen-ui-struts2/src/main/resources/log4j2.xml delete mode 100644 pollen-ui-struts2/src/test/resources/log4j.properties create mode 100644 pollen-ui-struts2/src/test/resources/log4j2.xml delete mode 100644 pollen-votecounting-api/src/test/resources/log4j.properties create mode 100644 pollen-votecounting-api/src/test/resources/log4j2.xml delete mode 100644 pollen-votecounting-borda/src/test/resources/log4j.properties create mode 100644 pollen-votecounting-borda/src/test/resources/log4j2.xml delete mode 100644 pollen-votecounting-condorcet/src/test/resources/log4j.properties create mode 100644 pollen-votecounting-condorcet/src/test/resources/log4j2.xml delete mode 100644 pollen-votecounting-coombs/src/test/resources/log4j.properties create mode 100644 pollen-votecounting-coombs/src/test/resources/log4j2.xml delete mode 100644 pollen-votecounting-instant-runoff/src/test/resources/log4j.properties create mode 100644 pollen-votecounting-instant-runoff/src/test/resources/log4j2.xml delete mode 100644 pollen-votecounting-normal/src/test/resources/log4j.properties create mode 100644 pollen-votecounting-normal/src/test/resources/log4j2.xml delete mode 100644 pollen-votecounting-number/src/test/resources/log4j.properties create mode 100644 pollen-votecounting-number/src/test/resources/log4j2.xml delete mode 100644 pollen-votecounting-percentage/src/test/resources/log4j.properties create mode 100644 pollen-votecounting-percentage/src/test/resources/log4j2.xml -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git commit 77fa61f67bd9de996bfee372b275034c1ba9d1d8 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Sun Nov 15 23:03:16 2015 +0100 Update to log4j2 --- pollen-persistence/pom.xml | 16 +++++--- .../src/test/resources/log4j.properties | 32 --------------- pollen-persistence/src/test/resources/log4j2.xml | 14 +++++++ pollen-services/pom.xml | 16 +++++--- .../src/test/resources/log4j.properties | 32 --------------- pollen-services/src/test/resources/log4j2.xml | 14 +++++++ pollen-ui-struts2/pom.xml | 21 ++++++---- pollen-ui-struts2/src/it/createPoll/pom.xml | 8 ---- pollen-ui-struts2/src/main/resources/log4j2.xml | 31 ++++++++++++++ .../src/test/resources/log4j.properties | 30 -------------- pollen-ui-struts2/src/test/resources/log4j2.xml | 14 +++++++ pollen-votecounting-api/pom.xml | 16 +++++++- .../src/test/resources/log4j.properties | 30 -------------- .../src/test/resources/log4j2.xml | 14 +++++++ pollen-votecounting-borda/pom.xml | 16 +++++++- .../src/test/resources/log4j.properties | 30 -------------- .../src/test/resources/log4j2.xml | 14 +++++++ pollen-votecounting-condorcet/pom.xml | 16 +++++++- .../src/test/resources/log4j.properties | 30 -------------- .../src/test/resources/log4j2.xml | 14 +++++++ pollen-votecounting-coombs/pom.xml | 16 +++++++- .../src/test/resources/log4j.properties | 30 -------------- .../src/test/resources/log4j2.xml | 14 +++++++ pollen-votecounting-instant-runoff/pom.xml | 16 +++++++- .../src/test/resources/log4j.properties | 30 -------------- .../src/test/resources/log4j2.xml | 14 +++++++ pollen-votecounting-normal/pom.xml | 16 +++++++- .../src/test/resources/log4j.properties | 30 -------------- .../src/test/resources/log4j2.xml | 14 +++++++ pollen-votecounting-number/pom.xml | 16 +++++++- .../src/test/resources/log4j.properties | 30 -------------- .../src/test/resources/log4j2.xml | 14 +++++++ pollen-votecounting-percentage/pom.xml | 16 +++++++- .../src/test/resources/log4j.properties | 30 -------------- .../src/test/resources/log4j2.xml | 14 +++++++ pom.xml | 48 ++++++++++++++++------ 36 files changed, 366 insertions(+), 390 deletions(-) diff --git a/pollen-persistence/pom.xml b/pollen-persistence/pom.xml index b56ab8c..9c28d0b 100644 --- a/pollen-persistence/pom.xml +++ b/pollen-persistence/pom.xml @@ -88,14 +88,20 @@ </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jcl</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> <scope>test</scope> </dependency> - + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> diff --git a/pollen-persistence/src/test/resources/log4j.properties b/pollen-persistence/src/test/resources/log4j.properties deleted file mode 100644 index fbba941..0000000 --- a/pollen-persistence/src/test/resources/log4j.properties +++ /dev/null @@ -1,32 +0,0 @@ -### -# #%L -# Pollen :: Persistence -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### -log4j.rootCategory=WARN, A1 - -# A1 is set to be a ConsoleAppender. -log4j.appender.A1=org.apache.log4j.ConsoleAppender - -# A1 uses PatternLayout. -log4j.appender.A1.layout=org.apache.log4j.PatternLayout -log4j.appender.A1.layout.ConversionPattern=[%p] %c %m%n - -log4j.logger.org.chorem.pollen=INFO diff --git a/pollen-persistence/src/test/resources/log4j2.xml b/pollen-persistence/src/test/resources/log4j2.xml new file mode 100644 index 0000000..d31e7d4 --- /dev/null +++ b/pollen-persistence/src/test/resources/log4j2.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration status="WARN"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="[%p] %c %m%n"/> + </Console> + </Appenders> + <Loggers> + <Logger name="org.chorem.pollen" level="info"/> + <Root level="warn"> + <AppenderRef ref="Console"/> + </Root> + </Loggers> +</Configuration> \ No newline at end of file diff --git a/pollen-services/pom.xml b/pollen-services/pom.xml index 3e33bd5..d95234f 100644 --- a/pollen-services/pom.xml +++ b/pollen-services/pom.xml @@ -108,14 +108,20 @@ </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jcl</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> <scope>test</scope> </dependency> - + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> diff --git a/pollen-services/src/test/resources/log4j.properties b/pollen-services/src/test/resources/log4j.properties deleted file mode 100644 index e029737..0000000 --- a/pollen-services/src/test/resources/log4j.properties +++ /dev/null @@ -1,32 +0,0 @@ -### -# #%L -# Pollen :: Services -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### -log4j.rootCategory=WARN, A1 - -# A1 is set to be a ConsoleAppender. -log4j.appender.A1=org.apache.log4j.ConsoleAppender - -# A1 uses PatternLayout. -log4j.appender.A1.layout=org.apache.log4j.PatternLayout -log4j.appender.A1.layout.ConversionPattern=[%p] %c %m%n - -log4j.logger.org.chorem.pollen=INFO diff --git a/pollen-services/src/test/resources/log4j2.xml b/pollen-services/src/test/resources/log4j2.xml new file mode 100644 index 0000000..d31e7d4 --- /dev/null +++ b/pollen-services/src/test/resources/log4j2.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration status="WARN"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="[%p] %c %m%n"/> + </Console> + </Appenders> + <Loggers> + <Logger name="org.chorem.pollen" level="info"/> + <Root level="warn"> + <AppenderRef ref="Console"/> + </Root> + </Loggers> +</Configuration> \ No newline at end of file diff --git a/pollen-ui-struts2/pom.xml b/pollen-ui-struts2/pom.xml index 75d6e65..a8a125a 100644 --- a/pollen-ui-struts2/pom.xml +++ b/pollen-ui-struts2/pom.xml @@ -218,16 +218,19 @@ <scope>runtime</scope> </dependency> - <!--dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jcl</artifactId> - <scope>runtime</scope> - </dependency--> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>runtime</scope> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> </dependency> <!-- Test dependencies --> diff --git a/pollen-ui-struts2/src/it/createPoll/pom.xml b/pollen-ui-struts2/src/it/createPoll/pom.xml index be52f6f..d620831 100644 --- a/pollen-ui-struts2/src/it/createPoll/pom.xml +++ b/pollen-ui-struts2/src/it/createPoll/pom.xml @@ -39,13 +39,5 @@ <name>Pollen :: IT createPoll</name> <description>createPoll</description> - <dependencies> - <dependency> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - <version>1.4.01</version> - </dependency> - </dependencies> - </project> diff --git a/pollen-ui-struts2/src/main/resources/log4j2.xml b/pollen-ui-struts2/src/main/resources/log4j2.xml new file mode 100644 index 0000000..5240491 --- /dev/null +++ b/pollen-ui-struts2/src/main/resources/log4j2.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration status="WARN"> + <Properties> + <Property name="pollen.log.dir">/tmp</Property> + </Properties> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d [%p] %c %m%n"/> + </Console> + <RollingFile name="File" fileName="${sys:pollen.log.dir}/pollen.log" + filePattern="${sys:pollen.log.dir}/pollen-%d{yyyyMMdd}-%i.log"> + <PatternLayout> + <pattern>%d{yyyy/MM/dd HH:mm:ss} %5p (%F:%L) %m%n</pattern> + </PatternLayout> + <Policies> + <TimeBasedTriggeringPolicy /> + <SizeBasedTriggeringPolicy size="10 MB"/> + </Policies> + <DefaultRolloverStrategy max="5"/> + </RollingFile> + + </Appenders> + <Loggers> + <Logger name="org.chorem.pollen" level="info"/> + <Logger name="org.nuiton" level="warn" /> + <Root level="warn"> + <AppenderRef ref="Console"/> + <AppenderRef ref="File" /> + </Root> + </Loggers> +</Configuration> \ No newline at end of file diff --git a/pollen-ui-struts2/src/test/resources/log4j.properties b/pollen-ui-struts2/src/test/resources/log4j.properties deleted file mode 100644 index 6a18cf2..0000000 --- a/pollen-ui-struts2/src/test/resources/log4j.properties +++ /dev/null @@ -1,30 +0,0 @@ -### -# #%L -# Pollen :: UI (struts2) -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2012 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### -# Global logging configuration -log4j.rootLogger=WARN, stdout -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n -# package level -log4j.logger.org.chorem.pollen=INFO diff --git a/pollen-ui-struts2/src/test/resources/log4j2.xml b/pollen-ui-struts2/src/test/resources/log4j2.xml new file mode 100644 index 0000000..cc4556f --- /dev/null +++ b/pollen-ui-struts2/src/test/resources/log4j2.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration status="WARN"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d %5p [%t] (%F:%L) %M - %m%n"/> + </Console> + </Appenders> + <Loggers> + <Logger name="org.chorem.pollen" level="info"/> + <Root level="warn"> + <AppenderRef ref="Console"/> + </Root> + </Loggers> +</Configuration> \ No newline at end of file diff --git a/pollen-votecounting-api/pom.xml b/pollen-votecounting-api/pom.xml index 34d2185..8aa8e8e 100644 --- a/pollen-votecounting-api/pom.xml +++ b/pollen-votecounting-api/pom.xml @@ -33,8 +33,20 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> diff --git a/pollen-votecounting-api/src/test/resources/log4j.properties b/pollen-votecounting-api/src/test/resources/log4j.properties deleted file mode 100644 index 2c35996..0000000 --- a/pollen-votecounting-api/src/test/resources/log4j.properties +++ /dev/null @@ -1,30 +0,0 @@ -### -# #%L -# Pollen :: VoteCounting Api -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2012 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### -# Global logging configuration -log4j.rootLogger=WARN, stdout -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n -# package level -log4j.logger.org.chorem.pollen=INFO diff --git a/pollen-votecounting-api/src/test/resources/log4j2.xml b/pollen-votecounting-api/src/test/resources/log4j2.xml new file mode 100644 index 0000000..cc4556f --- /dev/null +++ b/pollen-votecounting-api/src/test/resources/log4j2.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration status="WARN"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d %5p [%t] (%F:%L) %M - %m%n"/> + </Console> + </Appenders> + <Loggers> + <Logger name="org.chorem.pollen" level="info"/> + <Root level="warn"> + <AppenderRef ref="Console"/> + </Root> + </Loggers> +</Configuration> \ No newline at end of file diff --git a/pollen-votecounting-borda/pom.xml b/pollen-votecounting-borda/pom.xml index 9a3c2fd..37e0b6b 100644 --- a/pollen-votecounting-borda/pom.xml +++ b/pollen-votecounting-borda/pom.xml @@ -38,8 +38,20 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> diff --git a/pollen-votecounting-borda/src/test/resources/log4j.properties b/pollen-votecounting-borda/src/test/resources/log4j.properties deleted file mode 100644 index 8db1a8e..0000000 --- a/pollen-votecounting-borda/src/test/resources/log4j.properties +++ /dev/null @@ -1,30 +0,0 @@ -### -# #%L -# Pollen :: VoteCounting strategy :: Condorcet -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2012 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### -# Global logging configuration -log4j.rootLogger=WARN, stdout -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n -# package level -log4j.logger.org.chorem.pollen=INFO diff --git a/pollen-votecounting-borda/src/test/resources/log4j2.xml b/pollen-votecounting-borda/src/test/resources/log4j2.xml new file mode 100644 index 0000000..cc4556f --- /dev/null +++ b/pollen-votecounting-borda/src/test/resources/log4j2.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration status="WARN"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d %5p [%t] (%F:%L) %M - %m%n"/> + </Console> + </Appenders> + <Loggers> + <Logger name="org.chorem.pollen" level="info"/> + <Root level="warn"> + <AppenderRef ref="Console"/> + </Root> + </Loggers> +</Configuration> \ No newline at end of file diff --git a/pollen-votecounting-condorcet/pom.xml b/pollen-votecounting-condorcet/pom.xml index 52cc060..5abdc99 100644 --- a/pollen-votecounting-condorcet/pom.xml +++ b/pollen-votecounting-condorcet/pom.xml @@ -38,8 +38,20 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> diff --git a/pollen-votecounting-condorcet/src/test/resources/log4j.properties b/pollen-votecounting-condorcet/src/test/resources/log4j.properties deleted file mode 100644 index 8db1a8e..0000000 --- a/pollen-votecounting-condorcet/src/test/resources/log4j.properties +++ /dev/null @@ -1,30 +0,0 @@ -### -# #%L -# Pollen :: VoteCounting strategy :: Condorcet -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2012 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### -# Global logging configuration -log4j.rootLogger=WARN, stdout -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n -# package level -log4j.logger.org.chorem.pollen=INFO diff --git a/pollen-votecounting-condorcet/src/test/resources/log4j2.xml b/pollen-votecounting-condorcet/src/test/resources/log4j2.xml new file mode 100644 index 0000000..cc4556f --- /dev/null +++ b/pollen-votecounting-condorcet/src/test/resources/log4j2.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration status="WARN"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d %5p [%t] (%F:%L) %M - %m%n"/> + </Console> + </Appenders> + <Loggers> + <Logger name="org.chorem.pollen" level="info"/> + <Root level="warn"> + <AppenderRef ref="Console"/> + </Root> + </Loggers> +</Configuration> \ No newline at end of file diff --git a/pollen-votecounting-coombs/pom.xml b/pollen-votecounting-coombs/pom.xml index d3437f0..2573557 100644 --- a/pollen-votecounting-coombs/pom.xml +++ b/pollen-votecounting-coombs/pom.xml @@ -38,8 +38,20 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> diff --git a/pollen-votecounting-coombs/src/test/resources/log4j.properties b/pollen-votecounting-coombs/src/test/resources/log4j.properties deleted file mode 100644 index d87a163..0000000 --- a/pollen-votecounting-coombs/src/test/resources/log4j.properties +++ /dev/null @@ -1,30 +0,0 @@ -### -# #%L -# Pollen :: VoteCounting strategy :: Coombs -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2012 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### -# Global logging configuration -log4j.rootLogger=WARN, stdout -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n -# package level -log4j.logger.org.chorem.pollen=INFO diff --git a/pollen-votecounting-coombs/src/test/resources/log4j2.xml b/pollen-votecounting-coombs/src/test/resources/log4j2.xml new file mode 100644 index 0000000..cc4556f --- /dev/null +++ b/pollen-votecounting-coombs/src/test/resources/log4j2.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration status="WARN"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d %5p [%t] (%F:%L) %M - %m%n"/> + </Console> + </Appenders> + <Loggers> + <Logger name="org.chorem.pollen" level="info"/> + <Root level="warn"> + <AppenderRef ref="Console"/> + </Root> + </Loggers> +</Configuration> \ No newline at end of file diff --git a/pollen-votecounting-instant-runoff/pom.xml b/pollen-votecounting-instant-runoff/pom.xml index 8ab00a1..ceab62e 100644 --- a/pollen-votecounting-instant-runoff/pom.xml +++ b/pollen-votecounting-instant-runoff/pom.xml @@ -38,8 +38,20 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> diff --git a/pollen-votecounting-instant-runoff/src/test/resources/log4j.properties b/pollen-votecounting-instant-runoff/src/test/resources/log4j.properties deleted file mode 100644 index 8134979..0000000 --- a/pollen-votecounting-instant-runoff/src/test/resources/log4j.properties +++ /dev/null @@ -1,30 +0,0 @@ -### -# #%L -# Pollen :: VoteCounting strategy :: Instant Runoff -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2012 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### -# Global logging configuration -log4j.rootLogger=WARN, stdout -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n -# package level -log4j.logger.org.chorem.pollen=INFO diff --git a/pollen-votecounting-instant-runoff/src/test/resources/log4j2.xml b/pollen-votecounting-instant-runoff/src/test/resources/log4j2.xml new file mode 100644 index 0000000..cc4556f --- /dev/null +++ b/pollen-votecounting-instant-runoff/src/test/resources/log4j2.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration status="WARN"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d %5p [%t] (%F:%L) %M - %m%n"/> + </Console> + </Appenders> + <Loggers> + <Logger name="org.chorem.pollen" level="info"/> + <Root level="warn"> + <AppenderRef ref="Console"/> + </Root> + </Loggers> +</Configuration> \ No newline at end of file diff --git a/pollen-votecounting-normal/pom.xml b/pollen-votecounting-normal/pom.xml index d4348db..59a05ec 100644 --- a/pollen-votecounting-normal/pom.xml +++ b/pollen-votecounting-normal/pom.xml @@ -33,8 +33,20 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> diff --git a/pollen-votecounting-normal/src/test/resources/log4j.properties b/pollen-votecounting-normal/src/test/resources/log4j.properties deleted file mode 100644 index 631d77b..0000000 --- a/pollen-votecounting-normal/src/test/resources/log4j.properties +++ /dev/null @@ -1,30 +0,0 @@ -### -# #%L -# Pollen :: VoteCounting strategy :: Normal -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2012 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### -# Global logging configuration -log4j.rootLogger=WARN, stdout -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n -# package level -log4j.logger.org.chorem.pollen=INFO diff --git a/pollen-votecounting-normal/src/test/resources/log4j2.xml b/pollen-votecounting-normal/src/test/resources/log4j2.xml new file mode 100644 index 0000000..cc4556f --- /dev/null +++ b/pollen-votecounting-normal/src/test/resources/log4j2.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration status="WARN"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d %5p [%t] (%F:%L) %M - %m%n"/> + </Console> + </Appenders> + <Loggers> + <Logger name="org.chorem.pollen" level="info"/> + <Root level="warn"> + <AppenderRef ref="Console"/> + </Root> + </Loggers> +</Configuration> \ No newline at end of file diff --git a/pollen-votecounting-number/pom.xml b/pollen-votecounting-number/pom.xml index df8cd13..cf5621d 100644 --- a/pollen-votecounting-number/pom.xml +++ b/pollen-votecounting-number/pom.xml @@ -33,8 +33,20 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> diff --git a/pollen-votecounting-number/src/test/resources/log4j.properties b/pollen-votecounting-number/src/test/resources/log4j.properties deleted file mode 100644 index 0676156..0000000 --- a/pollen-votecounting-number/src/test/resources/log4j.properties +++ /dev/null @@ -1,30 +0,0 @@ -### -# #%L -# Pollen :: VoteCounting strategy :: Number -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2012 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### -# Global logging configuration -log4j.rootLogger=WARN, stdout -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n -# package level -log4j.logger.org.chorem.pollen=INFO diff --git a/pollen-votecounting-number/src/test/resources/log4j2.xml b/pollen-votecounting-number/src/test/resources/log4j2.xml new file mode 100644 index 0000000..cc4556f --- /dev/null +++ b/pollen-votecounting-number/src/test/resources/log4j2.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration status="WARN"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d %5p [%t] (%F:%L) %M - %m%n"/> + </Console> + </Appenders> + <Loggers> + <Logger name="org.chorem.pollen" level="info"/> + <Root level="warn"> + <AppenderRef ref="Console"/> + </Root> + </Loggers> +</Configuration> \ No newline at end of file diff --git a/pollen-votecounting-percentage/pom.xml b/pollen-votecounting-percentage/pom.xml index 94f273e..c720cd6 100644 --- a/pollen-votecounting-percentage/pom.xml +++ b/pollen-votecounting-percentage/pom.xml @@ -33,8 +33,20 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> <scope>test</scope> </dependency> diff --git a/pollen-votecounting-percentage/src/test/resources/log4j.properties b/pollen-votecounting-percentage/src/test/resources/log4j.properties deleted file mode 100644 index 3d8fafc..0000000 --- a/pollen-votecounting-percentage/src/test/resources/log4j.properties +++ /dev/null @@ -1,30 +0,0 @@ -### -# #%L -# Pollen :: VoteCounting strategy :: Percentage -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2012 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### -# Global logging configuration -log4j.rootLogger=WARN, stdout -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n -# package level -log4j.logger.org.chorem.pollen=INFO diff --git a/pollen-votecounting-percentage/src/test/resources/log4j2.xml b/pollen-votecounting-percentage/src/test/resources/log4j2.xml new file mode 100644 index 0000000..cc4556f --- /dev/null +++ b/pollen-votecounting-percentage/src/test/resources/log4j2.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Configuration status="WARN"> + <Appenders> + <Console name="Console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d %5p [%t] (%F:%L) %M - %m%n"/> + </Console> + </Appenders> + <Loggers> + <Logger name="org.chorem.pollen" level="info"/> + <Root level="warn"> + <AppenderRef ref="Console"/> + </Root> + </Loggers> +</Configuration> \ No newline at end of file diff --git a/pom.xml b/pom.xml index 7554a58..91471f1 100644 --- a/pom.xml +++ b/pom.xml @@ -171,7 +171,7 @@ <struts2Version>2.3.24.1</struts2Version> <jqueryPluginVersion>3.7.1</jqueryPluginVersion> <shiroVersion>1.2.4</shiroVersion> - <slf4jVersion>1.7.13</slf4jVersion> + <log4j>2.4.1</log4j> <jettyVersion>9.3.6.v20151106</jettyVersion> <jettyPluginVersion>9.3.6.v20151106</jettyPluginVersion> <hibernateVersion>4.3.11.Final</hibernateVersion> @@ -280,6 +280,12 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> <version>${hibernateVersion}</version> + <exclusions> + <exclusion> + <artifactId>xml-apis</artifactId> + <groupId>xml-apis</groupId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -432,25 +438,41 @@ </dependency> <!-- Logging --> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-jcl</artifactId> + <version>2.4.1</version> + <scope>runtime</scope> + </dependency> - <!--dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4jVersion}</version> - <scope>compile</scope> - </dependency--> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>2.4.1</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <version>2.4.1</version> + <scope>runtime</scope> + </dependency> + <!-- Temp : For hibernate to use log4j2 --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jcl</artifactId> - <version>${slf4jVersion}</version> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging</artifactId> + <version>3.3.0.Final</version> <scope>runtime</scope> </dependency> + <!-- Temp : For MLog to use log4j2 --> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.17</version> + <groupId>com.mchange</groupId> + <artifactId>c3p0</artifactId> + <version>0.9.5.1</version> + <scope>runtime</scope> </dependency> <!-- Others --> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm