IGNITE-5788 Web Console: Fixed dependencies for maven project with c3p0.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/02a1bdca Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/02a1bdca Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/02a1bdca Branch: refs/heads/ignite-5757 Commit: 02a1bdca57ce6af7fe7636b0a9f99048c89b88b6 Parents: 70d0f99 Author: Andrey Novikov <[email protected]> Authored: Thu Jul 20 15:47:49 2017 +0700 Committer: Andrey Novikov <[email protected]> Committed: Thu Jul 20 15:47:49 2017 +0700 ---------------------------------------------------------------------- modules/web-console/frontend/app/data/pom-dependencies.json | 5 ++++- .../app/modules/configuration/generator/Maven.service.js | 9 +++------ modules/web-console/frontend/webpack/webpack.common.js | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/02a1bdca/modules/web-console/frontend/app/data/pom-dependencies.json ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/data/pom-dependencies.json b/modules/web-console/frontend/app/data/pom-dependencies.json index 945e3f5..8d3fa81 100644 --- a/modules/web-console/frontend/app/data/pom-dependencies.json +++ b/modules/web-console/frontend/app/data/pom-dependencies.json @@ -11,7 +11,10 @@ "HadoopIgfsJcl": {"artifactId": "ignite-hadoop"}, "SLF4J": {"artifactId": "ignite-slf4j"}, - "Generic": {"groupId": "com.mchange", "artifactId": "c3p0", "version": "0.9.5.2"}, + "Generic": [ + {"groupId": "com.mchange", "artifactId": "c3p0", "version": "0.9.5.2"}, + {"groupId": "com.mchange", "artifactId": "mchange-commons-java", "version": "0.2.11"} + ], "MySQL": {"groupId": "mysql", "artifactId": "mysql-connector-java", "version": "5.1.40"}, "PostgreSQL": {"groupId": "org.postgresql", "artifactId": "postgresql", "version": "9.4.1212.jre7"}, "H2": {"groupId": "com.h2database", "artifactId": "h2", "version": [ http://git-wip-us.apache.org/repos/asf/ignite/blob/02a1bdca/modules/web-console/frontend/app/modules/configuration/generator/Maven.service.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/configuration/generator/Maven.service.js b/modules/web-console/frontend/app/modules/configuration/generator/Maven.service.js index 81d7d10..abbada9 100644 --- a/modules/web-console/frontend/app/modules/configuration/generator/Maven.service.js +++ b/modules/web-console/frontend/app/modules/configuration/generator/Maven.service.js @@ -47,12 +47,9 @@ export default class IgniteMavenGenerator { return _.isArray(version) ? _.find(version, (v) => versionService.since(igniteVer, v.range)).version : version; }; - if (!_.has(POM_DEPENDENCIES, key)) - return; - - const {groupId, artifactId, version, jar} = POM_DEPENDENCIES[key]; - - this.addDependency(deps, groupId || 'org.apache.ignite', artifactId, extractVersion(version) || dfltVer, jar); + _.forEach(POM_DEPENDENCIES[key], ({groupId, artifactId, version, jar}) => { + this.addDependency(deps, groupId || 'org.apache.ignite', artifactId, extractVersion(version) || dfltVer, jar); + }); } addResource(sb, dir, exclude) { http://git-wip-us.apache.org/repos/asf/ignite/blob/02a1bdca/modules/web-console/frontend/webpack/webpack.common.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/webpack/webpack.common.js b/modules/web-console/frontend/webpack/webpack.common.js index a303d6e..5a3763e 100644 --- a/modules/web-console/frontend/webpack/webpack.common.js +++ b/modules/web-console/frontend/webpack/webpack.common.js @@ -138,7 +138,7 @@ export default { }, { test: /\.(jpe?g|png|gif)$/i, - loader: 'file?name=assets/images/[name]_[hash].[ext]' + loader: 'file?name=assets/images/[name].[hash].[ext]' }, { test: require.resolve('jquery'), @@ -178,7 +178,7 @@ export default { new HtmlWebpackPlugin({ template: './views/index.pug' }), - new ExtractTextPlugin({filename: 'assets/css/[name].css', allChunks: true}), + new ExtractTextPlugin({filename: 'assets/css/[name].[hash].css', allChunks: true}), new CopyWebpackPlugin([ { context: 'public', from: '**/*.png' }, { context: 'public', from: '**/*.svg' },
