RFR: 8353185: Introduce the concept of upgradeable files in context of JEP 493 [v2]

[Severin Gehwolf]

On Sat, 5 Apr 2025 04:45:00 GMT, Christoph Langer <clanger at openjdk.org> wrote:

>> Severin Gehwolf has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. The pull request contains four additional commits since the last revision:
>> 
>>  - Reboot upgradeable files approach
>>  - Revert "8353185: Introduce the concept of upgradeable files in context of JEP 493"
>>    
>>    This reverts commit bfbfbcb8212ed0f9825549b02b4b52e930c379a7.
>>  - Merge branch 'master' into jdk-8353185-upgradable-files-jep493
>>  - 8353185: Introduce the concept of upgradeable files in context of JEP 493
>
> make/modules/jdk.jlink/Java.gmk line 29:
> 
>> 27: 
>> 28: COPY += \
>> 29:   $(TOPDIR)/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/upgrade_files_java.base
> 
> Wouldn't `COPY += upgrade_files_java.base` work here ?

Apparently it does. Thanks for the suggestion.

> src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JRTArchive.java line 250:
> 
>> 248: 
>> 249:     /**
>> 250:      * Certain files in the a module are considered upgradeable. That is,
> 
> Suggestion:
> 
>      * Certain files in a module are considered upgradeable. That is,

Fixed.

> src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JRTArchive.java line 254:
> 
>> 252:      *
>> 253:      * @param resPath The resource path of the file to check for upgradeability.
>> 254:      * @return {@code true} iff the file is upgradeable. {@code false} otherwise.
> 
> Suggestion:
> 
>      * @return {@code true} if the file is upgradeable. {@code false} otherwise.

Fixed.

> test/jdk/tools/jlink/runtimeImage/UpgradeableFileCacertsTest.java line 43:
> 
>> 41:  * @test
>> 42:  * @summary Verify warnings are being produced when linking from the run-time
>> 43:  *          image and files have been modified
> 
> I guess this summary has to be modified.

Thanks, fixed.

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

PR Review Comment: https://git.openjdk.org/jdk/pull/24388#discussion_r2031103556
PR Review Comment: https://git.openjdk.org/jdk/pull/24388#discussion_r2031102867
PR Review Comment: https://git.openjdk.org/jdk/pull/24388#discussion_r2031102616
PR Review Comment: https://git.openjdk.org/jdk/pull/24388#discussion_r2031102257