Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,7 @@
return manager.getContainerManager().getComponentLookup(getConfiguration().getMultiModuleProjectDirectory());
}

private static final class MavenProjectConfiguration implements IProjectConfiguration, Serializable {

Check warning on line 649 in org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/registry/MavenProjectFacade.java

View check run for this annotation

Jenkins - M2E / Compiler

Potential Programming Problem

NORMAL: The serializable class MavenProjectConfiguration does not declare a static final serialVersionUID field of type long

private final File multiModuleProjectDirectory;

Expand All @@ -664,6 +664,10 @@

private List<String> inactiveProfiles;

private String globalSettingsFile;

private String userSettingsFile;

private MavenProjectConfiguration(IProjectConfiguration baseConfiguration) {
if(baseConfiguration == null) {
//we should really forbid this but some test seem to pass null!
Expand All @@ -677,6 +681,8 @@
this.profiles = baseConfiguration.getSelectedProfiles();
this.activeProfiles = List.copyOf(baseConfiguration.getActiveProfileList());
this.inactiveProfiles = List.copyOf(baseConfiguration.getInactiveProfileList());
this.globalSettingsFile = baseConfiguration.getGlobalSettingsFile();
this.userSettingsFile = baseConfiguration.getUserSettingsFile();
}

@Override
Expand Down Expand Up @@ -735,6 +741,16 @@
return inactiveProfiles;
}

@Override
public String getGlobalSettingsFile() {
return globalSettingsFile;
}

@Override
public String getUserSettingsFile() {
return userSettingsFile;
}

}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ public interface IProjectConfiguration {

File getMultiModuleProjectDirectory();

String getGlobalSettingsFile();

String getUserSettingsFile();

/**
* Computes a hashcode over the contents of the given configuration, that is a semantic hash-code that can be used in
* combination of {@link #contentsEquals(IProjectConfiguration, IProjectConfiguration)}
Expand All @@ -65,7 +69,8 @@ public static int contentsHashCode(IProjectConfiguration configuration) {
return Objects.hash(configuration.isResolveWorkspaceProjects(), configuration.getActiveProfileList(),
configuration.getInactiveProfileList(), configuration.getLifecycleMappingId(),
configuration.getConfigurationProperties(), configuration.getUserProperties(),
configuration.getMultiModuleProjectDirectory());
configuration.getMultiModuleProjectDirectory(), configuration.getGlobalSettingsFile(),
configuration.getUserSettingsFile());
}

public static boolean contentsEquals(IProjectConfiguration configuration, IProjectConfiguration other) {
Expand All @@ -81,7 +86,9 @@ public static boolean contentsEquals(IProjectConfiguration configuration, IProje
&& Objects.equals(configuration.getInactiveProfileList(), other.getInactiveProfileList())
&& Objects.equals(configuration.getConfigurationProperties(), other.getConfigurationProperties())
&& Objects.equals(configuration.getUserProperties(), other.getUserProperties())
&& Objects.equals(configuration.getMultiModuleProjectDirectory(), other.getMultiModuleProjectDirectory());
&& Objects.equals(configuration.getMultiModuleProjectDirectory(), other.getMultiModuleProjectDirectory())
&& Objects.equals(configuration.getGlobalSettingsFile(), other.getGlobalSettingsFile())
&& Objects.equals(configuration.getUserSettingsFile(), other.getUserSettingsFile());
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ public class ResolverConfiguration implements Serializable, IProjectConfiguratio

private List<String> userInactiveProfiles;

private String globalSettingsFile;

private String userSettingsFile;

public ResolverConfiguration() {
}

Expand All @@ -77,9 +81,9 @@ public ResolverConfiguration(IProject project) {
public ResolverConfiguration(IProjectConfiguration resolverConfiguration) {
setLifecycleMappingId(resolverConfiguration.getLifecycleMappingId());
setMultiModuleProjectDirectory(resolverConfiguration.getMultiModuleProjectDirectory());
Properties properties2 = new Properties();
properties2.putAll(resolverConfiguration.getConfigurationProperties());
setProperties(properties2);
Properties properties = new Properties();
properties.putAll(resolverConfiguration.getConfigurationProperties());
setProperties(properties);
setResolveWorkspaceProjects(resolverConfiguration.isResolveWorkspaceProjects());
setSelectedProfiles(resolverConfiguration.getSelectedProfiles());
}
Expand Down Expand Up @@ -193,22 +197,32 @@ public File getMultiModuleProjectDirectory() {
return multiModuleProjectDirectory;
}

@Override
public String getGlobalSettingsFile() {
return globalSettingsFile;
}

@Override
public String getUserSettingsFile() {
return userSettingsFile;
}

/**
* @param multiModuleProjectDirectory The multiModuleProjectDirectory to set.
*/
public void setMultiModuleProjectDirectory(File multiModuleProjectDirectory) {
if(!Objects.equals(this.multiModuleProjectDirectory, multiModuleProjectDirectory)) {
this.multiModuleProjectDirectory = multiModuleProjectDirectory;
try {
Optional<MavenProperties> mavenProps = MavenProperties.getMavenArgs(multiModuleProjectDirectory);
Optional<MavenProperties> commandLine = MavenProperties.getMavenArgs(multiModuleProjectDirectory);
Map<String, String> props = new LinkedHashMap<>();
commandLine.ifPresent(p -> p.getCliProperties(props::put));
userProperties = Collections.unmodifiableMap(props);
userActiveProfiles = new ArrayList<>();
userInactiveProfiles = new ArrayList<>();
mavenProps.ifPresent(args -> {
args.getCliProperties(props::put);
args.getProfiles(userActiveProfiles::add, userInactiveProfiles::add);
});
userProperties = Collections.unmodifiableMap(props);
commandLine.ifPresent(p -> p.getProfiles(userActiveProfiles::add, userInactiveProfiles::add));
globalSettingsFile = commandLine.map(p -> p.getAlternateGlobalToolchainsFile()).orElse(null);
userSettingsFile = commandLine.map(p -> p.getAlternateUserToolchainsFile()).orElse(null);
} catch(IOException ex) {
//can't use it then... :-(
MavenPluginActivator.getDefault().getLog().error("can't read maven args from " + multiModuleProjectDirectory,
Expand Down Expand Up @@ -262,4 +276,4 @@ private static List<String> parseProfiles(String profilesAsText, boolean status)
}
return profiles;
}
}
}
Loading