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 2020/04/09 08:59:56 UTC
[camel] branch master updated: CAMEL-14864: Only generate
configurer in core for core-engine and main.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new db60213 CAMEL-14864: Only generate configurer in core for core-engine and main.
db60213 is described below
commit db60213841ffaefa2f4f1966f4ff48bc103ac826
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Apr 9 10:42:09 2020 +0200
CAMEL-14864: Only generate configurer in core for core-engine and main.
---
core/camel-core-engine/pom.xml | 2 +-
core/camel-main/pom.xml | 19 +++++++++++++++++++
.../apache/camel/maven/packaging/GenerateMojo.java | 2 --
3 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/core/camel-core-engine/pom.xml b/core/camel-core-engine/pom.xml
index 54c2ee1..dc2e7fe 100644
--- a/core/camel-core-engine/pom.xml
+++ b/core/camel-core-engine/pom.xml
@@ -128,9 +128,9 @@
<goals>
<goal>generate-configurer</goal>
</goals>
- <!-- we want to have configurer for ExtendedCamelContext in camel-core-engine -->
<configuration>
<discoverClasses>false</discoverClasses>
+ <!-- we want to have configurer for ExtendedCamelContext in camel-core-engine -->
<classes>org.apache.camel.ExtendedCamelContext</classes>
</configuration>
</execution>
diff --git a/core/camel-main/pom.xml b/core/camel-main/pom.xml
index bcd57da..8d4fdb2 100644
--- a/core/camel-main/pom.xml
+++ b/core/camel-main/pom.xml
@@ -128,4 +128,23 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <!-- we need to generate additional configurer classes from camel-main -->
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-package-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-configurer</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>generate-configurer</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
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 65303b5..dba8ac7 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
@@ -46,8 +46,6 @@ public class GenerateMojo extends AbstractGenerateMojo {
invoke(EndpointSchemaGeneratorMojo.class);
// prepare-components
invoke(PrepareComponentMojo.class);
- // generate-configurer
- invoke(GenerateConfigurerMojo.class);
// prepare-main
invoke(PrepareCamelMainMojo.class);
// generate-xml-parser