Skip to content

THRIFT-4766: Fix JDK11 build #1723

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

Merged
jeking3 merged 8 commits into from
Feb 1, 2019
Merged

THRIFT-4766: Fix JDK11 build #1723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
df2baaa
[THRIFT-4766] Enable JDK9 build
Jan 30, 2019
0b93064
THRIFT-4766: build on bionic using native jdk (java-11-openjdk)
jeking3 Jan 30, 2019
9b08b52
[THRIFT-4766] Enable JDK11 build
Jan 30, 2019
8aeb37b
[THRIFT-4766] Enable JDK11 build
Jan 31, 2019
dacd749
[THRIFT-4766] Enable JDK11 build
Jan 31, 2019
a5eee09
[THRIFT-4766] Enable JDK11 build
Feb 1, 2019
bbfc6bf
[THRIFT-4766] Enable JDK11 build
Feb 1, 2019
2570459
[THRIFT-4766] Enable JDK11 build
Feb 1, 2019
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
8 changes: 5 additions & 3 deletions build/docker/ubuntu-bionic/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
debhelper \
flex \
gdb \
libasound2 \
libatk-bridge2.0-0 \
libgtk-3-0 \
llvm \
ninja-build \
pkg-config \
Expand Down Expand Up @@ -174,9 +177,8 @@ RUN apt-get install -y --no-install-recommends \
`# Java dependencies` \
ant \
ant-optional \
openjdk-8-jdk \
maven && \
update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
maven \
openjdk-11-jdk-headless

RUN apt-get install -y --no-install-recommends \
`# Lua dependencies` \
Expand Down
2 changes: 1 addition & 1 deletion debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 9), build-essential, mono-mcs, python-dev, ant,
pkg-config, libtool, bison, flex, libboost-dev | libboost1.53-dev | libboost1.63-all-dev,
python-all, python-setuptools, python-all-dev, python-all-dbg,
python3-all, python3-setuptools, python3-all-dev, python3-all-dbg,
openjdk-7-jdk | openjdk-8-jdk | default-jdk,
openjdk-8-jdk | openjdk-8-jdk-headless | openjdk-11-jdk | openjdk-11-jdk-headless | default-jdk,
libboost-test-dev | libboost-test1.53-dev | libboost-test1.63-dev, libevent-dev, libssl-dev, perl (>= 5.8.0-7),
php (>= 5), php-dev (>= 5), libglib2.0-dev, qtchooser, qtbase5-dev-tools
Maintainer: Thrift Developer's <[email protected]>
Expand Down
1 change: 1 addition & 0 deletions lib/java/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ slf4j.version=1.7.25
servlet.version=2.5
junit.version=4.12
mockito.version=1.9.5
javax.annotation.version=1.3.2
2 changes: 2 additions & 0 deletions lib/java/gradle/environment.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ ext.servletVersion = property('servlet.version')
ext.slf4jVersion = property('slf4j.version')
ext.junitVersion = property('junit.version')
ext.mockitoVersion = property('mockito.version')
ext.javaxAnnotationVersion = property('javax.annotation.version')

// In this section you declare where to find the dependencies of your project
repositories {
Expand All @@ -66,6 +67,7 @@ dependencies {
compile "org.apache.httpcomponents:httpclient:${httpclientVersion}"
compile "org.apache.httpcomponents:httpcore:${httpcoreVersion}"
compile "javax.servlet:servlet-api:${servletVersion}"
compile "javax.annotation:javax.annotation-api:${javaxAnnotationVersion}"

testCompile "junit:junit:${junitVersion}"
testCompile "org.mockito:mockito-all:${mockitoVersion}"
Expand Down