Skip to content

Commit 7c2d652

Browse files
JolanrensenJolanrensen
committed
fixed dependencies as requested
1 parent 81448ee commit 7c2d652

File tree

5 files changed

+267
-249
lines changed

5 files changed

+267
-249
lines changed

‎core/3.2/pom_2.12.xml‎

Lines changed: 76 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,81 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
45

5-
<name>Kotlin Spark API: Scala core for Spark 3.2+ (Scala 2.12)</name>
6-
<description>Scala-Spark 3.2+ compatibility layer for Kotlin for Apache Spark</description>
7-
<artifactId>core-3.2_2.12</artifactId>
8-
<parent>
9-
<groupId>org.jetbrains.kotlinx.spark</groupId>
10-
<artifactId>kotlin-spark-api-parent_2.12</artifactId>
11-
<version>1.0.4-SNAPSHOT</version>
12-
<relativePath>../../pom_2.12.xml</relativePath>
13-
</parent>
6+
<name>Kotlin Spark API: Scala core for Spark 3.2+ (Scala 2.12)</name>
7+
<description>Scala-Spark 3.2+ compatibility layer for Kotlin for Apache Spark</description>
8+
<artifactId>core-3.2_2.12</artifactId>
9+
<parent>
10+
<groupId>org.jetbrains.kotlinx.spark</groupId>
11+
<artifactId>kotlin-spark-api-parent_2.12</artifactId>
12+
<version>1.0.4-SNAPSHOT</version>
13+
<relativePath>../../pom_2.12.xml</relativePath>
14+
</parent>
15+
16+
<dependencies>
17+
<dependency>
18+
<groupId>org.scala-lang</groupId>
19+
<artifactId>scala-library</artifactId>
20+
<version>${scala.version}</version>
21+
</dependency>
22+
<dependency>
23+
<groupId>org.jetbrains.kotlin</groupId>
24+
<artifactId>kotlin-reflect</artifactId>
25+
</dependency>
26+
27+
<!-- Provided dependencies -->
28+
29+
<dependency>
30+
<groupId>org.apache.spark</groupId>
31+
<artifactId>spark-sql_${scala.compat.version}</artifactId>
32+
<version>${spark3.version}</version>
33+
<scope>provided</scope>
34+
</dependency>
35+
36+
</dependencies>
37+
38+
<build>
39+
<sourceDirectory>src/main/scala</sourceDirectory>
40+
<testSourceDirectory>src/test/scala</testSourceDirectory>
41+
<directory>target/${scala.compat.version}</directory>
42+
<plugins>
43+
<plugin>
44+
<groupId>net.alchim31.maven</groupId>
45+
<artifactId>scala-maven-plugin</artifactId>
46+
<version>${scala-maven-plugin.version}</version>
47+
<executions>
48+
<execution>
49+
<id>compile</id>
50+
<goals>
51+
<goal>compile</goal>
52+
<goal>testCompile</goal>
53+
</goals>
54+
<configuration>
55+
<args>
56+
<arg>-dependencyfile</arg>
57+
<arg>${project.build.directory}/.scala_dependencies</arg>
58+
</args>
59+
</configuration>
60+
</execution>
61+
<execution>
62+
<id>docjar</id>
63+
<goals>
64+
<goal>doc-jar</goal>
65+
</goals>
66+
<phase>pre-integration-test</phase>
67+
</execution>
68+
</executions>
69+
</plugin>
70+
<plugin>
71+
<groupId>org.apache.maven.plugins</groupId>
72+
<artifactId>maven-site-plugin</artifactId>
73+
<configuration>
74+
<skip>true</skip>
75+
</configuration>
76+
</plugin>
77+
</plugins>
78+
</build>
1479

