Repository: cxf-fediz
Updated Branches:
refs/heads/1.2.x-fixes e75095cb7 -> accb971e2
Updated some dependencies
Conflicts:
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/accb971e
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/accb971e
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/accb971e
Branch: refs/heads/1.2.x-fixes
Commit: accb971e271c7416254894974105ac221c4e760d
Parents: e75095c
Author: Colm O hEigeartaigh <[email protected]>
Authored: Wed Nov 18 12:49:32 2015 +0000
Committer: Colm O hEigeartaigh <[email protected]>
Committed: Wed Nov 18 15:26:04 2015 +0000
----------------------------------------------------------------------
pom.xml | 14 ++++++++------
services/sts/pom.xml | 2 +-
systests/kerberos/pom.xml | 2 +-
3 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/accb971e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 63abc2f..47c5a1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,26 +42,28 @@
<commons.logging.version>1.2</commons.logging.version>
<cxf.version>3.0.7</cxf.version>
<cxf.build-utils.version>3.0.0</cxf.build-utils.version>
- <easymock.version>3.3</easymock.version>
+ <easymock.version>3.4</easymock.version>
<ecj.version>4.4.2</ecj.version>
<ehcache.version>2.8.5</ehcache.version>
+ <hibernate.version>5.2.2.Final</hibernate.version>
<httpclient.version>4.3.5</httpclient.version>
- <hsqldb.version>2.3.2</hsqldb.version>
+ <hsqldb.version>2.3.3</hsqldb.version>
<htmlunit.version>2.15</htmlunit.version>
- <javassist.version>3.16.1-GA</javassist.version>
+ <javassist.version>3.20.0-GA</javassist.version>
+ <javax.el.version>2.2</javax.el.version>
<javax.validation.version>1.1.0.Final</javax.validation.version>
<jericho.version>3.3</jericho.version>
<jetty.version>8.1.12.v20130726</jetty.version>
<!--<jetty.version>7.6.8.v20121106</jetty.version>-->
<junit.version>4.12</junit.version>
<log4j.version>1.2.17</log4j.version>
- <ognl.version>3.0.8</ognl.version>
+ <ognl.version>3.1.1</ognl.version>
<openjpa.version>2.4.0</openjpa.version>
<servlet.version>2.5</servlet.version>
- <slf4j.version>1.7.12</slf4j.version>
+ <slf4j.version>1.7.13</slf4j.version>
<spring.version>3.2.8.RELEASE</spring.version>
<spring.security.version>3.1.7.RELEASE</spring.security.version>
- <tomcat.version>7.0.64</tomcat.version>
+ <tomcat.version>7.0.65</tomcat.version>
<wss4j.version>2.0.6</wss4j.version>
<xalan.version>2.7.2</xalan.version>
<bval.version>0.5</bval.version>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/accb971e/services/sts/pom.xml
----------------------------------------------------------------------
diff --git a/services/sts/pom.xml b/services/sts/pom.xml
index baaa6a5..1e5ee8f 100644
--- a/services/sts/pom.xml
+++ b/services/sts/pom.xml
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.springframework.ldap</groupId>
<artifactId>spring-ldap-core</artifactId>
- <version>2.0.3.RELEASE</version>
+ <version>2.0.4.RELEASE</version>
<scope>compile</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/accb971e/systests/kerberos/pom.xml
----------------------------------------------------------------------
diff --git a/systests/kerberos/pom.xml b/systests/kerberos/pom.xml
index 818f450..a845252 100644
--- a/systests/kerberos/pom.xml
+++ b/systests/kerberos/pom.xml
@@ -181,7 +181,7 @@
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<scope>test</scope>
- <version>1.52</version>
+ <version>1.53</version>
</dependency>
</dependencies>
