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
commit f28c5bf4452322b0d597e9dc789b8a558a2db179 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Wed Jun 19 11:30:53 2019 +0200 CAMEL-13663: camel-main-maven-plugin to generte spring-boot tooling metadata to fool Java editors to have code completions for Camel Main application.properties files. --- .../camel/main/DefaultConfigurationProperties.java | 4 ---- examples/camel-example-main-artemis/pom.xml | 13 +++++++------ .../META-INF/spring-configuration-metadata.json | 22 ---------------------- 3 files changed, 7 insertions(+), 32 deletions(-) diff --git a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationProperties.java index 800fad9..0c8b011 100644 --- a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationProperties.java +++ b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationProperties.java @@ -611,8 +611,6 @@ public abstract class DefaultConfigurationProperties<T> { * Multiple patterns can be separated by comma, for example to exclude both foo and bar routes, use: exclude=foo*,bar* * * Exclude takes precedence over include. - * - * @param include the include pattern */ public void setRouteFilterIncludePattern(String include) { this.routeFilterIncludePattern = include; @@ -636,8 +634,6 @@ public abstract class DefaultConfigurationProperties<T> { * Multiple patterns can be separated by comma, for example to exclude both foo and bar routes, use: exclude=foo*,bar* * * Exclude takes precedence over include. - * - * @param exclude the exclude pattern */ public void setRouteFilterExcludePattern(String exclude) { this.routeFilterExcludePattern = exclude; diff --git a/examples/camel-example-main-artemis/pom.xml b/examples/camel-example-main-artemis/pom.xml index 0ef866f..ccf1cc0 100644 --- a/examples/camel-example-main-artemis/pom.xml +++ b/examples/camel-example-main-artemis/pom.xml @@ -40,12 +40,12 @@ <dependencies> <!-- Spring Boot --> - <!-- <dependency> --> - <!-- <groupId>org.springframework.boot</groupId> --> - <!-- <artifactId>spring-boot-starter</artifactId> --> - <!-- <scope>provided</scope> --> - <!-- <optional>true</optional> --> - <!-- </dependency> --> +<!-- <dependency>--> +<!-- <groupId>org.springframework.boot</groupId>--> +<!-- <artifactId>spring-boot-starter</artifactId>--> +<!-- <scope>provided</scope>--> +<!-- <optional>true</optional>--> +<!-- </dependency>--> <dependency> <groupId>org.apache.camel</groupId> @@ -124,6 +124,7 @@ <id>generate</id> <goals> <goal>autowire</goal> + <goal>spring-boot-tooling</goal> </goals> <phase>process-classes</phase> </execution> diff --git a/examples/camel-example-main-artemis/src/main/resources/META-INF/spring-configuration-metadata.json b/examples/camel-example-main-artemis/src/main/resources/META-INF/spring-configuration-metadata.json deleted file mode 100644 index 8381531..0000000 --- a/examples/camel-example-main-artemis/src/main/resources/META-INF/spring-configuration-metadata.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "properties": [ - { - "name": "camel.main.name", - "type": "java.lang.String", - "description": "Sets the main name of the CamelContext.", - "sourceType": "org.apache.camel.spring.boot.CamelConfigurationProperties" - }, - { - "name": "camel.main.jmx-enabled", - "type": "java.lang.Boolean", - "description": "Whether to JMX is enabled or not", - "sourceType": "org.apache.camel.spring.boot.CamelConfigurationProperties" - }, - { - "name": "camel.main.foo", - "type": "java.lang.Boolean", - "description": "Whether foo is there", - "sourceType": "org.apache.camel.spring.boot.CamelConfigurationProperties" - } - ] -} \ No newline at end of file