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 2014/09/19 18:06:44 UTC
git commit: CAMEL-7840: Upgrade to metrics 3.1. And also use spring
4.x test as spring 4.x is default now.
Repository: camel
Updated Branches:
refs/heads/master 94d6f0dd2 -> 42fbf6779
CAMEL-7840: Upgrade to metrics 3.1. And also use spring 4.x test as spring 4.x is default now.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/42fbf677
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/42fbf677
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/42fbf677
Branch: refs/heads/master
Commit: 42fbf6779a17da40cdc6ea16706dfb7b4a4cd200
Parents: 94d6f0d
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Sep 19 18:06:24 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Sep 19 18:06:34 2014 +0200
----------------------------------------------------------------------
components/camel-metrics/pom.xml | 4 ++--
parent/pom.xml | 4 ++--
platforms/karaf/features/src/main/resources/features.xml | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/42fbf677/components/camel-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-metrics/pom.xml b/components/camel-metrics/pom.xml
index 186c0e3..8511e01 100644
--- a/components/camel-metrics/pom.xml
+++ b/components/camel-metrics/pom.xml
@@ -43,14 +43,14 @@
</dependency>
<dependency>
- <groupId>com.codahale.metrics</groupId>
+ <groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>${metrics-version}</version>
</dependency>
<!-- json support -->
<dependency>
- <groupId>com.codahale.metrics</groupId>
+ <groupId>io.dropwizard.metrics</groupId>
<artifactId>metrics-json</artifactId>
<version>${metrics-version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/42fbf677/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index fdf5ef0..be6230e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -74,7 +74,7 @@
<boxjavalibv2.version>3.0.9</boxjavalibv2.version>
<build-helper-maven-plugin-version>1.8</build-helper-maven-plugin-version>
<c3p0-version>0.9.1.2</c3p0-version>
- <camel-test-spring-artifactId>camel-test-spring3</camel-test-spring-artifactId>
+ <camel-test-spring-artifactId>camel-test-spring</camel-test-spring-artifactId>
<castor-bundle-version>1.3.2_2</castor-bundle-version>
<cdi-api-version>1.2</cdi-api-version>
<cglib-bundle-version>2.1_3_7</cglib-bundle-version>
@@ -312,7 +312,7 @@
<maven-surefire-report-plugin-version>2.13</maven-surefire-report-plugin-version>
<maven-war-plugin-version>2.4</maven-war-plugin-version>
<maven-version>2.0</maven-version>
- <metrics-version>3.0.2</metrics-version>
+ <metrics-version>3.1.0</metrics-version>
<mina-bundle-version>1.1.7_6</mina-bundle-version>
<mina-version>1.1.7</mina-version>
<mina2-version>2.0.7</mina2-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/42fbf677/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 25b26f9..bb66582 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -838,8 +838,8 @@
<bundle>mvn:org.apache.camel/camel-mail/${project.version}</bundle>
</feature>
<feature name='camel-metrics' version='${project.version}' resolver='(obr)' start-level='50'>
- <bundle dependency='true'>mvn:com.codahale.metrics/metrics-core/${metrics-version}</bundle>
- <bundle dependency='true'>mvn:com.codahale.metrics/metrics-json/${metrics-version}</bundle>
+ <bundle dependency='true'>mvn:io.dropwizard.metrics/metrics-core/${metrics-version}</bundle>
+ <bundle dependency='true'>mvn:io.dropwizard.metrics/metrics-json/${metrics-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>