Updated Branches: refs/heads/master 928815296 -> db9fb33df
CAMEL-6673: Shade spi-annotations JAR into camel-core as its runtime required. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/db9fb33d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/db9fb33d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/db9fb33d Branch: refs/heads/master Commit: db9fb33dfa94cebb1bb3899051bba13d1da5843f Parents: 9288152 Author: Claus Ibsen <[email protected]> Authored: Tue Aug 27 12:32:50 2013 +0200 Committer: Claus Ibsen <[email protected]> Committed: Tue Aug 27 13:02:24 2013 +0200 ---------------------------------------------------------------------- camel-core/pom.xml | 29 ++++++++++++-------- .../camel-salesforce-component/pom.xml | 5 ---- tooling/spi-annotations/pom.xml | 7 +---- 3 files changed, 19 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/db9fb33d/camel-core/pom.xml ---------------------------------------------------------------------- diff --git a/camel-core/pom.xml b/camel-core/pom.xml index 42109b9..3c29f3b 100755 --- a/camel-core/pom.xml +++ b/camel-core/pom.xml @@ -101,18 +101,24 @@ <dependencies> <!-- required dependencies by camel-core --> + <!-- which we shade into camel-core so its available for everybody out of the box --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>spi-annotations</artifactId> <version>${project.version}</version> <optional>true</optional> + <scope>provided</scope> </dependency> + <!-- required dependencies by camel-core --> + <!-- which we shade into camel-core so its available for everybody out of the box --> <dependency> <groupId>com.googlecode.concurrentlinkedhashmap</groupId> <artifactId>concurrentlinkedhashmap-lru</artifactId> + <scope>provided</scope> </dependency> + <!-- required dependencies by camel-core --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> @@ -120,10 +126,10 @@ <!-- osgi support --> <dependency> - <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - <scope>provided</scope> - <optional>true</optional> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> + <optional>true</optional> </dependency> <!-- testing --> @@ -156,12 +162,12 @@ </dependency> <!-- validator --> - <dependency> - <groupId>xml-resolver</groupId> - <artifactId>xml-resolver</artifactId> - <version>${xml-resolver-version}</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>xml-resolver</groupId> + <artifactId>xml-resolver</artifactId> + <version>${xml-resolver-version}</version> + <scope>test</scope> + </dependency> </dependencies> @@ -169,7 +175,7 @@ <build> <plugins> - <!-- Shade the googlecode stuff for OSGi --> + <!-- shade concurrent hashmap for faster Camel and spi-annotations as needed by everybody --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> @@ -182,6 +188,7 @@ <configuration> <artifactSet> <includes> + <include>org.apache.camel:spi-annotations</include> <include>com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru</include> </includes> <excludes> http://git-wip-us.apache.org/repos/asf/camel/blob/db9fb33d/components/camel-salesforce/camel-salesforce-component/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml b/components/camel-salesforce/camel-salesforce-component/pom.xml index 933e2f5..5d6c831 100644 --- a/components/camel-salesforce/camel-salesforce-component/pom.xml +++ b/components/camel-salesforce/camel-salesforce-component/pom.xml @@ -45,11 +45,6 @@ <artifactId>camel-core</artifactId> </dependency> <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>spi-annotations</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-client</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/db9fb33d/tooling/spi-annotations/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/spi-annotations/pom.xml b/tooling/spi-annotations/pom.xml index b9c5def..f9d5e5c 100644 --- a/tooling/spi-annotations/pom.xml +++ b/tooling/spi-annotations/pom.xml @@ -25,21 +25,16 @@ <version>2.12-SNAPSHOT</version> </parent> + <!-- should not be OSGi bundle as we shade this component into camel-core --> <artifactId>spi-annotations</artifactId> <name>Camel :: SPI Annotations</name> <description>Annotations for Camel Endpoint developers</description> <properties> -<!-- - <camel.osgi.export.pkg> - org.apache.camel.spi*;-noimport:=true - </camel.osgi.export.pkg> ---> </properties> <dependencies> </dependencies> - </project>
