Skip to content

Commit a66e528

Browse files
gschulzeasm0dey
gschulze
authored and
asm0dey
committed
refactor: Change project structure
1 parent d373e7a commit a66e528

File tree

31 files changed

+503
-319
lines changed

31 files changed

+503
-319
lines changed

core-2.4.1_2.12/pom.xml renamed to core/2.4/pom_2.11.xml

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,41 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<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">
33
<modelVersion>4.0.0</modelVersion>
4+
5+
<name>Kotlin Spark API: Scala core for Spark 2.4+ (Scala 2.11)</name>
6+
<artifactId>core-2.4_2.11</artifactId>
7+
<description>Scala-Spark 2.4+ compatibility layer for Kotlin for Apache Spark</description>
48
<parent>
59
<groupId>org.jetbrains.kotlinx.spark</groupId>
6-
<artifactId>kotlin-spark-api-parent</artifactId>
10+
<artifactId>kotlin-spark-api-parent_2.11</artifactId>
711
<version>1.0.0-preview2-SNAPSHOT</version>
12+
<relativePath>../../pom_2.11.xml</relativePath>
813
</parent>
9-
<artifactId>core-2.4.1_2.12</artifactId>
10-
<name>Kotlin Spark API: Scala core (2.4.1+)</name>
11-
<description>Scala-Spark 2.4.1+ compatibility layer for Kotlin for Apache Spark</description>
12-
13-
<properties>
14-
<maven.compiler.source>1.8</maven.compiler.source>
15-
<maven.compiler.target>1.8</maven.compiler.target>
16-
<encoding>UTF-8</encoding>
17-
<scala.version>2.12.10</scala.version>
18-
<scala.compat.version>2.12</scala.compat.version>
19-
</properties>
2014

2115
<dependencies>
2216
<dependency>
2317
<groupId>org.scala-lang</groupId>
2418
<artifactId>scala-library</artifactId>
2519
<version>${scala.version}</version>
2620
</dependency>
21+
22+
<!-- Provided dependencies -->
2723
<dependency>
2824
<groupId>org.apache.spark</groupId>
29-
<artifactId>spark-sql_2.12</artifactId>
30-
<version>2.4.1</version>
25+
<artifactId>spark-sql_${scala.compat.version}</artifactId>
26+
<version>${spark2.version}</version>
3127
<scope>provided</scope>
3228
</dependency>
3329
</dependencies>
3430

3531
<build>
3632
<sourceDirectory>src/main/scala</sourceDirectory>
3733
<testSourceDirectory>src/test/scala</testSourceDirectory>
34+
<directory>target/${scala.compat.version}</directory>
3835
<plugins>
3936
<plugin>
40-
<!-- see http://davidb.github.com/scala-maven-plugin -->
4137
<groupId>net.alchim31.maven</groupId>
4238
<artifactId>scala-maven-plugin</artifactId>
43-
<version>4.4.0</version>
4439
<executions>
4540
<execution>
4641
<id>compile</id>

‎core/2.4/pom_2.12.xml‎

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

core-2.4.1_2.12/src/main/scala/org/apache/spark/sql/KotlinWrappers.scala renamed to core/2.4/src/main/scala/org/apache/spark/sql/KotlinWrappers.scala

File renamed without changes.

core-2.4.1_2.12/src/main/scala/org/apache/spark/sql/catalyst/KotlinReflection.scala renamed to core/2.4/src/main/scala/org/apache/spark/sql/catalyst/KotlinReflection.scala

File renamed without changes.

core-2.4.1_2.12/src/main/scala/org/jetbrains/kotlinx/spark/extensions/KSparkExtensions.scala renamed to core/2.4/src/main/scala/org/jetbrains/kotlinx/spark/extensions/KSparkExtensions.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import java.util
2424
import org.apache.spark.SparkContext
2525
import org.apache.spark.sql._
2626

27-
import scala.collection.JavaConverters
27+
import scala.collection.JavaConverters._
2828

