Skip to content

Add Maven Toolchains support to javaToolchains detection#19048

Merged
bot-gradle merged 5 commits intogradle:masterfrom
Okeanos:maven-toolchains-detection
Nov 25, 2021
Merged

Add Maven Toolchains support to javaToolchains detection#19048
bot-gradle merged 5 commits intogradle:masterfrom
Okeanos:maven-toolchains-detection

Conversation

@Okeanos
Copy link
Copy Markdown
Contributor

@Okeanos Okeanos commented Nov 18, 2021

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-services subproject?

Contributor Checklist

  • Review Contribution Guidelines
  • Make sure that all commits are signed off to indicate that you agree to the terms of Developer Certificate of Origin.
  • Make sure all contributed code can be distributed under the terms of the Apache License 2.0, e.g. the code was written by yourself or the original code is licensed under a license compatible to Apache License 2.0.
  • Check "Allow edit from maintainers" option in pull request so that additional changes can be pushed by Gradle team
  • Provide integration tests (under <subproject>/src/integTest) to verify changes from a user perspective
  • Provide unit tests (under <subproject>/src/test) to verify logic
  • Update User Guide, DSL Reference, and Javadoc for public-facing changes
  • Ensure that tests pass sanity check: ./gradlew sanityCheck
  • Ensure that tests pass locally: ./gradlew <changed-subproject>:quickTest

Gradle Core Team Checklist

  • Verify design and implementation
  • Verify test coverage and CI build status
  • Verify documentation
  • Recognize contributor in release notes

@donat donat requested a review from jbartok November 19, 2021 09:39
@donat donat assigned donat and jbartok and unassigned donat Nov 19, 2021
@gradle gradle deleted a comment from jbartok Nov 22, 2021
@Okeanos Okeanos requested a review from jbartok November 22, 2021 19:07
This fixes #19046 .

Signed-off-by: Nikolas Grottendieck <[email protected]>
@gradle gradle deleted a comment from jbartok Nov 23, 2021
@gradle gradle deleted a comment from jbartok Nov 24, 2021
@gradle gradle deleted a comment from jbartok Nov 24, 2021
@jbartok jbartok added this to the 7.4 RC1 milestone Nov 24, 2021
@gradle gradle deleted a comment from jbartok Nov 24, 2021
@bot-gradle
Copy link
Copy Markdown
Collaborator

OK, I've already triggered a build for you.

@bot-gradle
Copy link
Copy Markdown
Collaborator

Pre-tested commit build failed.

@blindpirate
Copy link
Copy Markdown
Member

@bot-gradle test and merge

@gradle gradle deleted a comment from jbartok Nov 25, 2021
@gradle gradle deleted a comment from jbartok Nov 25, 2021
@bot-gradle
Copy link
Copy Markdown
Collaborator

OK, I've already triggered a build for you.

@bot-gradle bot-gradle merged commit 23fedf0 into gradle:master Nov 25, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

from:contributor PR by an external contributor

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add Maven Toolchains support to Java Toolchains detection

6 participants