Repository: camel Updated Branches: refs/heads/camel-2.15.x 4a4cdcfa7 -> fdc45ad77 refs/heads/master 3f9651578 -> 8098936f5
[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/fdc45ad7 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fdc45ad7 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fdc45ad7 Branch: refs/heads/camel-2.15.x Commit: fdc45ad77a01726737b76295a7598c4caa61905c Parents: 4a4cdcf Author: Thomas Diesler <[email protected]> Authored: Mon Mar 23 14:20:54 2015 +0100 Committer: Thomas Diesler <[email protected]> Committed: Mon Mar 23 14:23:41 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/fdc45ad7/components/camel-ognl/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-ognl/pom.xml b/components/camel-ognl/pom.xml index 0a4b7a8..4c5b746 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/fdc45ad7/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 7a0d917..e7a85c7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -360,7 +360,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> @@ -2198,9 +2199,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/fdc45ad7/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 10c9581..482aee1 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1031,7 +1031,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>
