You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2021/12/21 15:35:37 UTC
[camel] 03/08: CAMEL-17194: endpointdsl - Prepare for generate only once during project build.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 038e4c8d634982d0166027b4ab57ec1b8c5958ff
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 21 15:10:05 2021 +0100
CAMEL-17194: endpointdsl - Prepare for generate only once during project build.
---
dsl/camel-endpointdsl/pom.xml | 37 +++++++++++++++++++++-
.../maven/packaging/GenerateComponentMojo.java | 4 ---
.../apache/camel/maven/packaging/GenerateMojo.java | 4 ---
3 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/dsl/camel-endpointdsl/pom.xml b/dsl/camel-endpointdsl/pom.xml
index 380e13f..57cc91e 100644
--- a/dsl/camel-endpointdsl/pom.xml
+++ b/dsl/camel-endpointdsl/pom.xml
@@ -33,7 +33,6 @@
<description>The Camel Endpoint DSL</description>
<properties>
- <camel-generate-endpoint-dsl>true</camel-generate-endpoint-dsl>
<camel.osgi.import>
javax.xml.bind*;version="[2.2,3.0)",
*
@@ -111,6 +110,42 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-package-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate</id>
+ <goals>
+ <goal>generate-endpoint-dsl</goal>
+ </goals>
+ <phase>generate-sources</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>initialize</phase>
+ <goals>
+ <goal>add-source</goal>
+ <goal>add-resource</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/generated/java</source>
+ </sources>
+ <resources>
+ <resource>
+ <directory>src/generated/resources</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<!-- The non generated code depends on the generated code,
so skip the first compilation phase -->
<artifactId>maven-compiler-plugin</artifactId>
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateComponentMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateComponentMojo.java
index 765b078..c5de00d 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateComponentMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateComponentMojo.java
@@ -52,10 +52,6 @@ public class GenerateComponentMojo extends AbstractGenerateMojo {
invoke(PrepareComponentMojo.class);
// validate-components
invoke(ValidateComponentMojo.class);
- // generate-endpoint-dsl
- invoke(EndpointDslMojo.class);
- // generate-component-dsl
- invoke(ComponentDslMojo.class);
}
}
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 f77da4d..880ded0 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
@@ -62,10 +62,6 @@ public class GenerateMojo extends AbstractGenerateMojo {
invoke(PackageLegalMojo.class);
// validate-components
invoke(ValidateComponentMojo.class);
- // generate-endpoint-dsl
- invoke(EndpointDslMojo.class);
- // generate-component-dsl
- invoke(ComponentDslMojo.class);
// update-readme
invoke(UpdateReadmeMojo.class);
}