RFR: 7903097: jtreg could implement ToolProvider [v6]

Wed Apr 6 19:19:00 UTC 2022

On Tue, 15 Feb 2022 06:42:11 GMT, Christian Stein <cstein at openjdk.org> wrote:

>> Implement `ToolProvider`, now that the main `jtreg` tool requires JDK >= 9.
>
> Christian Stein has updated the pull request incrementally with one additional commit since the last revision:
> 
>   Fix indentation
>   
>   [skip actions]

Changes requested by jjg (Lead).

make/jtreg.gmk line 85:

> 83: RESOURCES.com.sun.javatest.regtest = \
> 84: 	$(CLASSDIR)/META-INF/services/java.util.spi.ToolProvider \
> 85: 	$(CLASSDIR)/com/sun/javatest/regtest/i18n.properties \

This line is causing your conflict. It was recently removed, in 163ae22 `7903105: remove jtreg Ant task`

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

PR: https://git.openjdk.java.net/jtreg/pull/54