Merge branch 'master' into feat-classpathentry-excluding

Author: qxo

.github/workflows/junit.yml

@@ -45,7 +45,7 @@ jobs:
            done
 
       - name: Publish Test Results
-        uses: EnricoMi/publish-unit-test-result-action@e780361cd1fc1b1a170624547b3ffda64787d365 # v2.12.0
+        uses: EnricoMi/publish-unit-test-result-action@8885e273a4343cd7b48eaa72428dea0c3067ea98 # v2.14.0
         with:
           commit: ${{ github.event.workflow_run.head_sha }}
           event_file: artifacts/Event File/event.json

.github/workflows/maven.yml

@@ -45,7 +45,7 @@ jobs:
       with:
        run: mvn clean verify -Pits -Dtycho.p2.baselineMode=failCommon --batch-mode
     - name: Upload Test Results
-      uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
+      uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
       with:
         name: test-results-${{ matrix.os }}
         if-no-files-found: error
@@ -56,7 +56,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Upload
-      uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
+      uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
       with:
         name: Event File
         path: ${{ github.event_path }}

RELEASE_NOTES.md

@@ -8,6 +8,13 @@
 
 Updated the embedded Maven from version 3.9.5 to 3.9.6; [Maven 3.9.6 Release Notes](https://maven.apache.org/docs/3.9.6/release-notes.html).
 
+### New project preference for automated Maven project configuration updates
+
+Automatic configuration updates for Maven projects can now be disabled the in the project preferences.
+This allows to disable these updates individually per project and to store the setting in a preference-file under version control,
+which is useful for projects that require special workspace configuration that doesn't exactly match the configuration in the `pom.xml`.
+
+![grafik](https://github.com/eclipse-m2e/m2e-core/assets/44067969/7d27ceda-5d13-4f0e-97f0-ff34c94d7493)
 
 ## 2.5.0
 

org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF

@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.m2e.core.ui;singleton:=true
-Bundle-Version: 2.0.7.qualifier
+Bundle-Version: 2.0.800.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
@@ -56,3 +56,4 @@ Service-Component: OSGI-INF/component.xml,
  OSGI-INF/org.eclipse.m2e.core.ui.internal.archetype.ArchetypeGenerator.xml,
  OSGI-INF/org.eclipse.m2e.core.ui.internal.archetype.ArchetypePlugin.xml
 Automatic-Module-Name: org.eclipse.m2e.core.ui
+

org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/Messages.java

@@ -557,7 +557,7 @@ public class Messages extends NLS {
 
   public static String MavenRepositoryView_update_one;
 
-  public static String MavenSettingsPreferencePage_userSettingsBrowseButton_text;
+  public static String MavenSettingsPreferencePage_settingsBrowseButton_text;
 
   public static String MavenSettingsPreferencePage_btnUpdate;
 
@@ -569,6 +569,10 @@ public class Messages extends NLS {
 
   public static String MavenSettingsPreferencePage_error_userSettingsParse;
 
+  public static String MavenSettingsPreferencePage_error_userToolchainsMissing;
+
+  public static String MavenSettingsPreferencePage_error_userToolchainsParse;
+
   public static String MavenSettingsPreferencePage_job_indexing;
 
   public static String MavenSettingsPreferencePage_job_updating;
@@ -603,6 +607,12 @@ public class Messages extends NLS {
 
   public static String MavenWarningsPreferencePage_notCoveredMojoExecution;
 
+  public static String MavenSettingsPreferencePage_userToolchainslink1;
+
+  public static String MavenSettingsPreferencePage_userToolchainslink2;
+
+  public static String MavenSettingsPreferencePage_userToolchainslink_tooltip;
+
   public static String MavenWarningsPreferencePage_versionDupParent;
 
   public static String MavenWarningsPreferencePage_overridingManagedPreferences;
@@ -1025,8 +1035,6 @@ public class Messages extends NLS {
 
   public static String MavenInstallationWizardPage_selectProjectTitle;
 
-  public static String MavenSettingsPreferencePage_globalSettingsBrowseButton_text;
-
   public static String MavenProjectWizardArchetypeParametersPage_runInteractive;
 
   static {

org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/MavenPropertyTester.java

@@ -18,18 +18,18 @@
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.Adapters;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.ui.IFileEditorInput;
 
 import org.eclipse.m2e.core.MavenPlugin;
 import org.eclipse.m2e.core.embedder.ArtifactKey;
 import org.eclipse.m2e.core.internal.IMavenConstants;
+import org.eclipse.m2e.core.internal.project.ResolverConfigurationIO;
 import org.eclipse.m2e.core.project.IMavenProjectFacade;
 import org.eclipse.m2e.core.project.IMavenProjectRegistry;
-import org.eclipse.m2e.core.project.IProjectConfiguration;
 import org.eclipse.m2e.core.project.MavenProjectUtils;
 
 
@@ -60,19 +60,11 @@ public class MavenPropertyTester extends PropertyTester {
   @Override
   public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
     if(WORKSPACE_RESULUTION_ENABLE.equals(property)) {
-      boolean enableWorkspaceResolution = true;
-      IAdaptable adaptable = (IAdaptable) receiver;
-
-      IProject projectAdapter = adaptable.getAdapter(IProject.class);
+      IProject projectAdapter = Adapters.adapt(receiver, IProject.class);
       if(projectAdapter != null) {
-        IMavenProjectRegistry projectManager = MavenPlugin.getMavenProjectRegistry();
-        IMavenProjectFacade projectFacade = projectManager.create(projectAdapter, new NullProgressMonitor());
-        if(projectFacade != null) {
-          IProjectConfiguration configuration = projectFacade.getConfiguration();
-          return !configuration.isResolveWorkspaceProjects();
-        }
+        return !ResolverConfigurationIO.isResolveWorkspaceProjects(projectAdapter);
       }
-      return enableWorkspaceResolution;
+      return true;
     }
 
     if(HAS_ARTIFACT_KEY.equals(property)) {

org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/messages.properties

@@ -309,19 +309,23 @@ MavenRepositoryView_reload_msg=This will reload the settings.xml and rebuild the
 MavenRepositoryView_reload_title=Reload settings.xml
 MavenRepositoryView_update_more=Update Indexes
 MavenRepositoryView_update_one=Update Index
-MavenSettingsPreferencePage_userSettingsBrowseButton_text=Browse...
+MavenSettingsPreferencePage_settingsBrowseButton_text=Browse...
 MavenSettingsPreferencePage_btnUpdate=Update Settings
 MavenSettingsPreferencePage_error_globalSettingsMissing=Global settings file doesn't exist
 MavenSettingsPreferencePage_error_userSettingsMissing=User settings file doesn't exist
 MavenSettingsPreferencePage_error_globalSettingsParse=Unable to parse global settings file {0}
 MavenSettingsPreferencePage_error_userSettingsParse=Unable to parse user settings file {0}
-MavenSettingsPreferencePage_globalSettingsBrowseButton_text=Browse...
+MavenSettingsPreferencePage_error_userToolchainsMissing=User toolchains file doesn't exist
+MavenSettingsPreferencePage_error_userToolchainsParse=Unable to parse user toolchains file {0}
 MavenSettingsPreferencePage_job_indexing=Indexing Local Repository...
 MavenSettingsPreferencePage_job_updating=Updating Maven settings
 MavenSettingsPreferencePage_lblLocal=Local Repository (From merged user and global settings)\:
 MavenSettingsPreferencePage_userSettingslink1=User &Settings\:
 MavenSettingsPreferencePage_userSettingslink2=User &Settings (<a href\="\#">open file</a>)\:
 MavenSettingsPreferencePage_userSettingslink_tooltip=Open editor for user settings
+MavenSettingsPreferencePage_userToolchainslink1=User &Toolchains\:
+MavenSettingsPreferencePage_userToolchainslink2=User &Toolchains (<a href\="\#">open file</a>)\:
+MavenSettingsPreferencePage_userToolchainslink_tooltip=Open editor for user toolchains
 MavenSettingsPreferencePage_globalSettingslink1=Global &Settings\:
 MavenSettingsPreferencePage_globalSettingslink2=Global &Settings (<a href\="\#">open file</a>)\:
 MavenSettingsPreferencePage_globalSettingslink_tooltip=Open editor for global settings

org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/MavenProjectPreferencePage.java

@@ -36,10 +36,12 @@
 
 import org.eclipse.m2e.core.MavenPlugin;
 import org.eclipse.m2e.core.internal.IMavenConstants;
-import org.eclipse.m2e.core.project.IProjectConfiguration;
+import org.eclipse.m2e.core.internal.preferences.MavenPreferenceInitializer;
+import org.eclipse.m2e.core.internal.project.ResolverConfigurationIO;
 import org.eclipse.m2e.core.project.IProjectConfigurationManager;
 import org.eclipse.m2e.core.project.ResolverConfiguration;
 import org.eclipse.m2e.core.ui.internal.Messages;
+import org.eclipse.m2e.core.ui.internal.project.MavenUpdateConfigurationChangeListener;
 
 
 /**
@@ -52,6 +54,8 @@ public class MavenProjectPreferencePage extends PropertyPage {
 
   private Button resolveWorspaceProjectsButton;
 
+  private Button autoUpdateConfigurationButton;
+
 //  private Button includeModulesButton;
 
   private Text selectedProfilesText;
@@ -74,10 +78,18 @@ protected Control createContents(Composite parent) {
     selectedProfilesText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
 
     resolveWorspaceProjectsButton = new Button(composite, SWT.CHECK);
-    GridData resolveWorspaceProjectsButtonData = new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1);
-    resolveWorspaceProjectsButton.setLayoutData(resolveWorspaceProjectsButtonData);
+    resolveWorspaceProjectsButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
     resolveWorspaceProjectsButton.setText(Messages.MavenProjectPreferencePage_btnResolve);
 
+    autoUpdateConfigurationButton = new Button(composite, SWT.CHECK);
+    autoUpdateConfigurationButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
+    autoUpdateConfigurationButton.setText(Messages.MavenPreferencePage_autoUpdateProjectConfiguration);
+    if(MavenUpdateConfigurationChangeListener.isAutoConfigurationUpdateDisabled()) {
+      autoUpdateConfigurationButton.setEnabled(false);
+      String text = autoUpdateConfigurationButton.getText() + " (disabled in workspace preferences)";
+      autoUpdateConfigurationButton.setText(text);
+    }
+
 //    includeModulesButton = new Button(composite, SWT.CHECK);
 //    GridData gd = new GridData(SWT.FILL, SWT.CENTER, false, false, 2, 1);
 //    gd.verticalIndent = 15;
@@ -100,16 +112,19 @@ protected Control createContents(Composite parent) {
 
     init(getResolverConfiguration());
 
+    boolean isAutoUpdate = ResolverConfigurationIO.isAutomaticallyUpdateConfiguration(getProject());
+    autoUpdateConfigurationButton.setSelection(isAutoUpdate);
+
     return composite;
   }
 
   @Override
   protected void performDefaults() {
     init(new ResolverConfiguration());
+    autoUpdateConfigurationButton.setSelection(MavenPreferenceInitializer.P_AUTO_UPDATE_CONFIGURATION_DEFAULT);
   }
 
-  private void init(IProjectConfiguration configuration) {
-
+  private void init(ResolverConfiguration configuration) {
     resolveWorspaceProjectsButton.setSelection(configuration.isResolveWorkspaceProjects());
 //    includeModulesButton.setSelection(configuration.shouldIncludeModules());
     selectedProfilesText.setText(configuration.getSelectedProfiles());
@@ -130,11 +145,14 @@ public boolean performOk() {
     final ResolverConfiguration configuration = new ResolverConfiguration(getResolverConfiguration());
     if(configuration.getSelectedProfiles().equals(selectedProfilesText.getText()) &&
 //        configuration.shouldIncludeModules()==includeModulesButton.getSelection() &&
-        configuration.isResolveWorkspaceProjects() == resolveWorspaceProjectsButton.getSelection()) {
+        configuration.isResolveWorkspaceProjects() == resolveWorspaceProjectsButton.getSelection()
+        && ResolverConfigurationIO.isAutomaticallyUpdateConfiguration(project) == autoUpdateConfigurationButton
+            .getSelection()) {
       return true;
     }
 
     configuration.setResolveWorkspaceProjects(resolveWorspaceProjectsButton.getSelection());
+    ResolverConfigurationIO.setAutomaticallyUpdateConfiguration(project, autoUpdateConfigurationButton.getSelection());
 //    configuration.setIncludeModules(includeModulesButton.getSelection());
     configuration.setSelectedProfiles(selectedProfilesText.getText());
 
@@ -165,9 +183,9 @@ public IStatus runInWorkspace(IProgressMonitor monitor) {
     return isSet;
   }
 
-  private IProjectConfiguration getResolverConfiguration() {
+  private ResolverConfiguration getResolverConfiguration() {
     IProjectConfigurationManager projectManager = MavenPlugin.getProjectConfigurationManager();
-    return projectManager.getProjectConfiguration(getProject());
+    return (ResolverConfiguration) projectManager.getProjectConfiguration(getProject());
   }
 
   private IProject getProject() {