diff options
| author | Jiayu Liu <Jimexist@users.noreply.github.com> | 2022-09-27 14:06:57 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-27 14:06:57 +0800 |
| commit | f31c588ea3e501bc0b93aa1e297ceb7fc1e35356 (patch) | |
| tree | 9489bfa8d89f30618bc62858853e46151302ce8f | |
| parent | c5d0324a79da12559fcf64747da4f0035b3d8816 (diff) | |
| download | thrift-f31c588ea3e501bc0b93aa1e297ceb7fc1e35356.tar.gz | |
[build infra] focal to use openjdk 11 instead of 17 to get rid of false errors (#2662)
* java 17
* use --debug for java gradle build
* add --debug
* update javadoc options within gradle
* revert back to jdk 11
| -rw-r--r-- | build/docker/ubuntu-focal/Dockerfile | 2 | ||||
| -rw-r--r-- | lib/java/gradle/sourceConfiguration.gradle | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/build/docker/ubuntu-focal/Dockerfile b/build/docker/ubuntu-focal/Dockerfile index b35624536..115c2a5e5 100644 --- a/build/docker/ubuntu-focal/Dockerfile +++ b/build/docker/ubuntu-focal/Dockerfile @@ -168,7 +168,7 @@ RUN apt-get install -y --no-install-recommends \ ant \ ant-optional \ maven \ - openjdk-17-jdk-headless && \ + openjdk-11-jdk-headless && \ `# Gradle` \ wget https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip -q -O /tmp/gradle-$GRADLE_VERSION-bin.zip && \ (echo "f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4 /tmp/gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -) && \ diff --git a/lib/java/gradle/sourceConfiguration.gradle b/lib/java/gradle/sourceConfiguration.gradle index 044a11433..47f4ff024 100644 --- a/lib/java/gradle/sourceConfiguration.gradle +++ b/lib/java/gradle/sourceConfiguration.gradle @@ -53,6 +53,13 @@ tasks.withType(JavaCompile).configureEach { ] } +tasks.withType(Javadoc) { + failOnError false + options.addStringOption('Xdoclint:none', '-quiet') + options.addStringOption('encoding', 'UTF-8') + options.addStringOption('charSet', 'UTF-8') +} + // ---------------------------------------------------------------------------- // Jar packaging details processResources { |