@@ -160,24 +160,21 @@ class BuildPlugin implements Plugin<Project> {
160160 println " Using Gradle [${ project.gradle.gradleVersion} ]"
161161
162162 // Hadoop versions
163- project. rootProject. ext. hadoopClient = []
164- project. rootProject. ext. hadoopDistro = project. hasProperty(" distro" ) ? project. getProperty(" distro" ) : " hadoopStable"
165-
163+ project. rootProject. ext. hadoopDistro = project. hasProperty(" distro" ) ? project. getProperty(" distro" ) : " hadoopYarn"
166164 switch (project. rootProject. ext. hadoopDistro) {
167165 // Hadoop YARN/2.0.x
168166 case " hadoopYarn" :
169- String version = project. hadoop2Version
170- project. rootProject. ext. hadoopVersion = version
171- project. rootProject. ext. hadoopClient = [" org.apache.hadoop:hadoop-client:$version " ]
172- println " Using Apache Hadoop on YARN [$version ]"
167+ project. rootProject. ext. hadoopVersion = project. hadoop2Version
168+ println " Using Apache Hadoop on YARN [$project . hadoop2Version ]"
169+ break
170+ case " hadoopStable" :
171+ project. rootProject. ext. hadoopVersion = project. hadoop22Version
172+ println " Using Apache Hadoop [$project . hadoop22Version ]"
173173 break
174-
175174 default :
176- String version = project. hadoop22Version
177- project. rootProject. ext. hadoopVersion = version
178- project. rootProject. ext. hadoopClient = [" org.apache.hadoop:hadoop-client:$version " ]
179- println " Using Apache Hadoop [$version ]"
175+ throw new GradleException (" Invalid [hadoopDistro] setting: [$project . rootProject . ext . hadoopDistro ]" )
180176 }
177+ project. rootProject. ext. hadoopClient = [" org.apache.hadoop:hadoop-client:$project . rootProject . ext . hadoopVersion " ]
181178 }
182179 project. ext. eshadoopVersion = project. rootProject. ext. eshadoopVersion
183180 project. ext. elasticsearchVersion = project. rootProject. ext. elasticsearchVersion
0 commit comments