diff options
| author | Andrew Clemons <andrew.clemons@gmail.com> | 2022-03-01 21:56:01 +1300 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-03-03 15:56:51 +0700 |
| commit | b2519f95fdcc4c34874b99ada283907bfc6147ec (patch) | |
| tree | e75d63b868e6a19636de30283257389cb05b256a /system/apache-tomcat | |
| parent | 062c44615d50deb42afe6e8dfa766bbb726a386d (diff) | |
various: Use zulu jdk builds for REQUIRES.
As noted in the FAQ, you can still use Oracle's JDK for
building or running, but we'll default to the Zulu builds
in the REQUIRES since they are easily downloadable.
Zulu is a good default for us at SBo since it is available
for both 32 and 64 bit, freely downloadable and compatible
and they provide builds for all the LTS branches.
We don't currently have builds for Adoptium (previously
AdoptOpenJDK, not part of the Eclipse Foundation), but if
someone wants to submit builds for them, we can include them
too. Note though that they do not provide 32 bit builds.
Software should run with either Zulu or Oracle's JDK, or
indeed any other builds of OpenJDK, so if I have broken your
build with this change, apologies. This should be rare and
we can change the REQUIRES back to jdkX in that case and note
it in the README, but I do not expect this should be the case.
Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system/apache-tomcat')
| -rw-r--r-- | system/apache-tomcat/apache-tomcat.info | 2 | ||||
| -rw-r--r-- | system/apache-tomcat/rc.tomcat | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/system/apache-tomcat/apache-tomcat.info b/system/apache-tomcat/apache-tomcat.info index 66f3a4bc0d975..fd8bc56c655ce 100644 --- a/system/apache-tomcat/apache-tomcat.info +++ b/system/apache-tomcat/apache-tomcat.info @@ -5,6 +5,6 @@ DOWNLOAD="https://dlcdn.apache.org/tomcat/tomcat-10/v10.0.17/bin/apache-tomcat-1 MD5SUM="61e57ae161ab3cea28ca157b57fe8b77" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="jdk commons-daemon" +REQUIRES="zulu-openjdk8 commons-daemon" MAINTAINER="Heinz Wiesinger" EMAIL="pprkut@slackbuilds.org" diff --git a/system/apache-tomcat/rc.tomcat b/system/apache-tomcat/rc.tomcat index 3e2c307bf7851..e3630784a1a55 100644 --- a/system/apache-tomcat/rc.tomcat +++ b/system/apache-tomcat/rc.tomcat @@ -9,10 +9,14 @@ # Load environment variables . /etc/profile.d/apache-tomcat.sh -if [ -e "/etc/profile.d/openjdk.sh" ]; then - . /etc/profile.d/openjdk.sh -else - . /etc/profile.d/jdk.sh + +if [ -z "$JAVA_HOME" ]; then + for i in /etc/profile.d/*jdk*.sh; do + if [ -x $i ]; then + source $i + break + fi + done fi PIDFILE="/var/spool/tomcat/tomcat.pid" |