You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2015/08/18 13:53:25 UTC
olingo-odata4 git commit: [OLINGO-659] Revert binding change because
of embedded tomcat requirements
Repository: olingo-odata4
Updated Branches:
refs/heads/master 375575296 -> 7ec7168b1
[OLINGO-659] Revert binding change because of embedded tomcat requirements
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/7ec7168b
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/7ec7168b
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/7ec7168b
Branch: refs/heads/master
Commit: 7ec7168b1a1f38b6f58da196266aa62ab28229cd
Parents: 3755752
Author: Michael Bolz <mi...@sap.com>
Authored: Tue Aug 18 13:53:15 2015 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Tue Aug 18 13:53:15 2015 +0200
----------------------------------------------------------------------
fit/pom.xml | 9 ++++++++-
fit/src/main/resources/simplelogger.properties | 20 --------------------
2 files changed, 8 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/7ec7168b/fit/pom.xml
----------------------------------------------------------------------
diff --git a/fit/pom.xml b/fit/pom.xml
index 2122071..41fe4c2 100644
--- a/fit/pom.xml
+++ b/fit/pom.xml
@@ -136,7 +136,8 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${sl4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -153,6 +154,12 @@
<artifactId>odata-server-tecsvc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/7ec7168b/fit/src/main/resources/simplelogger.properties
----------------------------------------------------------------------
diff --git a/fit/src/main/resources/simplelogger.properties b/fit/src/main/resources/simplelogger.properties
deleted file mode 100644
index 2a3350c..0000000
--- a/fit/src/main/resources/simplelogger.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# 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.
-#
-org.slf4j.simpleLogger.defaultLogLevel=debug
-org.slf4j.simpleLogger.logFile=System.out
\ No newline at end of file