Support Vagrant 2.x

risdenk · jasontedor · commit f1e8b99fd95e · 2017-09-09T15:30:13.000-04:00
This commit adds support for Vagrant 2.x by allowing these versions to pass the Vagrant version check. Relates #26563
diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantSupportPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/vagrant/VagrantSupportPlugin.groovy
@@ -45,7 +45,7 @@ class VagrantSupportPlugin implements Plugin<Project> {
             }
             String version = pipe.toString().trim()
             if (runResult.exitValue == 0) {
-                if (version ==~ /Vagrant 1\.(8\.[6-9]|9\.[0-9])+/) {
+                if (version ==~ /Vagrant 1\.(8\.[6-9]|9\.[0-9])+/ || version ==~ /Vagrant 2\.[0-9]\.[0-9]+/) {
                     return [ 'supported' : true ]
                 } else {
                     return [ 'supported' : false,

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ class VagrantSupportPlugin implements Plugin<Project> {`
`45`	`45`	`}`
`46`	`46`	`String version = pipe.toString().trim()`
`47`	`47`	`if (runResult.exitValue == 0) {`
`48`		`- if (version ==~ /Vagrant 1\.(8\.[6-9]\|9\.[0-9])+/) {`
	`48`	`+ if (version ==~ /Vagrant 1\.(8\.[6-9]\|9\.[0-9])+/ \|\| version ==~ /Vagrant 2\.[0-9]\.[0-9]+/) {`
`49`	`49`	`return [ 'supported' : true ]`
`50`	`50`	`} else {`
`51`	`51`	`return [ 'supported' : false,`