RFR: 7903097: jtreg could implement ToolProvider [v6]

Thu Apr 7 14:52:24 UTC 2022

On Wed, 6 Apr 2022 19:13:24 GMT, Jonathan Gibbons <jjg at openjdk.org> wrote:

>> Christian Stein has updated the pull request incrementally with one additional commit since the last revision:
>> 
>>   Fix indentation
>>   
>>   [skip actions]
>
> 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`

Understood. Resolving conflict via UI...

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

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