gaspersic/java-design-patterns
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pom.xml Fixed Conflict

Browse Source
This commit is contained in:
Chandana Amarnath
2016-11-28 20:33:45 +05:30
parent 1387e2bc96 faa29f8025
commit 1d6d0c54a7
1074 changed files with 3857 additions and 2984 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pom.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
The MIT License
Copyright (c) 2014 Ilkka Seppälä
Copyright (c) 2014-2016 Ilkka Seppälä
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
@ -42,7 +42,7 @@
<hierarchical-junit-runner-version>4.12.1</hierarchical-junit-runner-version>
<apache-httpcomponents.version>4.5.2</apache-httpcomponents.version>
<htmlunit.version>2.22</htmlunit.version>
<urm.version>1.4.1</urm.version>
<urm.version>1.4.4</urm.version>
<guice.version>4.0</guice.version>
<mongo-java-driver.version>3.3.0</mongo-java-driver.version>
<slf4j.version>1.7.21</slf4j.version>
@ -132,7 +132,8 @@
<module>page-object</module>
<module>event-asynchronous</module>
<module>queue-load-leveling</module>
</modules>
<module>object-mother</module>
</modules>
<dependencyManagement>
<dependencies>