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 2019/01/12 12:54:02 UTC
[camel] 01/02: CAMEL-13052: Remove deprecated connector stuff
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 005bd727589eb4a670afbe620df63d47bd59f952
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Jan 12 13:28:37 2019 +0100
CAMEL-13052: Remove deprecated connector stuff
---
pom.xml | 4 ----
.../camel/maven/packaging/SpringBootAutoConfigurationMojo.java | 2 +-
.../java/org/apache/camel/maven/packaging/ValidateComponentMojo.java | 5 -----
3 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index d96b05d..cf1953f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -272,10 +272,6 @@
<exclude>**/npm-shrinkwrap.json</exclude>
<exclude>**/package.json</exclude>
<exclude>**/user-manual/**</exclude>
- <!-- camel connector -->
- <exclude>**/camel-connector.json</exclude>
- <exclude>**/camel-connector-schema.json</exclude>
- <exclude>**/src/main/resources/META-INF/MANIFEST.MF</exclude>
<!-- examples -->
<exclude>**/fabric8/*.yaml</exclude>
<exclude>**/src/main/resources/consul/services.json</exclude>
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
index a390ecd..3aa2cad 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
@@ -145,7 +145,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractMojo {
private static final List<String> JAVA_LANG_TYPES = Arrays.asList("Boolean", "Byte", "Character", "Class", "Double", "Float", "Integer", "Long", "Object", "Short", "String");
- private static final String[] IGNORE_MODULES = {/* Non-standard -> */ "camel-grape", "camel-connector"};
+ private static final String[] IGNORE_MODULES = {/* Non-standard -> */ "camel-grape"};
/**
* The output directory for generated component schema file
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ValidateComponentMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ValidateComponentMojo.java
index 17a1064..0afe2fb 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ValidateComponentMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ValidateComponentMojo.java
@@ -146,11 +146,6 @@ public class ValidateComponentMojo extends AbstractMojo {
return false;
}
- // skip connector metadata
- if ("camel-connector-schema.json".equals(pathname.getName()) || "camel-component-schema.json".equals(pathname.getName())) {
- return false;
- }
-
if (pathname.isFile() && pathname.getName().endsWith(".json")) {
// must be a components json file
try {