Index: build.gradle =================================================================== diff -u -r40872 -r40980 --- build.gradle (.../build.gradle) (revision 40872) +++ build.gradle (.../build.gradle) (revision 40980) @@ -36,10 +36,10 @@ ext.customLibPath = System.getenv('CUSTOM_LIB_PATH') //全局版本 -def globalVersion = '4.1.531'; +def globalVersion = '4.1.532'; -ext.svnRevision = getSvnRevision() -//ext.svnRevision = '39734' +//ext.svnRevision = getSvnRevision() +ext.svnRevision = '40961' ext.buildDateTime = getDateTime() ext.buildDateForRelease = getDateForRelease() @@ -188,10 +188,10 @@ if (seleniumParameters.length != 5){ // 抛出异常,终止编译 - throw new GradleException("selenium参数错误,参数个数应该为5个,并且用逗号分隔") + throw new GradleException("selenium参数错误,参数个数应该为5个,并且用逗号分隔!") } else{ - + println "未检测到命令行输入参数,采用文件: " + webProjectDir + "/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/settings.json" def jsonFile = file(webProjectDir + "/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/settings.json") def parsedJson = new groovy.json.JsonSlurper().parseText(jsonFile.getText('UTF-8')) assert parsedJson instanceof Map @@ -434,7 +434,7 @@ compile group: 'org.bouncycastle', name: 'bcprov-jdk16', version:'1.38' - compile group: 'com.google.code.gson', name: 'gson', version:'2.8.2' + compile group: 'com.google.code.gson', name: 'gson', version:'2.10.1' compile group: 'commons-lang', name: 'commons-lang', version:'2.5' @@ -448,7 +448,7 @@ //compile group: 'commons-collections', name: 'commons-collections', version:'2.1.1' compile group: 'commons-collections', name: 'commons-collections', version:'3.2.2' - compile group: 'commons-io', name: 'commons-io', version:'2.6' + compile group: 'commons-io', name: 'commons-io', version:'2.11.0' compile group: 'commons-fileupload', name: 'commons-fileupload', version:'1.4' compile group: 'commons-beanutils', name: 'commons-beanutils', version:'1.9.3' compile group: 'commons-digester', name: 'commons-digester', version:'1.8' @@ -567,7 +567,7 @@ // pagehelper compile group: 'com.github.pagehelper', name: 'pagehelper', version: '5.0.0' - compile 'com.google.guava:guava:23.0' + compile 'com.google.guava:guava:31.1-jre' compile 'net.lingala.zip4j:zip4j:1.3.2' compile 'org.apache.axis:axis-jaxrpc:1.4' @@ -1321,11 +1321,50 @@ compile (project(":ssts-storagelocation")) - compile group: 'org.seleniumhq.selenium', name: 'selenium-server', version: '3.141.59' + + implementation 'com.squareup.okhttp3:okhttp:3.14.9' // OkHttp 最后一个兼容 JDK8 的主线 + implementation 'com.squareup.okio:okio:1.17.5' + implementation 'dev.failsafe:failsafe:3.3.2' // 版本随 MavenCentral 可用的 3.x 稳定版 + + //compile group: 'org.seleniumhq.selenium', name: 'selenium-server', version: '3.141.59' // https://mvnrepository.com/artifact/org.seleniumhq.selenium/selenium-java - compile group: 'org.seleniumhq.selenium', name: 'selenium-java', version: '3.141.59' + //compile group: 'org.seleniumhq.selenium', name: 'selenium-java', version: '4.10.0' + compile 'org.seleniumhq.selenium:selenium-api:4.10.0' + compile 'org.seleniumhq.selenium:selenium-remote-driver:4.10.0' + compile 'org.seleniumhq.selenium:selenium-chrome-driver:4.10.0' + compile 'org.seleniumhq.selenium:selenium-ie-driver:4.10.0' + compile 'org.seleniumhq.selenium:selenium-chromium-driver:4.10.0' + compile 'org.seleniumhq.selenium:selenium-support:4.10.0' + compile 'org.seleniumhq.selenium:selenium-json:4.10.0' + //compile group: 'org.seleniumhq.selenium', name: 'selenium-server-standalone', version: '3.141.59' + // HTTP 客户端(JDK8 用 selenium-http + OkHttp,而不是 jdk-client) + compile 'org.seleniumhq.selenium:selenium-http:4.10.0' + + // (如仍需 IE,再额外加) + // implementation 'org.seleniumhq.selenium:selenium-ie-driver:4.10.0' + + + // AHC(Netty 上的异步 HTTP 客户端) + runtime 'org.asynchttpclient:async-http-client:2.12.3' + runtime 'org.asynchttpclient:async-http-client-netty-utils:2.12.3' + // Reactive Streams + runtime 'org.reactivestreams:reactive-streams:1.0.4' + runtime 'org.apache.commons:commons-exec:1.4.0' + + // 运行selenium测试用例时,需要的jar包 + runtime 'io.netty:netty-common:4.1.100.Final' + runtime 'io.netty:netty-buffer:4.1.100.Final' + runtime 'io.netty:netty-transport:4.1.100.Final' + runtime 'io.netty:netty-resolver:4.1.100.Final' + runtime 'io.netty:netty-codec:4.1.100.Final' + runtime 'io.netty:netty-codec-http:4.1.100.Final' + runtime 'io.netty:netty-handler:4.1.100.Final' + runtime 'io.netty:netty-resolver-dns:4.1.100.Final' - compile group: 'org.seleniumhq.selenium', name: 'selenium-server-standalone', version: '3.141.59' + // 提供 HandlerPublisher/HandlerSubscriber + runtime 'com.typesafe.netty:netty-reactive-streams:2.0.4' + runtime 'com.typesafe.netty:netty-reactive-streams-http:2.0.4' + compile group: 'io.qameta.allure', name: 'allure-java-commons', version: '2.17.0' compile group: 'io.qameta.allure', name: 'allure-model', version: '2.17.0'