This is an automated email from the ASF dual-hosted git repository.
jiajunwang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/helix.git
The following commit(s) were added to refs/heads/master by this push:
new 0e51cbb Update ivy dependencies to be same as pom dependencies (#1045)
0e51cbb is described below
commit 0e51cbba0eaa53c5e6ff563eb6ed458f532df6f8
Author: Huizhi Lu <[email protected]>
AuthorDate: Thu Jul 23 11:46:47 2020 -0700
Update ivy dependencies to be same as pom dependencies (#1045)
Helix jars built based on ivy dependencies don't have the same dependencies
as open source helix jars built with pom files.
This issue could cause inconsistent behaviors between internal helix lib
release and open source lib release. So release certification doesn't catch the
dependency issue. This commit updates ivy files to make dependencies same as
pom.
---
.../helix-admin-webapp-1.0.2-SNAPSHOT.ivy | 4 ++--
helix-agent/helix-agent-1.0.2-SNAPSHOT.ivy | 6 +++---
helix-common/helix-common-1.0.2-SNAPSHOT.ivy | 6 ++----
helix-core/helix-core-1.0.2-SNAPSHOT.ivy | 9 ++-------
helix-core/pom.xml | 20 --------------------
...etadata-store-directory-common-1.0.2-SNAPSHOT.ivy | 10 ++++------
metrics-common/metrics-common-1.0.2-SNAPSHOT.ivy | 1 +
zookeeper-api/zookeeper-api-1.0.2-SNAPSHOT.ivy | 9 +++++----
8 files changed, 19 insertions(+), 46 deletions(-)
diff --git a/helix-admin-webapp/helix-admin-webapp-1.0.2-SNAPSHOT.ivy
b/helix-admin-webapp/helix-admin-webapp-1.0.2-SNAPSHOT.ivy
index 4d3232d..a98c615 100644
--- a/helix-admin-webapp/helix-admin-webapp-1.0.2-SNAPSHOT.ivy
+++ b/helix-admin-webapp/helix-admin-webapp-1.0.2-SNAPSHOT.ivy
@@ -43,8 +43,8 @@ under the License.
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.14" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)">
<artifact name="slf4j-log4j12" ext="jar"/>
</dependency>
- <dependency org="org.apache.helix" name="helix-core"
rev="1.0.1-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(*)"/>
+ <dependency org="org.apache.helix" name="helix-core"
rev="1.0.2-SNAPSHOT" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+ <dependency org="org.restlet.jse" name="org.restlet"
rev="2.3.12" 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(*)"/>
<dependency org="org.codehaus.jackson"
name="jackson-mapper-asl" rev="1.8.5" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
<dependency org="commons-cli" name="commons-cli" rev="1.2"
force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
diff --git a/helix-agent/helix-agent-1.0.2-SNAPSHOT.ivy
b/helix-agent/helix-agent-1.0.2-SNAPSHOT.ivy
index d49a886..f6684ce 100644
--- a/helix-agent/helix-agent-1.0.2-SNAPSHOT.ivy
+++ b/helix-agent/helix-agent-1.0.2-SNAPSHOT.ivy
@@ -51,7 +51,7 @@ under the License.
<m:dependency.management__org.testng__testng__version>6.0.1</m:dependency.management__org.testng__testng__version>
<m:properties__helix.release.preparationGoals>clean
install</m:properties__helix.release.preparationGoals>
<m:properties__distMgmtSnapshotsName>Apache Development
Snapshot Repository</m:properties__distMgmtSnapshotsName>
-
<m:dependency.management__org.restlet.jse__org.restlet__version>2.2.1</m:dependency.management__org.restlet.jse__org.restlet__version>
+
<m:dependency.management__org.restlet.jse__org.restlet__version>2.3.12</m:dependency.management__org.restlet.jse__org.restlet__version>
<m:properties__helix.siteUrlDeployment>file://${helix.siteFilePath}</m:properties__helix.siteUrlDeployment>
<m:properties__maven-scm-provider-svnjava.version>2.0.5</m:properties__maven-scm-provider-svnjava.version>
<m:properties__sourceReleaseAssemblyDescriptor>source-release</m:properties__sourceReleaseAssemblyDescriptor>
@@ -78,7 +78,7 @@ under the License.
</publications>
<dependencies>
<dependency org="org.apache.helix" name="helix-core"
rev="1.0.2-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(*)"/>
+ <dependency org="org.restlet.jse" name="org.restlet"
rev="2.3.12" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
<dependency org="org.testng" name="testng" rev="6.0.1"
force="true" conf="test->runtime(*),master(*)">
<exclude org="junit" module="junit" name="*" type="*"
ext="*" conf="" matcher="exact"/>
</dependency>
@@ -93,7 +93,7 @@ under the License.
</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="1.0.2-SNAPSHOT"/>
- <override org="org.restlet.jse" module="org.restlet"
matcher="exact" rev="2.2.1"/>
+ <override org="org.restlet.jse" module="org.restlet"
matcher="exact" rev="2.3.12"/>
<override org="junit" module="junit" matcher="exact"
rev="4.11"/>
<override org="org.testng" module="testng" matcher="exact"
rev="6.0.1"/>
</dependencies>
diff --git a/helix-common/helix-common-1.0.2-SNAPSHOT.ivy
b/helix-common/helix-common-1.0.2-SNAPSHOT.ivy
index a9094e8..f92f398 100644
--- a/helix-common/helix-common-1.0.2-SNAPSHOT.ivy
+++ b/helix-common/helix-common-1.0.2-SNAPSHOT.ivy
@@ -43,9 +43,7 @@ under the License.
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.14" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)">
<artifact name="slf4j-log4j12" ext="jar"/>
</dependency>
- <dependency org="org.yaml" name="snakeyaml" rev="1.12"
conf="compile->compile(default);runtime->runtime(default);default->default"/>
- <dependency org="org.codehaus.jackson" name="jackson-core-asl"
rev="1.8.5" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
- <dependency org="org.codehaus.jackson"
name="jackson-mapper-asl" rev="1.8.5" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
- <dependency org="commons-cli" name="commons-cli" rev="1.2"
force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+ <dependency org="org.apache.helix" name="metrics-common"
rev="1.0.2-SNAPSHOT" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+ <dependency org="org.apache.helix" name="zookeeper-api"
rev="1.0.2-SNAPSHOT" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
</dependencies>
</ivy-module>
diff --git a/helix-core/helix-core-1.0.2-SNAPSHOT.ivy
b/helix-core/helix-core-1.0.2-SNAPSHOT.ivy
index ac369a2..12f10fd 100644
--- a/helix-core/helix-core-1.0.2-SNAPSHOT.ivy
+++ b/helix-core/helix-core-1.0.2-SNAPSHOT.ivy
@@ -52,17 +52,12 @@ under the License.
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.14" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)">
<artifact name="slf4j-log4j12" ext="jar"/>
</dependency>
- <dependency org="org.apache.zookeeper" name="zookeeper" rev="3.4.13"
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"/>
- <dependency org="org.codehaus.jackson" name="jackson-mapper-asl"
rev="1.8.5"
conf="compile->compile(default);runtime->runtime(default);default->default"/>
+ <dependency org="org.apache.helix" name="helix-common"
rev="1.0.2-SNAPSHOT" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
<dependency org="commons-io" name="commons-io" rev="1.4"
conf="compile->compile(default);runtime->runtime(default);default->default"/>
<dependency org="commons-cli" name="commons-cli" rev="1.2"
conf="compile->compile(default);runtime->runtime(default);default->default"/>
<dependency org="commons-math" name="commons-math" rev="2.1"
conf="compile->compile(default);runtime->runtime(default);default->default"/>
<dependency org="org.apache.commons" name="commons-math3" rev="3.6.1"
conf="compile->compile(default);runtime->runtime(default);default->default"/>
- <dependency org="com.google.guava" name="guava" rev="15.0"
conf="compile->compile(default);runtime->runtime(default);default->default"/>
- <dependency org="org.yaml" name="snakeyaml" rev="1.12"
conf="compile->compile(default);runtime->runtime(default);default->default"/>
- <dependency org="commons-logging" name="commons-logging-api" rev="1.1"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
- <dependency org="io.dropwizard.metrics" name="metrics-core" rev="3.2.3"
conf="compile->compile(default);runtime->runtime(default);default->default"/>
+ <dependency org="org.yaml" name="snakeyaml" rev="1.12"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
</dependencies>
</ivy-module>
diff --git a/helix-core/pom.xml b/helix-core/pom.xml
index 2a5f24e..d8314bf 100644
--- a/helix-core/pom.xml
+++ b/helix-core/pom.xml
@@ -129,30 +129,10 @@ under the License.
<version>3.6.1</version>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.6</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>15.0</version>
- </dependency>
- <dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.12</version>
</dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- <version>3.2.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.5.8</version>
- </dependency>
</dependencies>
<build>
<resources>
diff --git
a/metadata-store-directory-common/metadata-store-directory-common-1.0.2-SNAPSHOT.ivy
b/metadata-store-directory-common/metadata-store-directory-common-1.0.2-SNAPSHOT.ivy
index 5493bd0..70249ca 100644
---
a/metadata-store-directory-common/metadata-store-directory-common-1.0.2-SNAPSHOT.ivy
+++
b/metadata-store-directory-common/metadata-store-directory-common-1.0.2-SNAPSHOT.ivy
@@ -43,12 +43,10 @@ under the License.
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.14" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)">
<artifact name="slf4j-log4j12" ext="jar"/>
</dependency>
- <dependency org="org.yaml" name="snakeyaml" rev="1.17">
- <artifact name="snakeyaml" m:classifier="sources" ext="jar"/>
- </dependency>
- <dependency org="org.apache.helix" name="helix-core"
rev="1.0.2-SNAPSHOT" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+ <dependency org="org.yaml" name="snakeyaml" rev="1.17"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+ <dependency org="com.google.guava" name="guava" rev="20.0" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+ <dependency org="org.apache.httpcomponents" name="httpclient" rev="4.5.8"
force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
<dependency org="com.fasterxml.jackson.core"
name="jackson-databind" rev="2.10.2" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
- <dependency org="commons-cli" name="commons-cli" rev="1.2"
force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
- <dependency org="commons-io" name="commons-io" rev="1.4"
conf="compile->compile(default);runtime->runtime(default);default->default"/>
+ <dependency org="org.apache.commons" name="commons-lang3"
rev="3.8.1" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
</dependencies>
</ivy-module>
diff --git a/metrics-common/metrics-common-1.0.2-SNAPSHOT.ivy
b/metrics-common/metrics-common-1.0.2-SNAPSHOT.ivy
index 1f93631..2f61086 100644
--- a/metrics-common/metrics-common-1.0.2-SNAPSHOT.ivy
+++ b/metrics-common/metrics-common-1.0.2-SNAPSHOT.ivy
@@ -43,5 +43,6 @@ under the License.
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.14" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)">
<artifact name="slf4j-log4j12" ext="jar"/>
</dependency>
+ <dependency org="io.dropwizard.metrics" name="metrics-core" rev="3.2.3"
conf="compile->compile(*),master(*);runtime->runtime(*)/>
</dependencies>
</ivy-module>
diff --git a/zookeeper-api/zookeeper-api-1.0.2-SNAPSHOT.ivy
b/zookeeper-api/zookeeper-api-1.0.2-SNAPSHOT.ivy
index 33deaa1..24d37a0 100644
--- a/zookeeper-api/zookeeper-api-1.0.2-SNAPSHOT.ivy
+++ b/zookeeper-api/zookeeper-api-1.0.2-SNAPSHOT.ivy
@@ -43,9 +43,10 @@ under the License.
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.14" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)">
<artifact name="slf4j-log4j12" ext="jar"/>
</dependency>
- <dependency org="org.codehaus.jackson" name="jackson-core-asl"
rev="1.8.5" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
- <dependency org="org.codehaus.jackson"
name="jackson-mapper-asl" rev="1.8.5" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
- <dependency org="commons-cli" name="commons-cli" rev="1.2"
force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
- <dependency org="org.apache.httpcomponents" name="httpclient"
rev="4.5.8" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+ <dependency org="org.apache.helix" name="metrics-common"
rev="1.0.2-SNAPSHOT" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+ <dependency org="org.apache.helix" name="metadata-store-directory-common"
rev="1.0.2-SNAPSHOT" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+ <dependency org="org.apache.zookeeper" name="zookeeper" rev="3.4.13"
force="true" conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+ <dependency org="org.codehaus.jackson" name="jackson-mapper-asl"
rev="1.8.5" force="true"
conf="compile->compile(*),master(*);runtime->runtime(*)"/>
+ <dependency org="commons-codec" name="commons-codec" rev="1.14"
conf="compile->compile(default);runtime->runtime(default);default->default"/>
</dependencies>
</ivy-module>
