[CAMEL-8533] camel-ognl exposes servicemix ognl bundle
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8098936f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8098936f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8098936f Branch: refs/heads/master Commit: 8098936f522eab2dce5f9684458d5c2b5f96ded9 Parents: 3f96515 Author: Thomas Diesler <[email protected]> Authored: Mon Mar 23 14:20:54 2015 +0100 Committer: Claus Ibsen <[email protected]> Committed: Mon Mar 23 14:40:01 2015 +0100 ---------------------------------------------------------------------- components/camel-ognl/pom.xml | 16 ++-------------- parent/pom.xml | 10 ++++++++-- .../karaf/features/src/main/resources/features.xml | 2 +- 3 files changed, 11 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/8098936f/components/camel-ognl/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-ognl/pom.xml b/components/camel-ognl/pom.xml index 742800b..0e5a173 100644 --- a/components/camel-ognl/pom.xml +++ b/components/camel-ognl/pom.xml @@ -42,22 +42,10 @@ <artifactId>camel-core</artifactId> </dependency> <dependency> - <groupId>org.apache.servicemix.bundles</groupId> - <artifactId>org.apache.servicemix.bundles.ognl</artifactId> - <exclusions> - <exclusion> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - </exclusion> - </exclusions> + <groupId>ognl</groupId> + <artifactId>ognl</artifactId> </dependency> - <dependency> - <groupId>org.apache.servicemix.bundles</groupId> - <artifactId>org.apache.servicemix.bundles.javassist</artifactId> - <version>${javassist-bundle-version}</version> - </dependency> - <!-- testing --> <dependency> <groupId>org.apache.camel</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/8098936f/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 688d439..3fc5df4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -361,7 +361,8 @@ <openwebbeans-version>1.2.0</openwebbeans-version> <olingo2-version>2.0.0</olingo2-version> <olingo-odata2-core-bundle-version>2.0.0_1</olingo-odata2-core-bundle-version> - <ognl-version>3.0.8_1</ognl-version> + <ognl-version>3.0.8</ognl-version> + <ognl-bundle-version>3.0.8_1</ognl-bundle-version> <oncrpc-version>1.1.2</oncrpc-version> <openejb-version>4.6.0.2</openejb-version> <openjpa-version>2.3.0</openjpa-version> @@ -2210,9 +2211,14 @@ <!-- optional ognl support --> <dependency> + <groupId>ognl</groupId> + <artifactId>ognl</artifactId> + <version>${ognl-version}</version> + </dependency> + <dependency> <groupId>org.apache.servicemix.bundles</groupId> <artifactId>org.apache.servicemix.bundles.ognl</artifactId> - <version>${ognl-version}</version> + <version>${ognl-bundle-version}</version> </dependency> <!-- optional Pax support --> http://git-wip-us.apache.org/repos/asf/camel/blob/8098936f/platforms/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 547784c..b7d8d3a 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1036,7 +1036,7 @@ </feature> <feature name='camel-ognl' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> - <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ognl/${ognl-version}</bundle> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ognl/${ognl-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javassist/${javassist-bundle-version}</bundle> <bundle>mvn:org.apache.camel/camel-ognl/${project.version}</bundle> </feature>
