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.

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

Upgrade to run on newer versions of Java #329 #1

Merged
merged 6 commits into from
Apr 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@ language: scala
scala:
2.11.2
jdk:
- oraclejdk8
- openjdk8
script:
- ./sbt test
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Please note that this project is not actively maintained.
gem install s3_website

s3_website needs both [Ruby](https://www.ruby-lang.org/en/downloads/)
and [Java](http://java.com) to run. (S3_website is partly written in Scala, hence the need for Java.)
and [Java](http://java.com) to run. (S3_website is partly written in Scala, hence the need for Java 1.8 or later.)

## Usage

Expand Down
6 changes: 3 additions & 3 deletions bin/s3_website
Original file line number Diff line number Diff line change
Expand Up @@ -170,15 +170,15 @@ def autoinstall_java_or_print_help_and_exit(logger)
automatic_methods = [
{
:package_manager_lookup => 'which apt-get',
:install_command => 'sudo apt-get install --assume-yes openjdk-7-jre'
:install_command => 'sudo apt-get install --assume-yes openjdk-11-jre'
},
{
:package_manager_lookup => 'which yum',
:install_command => 'sudo yum install --assumeyes java-1.7.0-openjdk'
:install_command => 'sudo yum install --assumeyes java-11-openjdk'
},
{
:package_manager_lookup => 'which dnf',
:install_command => 'sudo dnf install --assumeyes java-1.7.0-openjdk'
:install_command => 'sudo dnf install --assumeyes java-11-openjdk'
}
]

Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ scalacOptions += "-target:jvm-1.6"

libraryDependencies += "org.yaml" % "snakeyaml" % "1.13"

libraryDependencies += "org.jruby" % "jruby" % "1.7.11"
libraryDependencies += "org.jruby" % "jruby" % "9.2.7.0" % "provided"

libraryDependencies += "com.amazonaws" % "aws-java-sdk" % "1.11.172"

Expand Down
Binary file modified project/sbt-launch.jar
Binary file not shown.