Repository: cxf Updated Branches: refs/heads/3.0.x-fixes b86ec03bb -> 49cfc390d
Reverting parent pom change Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/49cfc390 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/49cfc390 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/49cfc390 Branch: refs/heads/3.0.x-fixes Commit: 49cfc390dd84a61eb317ff1d9145b51e0d73904a Parents: 4666e2e Author: Colm O hEigeartaigh <[email protected]> Authored: Thu Aug 13 16:58:24 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Thu Aug 13 17:51:00 2015 +0100 ---------------------------------------------------------------------- parent/pom.xml | 6 ------ 1 file changed, 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/49cfc390/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index a47bb73..f101fb9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -137,16 +137,10 @@ <cxf.netty.version.range>[4,5)</cxf.netty.version.range> <cxf.oauth.bundle.version>20100527_1</cxf.oauth.bundle.version> <cxf.oauth.version>20100527</cxf.oauth.version> -<<<<<<< HEAD <cxf.opensaml.version>2.6.1</cxf.opensaml.version> <cxf.opensaml.osgi.version>2.6.1_1</cxf.opensaml.osgi.version> <cxf.opensaml.xmltooling.version>1.4.0_1</cxf.opensaml.xmltooling.version> <cxf.opensamlws.version>1.5.0_1</cxf.opensamlws.version> -======= - <cxf.opensaml.version>3.1.1_3-SNAPSHOT</cxf.opensaml.version> - <cxf.opensaml.osgi.version>3.1.0_1</cxf.opensaml.osgi.version> - <cxf.opensaml.osgi.version.range>[3.1,4)</cxf.opensaml.osgi.version.range> ->>>>>>> cf87907... Adding an STS OSGi test <cxf.rhino.version>1.7R2</cxf.rhino.version> <cxf.saaj-api.version>1.3.5</cxf.saaj-api.version> <cxf.servlet-api.group>org.apache.geronimo.specs</cxf.servlet-api.group>
