Repository: camel Updated Branches: refs/heads/master 9a0a2e234 -> f785c25ce
CAMEL-10959: add RuntimeCamelCatalog to camel-core so we can reuse more catalog logic at runtime and have camel-catalog for tooling that has the complete catalog content. We need the runtime for component health check and more in the future. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f785c25c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f785c25c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f785c25c Branch: refs/heads/master Commit: f785c25ceadd5955b756b62cf259f52d2c98b8ec Parents: 9a0a2e2 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Mar 9 07:46:12 2017 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Mar 9 07:46:12 2017 +0100 ---------------------------------------------------------------------- camel-core/pom.xml | 27 --------------------------- platforms/camel-catalog/pom.xml | 6 +----- 2 files changed, 1 insertion(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f785c25c/camel-core/pom.xml ---------------------------------------------------------------------- diff --git a/camel-core/pom.xml b/camel-core/pom.xml index 2b7ae8a..222bb00 100644 --- a/camel-core/pom.xml +++ b/camel-core/pom.xml @@ -233,33 +233,6 @@ <plugins> - <!-- Inline the contents of camel-catalog-core into this jar. --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.10</version> - <executions> - <execution> - <id>unpack</id> - <phase>process-sources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.camel</groupId> - <artifactId>camel-catalog-core</artifactId> - <version>${project.version}</version> - <includes>org/apache/camel/catalog/**</includes> - <outputDirectory>${project.build.directory}/classes</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <!-- shade caffeine cache for faster Camel and spi-annotations as needed by everybody --> <plugin> <groupId>org.apache.maven.plugins</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/f785c25c/platforms/camel-catalog/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/camel-catalog/pom.xml b/platforms/camel-catalog/pom.xml index 2f2f56f..2be82e0 100644 --- a/platforms/camel-catalog/pom.xml +++ b/platforms/camel-catalog/pom.xml @@ -30,11 +30,6 @@ <name>Camel :: Platforms :: Camel Catalog</name> <description>Camel Catalog</description> - <!-- the src/main/java folder is empty and that is on purpose, as the source code is in tooling/camel-catalog-core - and is copied into this JAR at build time so we can reuse the same code in both camel-core and camel-catalog. - For camel-core it allows us to use the catalog APIs at runtime, and for camel-catalog it is a 100% standalone - JAR with all the json files embedded for tooling to use. --> - <dependencies> <!-- no dependency --> @@ -107,6 +102,7 @@ <resources> <resource> <directory>../../camel-core/src/main/java/org/apache/camel/catalog</directory> + <!-- the following files are maintained in camel-core and not here, so they are copied over --> <includes> <include>AbstractCamelCatalog.java</include> <include>CatalogHelper.java</include>
