You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by go...@apache.org on 2015/08/28 15:16:39 UTC
incubator-slider git commit: SLIDER-927 Slider should not use
multiple versions of jackson jars
Repository: incubator-slider
Updated Branches:
refs/heads/develop 53f85aa15 -> 83722ac06
SLIDER-927 Slider should not use multiple versions of jackson jars
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/83722ac0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/83722ac0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/83722ac0
Branch: refs/heads/develop
Commit: 83722ac0632a4c76d23aed6d2bdd8e1d2e87783d
Parents: 53f85aa
Author: Gour Saha <go...@apache.org>
Authored: Fri Aug 28 06:16:01 2015 -0700
Committer: Gour Saha <go...@apache.org>
Committed: Fri Aug 28 06:16:01 2015 -0700
----------------------------------------------------------------------
.../slider/providers/agent/application/metadata/Application.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/83722ac0/slider-core/src/main/java/org/apache/slider/providers/agent/application/metadata/Application.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/application/metadata/Application.java b/slider-core/src/main/java/org/apache/slider/providers/agent/application/metadata/Application.java
index 5967a3a..3a445f4 100644
--- a/slider-core/src/main/java/org/apache/slider/providers/agent/application/metadata/Application.java
+++ b/slider-core/src/main/java/org/apache/slider/providers/agent/application/metadata/Application.java
@@ -16,10 +16,10 @@
*/
package org.apache.slider.providers.agent.application.metadata;
-import com.fasterxml.jackson.annotation.JsonIgnore;
import org.apache.slider.common.tools.SliderUtils;
import org.apache.slider.core.exceptions.BadCommandArgumentsException;
import org.apache.slider.core.exceptions.SliderException;
+import org.codehaus.jackson.annotate.JsonIgnore;
import org.codehaus.jackson.annotate.JsonProperty;
import java.util.ArrayList;