Repository: cxf Updated Branches: refs/heads/2.7.x-fixes a11825e8d -> 46687ecac
[CXF-5925] Making JEXL dependency optional and moving version to parent pom.xml Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3f3bd202 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3f3bd202 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3f3bd202 Branch: refs/heads/2.7.x-fixes Commit: 3f3bd2026a1325d41ee8580b79c767399d024a30 Parents: ed2a2ef Author: Jan Bernhardt <[email protected]> Authored: Tue Aug 5 11:48:16 2014 +0200 Committer: Colm O hEigeartaigh <[email protected]> Committed: Wed Aug 6 16:24:20 2014 +0100 ---------------------------------------------------------------------- parent/pom.xml | 2 +- services/sts/sts-core/pom.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/3f3bd202/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index a5f00fd..0487552 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -188,7 +188,7 @@ <cxf.oro.bundle.version>2.0.8_6</cxf.oro.bundle.version> <cxf.dom4j.bundle.version>1.6.1_5</cxf.dom4j.bundle.version> <cxf.jdom.bundle.version>1.1_4</cxf.jdom.bundle.version> - + <cxf.jexl.version>2.1.1</cxf.jexl.version> <cxf.checkstyle.extension /> <cxf.jaxb.context.class /> http://git-wip-us.apache.org/repos/asf/cxf/blob/3f3bd202/services/sts/sts-core/pom.xml ---------------------------------------------------------------------- diff --git a/services/sts/sts-core/pom.xml b/services/sts/sts-core/pom.xml index 35a240e..f48b033 100644 --- a/services/sts/sts-core/pom.xml +++ b/services/sts/sts-core/pom.xml @@ -110,7 +110,8 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-jexl</artifactId> - <version>2.1.1</version> + <version>${cxf.jexl.version}</version> + <optional>true</optional> </dependency> </dependencies>
