Repository: cxf-fediz Updated Branches: refs/heads/1.4.x-fixes 0b2f100d3 -> cb3b80db8
Fixing merge Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/cb3b80db Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/cb3b80db Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/cb3b80db Branch: refs/heads/1.4.x-fixes Commit: cb3b80db8fea41d760c4bdeac1ef322622349421 Parents: 0b2f100 Author: Colm O hEigeartaigh <[email protected]> Authored: Fri Aug 11 15:45:58 2017 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Fri Aug 11 15:45:58 2017 +0100 ---------------------------------------------------------------------- pom.xml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/cb3b80db/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ff25187..b5a36fa 100644 --- a/pom.xml +++ b/pom.xml @@ -64,14 +64,9 @@ <openjpa.version>2.4.2</openjpa.version> <servlet.version>2.5</servlet.version> <slf4j.version>1.7.22</slf4j.version> -<<<<<<< HEAD - <spring.version>4.3.5.RELEASE</spring.version> - <spring.security.version>4.2.2.RELEASE</spring.security.version> - <tomcat7.version>7.0.75</tomcat7.version> -======= <spring.version>4.3.10.RELEASE</spring.version> <spring.security.version>4.2.3.RELEASE</spring.security.version> ->>>>>>> 83711e91... Updating a few dependencies + <tomcat7.version>7.0.75</tomcat7.version> <tomcat8.version>8.5.12</tomcat8.version> <wss4j.version>2.1.10</wss4j.version>
