Skip to content

Commit

Permalink
Rework pom.xml, update versions of everything
Browse files Browse the repository at this point in the history
  • Loading branch information
dfdx committed May 28, 2022
1 parent dc2a760 commit db3b1dc
Show file tree
Hide file tree
Showing 24 changed files with 850 additions and 377 deletions.
6 changes: 3 additions & 3 deletions deps/build.jl
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ catch
error("Cannot find maven. Is it installed?")
end

SPARK_VERSION = get(ENV, "BUILD_SPARK_VERSION", "2.4.6")
SCALA_VERSION = get(ENV, "BUILD_SCALA_VERSION", "2.12.11")
SCALA_BINARY_VERSION = match(r"^\d+\.\d+", SCALA_VERSION).match
SPARK_VERSION = get(ENV, "BUILD_SPARK_VERSION", "3.2.1")
SCALA_VERSION = get(ENV, "BUILD_SCALA_VERSION", "2.13")
SCALA_BINARY_VERSION = get(ENV, "BUILD_SCALA_VERSION", "2.13.6")

cd(joinpath(dirname(@__DIR__), "jvm/sparkjl")) do
run(`$mvn clean package -Dspark.version=$SPARK_VERSION -Dscala.version=$SCALA_VERSION -Dscala.binary.version=$SCALA_BINARY_VERSION`)
Expand Down
2 changes: 1 addition & 1 deletion examples/SparkSubmitJulia.scala
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* /opt/julia/depot/helloworld.jl \
* /usr/local/julia/bin/julia \
* /opt/julia/depot
*
*
* To compile, use `src/main/scala/SparkSubmitJulia.scala` with a build.sbt like:
* ---------------------
* name := "Spark Submit Julia"
Expand Down
2 changes: 2 additions & 0 deletions examples/basic.jl
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
## THIS EXAMPLE IS OUTDATED!
## TODO: update or remove

using Spark

Expand Down
102 changes: 102 additions & 0 deletions jvm/sparkjl/dependency-reduced-pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>sparkjl</groupId>
<artifactId>sparkjl</artifactId>
<name>sparkjl</name>
<version>0.2</version>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>4.6.1</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<executions>
<execution>
<id>scala-compile-first</id>
<phase>process-resources</phase>
<goals>
<goal>add-source</goal>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>scala-test-compile</id>
<phase>process-test-resources</phase>
<goals>
<goal>testCompile</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<executions>
<execution>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
</executions>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<version>3.3.0</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<artifactSet>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
<exclude>classworlds:classworlds</exclude>
<exclude>junit:junit</exclude>
<exclude>jmock:*</exclude>
<exclude>*:xml-apis</exclude>
<exclude>org.apache.maven:lib:tests</exclude>
<exclude>log4j:log4j:jar:</exclude>
</excludes>
</artifactSet>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<properties>
<scala.binary.version>2.13.6</scala.binary.version>
<spark.version>[3.2.0,3.2.1]</spark.version>
<java.version>1.11</java.version>
<PermGen>64m</PermGen>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<scala.version>2.13</scala.version>
<MaxPermGen>512m</MaxPermGen>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
</project>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit db3b1dc

Please sign in to comment.