15-
<dependencies>
16-
<dependency>
17-
<groupId>org.scala-lang</groupId>
18-
<artifactId>scala-library</artifactId>
19-
<version>${scala.version}</version>
20-
</dependency>
21-
<dependency>
22-
<groupId>org.jetbrains.kotlin</groupId>
23-
<artifactId>kotlin-reflect</artifactId>
24-
</dependency>
25-
<!-- Provided dependencies -->
26-
<dependency>
27-
<groupId>org.apache.spark</groupId>
28-
<artifactId>spark-sql_${scala.compat.version}</artifactId>
29-
<version>${spark3.version}</version>
30-
</dependency>
31-
<!-- <dependency>-->
32-
<!-- <groupId>org.apache.spark</groupId>-->
33-
<!-- <artifactId>spark-core_${scala.compat.version}</artifactId>-->
34-
<!-- <version>${spark3.version}</version>-->
35-
<!--&lt;!&ndash; <scope>provided</scope>&ndash;&gt;-->
36-
<!-- </dependency>-->
37-
</dependencies>
3880

39-
<build>
40-
<sourceDirectory>src/main/scala</sourceDirectory>
41-
<testSourceDirectory>src/test/scala</testSourceDirectory>
42-
<directory>target/${scala.compat.version}</directory>
43-
<plugins>
44-
<plugin>
45-
<groupId>net.alchim31.maven</groupId>
46-
<artifactId>scala-maven-plugin</artifactId>
47-
<version>${scala-maven-plugin.version}</version>
48-
<executions>
49-
<execution>
50-
<id>compile</id>
51-
<goals>
52-
<goal>compile</goal>
53-
<goal>testCompile</goal>
54-
</goals>
55-
<configuration>
56-
<args>
57-
<arg>-dependencyfile</arg>
58-
<arg>${project.build.directory}/.scala_dependencies</arg>
59-
</args>
60-
</configuration>
61-
</execution>
62-
<execution>
63-
<id>docjar</id>
64-
<goals>
65-
<goal>doc-jar</goal>
66-
</goals>
67-
<phase>pre-integration-test</phase>
68-
</execution>
69-
</executions>
70-
</plugin>
71-
<plugin>
72-
<groupId>org.apache.maven.plugins</groupId>
73-
<artifactId>maven-site-plugin</artifactId>
74-
<configuration>
75-
<skip>true</skip>
76-
</configuration>
77-
</plugin>
78-
</plugins>
79-
</build>
8081
</project>

‎examples/pom-3.2_2.12.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
</parent>
1616

1717
<dependencies>
18-
<dependency>
19-
<groupId>org.jetbrains.kotlin</groupId>
20-
<artifactId>kotlin-reflect</artifactId>
21-
</dependency><!-- TODO this shouldn't be needed -->
2218
<dependency>
2319
<groupId>org.jetbrains.kotlinx.spark</groupId>
2420
<artifactId>kotlin-spark-api-3.2</artifactId>

‎jupyter/pom.xml‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,26 @@
4646
<artifactId>kotlinx-html-jvm</artifactId>
4747
<version>${kotlinx.html.version}</version>
4848
</dependency>
49-
<dependency> <!-- Needed for Jupyter -->
49+
<dependency>
50+
<groupId>org.apache.spark</groupId>
51+
<artifactId>spark-sql_${scala.compat.version}</artifactId>
52+
<version>${spark3.version}</version>
53+
</dependency>
54+
<dependency>
5055
<groupId>org.apache.spark</groupId>
5156
<artifactId>spark-repl_${scala.compat.version}</artifactId>
5257
<version>${spark3.version}</version>
5358
</dependency>
59+
<dependency>
60+
<groupId>org.apache.spark</groupId>
61+
<artifactId>spark-streaming_${scala.compat.version}</artifactId>
62+
<version>${spark3.version}</version>
63+
</dependency>
64+
<dependency>
65+
<groupId>org.apache.hadoop</groupId>
66+
<artifactId>hadoop-client</artifactId>
67+
<version>${hadoop.version}</version>
68+
</dependency>
5469
<dependency>
5570
<groupId>org.jetbrains.kotlinx</groupId>
5671
<artifactId>kotlin-jupyter-api</artifactId>

0 commit comments

Comments
 (0)