You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by am...@apache.org on 2019/06/05 11:08:23 UTC
[ignite] 20/31: GG-19181 Web Console: Added exclusions of "jetty"
artifacts for "hive" dependency. Fixes #79.
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch gg-19225
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 11ff0f65a307f86de5788b85cf76ded55d95bb90
Author: Vasiliy Sisko <vs...@gridgain.com>
AuthorDate: Fri May 31 20:49:23 2019 +0700
GG-19181 Web Console: Added exclusions of "jetty" artifacts for "hive" dependency. Fixes #79.
(cherry picked from commit 0e7bf29443178ac85747e97af2a837e308c37516)
---
.../generator/generator/Maven.service.js | 19 +++++++++++++++----
.../frontend/app/data/pom-dependencies.json | 2 +-
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/modules/web-console/frontend/app/configuration/generator/generator/Maven.service.js b/modules/web-console/frontend/app/configuration/generator/generator/Maven.service.js
index 9e4e301..b472272 100644
--- a/modules/web-console/frontend/app/configuration/generator/generator/Maven.service.js
+++ b/modules/web-console/frontend/app/configuration/generator/generator/Maven.service.js
@@ -44,8 +44,8 @@ export default class IgniteMavenGenerator {
sb.append(`<!-- ${comment} -->`);
}
- addDependency(deps, groupId, artifactId, version, jar, link) {
- deps.push({groupId, artifactId, version, jar, link});
+ addDependency(deps, groupId, artifactId, version, jar, link, exclude) {
+ deps.push({groupId, artifactId, version, jar, link, exclude});
}
_extractVersion(igniteVer, version) {
@@ -58,8 +58,8 @@ export default class IgniteMavenGenerator {
if (_.isNil(deps))
return;
- _.forEach(_.castArray(deps), ({groupId, artifactId, version, jar, link}) => {
- this.addDependency(acc, groupId || artifactGrp, artifactId, storedVer || this._extractVersion(igniteVer, version) || dfltVer, jar, link);
+ _.forEach(_.castArray(deps), ({groupId, artifactId, version, jar, link, exclude}) => {
+ this.addDependency(acc, groupId || artifactGrp, artifactId, storedVer || this._extractVersion(igniteVer, version) || dfltVer, jar, link, exclude);
});
}
@@ -101,6 +101,17 @@ export default class IgniteMavenGenerator {
if (dep.link)
this.addComment(sb, `You may download JDBC driver from: ${dep.link}`);
+ if (dep.exclude) {
+ sb.startBlock('<exclusions>');
+ _.forEach(dep.exclude, (e) => {
+ sb.startBlock('<exclusion>');
+ this.addProperty(sb, 'groupId', e.groupId);
+ this.addProperty(sb, 'artifactId', e.artifactId);
+ sb.endBlock('</exclusion>');
+ });
+ sb.endBlock('</exclusions>');
+ }
+
sb.endBlock('</dependency>');
});
diff --git a/modules/web-console/frontend/app/data/pom-dependencies.json b/modules/web-console/frontend/app/data/pom-dependencies.json
index e7bc106..b597e6a 100644
--- a/modules/web-console/frontend/app/data/pom-dependencies.json
+++ b/modules/web-console/frontend/app/data/pom-dependencies.json
@@ -16,7 +16,7 @@
{"groupId": "com.mchange", "artifactId": "mchange-commons-java", "version": "0.2.11"}
],
"Hive": [
- {"groupId": "org.apache.hive", "artifactId": "hive-jdbc", "version": "3.1.1"},
+ {"groupId": "org.apache.hive", "artifactId": "hive-jdbc", "version": "3.1.1", "exclude": [{ "groupId": "org.eclipse.jetty", "artifactId": "*" }]},
{"groupId": "com.mchange", "artifactId": "c3p0", "version": "0.9.5.2"},
{"groupId": "com.mchange", "artifactId": "mchange-commons-java", "version": "0.2.11"}
],