Maven invoker using Gradle Java toolchain

wttech · Aug 25, 2021 · cacb111 · cacb111
1 parent a1e5132
commit cacb111
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=1.0.35
+version=1.0.36
 release.useAutomaticVersion=true
 
 # Performance tuning

diff --git a/src/main/kotlin/com/cognifide/gradle/common/mvn/MvnInvoker.kt b/src/main/kotlin/com/cognifide/gradle/common/mvn/MvnInvoker.kt
@@ -7,7 +7,9 @@ import java.io.File
 
 class MvnInvoker(private val common: CommonExtension) {
 
- val workingDir = common.obj.dir()
+ val workingDir = common.obj.dir() {
+ convention(common.project.layout.projectDirectory)
+ }
 
  fun workingDir(dir: File) {
  workingDir.set(dir)
@@ -52,7 +54,16 @@ class MvnInvoker(private val common: CommonExtension) {
  args.addAll(values)
  }
 
- private var specOptions: ExecSpec.() -> Unit = {}
+ val javaToolchain = common.obj.boolean {
+ convention(true)
+ common.prop.boolean("mvn.javaToolchain")?.let { set(it) }
+ }
+
+ private var specOptions: ExecSpec.() -> Unit = {
+ if (javaToolchain.get()) {
+ environment("JAVA_HOME", common.javaSupport.homePath)
+ }
+ }
 
  fun spec(options: ExecSpec.() -> Unit) {
  this.specOptions = options