You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pp...@apache.org on 2023/06/23 13:37:45 UTC

[camel] 04/18: Do not fork cxf-codegen-plugin

This is an automated email from the ASF dual-hosted git repository.

ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit c2ea1c1f50722c283fed59e13c0619befcdd51ad
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Sat Jun 17 22:46:15 2023 +0200

    Do not fork cxf-codegen-plugin
---
 camel-dependencies/pom.xml                              | 2 --
 components/camel-cxf/camel-cxf-soap/pom.xml             | 2 --
 components/camel-cxf/camel-cxf-spring-soap/pom.xml      | 2 --
 components/camel-cxf/camel-cxf-spring-transport/pom.xml | 2 --
 components/camel-cxf/camel-cxf-transport/pom.xml        | 2 --
 components/camel-jmx/pom.xml                            | 2 --
 components/camel-soap/pom.xml                           | 6 ------
 parent/pom.xml                                          | 2 --
 tests/camel-itest/pom.xml                               | 2 --
 9 files changed, 22 deletions(-)

diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 29032c87b21..ca63e47dd0a 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -39,8 +39,6 @@
     <!-- sync properties here from parent/pom.xml -->
     <properties>
         <maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
-        <cxf.codegenplugin.forkmode>true</cxf.codegenplugin.forkmode>
-        <cxf.codegen.jvmArgs />
         <camel.surefire.fork.vmargs>-XX:+ExitOnOutOfMemoryError -XX:+HeapDumpOnOutOfMemoryError</camel.surefire.fork.vmargs>
         <camel.surefire.forkCount>1</camel.surefire.forkCount>
         <camel.surefire.forkTimeout>600</camel.surefire.forkTimeout>
diff --git a/components/camel-cxf/camel-cxf-soap/pom.xml b/components/camel-cxf/camel-cxf-soap/pom.xml
index c3538ae0101..1defc5f139e 100644
--- a/components/camel-cxf/camel-cxf-soap/pom.xml
+++ b/components/camel-cxf/camel-cxf-soap/pom.xml
@@ -288,8 +288,6 @@
                         <id>generate-sources</id>
                         <phase>generate-sources</phase>
                         <configuration>
-                            <fork>${cxf.codegenplugin.forkmode}</fork>
-                            <additionalJvmArgs>${cxf.codegen.jvmArgs}</additionalJvmArgs>
                             <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
                             <defaultOptions>
                                 <frontEnd>jaxws</frontEnd>
diff --git a/components/camel-cxf/camel-cxf-spring-soap/pom.xml b/components/camel-cxf/camel-cxf-spring-soap/pom.xml
index 3099abc7220..8c8d5371230 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/pom.xml
+++ b/components/camel-cxf/camel-cxf-spring-soap/pom.xml
@@ -322,8 +322,6 @@
                         <id>generate-sources</id>
                         <phase>generate-sources</phase>
                         <configuration>
-                            <fork>${cxf.codegenplugin.forkmode}</fork>
-                            <additionalJvmArgs>${cxf.codegen.jvmArgs}</additionalJvmArgs>
                             <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
                             <defaultOptions>
                                 <frontEnd>jaxws</frontEnd>
diff --git a/components/camel-cxf/camel-cxf-spring-transport/pom.xml b/components/camel-cxf/camel-cxf-spring-transport/pom.xml
index 92ac84e30a0..82825e03804 100644
--- a/components/camel-cxf/camel-cxf-spring-transport/pom.xml
+++ b/components/camel-cxf/camel-cxf-spring-transport/pom.xml
@@ -89,8 +89,6 @@
                         <id>generate-test-sources</id>
                         <phase>generate-sources</phase>
                         <configuration>
-                            <fork>${cxf.codegenplugin.forkmode}</fork>
-                            <additionalJvmArgs>${cxf.codegen.jvmArgs}</additionalJvmArgs>
                             <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
                             <defaultOptions>
                                 <frontEnd>jaxws</frontEnd>
diff --git a/components/camel-cxf/camel-cxf-transport/pom.xml b/components/camel-cxf/camel-cxf-transport/pom.xml
index c5577d86929..938ca2e10d2 100644
--- a/components/camel-cxf/camel-cxf-transport/pom.xml
+++ b/components/camel-cxf/camel-cxf-transport/pom.xml
@@ -106,8 +106,6 @@
                         <id>generate-test-sources</id>
                         <phase>generate-sources</phase>
                         <configuration>
-                            <fork>${cxf.codegenplugin.forkmode}</fork>
-                            <additionalJvmArgs>${cxf.codegen.jvmArgs}</additionalJvmArgs>
                             <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
                             <defaultOptions>
                                 <frontEnd>jaxws</frontEnd>
diff --git a/components/camel-jmx/pom.xml b/components/camel-jmx/pom.xml
index 6a43383dbf8..4ca337b01aa 100644
--- a/components/camel-jmx/pom.xml
+++ b/components/camel-jmx/pom.xml
@@ -119,8 +119,6 @@
                         <id>generate-sources</id>
                         <phase>generate-sources</phase>
                         <configuration>
-                            <fork>${cxf.codegenplugin.forkmode}</fork>
-                            <additionalJvmArgs>${cxf.xjc.jvmArgs}</additionalJvmArgs>
                             <sourceRoot>${basedir}/target/xjc</sourceRoot>
                             <xsdOptions>
                                 <xsdOption>
diff --git a/components/camel-soap/pom.xml b/components/camel-soap/pom.xml
index 443c8228756..b819b5fa6d4 100644
--- a/components/camel-soap/pom.xml
+++ b/components/camel-soap/pom.xml
@@ -136,8 +136,6 @@
                             <goal>xsdtojava-tests</goal>
                         </goals>
                         <configuration>
-                            <fork>${cxf.codegenplugin.forkmode}</fork>
-                            <additionalJvmArgs>${cxf.xjc.jvmArgs}</additionalJvmArgs>
                             <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
                             <xsdOptions>
                                 <xsdOption>
@@ -165,8 +163,6 @@
                         <id>generate-sources</id>
                         <phase>generate-sources</phase>
                         <configuration>
-                            <fork>${cxf.codegenplugin.forkmode}</fork>
-                            <additionalJvmArgs>${cxf.xjc.jvmArgs}</additionalJvmArgs>
                             <sourceRoot>${basedir}/target/xjc</sourceRoot>
                             <extensions>
                                 <extension>net.java.dev.jaxb2-commons:jaxb-fluent-api:2.1.8</extension>
@@ -206,8 +202,6 @@
                         <id>generate-sources-wsdl</id>
                         <phase>generate-sources</phase>
                         <configuration>
-                            <fork>${cxf.codegenplugin.forkmode}</fork>
-                            <additionalJvmArgs>${cxf.codegen.jvmArgs}</additionalJvmArgs>
                             <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
                             <defaultOptions>
                                 <frontEnd>jaxws</frontEnd>
diff --git a/parent/pom.xml b/parent/pom.xml
index e201dff0a42..76a121bf7e2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -34,8 +34,6 @@
 
     <properties>
         <maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
-        <cxf.codegenplugin.forkmode>true</cxf.codegenplugin.forkmode>
-        <cxf.codegen.jvmArgs />
         <camel.surefire.fork.vmargs>-XX:+ExitOnOutOfMemoryError -XX:+HeapDumpOnOutOfMemoryError</camel.surefire.fork.vmargs>
         <camel.surefire.forkCount>1</camel.surefire.forkCount>
         <camel.surefire.forkTimeout>600</camel.surefire.forkTimeout>
diff --git a/tests/camel-itest/pom.xml b/tests/camel-itest/pom.xml
index 768d40c97df..25a15e2b974 100644
--- a/tests/camel-itest/pom.xml
+++ b/tests/camel-itest/pom.xml
@@ -422,8 +422,6 @@
                         <id>generate-test-sources</id>
                         <phase>generate-sources</phase>
                         <configuration>
-                            <fork>${cxf.codegenplugin.forkmode}</fork>
-                            <additionalJvmArgs>-Dlog4j.configurationFile=${project.basedir}/src/test/resources/log4j2.properties ${cxf.codegen.jvmArgs}</additionalJvmArgs>
                             <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
                             <wsdlOptions>
                                 <wsdlOption>