This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 3.3.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git
commit e9b1d945fb0a1b59809722640bad60043aa64a19 Author: Colm O hEigeartaigh <[email protected]> AuthorDate: Mon Jan 6 16:35:01 2020 +0000 Recording .gitmergeinfo Changes --- .gitmergeinfo | 3 +++ .../main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitmergeinfo b/.gitmergeinfo index 34db7bf..9806ff9 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -48,6 +48,7 @@ B 9196f3364085c9f9ba6319d7b068d44206b0e290 B 930e6e5cbd64279a356560100090f04d81941182 B 964573a4d386339fd38a21885317ddfe338fd7a6 B 997eed0a4bc68445fe46dcf093548e04b17e1566 +B 9c48667915c34d2e8960d9f11be5b6b7d824ff24 B 9d97e0d5b7f4e0ed3ebf531b389b38f6f3c111ed B 9fd3ec99d73449779915279cd8bdabe484c29fda B a50d2d81dd7d620061ac21b6df7943ad5c6c92cc @@ -63,6 +64,7 @@ B de03dfae71010bd3719430d8d7453732f4c151ea B de393404c3c2e6b0f2d93f11f5fef0c53385d57d B e6d432be93022b5b4ac1998a546d0652861fdff3 B ef7f9b1d16ec71ea1186701e20818607ce7d2bba +B eff15d982722111d5da87591bd115cefefe944df B f0ad8c3079c37c7f1b9eaf0be0ee42ff5ddf5325 B f54062eb331fcf35d9f3a840f532417fccbb2673 B f9f5d45bbe302697224128d78e8b698928a7514d @@ -90,5 +92,6 @@ M c1b729ea9f0c43e6560099dbc427751fe33ee088 M d5b612c220bab496c3dab1731e56b3fea36c1b07 M d875ceee917237f5c344df989947aff025d45d4f M e1b81269089d6e7cb53e949a9fde629d37bce421 +M e72ad770c9a8f4439b93e2c19e61c43562ac5877 M f3e2a52faec1210b1a45eaa36e3812ca03a4969d M f6ee8880f961974da0aa2406d415627f6a382aaa diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java index f0c19a0..acb0e11 100644 --- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java +++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java @@ -610,15 +610,15 @@ public abstract class AbstractCodegenMoho extends AbstractMojo { cmd.getShell().setQuotedArgumentsEnabled(true); // for JVM args cmd.setWorkingDirectory(project.getBuild().getDirectory()); - String javaPath = getJavaExecutable().getAbsolutePath(); try { + String javaPath = getJavaExecutable().getAbsolutePath(); cmd.setExecutable(javaPath); + setJvmForkArgs(javaPath); } catch (IOException e) { getLog().debug(e); throw new MojoExecutionException(e.getMessage(), e); } - setJvmForkArgs(javaPath); cmd.createArg().setLine(additionalJvmArgs); File file = null;
