This is an automated email from the ASF dual-hosted git repository. oalsafi pushed a commit to branch camel-3.0.x in repository https://gitbox.apache.org/repos/asf/camel.git
commit dc098ae30984ef4284846333f74c9de271779bf6 Author: Omar Al-Safi <omars...@gmail.com> AuthorDate: Thu Nov 28 23:38:24 2019 +0100 CAMEL-14223: Make the file check more tolerant towards the naming --- .../org/apache/camel/builder/endpoint/EndpointBuilderFactory.java | 1 + .../main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java index 61df536..206fd0a 100644 --- a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java +++ b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java @@ -174,6 +174,7 @@ public interface EndpointBuilderFactory extends JcloudsEndpointBuilderFactory, JcrEndpointBuilderFactory, JdbcEndpointBuilderFactory, + JettyHttpEndpointBuilder9Factory, JingEndpointBuilderFactory, JiraEndpointBuilderFactory, JmsEndpointBuilderFactory, diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java index a8a85c0..73932ea 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java @@ -73,8 +73,6 @@ public class EndpointDslMojo extends AbstractMojo { private static final Map<String, Class<?>> PRIMITIVEMAP; - private static final String SUFFIX = "EndpointBuilderFactory"; - static { PRIMITIVEMAP = new HashMap<>(); PRIMITIVEMAP.put("boolean", java.lang.Boolean.class); @@ -514,7 +512,7 @@ public class EndpointDslMojo extends AbstractMojo { // load components return Arrays.asList(allComponentsDslEndpointFactory.listFiles()).stream() - .filter(file -> file.isFile() && file.getName().contains(SUFFIX) && file.exists()) + .filter(file -> file.isFile() && file.getName().endsWith(".java") && file.exists()) .map(file -> file.getName().replace(".java", "")) .sorted() .collect(Collectors.toList());