diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2019-05-14 09:38:41 +0200 |
|---|---|---|
| committer | SonarTech <sonartech@sonarsource.com> | 2019-05-14 20:21:11 +0200 |
| commit | 400a31228db020658b475ed3bc1b3fb2a09c14b1 (patch) | |
| tree | 290dfc46d0a93e00041d81dfa6c24952259615a4 | |
| parent | 5a5f33146ac2e224b13c0dce33cf162c5ae70a6f (diff) | |
| download | sonarqube-400a31228db020658b475ed3bc1b3fb2a09c14b1.tar.gz sonarqube-400a31228db020658b475ed3bc1b3fb2a09c14b1.zip | |
SONARCLOUD-644 fix conflict on javax.email
| -rw-r--r-- | build.gradle | 8 | ||||
| -rw-r--r-- | sonar-testing-harness/build.gradle | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/build.gradle b/build.gradle index b2192f7ae44..2109a921608 100644 --- a/build.gradle +++ b/build.gradle @@ -147,7 +147,7 @@ subprojects { dependency 'io.jsonwebtoken:jjwt-api:0.10.5' dependency 'io.jsonwebtoken:jjwt-impl:0.10.5' dependency 'io.jsonwebtoken:jjwt-jackson:0.10.5' - dependency 'javax.mail:mail:1.4.4' + dependency 'com.sun.mail:javax.mail:1.5.6' dependency 'javax.annotation:javax.annotation-api:1.3.1' dependency 'javax.servlet:javax.servlet-api:3.0.1' dependency 'javax.xml.bind:jaxb-api:2.3.0' @@ -240,6 +240,12 @@ subprojects { } } + // global exclusions + configurations.all { + // do not conflict with com.sun.mail:javax.mail + exclude group: 'javax.mail', module: 'mail' + } + sourceCompatibility = 1.8 tasks.withType(JavaCompile) { options.encoding = 'UTF-8' diff --git a/sonar-testing-harness/build.gradle b/sonar-testing-harness/build.gradle index eb2762a0e76..63878c08a84 100644 --- a/sonar-testing-harness/build.gradle +++ b/sonar-testing-harness/build.gradle @@ -9,15 +9,14 @@ dependencies { compile 'com.google.code.gson:gson' compile 'com.googlecode.json-simple:json-simple' + compile 'com.sun.mail:javax.mail' compile 'commons-io:commons-io' - compile 'javax.mail:mail' compile 'junit:junit' compile 'org.assertj:assertj-core' compile 'org.hamcrest:hamcrest-all' compile 'org.jsoup:jsoup' compileOnly 'com.google.code.findbugs:jsr305' - } artifactoryPublish.skip = false |