You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@htrace.apache.org by cm...@apache.org on 2015/04/22 21:07:46 UTC

incubator-htrace git commit: HTRACE-148. TestHTracedRESTReceiver should use the shaded ObjectMapper to avoid TestHTracedRESTReceiver failure (Masatake Iwasaki via Colin P. McCabe)

Repository: incubator-htrace
Updated Branches:
  refs/heads/master a9d85254b -> 4d4ed2cb1


HTRACE-148. TestHTracedRESTReceiver should use the shaded ObjectMapper to avoid TestHTracedRESTReceiver failure (Masatake Iwasaki via Colin P. McCabe)


Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/4d4ed2cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/4d4ed2cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/4d4ed2cb

Branch: refs/heads/master
Commit: 4d4ed2cb1772d687afe04fc73e3c225cb6243de4
Parents: a9d8525
Author: Colin P. Mccabe <cm...@apache.org>
Authored: Wed Apr 22 12:06:49 2015 -0700
Committer: Colin P. Mccabe <cm...@apache.org>
Committed: Wed Apr 22 12:06:49 2015 -0700

----------------------------------------------------------------------
 .../test/java/org/apache/htrace/impl/TestHTracedRESTReceiver.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/4d4ed2cb/htrace-htraced/src/test/java/org/apache/htrace/impl/TestHTracedRESTReceiver.java
----------------------------------------------------------------------
diff --git a/htrace-htraced/src/test/java/org/apache/htrace/impl/TestHTracedRESTReceiver.java b/htrace-htraced/src/test/java/org/apache/htrace/impl/TestHTracedRESTReceiver.java
index 9a01005..b933a14 100644
--- a/htrace-htraced/src/test/java/org/apache/htrace/impl/TestHTracedRESTReceiver.java
+++ b/htrace-htraced/src/test/java/org/apache/htrace/impl/TestHTracedRESTReceiver.java
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertTrue;
 import java.io.File;
 import java.net.URL;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.htrace.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.htrace.HTraceConfiguration;