HELIX-674: change slf4j-log4j12 to use jar instead of ivy in IVY file
Project: http://git-wip-us.apache.org/repos/asf/helix/repo Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/d9696cc1 Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/d9696cc1 Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/d9696cc1 Branch: refs/heads/master Commit: d9696cc16af8bdfc042c488fe3c28cb3b31413eb Parents: 4d630e0 Author: hrzhang <[email protected]> Authored: Mon Dec 11 15:02:33 2017 -0800 Committer: Junkai Xue <[email protected]> Committed: Wed Jan 24 18:32:13 2018 -0800 ---------------------------------------------------------------------- helix-admin-webapp/helix-admin-webapp-0.6.10-SNAPSHOT.ivy | 2 +- helix-agent/helix-agent-0.6.10-SNAPSHOT.ivy | 2 +- helix-core/helix-core-0.6.10-SNAPSHOT.ivy | 2 +- helix-rest/helix-rest-0.6.10-SNAPSHOT.ivy | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/helix/blob/d9696cc1/helix-admin-webapp/helix-admin-webapp-0.6.10-SNAPSHOT.ivy ---------------------------------------------------------------------- diff --git a/helix-admin-webapp/helix-admin-webapp-0.6.10-SNAPSHOT.ivy b/helix-admin-webapp/helix-admin-webapp-0.6.10-SNAPSHOT.ivy index 6232300..36674ab 100644 --- a/helix-admin-webapp/helix-admin-webapp-0.6.10-SNAPSHOT.ivy +++ b/helix-admin-webapp/helix-admin-webapp-0.6.10-SNAPSHOT.ivy @@ -41,7 +41,7 @@ under the License. <artifact name="slf4j-api" ext="jar"/> </dependency> <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.14" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"> - <artifact name="slf4j-log4j12" ext="ivy"/> + <artifact name="slf4j-log4j12" ext="jar"/> </dependency> <dependency org="org.apache.helix" name="helix-core" rev="0.6.10-SNAPSHOT" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/> <dependency org="org.restlet.jse" name="org.restlet" rev="2.2.1" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/> http://git-wip-us.apache.org/repos/asf/helix/blob/d9696cc1/helix-agent/helix-agent-0.6.10-SNAPSHOT.ivy ---------------------------------------------------------------------- diff --git a/helix-agent/helix-agent-0.6.10-SNAPSHOT.ivy b/helix-agent/helix-agent-0.6.10-SNAPSHOT.ivy index 0b75303..2f4aae4 100644 --- a/helix-agent/helix-agent-0.6.10-SNAPSHOT.ivy +++ b/helix-agent/helix-agent-0.6.10-SNAPSHOT.ivy @@ -89,7 +89,7 @@ under the License. <artifact name="slf4j-api" ext="jar"/> </dependency> <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.14" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"> - <artifact name="slf4j-log4j12" ext="ivy"/> + <artifact name="slf4j-log4j12" ext="jar"/> </dependency> <override org="org.mockito" module="mockito-all" matcher="exact" rev="1.9.5"/> <override org="org.apache.helix" module="helix-core" matcher="exact" rev="0.6.10-SNAPSHOT"/> http://git-wip-us.apache.org/repos/asf/helix/blob/d9696cc1/helix-core/helix-core-0.6.10-SNAPSHOT.ivy ---------------------------------------------------------------------- diff --git a/helix-core/helix-core-0.6.10-SNAPSHOT.ivy b/helix-core/helix-core-0.6.10-SNAPSHOT.ivy index 1e22533..e86bc7e 100644 --- a/helix-core/helix-core-0.6.10-SNAPSHOT.ivy +++ b/helix-core/helix-core-0.6.10-SNAPSHOT.ivy @@ -50,7 +50,7 @@ under the License. <artifact name="slf4j-api" ext="jar"/> </dependency> <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.14" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"> - <artifact name="slf4j-log4j12" ext="ivy"/> + <artifact name="slf4j-log4j12" ext="jar"/> </dependency> <dependency org="org.apache.zookeeper" name="zookeeper" rev="3.4.9" conf="compile->compile(default);runtime->runtime(default);default->default"/> <dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="1.8.5" conf="compile->compile(default);runtime->runtime(default);default->default"/> http://git-wip-us.apache.org/repos/asf/helix/blob/d9696cc1/helix-rest/helix-rest-0.6.10-SNAPSHOT.ivy ---------------------------------------------------------------------- diff --git a/helix-rest/helix-rest-0.6.10-SNAPSHOT.ivy b/helix-rest/helix-rest-0.6.10-SNAPSHOT.ivy index ec53987..5508152 100644 --- a/helix-rest/helix-rest-0.6.10-SNAPSHOT.ivy +++ b/helix-rest/helix-rest-0.6.10-SNAPSHOT.ivy @@ -41,7 +41,7 @@ under the License. <artifact name="slf4j-api" ext="jar"/> </dependency> <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.14" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"> - <artifact name="slf4j-log4j12" ext="ivy"/> + <artifact name="slf4j-log4j12" ext="jar"/> </dependency> <dependency org="org.apache.helix" name="helix-core" rev="0.6.10-SNAPSHOT" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/> <dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="1.8.5" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
