Repository: cxf-fediz
Updated Branches:
refs/heads/1.1.x-fixes 7c335e2b3 -> 2af501c5e
Upgrading SLF4J
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/2af501c5
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/2af501c5
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/2af501c5
Branch: refs/heads/1.1.x-fixes
Commit: 2af501c5e70ea4458ddd33d08631d330e7b27bd5
Parents: 7c335e2
Author: Colm O hEigeartaigh <[email protected]>
Authored: Fri Dec 19 12:42:01 2014 +0000
Committer: Colm O hEigeartaigh <[email protected]>
Committed: Fri Dec 19 12:48:55 2014 +0000
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/2af501c5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 62540ce..ccbc3c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
<ognl.version>3.0.8</ognl.version>
<openjpa.version>2.3.0</openjpa.version>
<servlet.version>2.5</servlet.version>
- <slf4j.version>1.7.7</slf4j.version>
+ <slf4j.version>1.7.9</slf4j.version>
<spring.version>3.1.4.RELEASE</spring.version>
<spring.security.version>3.1.4.RELEASE</spring.security.version>
<tomcat.version>7.0.54</tomcat.version>
