Repository: olingo-odata4 Updated Branches: refs/heads/master a794f7ee7 -> 1831364aa
[OLINGO-806] Changed to correct servlet version Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/1831364a Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/1831364a Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/1831364a Branch: refs/heads/master Commit: 1831364aa46777b244f4bc8798916ad286778e87 Parents: a794f7e Author: mibo <[email protected]> Authored: Tue Nov 3 06:29:05 2015 +0100 Committer: mibo <[email protected]> Committed: Tue Nov 3 06:29:05 2015 +0100 ---------------------------------------------------------------------- fit/pom.xml | 9 +++++- fit/src/main/resources/log4j.xml | 53 ----------------------------------- 2 files changed, 8 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/1831364a/fit/pom.xml ---------------------------------------------------------------------- diff --git a/fit/pom.xml b/fit/pom.xml index 5629937..a0c43be 100644 --- a/fit/pom.xml +++ b/fit/pom.xml @@ -121,11 +121,18 @@ <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>tomcat-jasper</artifactId> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> <scope>provided</scope> </dependency> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/1831364a/fit/src/main/resources/log4j.xml ---------------------------------------------------------------------- diff --git a/fit/src/main/resources/log4j.xml b/fit/src/main/resources/log4j.xml deleted file mode 100644 index edb5223..0000000 --- a/fit/src/main/resources/log4j.xml +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE log4j:configuration PUBLIC - "-//APACHE//DTD LOG4J 1.2//EN" - "http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/xml/doc-files/log4j.dtd";> -<!-- -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. ---> -<log4j:configuration debug="true" - xmlns:log4j='http://jakarta.apache.org/log4j/'> - - <appender name="fitlog" class="org.apache.log4j.RollingFileAppender"> - <param name="append" value="false"/> - <param name="file" value="${project.build.directory}/emb-tom-fit/fit.log"/> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss} %-5p %C:%L - %m%n"/> - </layout> - </appender> - - <logger name="org.apache.tomcat"> - <level value="ERROR" /> - <appender-ref ref="fitlog"/> - </logger> - <logger name="org.apache.catalina"> - <level value="ERROR" /> - <appender-ref ref="fitlog"/> - </logger> - - <logger name="org.apache.cxf"> - <level value="ERROR" /> - <appender-ref ref="fitlog"/> - </logger> - - <root> - <level value="INFO"/> - <appender-ref ref="fitlog"/> - </root> - -</log4j:configuration> \ No newline at end of file