2929
object KSparkExtensions {
3030
def col(d: Dataset[_], name: String): Column = d.col(name)
@@ -33,7 +33,7 @@ object KSparkExtensions {
3333

3434
def lit(literal: Any): Column = functions.lit(literal)
3535

36-
def collectAsList[T](ds: Dataset[T]): util.List[T] = JavaConverters.seqAsJavaList(ds.collect())
36+
def collectAsList[T](ds: Dataset[T]): util.List[T] = ds.collect().toSeq.asJava
3737

3838

3939
def debugCodegen(df: Dataset[_]): Unit = {

core-3.0.0_2.12/pom.xml renamed to core/3.0/pom_2.12.xml

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,39 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<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">
33
<modelVersion>4.0.0</modelVersion>
4+
5+
<name>Kotlin Spark API: Scala core for Spark 3.0+ (Scala 2.12)</name>
6+
<description>Scala-Spark 3.0+ compatibility layer for Kotlin for Apache Spark</description>
7+
<artifactId>core-3.0_2.12</artifactId>
48
<parent>
59
<groupId>org.jetbrains.kotlinx.spark</groupId>
6-
<artifactId>kotlin-spark-api-parent</artifactId>
10+
<artifactId>kotlin-spark-api-parent_2.12</artifactId>
711
<version>1.0.0-preview2-SNAPSHOT</version>
12+
<relativePath>../../pom_2.12.xml</relativePath>
813
</parent>
9-
<artifactId>core-3.0.0_2.12</artifactId>
10-
<name>Kotlin Spark API: Scala core (3.0.0)</name>
11-
<description>Scala-Spark 3.0.0 compatibility layer for Kotlin for Apache Spark</description>
12-
13-
<properties>
14-
<maven.compiler.source>1.8</maven.compiler.source>
15-
<maven.compiler.target>1.8</maven.compiler.target>
16-
<encoding>UTF-8</encoding>
17-
<scala.version>2.12.10</scala.version>
18-
<scala.compat.version>2.12</scala.compat.version>
19-
</properties>
2014

2115
<dependencies>
2216
<dependency>
2317
<groupId>org.scala-lang</groupId>
2418
<artifactId>scala-library</artifactId>
2519
<version>${scala.version}</version>
2620
</dependency>
21+
22+
<!-- Provided dependencies -->
2723
<dependency>
2824
<groupId>org.apache.spark</groupId>
29-
<artifactId>spark-sql_2.12</artifactId>
30-
<version>3.0.0</version>
25+
<artifactId>spark-sql_${scala.compat.version}</artifactId>
26+
<version>${spark3.version}</version>
3127
<scope>provided</scope>
3228
</dependency>
3329
</dependencies>
3430

3531
<build>
3632
<sourceDirectory>src/main/scala</sourceDirectory>
3733
<testSourceDirectory>src/test/scala</testSourceDirectory>
34+
<directory>target/${scala.compat.version}</directory>
3835
<plugins>
3936
<plugin>
40-
<!-- see http://davidb.github.com/scala-maven-plugin -->
4137
<groupId>net.alchim31.maven</groupId>
4238
<artifactId>scala-maven-plugin</artifactId>
4339
<version>4.4.0</version>

core-3.0.0_2.12/src/main/scala/org/apache/spark/sql/KotlinReflection.scala renamed to core/3.0/src/main/scala/org/apache/spark/sql/KotlinReflection.scala

File renamed without changes.

core-3.0.0_2.12/src/main/scala/org/apache/spark/sql/KotlinWrappers.scala renamed to core/3.0/src/main/scala/org/apache/spark/sql/KotlinWrappers.scala

File renamed without changes.

core-3.0.0_2.12/src/main/scala/org/jetbrains/kotinx/spark/extensions/KSparkExtensions.scala renamed to core/3.0/src/main/scala/org/jetbrains/kotinx/spark/extensions/KSparkExtensions.scala

File renamed without changes.

examples/pom.xml renamed to examples/pom_2.12.xml

Lines changed: 10 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -3,70 +3,42 @@
33

44
<modelVersion>4.0.0</modelVersion>
55

6+
<name>Kotlin Spark API: Examples (Scala 2.12)</name>
7+
<description>Example of usage</description>
8+
<artifactId>examples_2.12</artifactId>
69
<parent>
710
<groupId>org.jetbrains.kotlinx.spark</groupId>
8-
<artifactId>kotlin-spark-api-parent</artifactId>
11+
<artifactId>kotlin-spark-api-parent_2.12</artifactId>
912
<version>1.0.0-preview2-SNAPSHOT</version>
13+
<relativePath>../pom_2.12.xml</relativePath>
1014
</parent>
1115

12-
<artifactId>examples</artifactId>
13-
<packaging>jar</packaging>
14-
15-
<name>Kotlin Spark API: Examples</name>
16-
<description>Example of usage</description>
17-
18-
<properties>
19-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
20-
<kotlin.code.style>official</kotlin.code.style>
21-
</properties>
22-
2316
<dependencies>
2417
<dependency>
2518
<groupId>org.jetbrains.kotlinx.spark</groupId>
26-
<artifactId>kotlin-spark-api-3.0.0_2.12</artifactId>
19+
<artifactId>kotlin-spark-api-3.0</artifactId>
2720
<version>${project.version}</version>
2821
</dependency>
2922
<dependency>
3023
<groupId>org.apache.spark</groupId>
31-
<artifactId>spark-sql_2.12</artifactId>
32-
<version>3.0.0</version>
24+
<artifactId>spark-sql_${scala.compat.version}</artifactId>
25+
<version>${spark3.version}</version>
3326
</dependency>
34-
3527
</dependencies>
3628

3729
<build>
3830
<sourceDirectory>src/main/kotlin</sourceDirectory>
3931
<testSourceDirectory>src/test/kotlin</testSourceDirectory>
40-
32+
<directory>target/${scala.compat.version}</directory>
4133
<plugins>
4234
<plugin>
4335
<groupId>org.jetbrains.kotlin</groupId>
4436
<artifactId>kotlin-maven-plugin</artifactId>
45-
<version>${kotlin.version}</version>
46-
<executions>
47-
<execution>
48-
<id>compile</id>
49-
<goals>
50-
<goal>compile</goal>
51-
</goals>
52-
<phase>compile</phase>
53-
<configuration>
54-
<jvmTarget>1.8</jvmTarget>
55-
</configuration>
56-
</execution>
57-
<execution>
58-
<id>test-compile</id>
59-
<goals>
60-
<goal>test-compile</goal>
61-
</goals>
62-
<phase>test-compile</phase>
63-
</execution>
64-
</executions>
6537
</plugin>
6638
<plugin>
6739
<groupId>org.apache.maven.plugins</groupId>
6840
<artifactId>maven-assembly-plugin</artifactId>
69-
<version>3.3.0</version>
41+
<version>${maven-assembly-plugin.version}</version>
7042
<configuration>
7143
<descriptorRefs>
7244
<descriptorRef>jar-with-dependencies</descriptorRef>
@@ -88,12 +60,10 @@
8860
<plugin>
8961
<groupId>org.apache.maven.plugins</groupId>
9062
<artifactId>maven-deploy-plugin</artifactId>
91-
<version>2.8.2</version>
9263
<configuration>
9364
<skip>true</skip>
9465
</configuration>
9566
</plugin>
9667
</plugins>
9768
</build>
98-
9969
</project>

0 commit comments

Comments
 (0)