Rewrite Groovy into Java #882
Conversation
…eserve task behavior
…preserve task behavior
…eserve task behavior
…preserve task behavior
…; preserve task behavior
…serve task behavior
… Java; preserve task behavior
…preserve task behavior
…to Java; preserve task behavior
…from Groovy to Java; preserve task behavior
…erve task behavior
…onventional layout and metadata-version; tolerate missing tests index.json in TestInvocationTask
vjovanov
force-pushed
the
vj/rewrite-java
branch
from
bd9ecbd to
7423c62
Compare
jormundur00
left a comment
jormundur00
left a comment
There was a problem hiding this comment.
Changes look generally good to me (except for the version pattern that needs to be changed).
I see that all these files are still in the groovy sub-directory, which I assume is because the Utils and gradle files are still in written in Groovy. Are there plans to change them to Java too (either in this PR, or a follow-up), so we don't have a misleading groovy directory?
| // Fall through to conventional layout resolution below. | ||
| } | ||
| // Fallback: conventional layout tests/src/<group>/<artifact>/<version> | ||
| Path conventional = testRoot().resolve(groupId).resolve(artifactId).resolve(version); |
There was a problem hiding this comment.
So previously we only matched using tests/src/index.json, and failed otherwise? These fallbacks will be useful once we get rid of that index.json.
| * Pre-release identifiers (case-insensitive): alpha, beta, rc, cr, m<num>, ea, b<num>, preview, and pure numeric suffixes. | ||
| * Versions ending with ".Final" are treated as full releases of the base version. | ||
| */ | ||
| private static final Pattern VERSION_PATTERN = Pattern.compile("(?i)^(\\\\d+(?:\\\\.\\\\d+)*)" |
There was a problem hiding this comment.
This pattern is not correct. Please take a look at org.graalvm.internal.tck.TestedVersionUpdaterTask#VERSION_PATTERN for the Java equivalent of this Groovy pattern, and either copy it, or even better, reuse it (reference the other from whichever class is best).
2 participants
Fixes: #774