Skip to content

Commit 3a8f942

Browse files
feat: add compatibility with Spark 3.5 #3
1 parent 8e67b77 commit 3a8f942

File tree

4 files changed

+13
-26
lines changed

4 files changed

+13
-26
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ ADD .devcontainer/hive-site.xml "/tmp/"
3636
RUN curl -s "https://get.sdkman.io?rcupdate=false" | bash
3737

3838
ENV JAVA_VERSION="17.0.13-amzn"
39-
ENV SCALA_VERSION="2.12.18"
39+
ENV SCALA_VERSION="2.12.19"
4040
ENV SCALA_BINARY_VERSION="2.12"
4141
ENV SBT_VERSION="1.10.6"
4242
ENV SPARK_VERSION="3.5.2"

.devcontainer/docker-compose.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,20 @@ x-environment:
1212
MINIO_ROOT_PASSWORD: CHANGEME123
1313
TEST_BUCKET_NAME: test-bucket
1414
JDK_JAVA_OPTIONS: |
15-
--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED
16-
--add-opens=java.base/sun.nio.ch=ALL-UNNAMED
17-
--add-opens=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED
18-
--add-opens=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED
19-
--add-opens=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED
20-
--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED
15+
--add-opens=java.base/java.lang=ALL-UNNAMED
16+
--add-opens=java.base/java.lang.invoke=ALL-UNNAMED
17+
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED
2118
--add-opens=java.base/java.io=ALL-UNNAMED
19+
--add-opens=java.base/java.net=ALL-UNNAMED
2220
--add-opens=java.base/java.nio=ALL-UNNAMED
2321
--add-opens=java.base/java.util=ALL-UNNAMED
24-
--add-opens=java.base/java.lang=ALL-UNNAMED
22+
--add-opens=java.base/java.util.concurrent=ALL-UNNAMED
23+
--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED
24+
--add-opens=java.base/sun.nio.ch=ALL-UNNAMED
25+
--add-opens=java.base/sun.nio.cs=ALL-UNNAMED
26+
--add-opens=java.base/sun.security.action=ALL-UNNAMED
27+
--add-opens=java.base/sun.util.calendar=ALL-UNNAMED
28+
--add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED
2529
services:
2630
main:
2731
image: ghcr.io/syngenta-digital/service-java-data-pipelines-metorikku:devcontainer

scripts/test.sh

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,6 @@ rm -Rf $MAIN_DIR/spark-warehouse $MAIN_DIR/metastore_db
99

1010
TEST_NAME=$1
1111

12-
export JDK_JAVA_OPTIONS='
13-
--add-opens=java.base/java.lang=ALL-UNNAMED
14-
--add-opens=java.base/java.lang.invoke=ALL-UNNAMED
15-
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED
16-
--add-opens=java.base/java.io=ALL-UNNAMED
17-
--add-opens=java.base/java.net=ALL-UNNAMED
18-
--add-opens=java.base/java.nio=ALL-UNNAMED
19-
--add-opens=java.base/java.util=ALL-UNNAMED
20-
--add-opens=java.base/java.util.concurrent=ALL-UNNAMED
21-
--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED
22-
--add-opens=java.base/sun.nio.ch=ALL-UNNAMED
23-
--add-opens=java.base/sun.nio.cs=ALL-UNNAMED
24-
--add-opens=java.base/sun.security.action=ALL-UNNAMED
25-
--add-opens=java.base/sun.util.calendar=ALL-UNNAMED
26-
--add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED
27-
'
28-
2912
if [[ -z "$TEST_NAME" ]]; then
3013
echo "################################"
3114
echo "Executing unit tests"

src/test/scala/com/yotpo/metorikku/test/MetorikkuTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class MetorikkuTest extends AnyFunSuite with BeforeAndAfterAll {
7676
)
7777
)
7878
}
79-
assert(thrown.getMessage.startsWith("Path does not exist"))
79+
assert(thrown.getMessage.contains("Path does not exist"))
8080

8181
}
8282

0 commit comments

Comments
 (0)