Skip to content

Commit 5d1573e

Browse files
wezhangwezhang
committed
Revert HDInsight Spark local run feature into v3.0.11
Signed-off-by: Wei Zhang <[email protected]>
1 parent e4d69b1 commit 5d1573e

File tree

6 files changed

+47
-641
lines changed

6 files changed

+47
-641
lines changed

‎Utils/hdinsight-node-common/Test/java/com/microsoft/azure/hdinsight/spark/mock/MockRawLocalFileSystemScenario.kt‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎Utils/hdinsight-node-common/Test/java/com/microsoft/azure/hdinsight/spark/mock/MockRawLocalFileSystemTest.kt‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎Utils/hdinsight-node-common/Test/java/com/microsoft/azure/hdinsight/spark/mock/SparkLocalRunnerITScenario.kt‎

Lines changed: 0 additions & 102 deletions
This file was deleted.

‎Utils/hdinsight-node-common/Test/java/com/microsoft/azure/hdinsight/spark/mock/SparkLocalRunnerIntegrationTest.kt‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎Utils/hdinsight-node-common/pom.xml‎

Lines changed: 1 addition & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
<artifact.name>${project.artifactId}-${project.version}.jar</artifact.name>
1313
<hdinsight.htmlcopy.enabled>false</hdinsight.htmlcopy.enabled>
1414
<project.build.encoding>UTF-8</project.build.encoding>
15-
<scala.version>2.11.11</scala.version>
16-
<spark.version>2.1.0</spark.version>
1715
</properties>
1816

1917
<profiles>
@@ -82,21 +80,6 @@
8280
</testResources>
8381
<defaultGoal>install</defaultGoal>
8482
<plugins>
85-
<plugin>
86-
<groupId>net.alchim31.maven</groupId>
87-
<artifactId>scala-maven-plugin</artifactId>
88-
<version>3.3.1</version>
89-
<executions>
90-
<execution>
91-
<goals>
92-
<goal>testCompile</goal>
93-
</goals>
94-
</execution>
95-
</executions>
96-
<configuration>
97-
<scalaVersion>${scala.version}</scalaVersion>
98-
</configuration>
99-
</plugin>
10083
<plugin>
10184
<groupId>org.jetbrains.kotlin</groupId>
10285
<artifactId>kotlin-maven-plugin</artifactId>
@@ -116,45 +99,11 @@
11699
<goal>test-compile</goal>
117100
</goals>
118101
</execution>
119-
<execution>
120-
<id>clone-winutils</id>
121-
<phase>generate-test-resources</phase>
122-
<goals>
123-
<goal>script</goal>
124-
</goals>
125-
<configuration>
126-
<scriptFile>build-tools/cloneWinutils.kts</scriptFile>
127-
</configuration>
128-
</execution>
129102
</executions>
130103
<configuration>
131104
<jvmTarget>${kotlin.jvmTargetVersion}</jvmTarget>
132105
</configuration>
133106
</plugin>
134-
<plugin>
135-
<artifactId>maven-resources-plugin</artifactId>
136-
<version>3.0.2</version>
137-
<executions>
138-
<execution>
139-
<id>copy-test-data-resources</id>
140-
<phase>generate-test-resources</phase>
141-
<goals>
142-
<goal>testResources</goal>
143-
</goals>
144-
<configuration>
145-
<outputDirectory>${project.build.directory}</outputDirectory>
146-
<resources>
147-
<resource>
148-
<directory>Test/resources/data</directory>
149-
<targetPath>data</targetPath>
150-
</resource>
151-
</resources>
152-
<overwrite>true</overwrite>
153-
<includeEmptyDirs>true</includeEmptyDirs>
154-
</configuration>
155-
</execution>
156-
</executions>
157-
</plugin>
158107
<plugin>
159108
<groupId>org.apache.maven.plugins</groupId>
160109
<artifactId>maven-compiler-plugin</artifactId>
@@ -299,91 +248,12 @@
299248
<dependency>
300249
<groupId>org.jetbrains.kotlin</groupId>
301250
<artifactId>kotlin-stdlib-jre8</artifactId>
302-
<scope>provided</scope>
251+
<scope>test</scope>
303252
</dependency>
304253
<dependency>
305254
<groupId>org.jetbrains.kotlin</groupId>
306255
<artifactId>kotlin-test</artifactId>
307256
<scope>test</scope>
308257
</dependency>
309-
<dependency>
310-
<groupId>org.assertj</groupId>
311-
<artifactId>assertj-core</artifactId>
312-
<scope>test</scope>
313-
</dependency>
314-
<dependency>
315-
<groupId>com.fasterxml.jackson.module</groupId>
316-
<artifactId>jackson-module-scala_2.11</artifactId>
317-
<scope>test</scope>
318-
</dependency>
319-
<dependency>
320-
<groupId>org.apache.spark</groupId>
321-
<artifactId>spark-core_2.11</artifactId>
322-
<version>${spark.version}</version>
323-
<scope>test</scope>
324-
<exclusions>
325-
<exclusion>
326-
<groupId>com.fasterxml.jackson.core</groupId>
327-
<artifactId>jackson-databind</artifactId>
328-
</exclusion>
329-
<exclusion>
330-
<groupId>com.fasterxml.jackson.core</groupId>
331-
<artifactId>jackson-module-scala_2.11</artifactId>
332-
</exclusion>
333-
</exclusions>
334-
</dependency>
335-
<dependency>
336-
<groupId>org.apache.spark</groupId>
337-
<artifactId>spark-sql_2.11</artifactId>
338-
<version>${spark.version}</version>
339-
<scope>test</scope>
340-
<exclusions>
341-
<exclusion>
342-
<groupId>com.fasterxml.jackson.core</groupId>
343-
<artifactId>jackson-databind</artifactId>
344-
</exclusion>
345-
<exclusion>
346-
<groupId>com.fasterxml.jackson.core</groupId>
347-
<artifactId>jackson-module-scala_2.11</artifactId>
348-
</exclusion>
349-
</exclusions>
350-
</dependency>
351-
<dependency>
352-
<groupId>org.apache.spark</groupId>
353-
<artifactId>spark-streaming_2.11</artifactId>
354-
<version>${spark.version}</version>
355-
<scope>test</scope>
356-
<exclusions>
357-
<exclusion>
358-
<groupId>com.fasterxml.jackson.core</groupId>
359-
<artifactId>jackson-databind</artifactId>
360-
</exclusion>
361-
<exclusion>
362-
<groupId>com.fasterxml.jackson.core</groupId>
363-
<artifactId>jackson-module-scala_2.11</artifactId>
364-
</exclusion>
365-
</exclusions>
366-
</dependency>
367-
<dependency>
368-
<groupId>org.apache.spark</groupId>
369-
<artifactId>spark-mllib_2.11</artifactId>
370-
<version>${spark.version}</version>
371-
<scope>test</scope>
372-
<exclusions>
373-
<exclusion>
374-
<groupId>com.fasterxml.jackson.core</groupId>
375-
<artifactId>jackson-databind</artifactId>
376-
</exclusion>
377-
<exclusion>
378-
<groupId>com.fasterxml.jackson.core</groupId>
379-
<artifactId>jackson-module-scala_2.11</artifactId>
380-
</exclusion>
381-
</exclusions>
382-
</dependency>
383-
<dependency>
384-
<groupId>xml-apis</groupId>
385-
<artifactId>xml-apis</artifactId>
386-
<scope>test</scope>
387-
</dependency>
388258
</dependencies>
389259
</project>

0 commit comments

Comments
 (0)