You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2015/11/25 17:26:20 UTC
[1/2] camel git commit: Upgrade Gson to version 2.5
Repository: camel
Updated Branches:
refs/heads/master 9d8e12ddc -> a55d94524
Upgrade Gson to version 2.5
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0b42edb6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0b42edb6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0b42edb6
Branch: refs/heads/master
Commit: 0b42edb6222963ea0ef0391c01aa88bdd702bdda
Parents: 9d8e12d
Author: Andrea Cosentino <an...@gmail.com>
Authored: Wed Nov 25 17:17:59 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Wed Nov 25 17:17:59 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0b42edb6/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b7c23f2..b23a85a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -196,7 +196,7 @@
<google-api-services-mail-version>v1-rev15-1.19.0</google-api-services-mail-version>
<grizzly-websockets-version>2.3.23</grizzly-websockets-version>
<groovy-version>2.4.5</groovy-version>
- <gson-version>2.4</gson-version>
+ <gson-version>2.5</gson-version>
<guice3-version>3.0</guice3-version>
<guice-version>4.0</guice-version>
<guice-bundle-version>3.0_1</guice-bundle-version>
[2/2] camel git commit: CAMEL-9342: Metrics component should log at
debug level
Posted by ac...@apache.org.
CAMEL-9342: Metrics component should log at debug level
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a55d9452
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a55d9452
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a55d9452
Branch: refs/heads/master
Commit: a55d94524c8702468540ee3b86e758e2b0d5e03c
Parents: 0b42edb
Author: Andrea Cosentino <an...@gmail.com>
Authored: Wed Nov 25 17:24:18 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Wed Nov 25 17:26:02 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/camel/component/metrics/MetricsComponent.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a55d9452/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/MetricsComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/MetricsComponent.java b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/MetricsComponent.java
index 3b4124e..71ea228 100644
--- a/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/MetricsComponent.java
+++ b/components/camel-metrics/src/main/java/org/apache/camel/component/metrics/MetricsComponent.java
@@ -101,6 +101,7 @@ public class MetricsComponent extends UriEndpointComponent {
.outputTo(LOG)
.convertRatesTo(TimeUnit.SECONDS)
.convertDurationsTo(TimeUnit.MILLISECONDS)
+ .withLoggingLevel(Slf4jReporter.LoggingLevel.DEBUG)
.build();
reporter.start(DEFAULT_REPORTING_INTERVAL_SECONDS, TimeUnit.SECONDS);
return registry;