Add API to pass user properties in IProjectConfiguration

Author: laeubi

org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/MavenProjectFacade.java

@@ -650,6 +650,8 @@ private static final class MavenProjectConfiguration implements IProjectConfigur
 
     private final String profiles;
 
+    private final Map<String, String> userProperties;
+
     public MavenProjectConfiguration(IProjectConfiguration baseConfiguration, File multiModuleProjectDirectory) {
       if(baseConfiguration == null) {
         //we should really forbid this but some test seem to pass null!
@@ -658,6 +660,7 @@ public MavenProjectConfiguration(IProjectConfiguration baseConfiguration, File m
       this.multiModuleProjectDirectory = multiModuleProjectDirectory;
       this.mappingId = baseConfiguration.getLifecycleMappingId();
       this.properties = Map.copyOf(baseConfiguration.getConfigurationProperties());
+      this.userProperties = Map.copyOf(baseConfiguration.getUserProperties());
       this.resolveWorkspace = baseConfiguration.isResolveWorkspaceProjects();
       this.profiles = baseConfiguration.getSelectedProfiles();
     }
@@ -667,6 +670,11 @@ public Map<String, String> getConfigurationProperties() {
       return properties;
     }
 
+    @Override
+    public Map<String, String> getUserProperties() {
+      return userProperties;
+    }
+
     @Override
     public boolean isResolveWorkspaceProjects() {
       return resolveWorkspace;

org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/IProjectConfiguration.java

@@ -26,8 +26,22 @@
  */
 public interface IProjectConfiguration {
 
+  /**
+   * Additional properties of a project can be stored in the org.eclipse.m2e.core.prefs file under the key
+   * <code>properties</code>, will be handled as user-properties
+   * 
+   * @return return project configuration properties
+   */
   Map<String, String> getConfigurationProperties();
 
+  /**
+   * User properties are stored in the <code>.mvn/maven.config</code> file with <code>-Dkey=value</code>, they are
+   * therefore not persisted in the project configuration
+   * 
+   * @return the user properties
+   */
+  Map<String, String> getUserProperties();
+
   boolean isResolveWorkspaceProjects();
 
   String getSelectedProfiles();

org.eclipse.m2e.core/src/org/eclipse/m2e/core/project/ResolverConfiguration.java

@@ -45,6 +45,8 @@ public class ResolverConfiguration implements Serializable, IProjectConfiguratio
 
   private Properties properties;
 
+  private Map<String, String> userProperties;
+
   private File multiModuleProjectDirectory;
 
   public ResolverConfiguration() {
@@ -91,6 +93,14 @@ public Map<String, String> getConfigurationProperties() {
     return Collections.unmodifiableMap(map);
   }
 
+  @Override
+  public Map<String, String> getUserProperties() {
+    if(userProperties == null) {
+      return Collections.emptyMap();
+    }
+    return userProperties;
+  }
+
   public void setProperties(Properties properties) {
     this.properties = properties;
   }
@@ -158,13 +168,15 @@ public boolean equals(Object obj) {
     return this.resolveWorkspaceProjects == other.resolveWorkspaceProjects
         && Objects.equals(this.selectedProfiles, other.selectedProfiles)
         && Objects.equals(this.lifecycleMappingId, other.lifecycleMappingId)
-        && Objects.equals(this.properties, other.properties)
+        && Objects.equals(this.getProperties(), other.getProperties())
+        && Objects.equals(this.getUserProperties(), other.getUserProperties())
         && Objects.equals(this.multiModuleProjectDirectory, other.multiModuleProjectDirectory);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(resolveWorkspaceProjects, selectedProfiles, lifecycleMappingId, properties,
+    return Objects.hash(resolveWorkspaceProjects, selectedProfiles, lifecycleMappingId, getProperties(),
+        getUserProperties(),
         multiModuleProjectDirectory);
   }