diff options
author | Fokko Driesprong <fokko@driesprong.frl> | 2019-02-01 20:31:58 +0100 |
---|---|---|
committer | James E. King III <jking@apache.org> | 2019-02-01 14:31:58 -0500 |
commit | 1686c87024766015d510fc007aeef548a9c1a2a0 (patch) | |
tree | 69309430f0983c5dc91e8bf33de604b4a0672168 /lib/java | |
parent | 3ec4031a4c6d685bcc02fa10dd13b2df58732b82 (diff) | |
download | thrift-1686c87024766015d510fc007aeef548a9c1a2a0.tar.gz |
THRIFT-4766: Fix JDK11 build (#1723)
* [THRIFT-4766] Enable JDK9 build
* THRIFT-4766: build on bionic using native jdk (java-11-openjdk)
Change from headless to the normal JDK. Maybe the libasound is pulled
in transitively.
Diffstat (limited to 'lib/java')
-rw-r--r-- | lib/java/gradle.properties | 1 | ||||
-rw-r--r-- | lib/java/gradle/environment.gradle | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/lib/java/gradle.properties b/lib/java/gradle.properties index a964675a3..081165910 100644 --- a/lib/java/gradle.properties +++ b/lib/java/gradle.properties @@ -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 diff --git a/lib/java/gradle/environment.gradle b/lib/java/gradle/environment.gradle index 9b7eb1ed6..45fa63a17 100644 --- a/lib/java/gradle/environment.gradle +++ b/lib/java/gradle/environment.gradle @@ -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 { @@ -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}" |