Merge pull request #1208 from scm-manager/bugfix/dont_force_recommended_java_home

#1195 do not force java home of recommended java dependency

CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Unreleased
 ### Fixed
 - Wait until recommended java installation is available for deb packages ([#1209](https://github.com/scm-manager/scm-manager/pull/1209))
+- Do not force java home of recommended java dependency for rpm and deb packages ([#1195](https://github.com/scm-manager/scm-manager/issues/1195) and [#1208](https://github.com/scm-manager/scm-manager/pull/1208))
 
 ## [2.1.0] - 2020-06-18
 ### Added

scm-packaging/deb/src/main/fs/etc/default/scm-server

@@ -36,7 +36,7 @@ USER=scm
 export SCM_HOME=/var/lib/scm
 
 # force jvm path
-JAVA_HOME="/usr/lib/jvm/java-11-openjdk-amd64"
+# JAVA_HOME="/usr/lib/jvm/java-11-openjdk-amd64"
 
 # path to pid
 PIDFILE=/var/run/scm/scm.pid

scm-packaging/rpm/src/main/fs/etc/default/scm-server

@@ -36,7 +36,7 @@ USER=scm
 export SCM_HOME=/var/lib/scm
 
 # force jvm path
-JAVA_HOME="/usr/lib/jvm/jre-11"
+# JAVA_HOME="/usr/lib/jvm/jre-11"
 
 # path to pid
 PIDFILE=/var/run/scm/scm.pid