Rename IConsumer & add missing global toolchains on context

configuration.

Author: G-Ork

org.eclipse.m2e.core.tests/src/org/eclipse/m2e/core/IBiConsumer.java renamed to org.eclipse.m2e.core.tests/src/org/eclipse/m2e/core/CoreBiConsumer.java

@@ -31,7 +31,7 @@
  * @author Georg Tsakumagos
  */
 @FunctionalInterface
-public interface IBiConsumer<T, U> {
+public interface CoreBiConsumer<T, U> {
 
     /**
      * Performs this operation on the given arguments.

org.eclipse.m2e.core.tests/src/org/eclipse/m2e/internal/launch/MavenLaunchDelegateTest.java

@@ -37,7 +37,7 @@
 import org.eclipse.jdt.launching.IVMInstallType;
 import org.eclipse.jdt.launching.JavaRuntime;
 import org.eclipse.m2e.actions.MavenLaunchConstants;
-import org.eclipse.m2e.core.IBiConsumer;
+import org.eclipse.m2e.core.CoreBiConsumer;
 import org.eclipse.m2e.core.MavenPlugin;
 import org.eclipse.m2e.core.embedder.IMavenConfiguration;
 import org.eclipse.m2e.tests.common.AbstractMavenProjectTestCase;
@@ -229,7 +229,7 @@ public void testUserToolchains_Invalid() throws Exception {
 	 * @param relativePath Relative path for the file.  Must not be <code>null</code>.
 	 * @throws Exception Usually only on missed assertions. 
 	 */
-	private void assertMavenLaunchConfig(IBiConsumer<IMavenConfiguration, String> configSetter, String goal, IBiConsumer<MavenLaunchDelegate, ILaunchConfigurationWorkingCopy> verifier, String relativePath)
+	private void assertMavenLaunchConfig(CoreBiConsumer<IMavenConfiguration, String> configSetter, String goal, CoreBiConsumer<MavenLaunchDelegate, ILaunchConfigurationWorkingCopy> verifier, String relativePath)
 			throws Exception {
 
 		waitForJobsToComplete();
@@ -273,7 +273,7 @@ private void assertMavenLaunchConfig(IBiConsumer<IMavenConfiguration, String> co
 	 * @param relativePath Relative path for the file.  Must not be <code>null</code>.
 	 * @throws Exception Usually only on missed assertions. 
 	 */
-	private void assertMavenLaunchFileSetting(IBiConsumer<IMavenConfiguration, String> configSetter, String key, String relativePath)
+	private void assertMavenLaunchFileSetting(CoreBiConsumer<IMavenConfiguration, String> configSetter, String key, String relativePath)
 			throws Exception {
 		this.assertMavenLaunchConfig(configSetter, null, (launcher, config) -> {
 			String programArguments = launcher.getProgramArguments(config);
@@ -296,7 +296,7 @@ private void assertMavenLaunchFileSetting(IBiConsumer<IMavenConfiguration, Strin
 	 * @param relativePath Relative path for the file.  Must not be <code>null</code>.
 	 * @throws Exception Usually only on missed assertions. 
 	 */
-	private void assertMavenLaunchFileSettingGoalOverride(IBiConsumer<IMavenConfiguration, String> configSetter, String key, String relativePath)
+	private void assertMavenLaunchFileSettingGoalOverride(CoreBiConsumer<IMavenConfiguration, String> configSetter, String key, String relativePath)
 			throws Exception {
 		final String userDerivedPath = "./resources/settings/empty_settings/this_do_not_exists.xml";
 		final String goalConfig = "clean " + key + " " + userDerivedPath;
@@ -323,7 +323,7 @@ private void assertMavenLaunchFileSettingGoalOverride(IBiConsumer<IMavenConfigur
 	 * @param key Key of the configuration.  Must not be <code>null</code>.
 	 * @throws Exception Usually only on missed assertions. 
 	 */
-	private void assertMavenLaunchFileSettingPathInvalid(IBiConsumer<IMavenConfiguration, String> configSetter) throws Exception {
+	private void assertMavenLaunchFileSettingPathInvalid(CoreBiConsumer<IMavenConfiguration, String> configSetter) throws Exception {
 		final String path = "./resources/settings/empty_settings/this_do_not_exists.xml";
 		try {
 			this.assertMavenLaunchConfig(configSetter, null, (launcher, config) -> {}, path);

org.eclipse.m2e.core/src/org/eclipse/m2e/core/embedder/ISupplier.java renamed to org.eclipse.m2e.core/src/org/eclipse/m2e/core/embedder/CoreSupplier.java

@@ -28,7 +28,7 @@
  * @author Georg Tsakumagos
  */
 @FunctionalInterface
-public interface ISupplier<T> {
+public interface CoreSupplier<T> {
 
   /**
    * Gets a result.

org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/MavenExecutionContext.java

@@ -208,6 +208,9 @@ static MavenExecutionRequest createExecutionRequest(IMavenConfiguration mavenCon
     updateSettingsFiles(request, settingsLocations);
     //and settings are actually derived from IMavenConfiguration
     File userToolchainsFile = MavenCli.DEFAULT_USER_TOOLCHAINS_FILE;
+    if(mavenConfiguration.getGlobalToolchainsFile() != null) {
+      request.setGlobalToolchainsFile(new File(mavenConfiguration.getGlobalToolchainsFile()));
+    }
     if(mavenConfiguration.getUserToolchainsFile() != null) {
       userToolchainsFile = new File(mavenConfiguration.getUserToolchainsFile());
     }

org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchDelegate.java

@@ -64,7 +64,7 @@
 import org.eclipse.m2e.actions.MavenLaunchConstants;
 import org.eclipse.m2e.core.MavenPlugin;
 import org.eclipse.m2e.core.embedder.IMavenConfiguration;
-import org.eclipse.m2e.core.embedder.ISupplier;
+import org.eclipse.m2e.core.embedder.CoreSupplier;
 import org.eclipse.m2e.core.internal.IMavenConstants;
 import org.eclipse.m2e.core.internal.launch.AbstractMavenRuntime;
 import org.eclipse.m2e.core.project.IMavenProjectFacade;
@@ -127,7 +127,7 @@ public MavenLaunchDelegate() {
    * @throws IllegalArgumentException If the configured file does not exists.
    */
   private void appendFileSetting(String name, String arg, StringBuilder sb, String goals, boolean substitute,
-      ISupplier<String> source) throws CoreException, IllegalArgumentException {
+      CoreSupplier<String> source) throws CoreException, IllegalArgumentException {
     if(!goals.contains(arg) && 0 >= sb.indexOf(arg)) {
       String setting = source.get();
 

org.eclipse.m2e.model.edit/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-Name: M2E Maven Project Model Edit
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-Vendor: Eclipse.org - m2e
-Bundle-Version: 2.0.400.qualifier
+Bundle-Version: 2.0.401.qualifier
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.m2e.model.edit;singleton:=true
 Require-Bundle: org.eclipse.core.runtime,