diff --git a/build.gradle b/build.gradle index eed71be4f..4490579e9 100644 --- a/build.gradle +++ b/build.gradle @@ -104,6 +104,7 @@ project.assembleTargetPlatform.doLast { '-p2.ws', Constants.ws, '-p2.arch', Constants.arch, '-roaming', + '-vm', System.getProperty('java.home') + '/bin/java', '-nosplash') } diff --git a/buildSrc/src/main/groovy/eclipsebuild/BuildDefinitionPlugin.groovy b/buildSrc/src/main/groovy/eclipsebuild/BuildDefinitionPlugin.groovy index 77f7c788a..4e7637c83 100644 --- a/buildSrc/src/main/groovy/eclipsebuild/BuildDefinitionPlugin.groovy +++ b/buildSrc/src/main/groovy/eclipsebuild/BuildDefinitionPlugin.groovy @@ -398,6 +398,7 @@ class BuildDefinitionPlugin implements Plugin { '-roaming', '-nosplash', '-consoleLog', + '-vm', System.getProperty('java.home') + '/bin/java', '-vmargs', '-Declipse.p2.mirror=false') ignoreExitValue = true @@ -423,6 +424,7 @@ class BuildDefinitionPlugin implements Plugin { '-roaming', '-nosplash', '-consoleLog', + '-vm', System.getProperty('java.home') + '/bin/java', '-vmargs', '-Declipse.p2.mirror=false') } } diff --git a/buildSrc/src/main/groovy/eclipsebuild/TestBundlePlugin.groovy b/buildSrc/src/main/groovy/eclipsebuild/TestBundlePlugin.groovy index aa7fe06f4..6e47941dd 100644 --- a/buildSrc/src/main/groovy/eclipsebuild/TestBundlePlugin.groovy +++ b/buildSrc/src/main/groovy/eclipsebuild/TestBundlePlugin.groovy @@ -221,6 +221,7 @@ class TestBundlePlugin implements Plugin { "-bundles", p.tasks.jar.outputs.files.singleFile.path, "-publishArtifacts", "-nosplash", + '-vm', System.getProperty('java.home') + '/bin/java', "-consoleLog") } } @@ -235,6 +236,7 @@ class TestBundlePlugin implements Plugin { "-bundles", project.jar.outputs.files.singleFile.path, "-publishArtifacts", "-nosplash", + '-vm', System.getProperty('java.home') + '/bin/java', "-consoleLog") } } @@ -255,6 +257,7 @@ class TestBundlePlugin implements Plugin { '-p2.arch', Constants.arch, '-roaming', '-nosplash', + '-vm', System.getProperty('java.home') + '/bin/java', '-consoleLog') } } @@ -272,6 +275,7 @@ class TestBundlePlugin implements Plugin { '-p2.ws', Constants.ws, '-p2.arch', Constants.arch, '-roaming', + '-vm', System.getProperty('java.home') + '/bin/java', '-nosplash') } } diff --git a/buildSrc/src/main/groovy/eclipsebuild/UpdateSitePlugin.groovy b/buildSrc/src/main/groovy/eclipsebuild/UpdateSitePlugin.groovy index 73254ab5a..286ba3df1 100644 --- a/buildSrc/src/main/groovy/eclipsebuild/UpdateSitePlugin.groovy +++ b/buildSrc/src/main/groovy/eclipsebuild/UpdateSitePlugin.groovy @@ -338,6 +338,7 @@ class UpdateSitePlugin implements Plugin { '-publishArtifacts', '-reusePack200Files', '-configs', 'ANY', + '-vm', System.getProperty('java.home') + '/bin/java', '-consoleLog') } @@ -350,6 +351,7 @@ class UpdateSitePlugin implements Plugin { '-metadataRepository', repositoryDir.toURI().toURL(), '-categoryDefinition', project.updateSite.siteDescriptor.toURI().toURL(), '-compress', + '-vm', System.getProperty('java.home') + '/bin/java', '-consoleLog') } diff --git a/buildSrc/src/main/groovy/eclipsebuild/jar/CreateP2RepositoryTask.groovy b/buildSrc/src/main/groovy/eclipsebuild/jar/CreateP2RepositoryTask.groovy index 823b0770d..2e337f93d 100644 --- a/buildSrc/src/main/groovy/eclipsebuild/jar/CreateP2RepositoryTask.groovy +++ b/buildSrc/src/main/groovy/eclipsebuild/jar/CreateP2RepositoryTask.groovy @@ -25,6 +25,7 @@ class CreateP2RepositoryTask extends DefaultTask { '-artifactRepository', targetRepositoryDir.toURI().toURL(), '-source', bundleSourceDir, '-publishArtifacts', + '-vm', System.getProperty('java.home') + '/bin/java', '-configs', 'ANY') } }