RFR: 7903097: jtreg could implement ToolProvider [v6]

Thu Apr 7 14:52:25 UTC 2022

On Thu, 7 Apr 2022 14:47:07 GMT, Christian Stein <cstein at openjdk.org> wrote:

>> 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...

Resolved via https://github.com/openjdk/jtreg/pull/54/commits/49c11b09de75ac9ef281722a272020fd188a80fe

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

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