Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update RPM and build for JDK 8u161+ requirement #983

Merged
merged 1 commit into from
Jun 13, 2019
Merged

Update RPM and build for JDK 8u161+ requirement #983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ See the [User Manual](https://prestosql.io/docs/current/) for deployment instruc
## Requirements

* Mac OS X or Linux
* Java 8 Update 151 or higher (8u151+), 64-bit. Both Oracle JDK and OpenJDK are supported.
* Java 8 Update 161 or higher (8u161+), 64-bit. Both Oracle JDK and OpenJDK are supported.
* Maven 3.3.9+ (for building)
* Python 2.4+ (for running with the launcher script)

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<air.check.skip-pmd>true</air.check.skip-pmd>
<air.check.skip-jacoco>true</air.check.skip-jacoco>

<air.java.version>1.8.0-151</air.java.version>
<air.java.version>1.8.0-161</air.java.version>
<air.maven.version>3.3.9</air.maven.version>

<dep.antlr.version>4.7.1</dep.antlr.version>
Expand Down
6 changes: 3 additions & 3 deletions presto-server-rpm/src/main/rpm/preinstall
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ check_if_correct_java_version() {
# candidate for JAVA_HOME).
JAVA_VERSION=$(java_version "$1")
JAVA_UPDATE=$(echo $JAVA_VERSION | cut -d'_' -f2)
if [[ ("$JAVA_VERSION" > "1.8") && ($JAVA_UPDATE -ge 151) ]]; then
if [[ ("$JAVA_VERSION" > "1.8") && ($JAVA_UPDATE -ge 161) ]]; then
echo "JAVA8_HOME=$1" > /tmp/presto_env.sh
return 0
else
return 1
fi
}

# if Java version of $JAVA_HOME is not 1.8 update 151 (8u151) and is not Oracle Java, then try to find it again below
# if Java version of $JAVA_HOME is not 1.8 update 161 (8u161) and is not Oracle Java, then try to find it again below
if ! check_if_correct_java_version "$JAVA8_HOME" && ! check_if_correct_java_version "$JAVA_HOME"; then
java_found=false
for candidate in \
Expand Down Expand Up @@ -62,7 +62,7 @@ if [ "$java_found" = false ]; then
| Please download the latest Oracle JDK/JRE from the Java web site |
| > http://www.oracle.com/technetwork/java/javase/downloads < |
| |
| Presto requires Java 1.8 update 151 (8u151) |
| Presto requires Java 1.8 update 161 (8u161) |
| NOTE: This script will attempt to find Java whether you install |
| using the binary or the RPM based installer. |
+======================================================================+
Expand Down