Skip to content

Commit a70c871

Browse files
woowahan-jaehoonwoowahan-jaehoon
committed
Remove Scala-2.10 module for spark 2.3
1 parent 4369495 commit a70c871

File tree

2 files changed

+92
-7
lines changed

2 files changed

+92
-7
lines changed

‎spark/interpreter/pom.xml‎

Lines changed: 74 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,6 @@
6969
<version>${project.version}</version>
7070
</dependency>
7171

72-
<dependency>
73-
<groupId>org.apache.zeppelin</groupId>
74-
<artifactId>spark-scala-2.10</artifactId>
75-
<version>${project.version}</version>
76-
</dependency>
77-
7872
<dependency>
7973
<groupId>org.apache.zeppelin</groupId>
8074
<artifactId>zeppelin-interpreter</artifactId>
@@ -578,4 +572,78 @@
578572
</plugins>
579573
</build>
580574

575+
<profiles>
576+
<profile>
577+
<id>spark-2.3</id>
578+
</profile>
579+
580+
<profile>
581+
<id>spark-2.2</id>
582+
<activation>
583+
<activeByDefault>true</activeByDefault>
584+
</activation>
585+
<dependencies>
586+
<dependency>
587+
<groupId>org.apache.zeppelin</groupId>
588+
<artifactId>spark-scala-2.10</artifactId>
589+
<version>${project.version}</version>
590+
</dependency>
591+
</dependencies>
592+
</profile>
593+
594+
<profile>
595+
<id>spark-2.1</id>
596+
<dependencies>
597+
<dependency>
598+
<groupId>org.apache.zeppelin</groupId>
599+
<artifactId>spark-scala-2.10</artifactId>
600+
<version>${project.version}</version>
601+
</dependency>
602+
</dependencies>
603+
</profile>
604+
605+
<profile>
606+
<id>spark-2.0</id>
607+
<dependencies>
608+
<dependency>
609+
<groupId>org.apache.zeppelin</groupId>
610+
<artifactId>spark-scala-2.10</artifactId>
611+
<version>${project.version}</version>
612+
</dependency>
613+
</dependencies>
614+
</profile>
615+
616+
<profile>
617+
<id>spark-1.6</id>
618+
<dependencies>
619+
<dependency>
620+
<groupId>org.apache.zeppelin</groupId>
621+
<artifactId>spark-scala-2.10</artifactId>
622+
<version>${project.version}</version>
623+
</dependency>
624+
</dependencies>
625+
</profile>
626+
627+
<profile>
628+
<id>spark-1.5</id>
629+
<dependencies>
630+
<dependency>
631+
<groupId>org.apache.zeppelin</groupId>
632+
<artifactId>spark-scala-2.10</artifactId>
633+
<version>${project.version}</version>
634+
</dependency>
635+
</dependencies>
636+
</profile>
637+
638+
<profile>
639+
<id>spark-1.4</id>
640+
<dependencies>
641+
<dependency>
642+
<groupId>org.apache.zeppelin</groupId>
643+
<artifactId>spark-scala-2.10</artifactId>
644+
<version>${project.version}</version>
645+
</dependency>
646+
</dependencies>
647+
</profile>
648+
</profiles>
581649
</project>

‎spark/pom.xml‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
<modules>
6161
<module>interpreter</module>
6262
<module>spark-scala-parent</module>
63-
<module>scala-2.10</module>
6463
<module>scala-2.11</module>
6564
<module>spark-dependencies</module>
6665
<module>spark-shims</module>
@@ -217,6 +216,9 @@
217216
<spark.version>2.2.0</spark.version>
218217
<py4j.version>0.10.4</py4j.version>
219218
</properties>
219+
<modules>
220+
<module>scala-2.10</module>
221+
</modules>
220222
</profile>
221223

222224
<profile>
@@ -225,6 +227,9 @@
225227
<spark.version>2.1.0</spark.version>
226228
<py4j.version>0.10.4</py4j.version>
227229
</properties>
230+
<modules>
231+
<module>scala-2.10</module>
232+
</modules>
228233
</profile>
229234

230235
<profile>
@@ -233,6 +238,9 @@
233238
<spark.version>2.0.2</spark.version>
234239
<py4j.version>0.10.3</py4j.version>
235240
</properties>
241+
<modules>
242+
<module>scala-2.10</module>
243+
</modules>
236244
</profile>
237245

238246
<profile>
@@ -241,6 +249,9 @@
241249
<spark.version>1.6.3</spark.version>
242250
<py4j.version>0.9</py4j.version>
243251
</properties>
252+
<modules>
253+
<module>scala-2.10</module>
254+
</modules>
244255
</profile>
245256

246257
<profile>
@@ -249,6 +260,9 @@
249260
<spark.version>1.5.2</spark.version>
250261
<py4j.version>0.8.2.1</py4j.version>
251262
</properties>
263+
<modules>
264+
<module>scala-2.10</module>
265+
</modules>
252266
</profile>
253267

254268
<profile>
@@ -257,6 +271,9 @@
257271
<spark.version>1.4.1</spark.version>
258272
<py4j.version>0.8.2.1</py4j.version>
259273
</properties>
274+
<modules>
275+
<module>scala-2.10</module>
276+
</modules>
260277
</profile>
261278

262279
</profiles>

0 commit comments

Comments
 (0)