Skip to content

Commit

Permalink
Merge 665deec into d9cf38b
Browse files Browse the repository at this point in the history
  • Loading branch information
asolntsev committed Sep 11, 2017
2 parents d9cf38b + 665deec commit 90681db
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
== Changelog

=== 4.7 (planned to 2x.09.2017)
*
* upgrade to selenium-java 3.5.3
* upgrade to browsermob-core 2.1.5

=== 4.6 (released 31.08.2017)
* #529 Cannot find capabilities with browserName=ie when grid hub url specified in -Dremote -- thanks to @BorisOsipov
Expand Down
9 changes: 3 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ configurations {

dependencies {
compile('org.apache.httpcomponents:httpcore:4.4.6')
compile('org.seleniumhq.selenium:selenium-java:3.4.0') {
compile('org.seleniumhq.selenium:selenium-java:3.5.3') {
exclude group: 'org.seleniumhq.selenium', module: 'selenium-android-driver'
exclude group: 'org.seleniumhq.selenium', module: 'selenium-iphone-driver'
exclude group: 'org.seleniumhq.selenium', module: 'selenium-safari-driver'
Expand All @@ -61,16 +61,13 @@ dependencies {
provided group: 'org.seleniumhq.selenium', name: 'htmlunit-driver', version: '2.24', transitive: false
provided group: 'net.sourceforge.htmlunit', name: 'htmlunit', version: '2.24', transitive: false
testRuntime group: 'net.sourceforge.htmlunit', name: 'htmlunit', version: '2.24', transitive: false
compile('net.lightbody.bmp:browsermob-core:2.1.4') {
exclude group: 'net.lightbody.bmp', module: 'littleproxy'
}
compile group: 'org.littleshoot', name: 'littleproxy', version: '1.1.2'
compile('net.lightbody.bmp:browsermob-core:2.1.5')
testRuntime group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25', transitive: false

provided 'junit:junit:4.12'
provided 'org.testng:testng:6.9.10'

testCompile group: 'org.seleniumhq.selenium', name: 'selenium-server', version: '3.4.0', transitive: false
testCompile group: 'org.seleniumhq.selenium', name: 'selenium-server', version: '3.5.3', transitive: false
testCompile 'org.mockito:mockito-core:2.8.9'
testCompile 'org.seleniumhq.selenium:jetty-repacked:9.4.5.v20170502'
testCompile 'org.eclipse.jetty:jetty-server:9.4.5.v20170502'
Expand Down

0 comments on commit 90681db

Please sign in to comment.