Fixed npmTest problem (can't have project names with dashes in them). Upgraded Docker plugin for Gradle, as used version doesn't work here.
Signed-off-by: niclas <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/5d91b65f Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/5d91b65f Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/5d91b65f Branch: refs/heads/yeoman-work Commit: 5d91b65f42b163a90eda330bbe5b2a0879b60566 Parents: 9a0b910 Author: niclas <[email protected]> Authored: Tue May 23 07:58:22 2017 +0800 Committer: niclas <[email protected]> Committed: Tue May 23 07:58:22 2017 +0800 ---------------------------------------------------------------------- buildSrc/build.gradle | 2 +- tools/generator-polygene/package.json | 2 +- tools/generator-polygene/test/generator_test.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/polygene-java/blob/5d91b65f/buildSrc/build.gradle ---------------------------------------------------------------------- diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index b5ac8d6..1927808 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -33,7 +33,7 @@ dependencies { compile 'org.hibernate.build.gradle:gradle-maven-publish-auth:2.0.1' compile 'org.apache.httpcomponents:httpclient:4.5.2' compile 'org.apache.httpcomponents:httpmime:4.5.2' - compile 'com.bmuschko:gradle-docker-plugin:3.0.5' + compile 'com.bmuschko:gradle-docker-plugin:3.0.7' compile 'com.moowork.gradle:gradle-node-plugin:1.1.1' testCompile 'junit:junit:4.12' http://git-wip-us.apache.org/repos/asf/polygene-java/blob/5d91b65f/tools/generator-polygene/package.json ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/package.json b/tools/generator-polygene/package.json index 57ac117..74f6290 100644 --- a/tools/generator-polygene/package.json +++ b/tools/generator-polygene/package.json @@ -1,7 +1,7 @@ { "name": "generator-polygene", "version": "3.0.0", - "polygene_version": "3.0.0", + "polygene_version": "0", "description": "Generates an Apache Polygene project.", "homepage": "https://polygene.apache.org";, "license": "Apache-2.0", http://git-wip-us.apache.org/repos/asf/polygene-java/blob/5d91b65f/tools/generator-polygene/test/generator_test.js ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/test/generator_test.js b/tools/generator-polygene/test/generator_test.js index 0702979..15f1429 100644 --- a/tools/generator-polygene/test/generator_test.js +++ b/tools/generator-polygene/test/generator_test.js @@ -152,7 +152,7 @@ function test(appType, entityStore, indexing, serialization, caching, metrics, f return helpers.run(path.join(__dirname, '../app')) .inDir(path.join(__dirname, '../build/npm-test/'+testDirName)) .withPrompts({ - name: 'test-project', + name: 'TestProject', packageName: 'org.apache.polygene.generator.test', applicationtype: appType, entitystore: entityStore,
