cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject git commit: Upgrade to javassist 3.1.16-GA
Date Mon, 26 May 2014 14:23:34 GMT
Repository: cxf-fediz
Updated Branches:
  refs/heads/master 2f433d1e7 -> 1770ee8c7


Upgrade to javassist 3.1.16-GA


Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/1770ee8c
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/1770ee8c
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/1770ee8c

Branch: refs/heads/master
Commit: 1770ee8c7a006c3b430194a788c33968985d5bda
Parents: 2f433d1
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:23:20 2014 +0100

----------------------------------------------------------------------
 pom.xml              |  2 ++
 services/idp/pom.xml | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/1770ee8c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7532416..d16fc27 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.8.1</ehcache.version>
         <httpclient.version>4.3.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.7</slf4j.version>
         <spring.version>3.1.4.RELEASE</spring.version>

http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/1770ee8c/services/idp/pom.xml
----------------------------------------------------------------------
diff --git a/services/idp/pom.xml b/services/idp/pom.xml
index 0174863..6c9235d 100644
--- a/services/idp/pom.xml
+++ b/services/idp/pom.xml
@@ -113,7 +113,19 @@
         <dependency>
             <groupId>ognl</groupId>
             <artifactId>ognl</artifactId>
-            <version>3.0.5</version>
+            <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>


Mime
View raw message