From 775eb3f35c6bf74adedbc2571ed3a5efcac0edd2 Mon Sep 17 00:00:00 2001 From: Sergey Ponomarev Date: Sat, 31 Jan 2026 13:33:39 +0200 Subject: [PATCH] SPARK-2387: remove jniwrap.dll and jniwrap.lic --- core/src/assembly/installation-directory.xml | 8 -------- core/src/main/resources/jniwrap.dll | Bin 45056 -> 0 bytes core/src/main/resources/jniwrap.lic | 11 ----------- distribution/src/installer/spark.install4j | 6 ------ 4 files changed, 25 deletions(-) delete mode 100644 core/src/main/resources/jniwrap.dll delete mode 100644 core/src/main/resources/jniwrap.lic diff --git a/core/src/assembly/installation-directory.xml b/core/src/assembly/installation-directory.xml index 626ff25c1..0cad7a58a 100644 --- a/core/src/assembly/installation-directory.xml +++ b/core/src/assembly/installation-directory.xml @@ -68,14 +68,6 @@ ${project.basedir}/src/main/resources/Info.plist resources - - ${project.basedir}/src/main/resources/jniwrap.dll - resources - - - ${project.basedir}/src/main/resources/jniwrap.lic - resources - ${project.basedir}/src/main/resources/startup.bat resources diff --git a/core/src/main/resources/jniwrap.dll b/core/src/main/resources/jniwrap.dll deleted file mode 100644 index 1f4c0655850ffe8cbcd341d717f24a8c020e0b11..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 45056 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 diff --git a/core/src/main/resources/jniwrap.lic b/core/src/main/resources/jniwrap.lic deleted file mode 100644 index c86f6ef1b..000000000 --- a/core/src/main/resources/jniwrap.lic +++ /dev/null @@ -1,11 +0,0 @@ -Thu Oct 19 14:56:36 EEST 2006 - -Jive Software -NEVER -Runtime -Not for development -win32/x86 -5lwtbvc0j4copm5e2qnjhgfv33h0nqbesyx4lfr2479w4lp4j2grqi4378utxg8t1h5rjgboe1fwxmx0 -55yhidf684qsae1pqf8pphen1gqnspw0mrygd2z10589rng339noyvxigs6e98jwql3kl59v8xr0h3en -Version: 3.x -Product: JNIWrapper diff --git a/distribution/src/installer/spark.install4j b/distribution/src/installer/spark.install4j index 3fe6d00e8..5c7de5fac 100644 --- a/distribution/src/installer/spark.install4j +++ b/distribution/src/installer/spark.install4j @@ -804,7 +804,6 @@ return console.askYesNo(message, true); - @@ -821,7 +820,6 @@ return console.askYesNo(message, true); - @@ -838,7 +836,6 @@ return console.askYesNo(message, true); - @@ -855,7 +852,6 @@ return console.askYesNo(message, true); - @@ -870,7 +866,6 @@ return console.askYesNo(message, true); - @@ -885,7 +880,6 @@ return console.askYesNo(message, true); -