Merge remote-tracking branch 'origin/master' into 2.3.0

This commit is contained in:
wing328
2017-04-11 01:03:28 +08:00
2 changed files with 169 additions and 146 deletions

View File

@@ -244,6 +244,9 @@ public class CodeGenMojo extends AbstractMojo {
@Parameter
protected Map<String, String> environmentVariables = new HashMap<String, String>();
@Parameter
protected Map<String, String> originalEnvironmentVariables = new HashMap<String, String>();
@Parameter
private boolean configHelp = false;
@@ -253,6 +256,8 @@ public class CodeGenMojo extends AbstractMojo {
@Parameter(readonly = true, required = true, defaultValue = "${project}")
private MavenProject project;
@Override
public void execute() throws MojoExecutionException {
@@ -393,8 +398,6 @@ public class CodeGenMojo extends AbstractMojo {
}
}
Map<String, String> originalEnvironmentVariables = new HashMap<>();
if (environmentVariables != null) {
for(String key : environmentVariables.keySet()) {