Commit 621b5434 authored by Elana Hashman's avatar Elana Hashman

Force usage of Java 8 for performance and compatibility

parent e21689c8
......@@ -4,6 +4,7 @@ leiningen-clojure (2.8.1-5) UNRELEASED; urgency=medium
* Update clojure builddep to clojure1.8. (Closes: #889533)
* Patch commons-io version to match Debian.
* Switch Vcs from alioth to salsa.
* Add hard dependency on Java 8.
-- Elana Hashman <ehashman@debian.org> Fri, 23 Mar 2018 09:47:49 -0400
......
......@@ -41,10 +41,10 @@ Architecture: all
Depends:
${java:Depends},
${misc:Depends},
default-jre-headless | java8-runtime-headless
openjdk-8-jre-headless
Recommends:
${java:Recommends},
default-jdk-headless | java8-sdk-headless
openjdk-8-jdk-headless
Suggests: ${maven:OptionalDepends}
Description: Automation tool and dependency manager for Clojure projects
Working on Clojure projects with tools designed for Java can be an
......
From: Elana Hashman <ehashman@debian.org>
Date: Sat, 14 Apr 2018 01:42:23 +0000
Subject: Make run script use Java 8
---
bin/lein-pkg | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/bin/lein-pkg b/bin/lein-pkg
index de113fc..6c7a23b 100644
--- a/bin/lein-pkg
+++ b/bin/lein-pkg
@@ -27,7 +27,10 @@ export LEIN_HOME="${LEIN_HOME:-"$HOME/.lein"}"
# Support $JAVA_OPTS for backwards-compatibility.
JVM_OPTS=${JVM_OPTS:-"$JAVA_OPTS"}
-JAVA_CMD=${JAVA_CMD:-"java"}
+
+# NOTE(Debian): Force Java 8 usage for performance and compatibility
+# See https://salsa.debian.org/clojure-team/leiningen-clojure/issues/1
+JAVA_CMD=${JAVA_CMD:-"/usr/lib/jvm/java-8-openjdk-amd64/bin/java"}
for f in "/etc/leinrc" "$LEIN_HOME/leinrc" ".leinrc"; do
if [ -e "$f" ]; then
......@@ -2,3 +2,4 @@
0002-Fix-source-directory-in-POM.patch
0003-Update-LEIN_JAR-location-to-match-installed-jar.patch
0004-Bump-commons-io-version.patch
0005-Make-run-script-use-Java-8.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment