honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clarify why jarhell and dependency license check are disabled, add okhttp mockwebserver dependency 

Also enable forbiddenApisTest (will fail till we get rid of the sun http web server in RestClientTests that will be replaced with mockwebserver)
This commit is contained in:
javanna 2016-04-11 14:32:19 +02:00 committed by Luca Cavanna
parent c9c33a7719
commit 5970723945
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
client/build.gradle
View File

@ -31,13 +31,18 @@ dependencies {
compile "commons-codec:commons-codec:1.9" compile "commons-codec:commons-codec:1.9"
compile "commons-logging:commons-logging:1.2" compile "commons-logging:commons-logging:1.2"
// we use lucene-test-framework here without pulling in ES core or its own test-framework
testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}" testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
testCompile "junit:junit:${versions.junit}" testCompile "junit:junit:${versions.junit}"
testCompile 'org.hamcrest:hamcrest-all:1.3' testCompile 'org.hamcrest:hamcrest-all:1.3'
testCompile "org.apache.lucene:lucene-test-framework:${versions.lucene}" testCompile "org.apache.lucene:lucene-test-framework:${versions.lucene}"
testCompile "org.apache.lucene:lucene-core:${versions.lucene}" testCompile "org.apache.lucene:lucene-core:${versions.lucene}"
testCompile "org.apache.lucene:lucene-codecs:${versions.lucene}" testCompile "org.apache.lucene:lucene-codecs:${versions.lucene}"
//mock web server
testCompile "com.squareup.okhttp3:mockwebserver:3.2.0"
testCompile "com.squareup.okhttp3:okhttp:3.2.0"
testCompile "com.squareup.okhttp3:okhttp-ws:3.2.0"
testCompile "com.squareup.okio:okio:1.6.0"
testCompile "org.bouncycastle:bcprov-jdk15on:1.54"
} }
compileJava.options.compilerArgs << '-Xlint:-cast,-rawtypes,-try,-unchecked' compileJava.options.compilerArgs << '-Xlint:-cast,-rawtypes,-try,-unchecked'
@ -48,13 +53,15 @@ forbiddenApisMain {
signaturesURLs = [PrecommitTasks.getResource('/forbidden/jdk-signatures.txt')] signaturesURLs = [PrecommitTasks.getResource('/forbidden/jdk-signatures.txt')]
} }
forbiddenApisMain.enabled=true forbiddenApisTest {
//TODO remove use of sun http server and enable forbidden-apis for tests //client does not depend on core, so only jdk signatures should be checked
forbiddenApisTest.enabled=false signaturesURLs = [PrecommitTasks.getResource('/forbidden/jdk-signatures.txt')]
//TODO add licenses for deps and check out distribution task }
//TODO add licenses for dependencies and take care of distribution
//dependency license are currently checked in distribution //dependency license are currently checked in distribution
dependencyLicenses.enabled=false dependencyLicenses.enabled=false
//TODO enable jarhell checks //JarHell is part of es core, which we don't want to pull in
jarHell.enabled=false jarHell.enabled=false
//NamingConventionCheck is part of test-framework, which we don't want to pull in as it depends on es core //NamingConventionCheck is part of test-framework, which we don't want to pull in as it depends on es core
namingConventions.enabled=false namingConventions.enabled=false
@ -64,6 +71,7 @@ thirdPartyAudit.excludes = [
'org.apache.avalon.framework.logger.Logger', 'org.apache.avalon.framework.logger.Logger',
'org.apache.log.Hierarchy', 'org.apache.log.Hierarchy',
'org.apache.log.Logger', 'org.apache.log.Logger',
'org.apache.log4j.Category',
'org.apache.log4j.Level', 'org.apache.log4j.Level',
'org.apache.log4j.Logger', 'org.apache.log4j.Logger',
'org.apache.log4j.Priority', 'org.apache.log4j.Priority',