Skip to content

Commit

Permalink
Merge pull request #666 from exacaster/update_spark350
Browse files Browse the repository at this point in the history
Update supported Spark versions & java dependencies
  • Loading branch information
pdambrauskas authored Sep 13, 2023
2 parents a449908 + 6a05605 commit 8677e0a
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/publish-registry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ jobs:
strategy:
matrix:
include:
- spark_version: 3.2.4
hadoop_version: 3.2
- spark_version: 3.3.2
- spark_version: 3.3.3
hadoop_version: 3
- spark_version: 3.4.1
hadoop_version: 3
- spark_version: 3.5.0
hadoop_version: 3
steps:
- uses: docker/setup-buildx-action@v2
- uses: docker/login-action@v2
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM eclipse-temurin:11-jdk-jammy as server

ARG SPARK_VERSION=3.4.1
ARG SPARK_VERSION=3.5.0
ARG HADOOP_VERSION=3

WORKDIR /home/app/
Expand All @@ -11,7 +11,7 @@ RUN ./gradlew build -x test -PSPARK_VERSION=${SPARK_VERSION}

FROM node:lts-alpine3.18 as frontend

ARG SPARK_VERSION=3.4.1
ARG SPARK_VERSION=3.5.0
ARG HADOOP_VERSION=3

ENV REACT_APP_API_BASE_URL='/lighter'
Expand All @@ -25,7 +25,7 @@ RUN yarn install && yarn build

FROM eclipse-temurin:11-jre-jammy

ARG SPARK_VERSION=3.4.1
ARG SPARK_VERSION=3.5.0
ARG HADOOP_VERSION=3

ENV FRONTEND_PATH=/home/app/frontend/
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ docker build -t lighter .

### Spark versions

Lighter will always try to support the latest patch version for all officially recommended [Apache Spark](https://spark.apache.org/) releases i.e.: 3.2.4, 3.3.2 and 3.4.1.
Lighter will always try to support the latest patch version for all officially recommended [Apache Spark](https://spark.apache.org/) releases i.e.: 3.3.3, 3.4.1 and 3.5.0.

### Contributing

Expand Down
2 changes: 1 addition & 1 deletion docs/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
If you're thinking of running Lighter on docker, you are probably using it with YARN backend. When you are running it, you should expose two ports (REST API port and Python Gateway port), as shown in this example:

```bash
docker run ghcr.io/exacaster/lighter:0.0.49-spark3.4.1 \
docker run ghcr.io/exacaster/lighter:0.0.50-spark3.5.0 \
-p 8080:8080 \
-p 25333:25333 \
-e LIGHTER_KUBERNETES_ENABLED=false \
Expand Down
2 changes: 1 addition & 1 deletion quickstart/lighter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ spec:
run: lighter
spec:
containers:
- image: ghcr.io/exacaster/lighter:0.0.49-spark3.4.1
- image: ghcr.io/exacaster/lighter:0.0.50-spark3.5.0
name: lighter
readinessProbe:
httpGet:
Expand Down
10 changes: 5 additions & 5 deletions server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
id "java"
id "groovy"
id "io.micronaut.application" version "3.7.10"
id "com.github.ben-manes.versions" version "0.47.0"
id "com.github.ben-manes.versions" version "0.48.0"
}

group "org.exacaster.lighter"
Expand All @@ -17,14 +17,14 @@ java {
}

micronaut {
version = "3.9.4"
version = "3.10.1"
runtime "netty"
}
mainClassName = "com.exacaster.lighter.Application"

def sparkVersion = project.hasProperty("SPARK_VERSION") ? project.getProperty("SPARK_VERSION") : '3.4.1'
def sparkVersion = project.hasProperty("SPARK_VERSION") ? project.getProperty("SPARK_VERSION") : '3.5.0'
def hadoopVersion = '3.3.3'
def k8sClientVersion = '6.7.2'
def k8sClientVersion = '6.8.1'
def shedlockVersion = '4.44.0'

dependencies {
Expand Down Expand Up @@ -56,7 +56,7 @@ dependencies {
runtimeOnly "com.h2database:h2"
runtimeOnly "org.postgresql:postgresql"

testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.9.3"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.0"
testImplementation "io.micronaut:micronaut-inject-groovy"
testImplementation "io.micronaut.test:micronaut-test-spock"
testImplementation "io.micronaut:micronaut-http-client"
Expand Down
2 changes: 1 addition & 1 deletion server/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 8677e0a

Please sign in to comment.