Updating Apache DS # Conflicts: # parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b4311af3 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b4311af3 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b4311af3 Branch: refs/heads/3.1.x-fixes Commit: b4311af385d2e3b960d0139f2595589eac78ded4 Parents: c2ecb40 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Tue Jun 28 12:23:42 2016 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Tue Jun 28 12:24:12 2016 +0100 ---------------------------------------------------------------------- parent/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/b4311af3/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 532ee71..8a50405 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -68,9 +68,15 @@ <cxf.abdera.version>1.1.3</cxf.abdera.version> <cxf.activemq.version>5.12.0</cxf.activemq.version> <cxf.ahc.version>1.9.8</cxf.ahc.version> +<<<<<<< HEAD <cxf.apacheds.version>2.0.0-M21</cxf.apacheds.version> <cxf.atmosphere.version>2.3.7</cxf.atmosphere.version> <cxf.atmosphere.version.range>[2.0,2.4)</cxf.atmosphere.version.range> +======= + <cxf.apacheds.version>2.0.0-M22</cxf.apacheds.version> + <cxf.atmosphere.version>2.4.3</cxf.atmosphere.version> + <cxf.atmosphere.version.range>[2.4,3.0)</cxf.atmosphere.version.range> +>>>>>>> 91bb2a1... Updating Apache DS <cxf.axiom.version>1.2.14</cxf.axiom.version> <cxf.bcprov.version>1.54</cxf.bcprov.version> <cxf.cglib.bundle.version>2.2_2</cxf.cglib.bundle.version>
