Add Maven Toolchains support to javaToolchains detection#19048
Merged
bot-gradle merged 5 commits intogradle:masterfrom Nov 25, 2021
Okeanos:maven-toolchains-detection
Merged
Add Maven Toolchains support to javaToolchains detection#19048bot-gradle merged 5 commits intogradle:masterfrom Okeanos:maven-toolchains-detection
bot-gradle merged 5 commits intogradle:masterfrom
Okeanos:maven-toolchains-detection
Conversation
jbartok
reviewed
Nov 22, 2021
...ces/src/main/java/org/gradle/jvm/toolchain/internal/MavenToolchainsInstallationSupplier.java
Outdated
Show resolved
Hide resolved
jbartok
reviewed
Nov 22, 2021
This fixes #19046 . Signed-off-by: Nikolas Grottendieck <[email protected]>
jbartok
added a commit
that referenced
this pull request
Nov 23, 2021
jbartok
approved these changes
Nov 23, 2021
Okeanos
commented
Nov 24, 2021
subprojects/core-api/src/main/java/org/gradle/util/internal/MavenUtil.java
Show resolved
Hide resolved
Collaborator
|
OK, I've already triggered a build for you. |
Collaborator
|
Pre-tested commit build failed. |
Member
|
@bot-gradle test and merge |
Collaborator
|
OK, I've already triggered a build for you. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This fixes #19046 .
Signed-off-by: Nikolas Grottendieck [email protected]
Context
See #19046 for additional details.
There is one caveat with the current solution: if the XML parser encounters an error with the toolchains file, e.g. it's not valid XML, it'll print a message to stdout separate from any logging/exception handling in place:
[Fatal Error] :1:1: Content is not allowed in prolog.for example. I have not found a way of turning that off :(.Concerning the integTest checkbox … this doesn't exist for the
jvm-servicessubproject?Contributor Checklist
<subproject>/src/integTest) to verify changes from a user perspective<subproject>/src/test) to verify logic./gradlew sanityCheck./gradlew <changed-subproject>:quickTestGradle Core Team Checklist