Repository: wicket Updated Branches: refs/heads/master eb9f6c9cf -> 1d20044b5
[WICKET-6518] Log4j is replaced with logback Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/cfd6a55f Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/cfd6a55f Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/cfd6a55f Branch: refs/heads/master Commit: cfd6a55fc9d613d4412a004efcc8e06d6ac1d73d Parents: c787470 Author: Maxim Solodovnik <solomax...@gmail.com> Authored: Sat Jan 13 10:18:56 2018 +0700 Committer: Maxim Solodovnik <solomax...@gmail.com> Committed: Sat Jan 13 10:18:56 2018 +0700 ---------------------------------------------------------------------- .../META-INF/maven/archetype-metadata.xml | 7 +------ .../src/main/resources/archetype-resources/pom.xml | 17 ++++++----------- .../src/main/resources/__log4j.properties__ | 16 ---------------- pom.xml | 2 +- 4 files changed, 8 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/cfd6a55f/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml ---------------------------------------------------------------------- diff --git a/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml index 14dcce0..d31de29 100644 --- a/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -1,10 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <archetype-descriptor name="quickstart"> - <requiredProperties> - <requiredProperty key="log4j.properties"> - <defaultValue>log4j2.xml</defaultValue> - </requiredProperty> - </requiredProperties> <fileSets> <fileSet filtered="true" packaged="true" encoding="UTF-8"> <directory>src/main/java</directory> @@ -28,7 +23,7 @@ <fileSet filtered="false" packaged="false" encoding="UTF-8"> <directory>src/main/resources</directory> <includes> - <include>__log4j.properties__</include> + <include>**/*.xml</include> </includes> </fileSet> <fileSet filtered="true" packaged="false" encoding="UTF-8"> http://git-wip-us.apache.org/repos/asf/wicket/blob/cfd6a55f/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml b/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml index 395ab9c..a32fb9f 100644 --- a/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml @@ -44,7 +44,7 @@ <properties> <wicket.version>@project.version@</wicket.version> <jetty9.version>@jetty.version@</jetty9.version> - <log4j.version>@log4j.version@</log4j.version> + <logback.version>@logback.version@</logback.version> <junit.version>@junit.version@</junit.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <!-- allowed values: R7, 1.0, 1.5, 2.0 or none --> @@ -65,16 +65,11 @@ </dependency> --> - <!-- LOGGING DEPENDENCIES - LOG4J --> + <!-- LOGGING DEPENDENCIES - LOGBACK --> <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - <version>${log4j.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <version>${log4j.version}</version> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + <version>${logback.version}</version> </dependency> <!-- JUNIT DEPENDENCY FOR TESTING --> @@ -103,7 +98,7 @@ <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>javax-websocket-server-impl</artifactId> - <version>${jetty.version}</version> + <version>${jetty9.version}</version> <scope>test</scope> </dependency> --> http://git-wip-us.apache.org/repos/asf/wicket/blob/cfd6a55f/archetypes/quickstart/src/main/resources/archetype-resources/src/main/resources/__log4j.properties__ ---------------------------------------------------------------------- diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/src/main/resources/__log4j.properties__ b/archetypes/quickstart/src/main/resources/archetype-resources/src/main/resources/__log4j.properties__ deleted file mode 100644 index 63e6030..0000000 --- a/archetypes/quickstart/src/main/resources/archetype-resources/src/main/resources/__log4j.properties__ +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"; configDebug="true"> - <Appenders> - <Console name="CONSOLE" target="SYSTEM_OUT"> - <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/> - </Console> - </Appenders> - <Loggers> - <logger name="org.apache.wicket" level="INFO" additivity="false"> - <AppenderRef ref="CONSOLE"/> - </logger> - <Root level="WARN"> - <AppenderRef ref="CONSOLE"/> - </Root> - </Loggers> -</log4j:configuration> http://git-wip-us.apache.org/repos/asf/wicket/blob/cfd6a55f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 94d04ca..218e036 100644 --- a/pom.xml +++ b/pom.xml @@ -134,7 +134,7 @@ <maven.surefire.version>2.20</maven.surefire.version> <mockito.version>2.9.0</mockito.version> <slf4j.version>1.7.25</slf4j.version> - <log4j.version>2.9.0</log4j.version> + <logback.version>1.2.3</logback.version> <hamcrest.version>2.0.0.0</hamcrest.version> <objenesis.version>2.6</objenesis.version> <aspectj.version>1.8.10</aspectj.version>
