Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not get UPPERCASE env vars #427

Merged
merged 5 commits into from
Aug 5, 2024
Merged

Do not get UPPERCASE env vars #427

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ec3679c
Do not get UPPERCASE env vars
May 10, 2024
6eb95e5
PR feedback: use System.getenv()
May 12, 2024
6b5f3e2
Copy immutable env map
Jun 25, 2024
182c829
Merge remote-tracking branch 'upstream/master'
Jul 3, 2024
0731ed3
remove unused import
Jul 3, 2024
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
13 changes: 5 additions & 8 deletions src/main/java/org/codehaus/mojo/exec/ExecMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.TreeSet;
import java.util.function.Consumer;
Expand Down Expand Up @@ -476,13 +475,11 @@ public void execute() throws MojoExecutionException {
}

private Map<String, String> handleSystemEnvVariables() throws MojoExecutionException {

Map<String, String> enviro = new HashMap<>();
Properties systemEnvVars = CommandLineUtils.getSystemEnvVars();
for (Map.Entry<?, ?> entry : systemEnvVars.entrySet()) {
enviro.put((String) entry.getKey(), (String) entry.getValue());
}

// Avoid creating env vars that differ only in case on Windows.
// https://github.com/mojohaus/exec-maven-plugin/issues/328
// It is not enough to avoid duplicates; we must preserve the case found in the "natural" environment.
// https://developercommunity.visualstudio.com/t/Build-Error:-MSB6001-in-Maven-Build/10527486?sort=newest
Map<String, String> enviro = new HashMap<>(System.getenv());
if (environmentVariables != null) {
enviro.putAll(environmentVariables);
}
Expand Down