[jdk11u-dev] RFR: 8259530: Generated docs contain MIT/GPL-licenced works without reproducing the licence [v2]

Kimura Yukihiro duke at openjdk.org
Sat Mar 18 13:09:31 UTC 2023


On Sat, 18 Mar 2023 12:17:18 GMT, Kimura Yukihiro <duke at openjdk.org> wrote:

>> I would like to backport
>> JDK-8259530: Generated docs contain MIT/GPL-licenced works without reproducing the licence.
>> The original patch does not apply cleanly to 11u. 
>> Because the original patch has switch expressions which can not be used in 11u,
>> and it has the Class jdk.javadoc.internal.doclets.formats.html.HtmlOptions which is not defined in 11u. 
>> There is no risk, because the logic around the changes is the same as jdk17. 
>> I confirmed the following test and all langtool tests.
>> test/langtools/jdk/javadoc/doclet/testLegalNotices/TestLegalNotices.java
>> 
>> Could anyone review the fix please?
>
> Kimura Yukihiro has updated the pull request incrementally with three additional commits since the last revision:
> 
>  - Merge branch '8259530' of https://github.com/yukikimmura/jdk11u-dev into 8259530
>  - Merge branch 'master' into 8259530
>  - Backport e9f3e325c274f19b0f6eceea2367708e3be689e9

In the case of 17u, 
variables about javadoc options are defined as PRIVATE variable in HtmlOptions.java and BaseOptions.java
On the other hand, variables about configurations are defined as PUBLIC variable in HtmlConfiguration.java and BaseConfiguration.java

In the case of 11u, 
both variables about options and configurations are defined as public variables
in HtmlConfiguration.java and BaseConfiguration.java
I changed variables about javadoc options to private variables according to the latest JDK.

-------------

PR: https://git.openjdk.org/jdk11u-dev/pull/1805


More information about the jdk-updates-dev mailing list