You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/11/24 07:28:34 UTC

camel git commit: CAMEL-9242: Upgrade slf4j-api to 1.7

Repository: camel
Updated Branches:
  refs/heads/master d4a95013d -> 385a4b4fc


CAMEL-9242: Upgrade slf4j-api to 1.7


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/385a4b4f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/385a4b4f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/385a4b4f

Branch: refs/heads/master
Commit: 385a4b4fca32f222ddb367df98176df951e7282f
Parents: d4a9501
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Nov 24 07:26:17 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Nov 24 07:26:17 2015 +0100

----------------------------------------------------------------------
 .../org/apache/camel/component/swagger/RestSwaggerReader.scala  | 4 ++--
 parent/pom.xml                                                  | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/385a4b4f/components/camel-swagger/src/main/scala/org/apache/camel/component/swagger/RestSwaggerReader.scala
----------------------------------------------------------------------
diff --git a/components/camel-swagger/src/main/scala/org/apache/camel/component/swagger/RestSwaggerReader.scala b/components/camel-swagger/src/main/scala/org/apache/camel/component/swagger/RestSwaggerReader.scala
index aae45c9..582e269 100644
--- a/components/camel-swagger/src/main/scala/org/apache/camel/component/swagger/RestSwaggerReader.scala
+++ b/components/camel-swagger/src/main/scala/org/apache/camel/component/swagger/RestSwaggerReader.scala
@@ -54,7 +54,7 @@ class RestSwaggerReader {
       resourcePath = "/" + resourcePath
     }
 
-    LOG.debug("Reading rest path: {} -> {}", resourcePath, rest)
+    LOG.debug("Reading rest path: " + resourcePath + " -> " + rest)
 
     // create a list of apis
     val apis = new ListBuffer[ApiDescription]
@@ -107,7 +107,7 @@ class RestSwaggerReader {
         summary = ""
       }
 
-      LOG.debug("Adding operation {} {}", method, nickName)
+      LOG.debug("Adding operation " + method + " " + nickName)
 
       operations += Operation(
         method,

http://git-wip-us.apache.org/repos/asf/camel/blob/385a4b4f/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 1d94252..edbfde2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -448,9 +448,8 @@
     <servlet-version-range>[2.5,4)</servlet-version-range>
     <shiro-version>1.2.4</shiro-version>
     <sip-api-version>1.1</sip-api-version>
-    <!-- use slf4j-api 1.6.x to be easy compatible with older Camel releases -->
-    <slf4j-api-version>1.6.6</slf4j-api-version>
-    <slf4j-version>1.7.12</slf4j-version>
+    <slf4j-api-version>1.7.13</slf4j-api-version>
+    <slf4j-version>1.7.13</slf4j-version>
     <smack-bundle-version>4.0.6</smack-bundle-version>
     <smack-version>4.0.7</smack-version>
     <snakeyaml-version>1.16</snakeyaml-version>