File tree Expand file tree Collapse file tree 3 files changed +21
-16
lines changed
Expand file tree Collapse file tree 3 files changed +21
-16
lines changed Original file line number Diff line number Diff line change 184184 <outputDirectory >target/scala-${scala.binary.version} /classes</outputDirectory >
185185 <testOutputDirectory >target/scala-${scala.binary.version} /test-classes</testOutputDirectory >
186186 <plugins >
187- <plugin >
188- <groupId >org.codehaus.gmaven</groupId >
189- <artifactId >gmaven-plugin</artifactId >
190- <version >1.4</version >
191- <executions >
192- <execution >
193- <phase >none</phase >
194- </execution >
195- </executions >
196- </plugin >
197187 <plugin >
198188 <groupId >org.apache.maven.plugins</groupId >
199189 <artifactId >maven-deploy-plugin</artifactId >
Original file line number Diff line number Diff line change 267267 </snapshots >
268268 </pluginRepository >
269269 </pluginRepositories >
270+
271+ <dependencies >
270272 <!--
271273 This is a dummy dependency that is used along with the shading plug-in
272274 to create effective poms on publishing (see SPARK-3812).
273275 -->
274- <dependencies >
275276 <dependency >
276277 <groupId >org.spark-project.spark</groupId >
277278 <artifactId >unused</artifactId >
278279 <version >1.0.0</version >
279280 </dependency >
281+ <!--
282+ This depndency has been added to provided scope as it is needed for excuting build
283+ specific groovy scripts using gmaven+ and not required for downstream project building
284+ with spark.
285+ -->
286+ <dependency >
287+ <groupId >org.codehaus.groovy</groupId >
288+ <artifactId >groovy-all</artifactId >
289+ <version >2.3.7</version >
290+ <scope >provided</scope >
291+ </dependency >
280292 </dependencies >
281293 <dependencyManagement >
282294 <dependencies >
10481060
10491061 <!-- This plugin reads a file into maven property. And it lets us write groovy !! -->
10501062 <plugin >
1051- <groupId >org.codehaus.gmaven </groupId >
1052- <artifactId >gmaven -plugin</artifactId >
1053- <version >1.4 </version >
1063+ <groupId >org.codehaus.gmavenplus </groupId >
1064+ <artifactId >gmavenplus -plugin</artifactId >
1065+ <version >1.2 </version >
10541066 <executions >
10551067 <execution >
10561068 <phase >process-test-classes</phase >
10571069 <goals >
10581070 <goal >execute</goal >
10591071 </goals >
10601072 <configuration >
1061- <source >
1073+ <scripts >
1074+ <script ><![CDATA[
10621075 def file = new File(project.properties.test_classpath_file)
10631076 project.properties.test_classpath = file.getText().split().join(":")
1064- </source >
1077+ ]]> </script >
1078+ </scripts >
10651079 </configuration >
10661080 </execution >
10671081 </executions >
Original file line number Diff line number Diff line change @@ -361,6 +361,7 @@ object TestSettings {
361361 .map { case (k,v) => s " -D $k= $v" }.toSeq,
362362 javaOptions in Test ++= " -Xmx3g -XX:PermSize=128M -XX:MaxNewSize=256m -XX:MaxPermSize=1g"
363363 .split(" " ).toSeq,
364+ // This places test scope jars on the classpath of executors during tests.
364365 javaOptions in Test +=
365366 " -Dspark.executor.extraClassPath=" + (fullClasspath in Test ).value.files.
366367 map(_.getAbsolutePath).mkString(" :" ).stripSuffix(" :" ),
You can’t perform that action at this time.
0 commit comments