Fixing update
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6189719e Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6189719e Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6189719e Branch: refs/heads/3.0.x-fixes Commit: 6189719e60ed16607d24f1e9fca9643f32bf9b03 Parents: 156abc3 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Tue Mar 15 11:43:40 2016 +0000 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Tue Mar 15 11:43:40 2016 +0000 ---------------------------------------------------------------------- parent/pom.xml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/6189719e/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 15a8088..7620b11 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -172,12 +172,7 @@ <cxf.validation.api.version>1.1.0.Final</cxf.validation.api.version> <cxf.cdi.api.version>1.1</cxf.cdi.api.version> <cxf.json.api.version>1.0</cxf.json.api.version> -<<<<<<< HEAD - <cxf.jboss.weld.version>2.1.2.Final</cxf.jboss.weld.version> -======= - <cxf.jboss.weld.version>2.3.3.Final</cxf.jboss.weld.version> - <cxf.jboss.logging.version>3.3.0.Final</cxf.jboss.logging.version> ->>>>>>> 3a1b806... Updating Weld version due to CVE-2014-8122 + <cxf.jboss.weld.version>2.2.16.Final</cxf.jboss.weld.version> <cxf.osgi.validation.api.version>1.1.0</cxf.osgi.validation.api.version> <cxf.hibernate.validator.version>5.0.2.Final</cxf.hibernate.validator.version> <cxf.glassfish.json.version>1.0.4</cxf.glassfish.json.version>
