You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2020/02/12 02:45:20 UTC
[camel] 10/18: Fix generation process
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6894ca032ee151795c5ad057585889e8804c1ce6
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Feb 11 13:11:32 2020 +0100
Fix generation process
---
components/camel-spring/pom.xml | 19 -------------------
.../apache/camel/maven/packaging/GenerateMojo.java | 2 ++
.../maven/packaging/ModelXmlParserGeneratorMojo.java | 11 +++++++++++
3 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index a082025..b2e24e0 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -320,25 +320,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-package-maven-plugin</artifactId>
- <version>${project.version}</version>
- <executions>
- <execution>
- <id>generate</id>
- <goals>
- <goal>jandex</goal>
- <goal>generate-schema</goal>
- <goal>generate-spi</goal>
- <goal>prepare-components</goal>
- <goal>generate-components-list</goal>
- <goal>generate-jaxb-list</goal>
- </goals>
- <phase>process-classes</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateMojo.java
index dba8ac7..ca35ccdb 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateMojo.java
@@ -60,6 +60,8 @@ public class GenerateMojo extends AbstractGenerateMojo {
invoke(ComponentDslMojo.class);
// update-readme
invoke(UpdateReadmeMojo.class);
+ // generate-xml-parser
+ invoke(ModelXmlParserGeneratorMojo.class);
}
}
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java
index 9d90ec1..7b543bb 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java
@@ -64,16 +64,20 @@ import org.apache.camel.tooling.util.srcgen.GenericType;
import org.apache.camel.tooling.util.srcgen.JavaClass;
import org.apache.maven.artifact.DependencyResolutionRequiredException;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.MavenProjectHelper;
import org.jboss.jandex.AnnotationInstance;
import org.jboss.jandex.AnnotationTarget;
import org.jboss.jandex.ClassInfo;
import org.jboss.jandex.DotName;
import org.jboss.jandex.Index;
import org.jboss.jandex.IndexReader;
+import org.sonatype.plexus.build.incremental.BuildContext;
/**
* Generate Model lightweight XML Parser source code.
@@ -100,6 +104,13 @@ public class ModelXmlParserGeneratorMojo extends AbstractGeneratorMojo {
private Class<?> dataFormatDefinitionClass;
@Override
+ public void execute(MavenProject project, MavenProjectHelper projectHelper, BuildContext buildContext) throws MojoFailureException, MojoExecutionException {
+ sourcesOutputDir = new File(project.getBasedir(), "src/generated/java");
+ generateXmlParser = Boolean.parseBoolean(project.getProperties().getProperty("camel-generate-xml-parser", "false"));
+ super.execute(project, projectHelper, buildContext);
+ }
+
+ @Override
public void execute() throws MojoExecutionException {
if (!generateXmlParser) {
return;