Repository: cxf-fediz
Updated Branches:
refs/heads/1.1.x-fixes 5d3b28669 -> 51007f26a
Upgrade to javassist 3.1.16-GA
Conflicts:
pom.xml
services/idp/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/51007f26
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/51007f26
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/51007f26
Branch: refs/heads/1.1.x-fixes
Commit: 51007f26a86bec20ee8288857b4c4fc0f19b3896
Parents: 5d3b286
Author: Colm O hEigeartaigh <[email protected]>
Authored: Mon May 26 15:23:20 2014 +0100
Committer: Colm O hEigeartaigh <[email protected]>
Committed: Mon May 26 15:29:30 2014 +0100
----------------------------------------------------------------------
pom.xml | 2 ++
services/idp/pom.xml | 20 ++++++++++++++++----
2 files changed, 18 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/51007f26/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f2e2a30..3f6077c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,11 +38,13 @@
<cxf.build-utils.version>2.6.0</cxf.build-utils.version>
<ehcache.version>2.5.1</ehcache.version>
<httpclient.version>4.2.2</httpclient.version>
+ <javassist.version>3.16.1-GA</javassist.version>
<jericho.version>3.2</jericho.version>
<jetty.version>8.1.12.v20130726</jetty.version>
<!--<jetty.version>7.6.8.v20121106</jetty.version>-->
<junit.version>4.11</junit.version>
<log4j.version>1.2.17</log4j.version>
+ <ognl.version>3.0.8</ognl.version>
<servlet.version>2.5</servlet.version>
<slf4j.version>1.7.5</slf4j.version>
<spring.version>3.1.4.RELEASE</spring.version>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/51007f26/services/idp/pom.xml
----------------------------------------------------------------------
diff --git a/services/idp/pom.xml b/services/idp/pom.xml
index 2123987..859787b 100644
--- a/services/idp/pom.xml
+++ b/services/idp/pom.xml
@@ -89,10 +89,22 @@
<version>${spring.security.version}</version>
</dependency>
<dependency>
- <groupId>ognl</groupId>
- <artifactId>ognl</artifactId>
- <version>3.0.5</version>
- <scope>runtime</scope>
+ <groupId>ognl</groupId>
+ <artifactId>ognl</artifactId>
+ <version>${ognl.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>${javassist.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
