Return-Path: 
 <commits-return-32445-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
X-Original-To: apmail-cxf-commits-archive@www.apache.org
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 8F6B1FB3F
	for <apmail-cxf-commits-archive@www.apache.org>;
 Mon, 26 May 2014 14:29:39 +0000 (UTC)
Received: (qmail 25460 invoked by uid 500); 26 May 2014 14:29:39 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 25396 invoked by uid 500); 26 May 2014 14:29:39 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 25389 invoked by uid 99); 26 May 2014 14:29:39 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 May 2014 14:29:39 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 367F29A5776; Mon, 26 May 2014 14:29:39 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: coheigea@apache.org
To: commits@cxf.apache.org
Message-Id: <2a5b277459b241c5b1393afa25cc0976@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: Upgrade to javassist 3.1.16-GA
Date: Mon, 26 May 2014 14:29:39 +0000 (UTC)

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 <coheigea@apache.org>
Authored: Mon May 26 15:23:20 2014 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
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>