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.

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

Moe Sync #96

Merged
merged 4 commits into from
Oct 4, 2019
Merged

Moe Sync #96

merged 4 commits into from
Oct 4, 2019

Conversation

cpovirk
Copy link
Member

@cpovirk cpovirk commented Oct 4, 2019

This code has been reviewed and submitted internally. Feel free to discuss on the PR and we can submit follow-up changes as necessary.

Commits:

Travis: use 'openjdk8' instead of 'oraclejdk8'

(This now restores coverage for 8, and I made a similar change for 11.)

Fixes #89

d30e344


maven-compiler-plugin 3.8.1

Fixes #90

54912ec


Run Error Prone as a plugin.

If run in the old style, it uses javac9, which can't handle the Java 11 class files in the JDK11 bootclasspath.

This follows the instructions at https://errorprone.info/docs/installation#maven

Note also the need to include -Xep:BetaApi:OFF in the same arg as -Xplugin:ErrorProne: google/error-prone#1136 (comment) google/error-prone#1115

(Also, incidentally update Error Prone itself. I forget whether I had a Java-11-related reason for that, but it seems like a good idea.)

7e467aa


Prepare Javadoc for Java 11, and make other improvements:

  • Move nearly all Javadoc configuration to the parent POM.
  • Update Guava and ICU4J link locations. The current links resolve to the Javadoc -- but only after a redirect, which Javadoc doesn't like: https://bugs.openjdk.java.net/browse/JDK-8190312
  • Update maven-javadoc-plugin to 3.1.1. (This version knows how to work around the aforementioned redirect problem, should it happen again.)
  • Add links to Checker Framework. For some reason, this isn't working under Java 11. I haven't investigated.
  • Disable detectJavaApiLink, and fill in https://docs.oracle.com/javase/9/docs/api/ for Java 8 and https://docs.oracle.com/en/java/javase/11/docs/api/ for newer versions. (I've tested only with Java 8 and 11, so hopefully the "newer versions" behavior is OK for 9 and 10.)
    It does look like it may be necessary to duplicate all the links in 3 places :
    This is all in service of preventing:
    [ERROR] Exit code: 1 - javadoc: error - The code being documented uses modules but the packages defined in https://docs.oracle.com/javase/9/docs/api/ are in the unnamed module.
    Traditionally we solve this problem by setting 8 on Javadoc (CL 235241314, CL 236159968). That would probably work here, but I've been experimenting with 9 (for proper modules support in jimfs), so that might not be an option soon. Or maybe it still would be, but I'd have to exclude module-info.java, but then I wonder if that will trigger modules problems? In any case, it seems more future-proof to solve this the right(?) way.

7b2eccd

sullis and others added 4 commits October 4, 2019 15:56
(This now restores coverage for 8, and I made a similar change for 11.)

Fixes #89

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=272930783
Fixes #90

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=272930832
If run in the old style, it uses javac9, which can't handle the Java 11 class files in the JDK11 bootclasspath.

This follows the instructions at https://errorprone.info/docs/installation#maven

Note also the need to include -Xep:BetaApi:OFF in the same arg as -Xplugin:ErrorProne: google/error-prone#1136 (comment) google/error-prone#1115

(Also, incidentally update Error Prone itself. I forget whether I had a Java-11-related reason for that, but it seems like a good idea.)

RELNOTES=n/a

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=272934125
- Move nearly all Javadoc configuration to the parent POM.
- Update Guava and ICU4J link locations. The current links resolve to the Javadoc -- but only after a redirect, which Javadoc doesn't like: https://bugs.openjdk.java.net/browse/JDK-8190312
- Update maven-javadoc-plugin to 3.1.1. (This version knows how to work around the aforementioned redirect problem, should it happen again.)
- Add links to Checker Framework. For some reason, this isn't working under Java 11. I haven't investigated.
- Disable detectJavaApiLink, and fill in https://docs.oracle.com/javase/9/docs/api/ for Java 8 and https://docs.oracle.com/en/java/javase/11/docs/api/ for newer versions. (I've tested only with Java 8 and 11, so hopefully the "newer versions" behavior is OK for 9 and 10.)
  It does look like it may be necessary to duplicate all the links in 3 places :\
  This is all in service of preventing:
    [ERROR] Exit code: 1 - javadoc: error - The code being documented uses modules but the packages defined in https://docs.oracle.com/javase/9/docs/api/ are in the unnamed module.
  Traditionally we solve this problem by setting <source>8</source> on Javadoc (CL 235241314, CL 236159968). That would probably work here, but I've been experimenting with <source>9</source> (for proper modules support in jimfs), so that might not be an option soon. Or maybe it still would be, but I'd have to exclude module-info.java, but then I wonder if that will trigger modules problems? In any case, it seems more future-proof to solve this the right(?) way.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=272937179
@googlebot
Copy link
Collaborator

All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter.

We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only @googlebot I consent. in this pull request.

Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the cla label to yes (if enabled on your project).

ℹ️ Googlers: Go here for more info.

@cpovirk cpovirk merged commit 1370e8f into master Oct 4, 2019
@cpovirk cpovirk deleted the sync-master-2019/10/04 branch October 4, 2019 20:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants