This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8d4ca26e1bbd89023eb6a3cc2545eb8b3d8daed9 Author: Claus Ibsen <[email protected]> AuthorDate: Mon Jan 10 10:41:20 2022 +0100 Remove deprecated spring-javaconfig from camel-maven-plugin --- .../main/java/org/apache/camel/maven/RunMojo.java | 30 +--------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java index 2c85623..6f290a8 100644 --- a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java +++ b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java @@ -170,18 +170,6 @@ public class RunMojo extends AbstractExecMojo { private String mainClass; /** - * The basedPackages that spring java config want to gets. - */ - @Parameter(property = "camel.basedPackages") - private String basedPackages; - - /** - * The configClasses that spring java config want to gets. - */ - @Parameter(property = "camel.configClasses") - private String configClasses; - - /** * The classpath based application context uri that spring want to gets. */ @Parameter(property = "camel.applicationContextUri") @@ -312,8 +300,6 @@ public class RunMojo extends AbstractExecMojo { getLog().info("You can skip tests from the command line using: mvn " + goal() + " -Dmaven.test.skip=true"); } - boolean usingSpringJavaConfigureMain = false; - boolean useCdiMain; if (useCDI != null) { // use configured value @@ -345,17 +331,6 @@ public class RunMojo extends AbstractExecMojo { args.add(fileApplicationContextUri); } - if (configClasses != null) { - args.add("-cc"); - args.add(configClasses); - usingSpringJavaConfigureMain = true; - } - if (basedPackages != null) { - args.add("-bp"); - args.add(basedPackages); - usingSpringJavaConfigureMain = true; - } - if (!duration.equals("-1")) { args.add("-d"); args.add(duration); @@ -372,10 +347,7 @@ public class RunMojo extends AbstractExecMojo { args.addAll(Arrays.asList(arguments)); } - if (usingSpringJavaConfigureMain) { - mainClass = "org.apache.camel.spring.javaconfig.Main"; - getLog().info("Using org.apache.camel.spring.javaconfig.Main to initiate a CamelContext"); - } else if (useCdiMain) { + if (useCdiMain) { mainClass = "org.apache.camel.cdi.Main"; // must include plugin dependencies for cdi extraPluginDependencyArtifactId = "camel-cdi";
