Skip to content
This repository has been archived by the owner on Mar 3, 2023. It is now read-only.

Support Java 11 #3382

Closed
wants to merge 2 commits into from
Closed
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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dist: trusty
language: java

jdk:
- oraclejdk8
- oraclejdk11

addons:
apt:
Expand Down
13 changes: 12 additions & 1 deletion WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ maven_jar(

maven_jar(
name = "javax_annotation_javax_annotation_api",
artifact = "javax.annotation:javax.annotation-api:1.2",
artifact = "javax.annotation:javax.annotation-api:1.3.2",
)

maven_jar(
Expand Down Expand Up @@ -735,6 +735,17 @@ maven_jar(
artifact = "org.apache.commons:commons-compress:1.14",
)

maven_jar(
name = "javax_xml_bind_jaxb",
artifact = "javax.xml.bind:jaxb-api:2.3.0",
)

maven_jar(
name = "javax_activation_activation",
artifact = "javax.activation:activation:1.1.1",
)


# bookkeeper & distributedlog dependencies
maven_jar(
name = "org_apache_distributedlog_core",
Expand Down
3 changes: 2 additions & 1 deletion heron/api/src/java/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ api_deps_files = \
heron_java_api_proto_files() + [
":classification",
"//heron/common/src/java:basics-java",
"@javax_xml_bind_jaxb//jar",
]

# Low Level Api
Expand Down Expand Up @@ -46,7 +47,7 @@ java_library(
srcs = glob(["org/apache/heron/api/**/*.java", "org/apache/heron/streamlet/**/*.java"]),
deps = api_deps_files + [
"//third_party/java:kryo-neverlink",
"@org_apache_commons_commons_lang3//jar"
"@org_apache_commons_commons_lang3//jar",
]
)

Expand Down
1 change: 1 addition & 0 deletions heron/common/src/java/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ java_library(
srcs = glob(["**/config/*.java"]),
deps = [
":basics-java",
"@javax_xml_bind_jaxb//jar",
"@org_yaml_snakeyaml//jar",
],
)
Expand Down
1 change: 1 addition & 0 deletions heron/scheduler-core/src/java/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ common_deps_files = [
"//heron/api/src/java:classification",
"@commons_cli_commons_cli//jar",
"@com_google_guava_guava//jar",
"@javax_xml_bind_jaxb//jar",
"@org_apache_commons_commons_lang3//jar",
"//third_party/java:jackson",
]
Expand Down
1 change: 1 addition & 0 deletions heron/simulator/src/java/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ simulator_deps_files = \
"//heron/common/src/java:config-java",
"//heron/common/src/java:utils-java",
"//heron/instance/src/java:instance-java",
"@javax_xml_bind_jaxb//jar",
"@org_yaml_snakeyaml//jar",
]

Expand Down
5 changes: 4 additions & 1 deletion heron/tools/apiserver/src/java/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,14 @@ apiserver_deps_files = \
packing_deps_files + \
uploader_deps_files + [
"//third_party/java:cli",
"@org_yaml_snakeyaml//jar",
"//third_party/java:jetty-jersey-java",
"//third_party/java:commons-compress",
"//third_party/java:jackson",
"//third_party/java:logging",
"@javax_activation_activation//jar",
"@javax_annotation_javax_annotation_api//jar",
"@javax_xml_bind_jaxb//jar",
"@org_yaml_snakeyaml//jar",
]

java_binary(
Expand Down