Repository: wicket Updated Branches: refs/heads/WICKET-6518-quickstart-logback 2e545f66c -> da3b69f55
Logback is replaced with slf4j-simple Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/da3b69f5 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/da3b69f5 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/da3b69f5 Branch: refs/heads/WICKET-6518-quickstart-logback Commit: da3b69f55077e8945108990df14dc751e4504741 Parents: 2e545f6 Author: Maxim Solodovnik <solomax...@gmail.com> Authored: Tue Jan 16 10:30:33 2018 +0700 Committer: Maxim Solodovnik <solomax...@gmail.com> Committed: Tue Jan 16 10:30:33 2018 +0700 ---------------------------------------------------------------------- .../main/resources/archetype-resources/pom.xml | 10 +++---- .../src/main/resources/logback.xml | 30 -------------------- 2 files changed, 5 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/da3b69f5/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 a32fb9f..0a14313 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> - <logback.version>@logback.version@</logback.version> + <slf4j.version>@slf4j.version@</slf4j.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,11 +65,11 @@ </dependency> --> - <!-- LOGGING DEPENDENCIES - LOGBACK --> + <!-- LOGGING DEPENDENCIES - SLF4J-SIMPLE --> <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <version>${logback.version}</version> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>${slf4j.version}</version> </dependency> <!-- JUNIT DEPENDENCY FOR TESTING --> http://git-wip-us.apache.org/repos/asf/wicket/blob/da3b69f5/archetypes/quickstart/src/main/resources/archetype-resources/src/main/resources/logback.xml ---------------------------------------------------------------------- diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/src/main/resources/logback.xml b/archetypes/quickstart/src/main/resources/archetype-resources/src/main/resources/logback.xml deleted file mode 100644 index f749c74..0000000 --- a/archetypes/quickstart/src/main/resources/archetype-resources/src/main/resources/logback.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. - ---> -<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> - <layout class="ch.qos.logback.classic.PatternLayout"> - <pattern>%5p %d{MM-dd HH:mm:ss.SSS } %r %L %c{15} [%.15thread] - %m%n</pattern> - </layout> - </appender> - <root level="WARN"> - <appender-ref ref="CONSOLE" /> - </root> -</configuration>