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

[risk=no] java upgrade #1310

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[risk=no] java upgrade #1310

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
1 change: 1 addition & 0 deletions public-api/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,7 @@ dependencies {
generatedCompile "com.google.code.gson:gson:${GSON_VERSION}"
generatedCompile 'joda-time:joda-time:2.10'
generatedCompile "com.fasterxml.jackson.datatype:jackson-datatype-joda:${JACKSON_VERSION}"
generatedCompile "javax.xml.bind:jaxb-api:2.3.1"
}

swaggerSources {
Expand Down
2 changes: 1 addition & 1 deletion public-api/src/dev/server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ FROM ubuntu:22.04

RUN apt-get update && \
apt-get install --no-install-recommends -y \
openjdk-8-jdk \
openjdk-11-jdk \
curl \
python2 \
python3 \
Expand Down
18 changes: 17 additions & 1 deletion public-api/src/main/webapp/WEB-INF/appengine-web.xml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
<service>api</service>
<runtime>java8</runtime>
<runtime>java11</runtime>

<!--
The GAE java8 runtime restricts certain JVM APIs. The java11 runtime has fewer restrictions.
Google provides GAE-specific libraries to work around these restrictions, but using these
libraries on the java11 runtime throws a:
com.google.apphosting.api.ApiProxy$FeatureNotEnabledException

See:
https://cloud.google.com/appengine/docs/standard/bundled-services-overview
https://cloud.google.com/appengine/docs/standard/java-gen2/services/access
https://www.googlecloudcommunity.com/gc/Serverless/FeatureNotEnabledException-using-App-Engine-bundled-service/m-p/181253

The following flag enables these libraries in the java11 runtime, allowing us to migrate away
from them in subsequent steps.
-->
<app-engine-apis>true</app-engine-apis>
<threadsafe>true</threadsafe>
<!-- Deploy complains about this tag, bug BigQuery needs it. -->
<application>aou-db-test</application>
Expand Down