From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Wed, 14 Mar 2018 16:05:59 +0000 (+0100)
Subject: Fix Gradle hack to resolve Jetty dependency
X-Git-Tag: 7.5~1530
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8ab2074c40707cec61b1fecbdf7eb6a23881161c;p=sonarqube.git

Fix Gradle hack to resolve Jetty dependency

by upgrading Jetty
---

diff --git a/build.gradle b/build.gradle
index 4afdc28f758..6bc079fe020 100644
--- a/build.gradle
+++ b/build.gradle
@@ -170,8 +170,11 @@ subprojects {
         exclude 'xerces:xmlParserAPIs'
         exclude 'xerces:xercesImpl'
       }
-      dependency 'org.eclipse.jetty:jetty-server:8.1.12.v20130726'
-      dependency 'org.eclipse.jetty:test-jetty-servlet:8.1.12.v20130726'
+      dependencySet(group: 'org.eclipse.jetty', version: '9.4.8.v20171121') {
+        entry 'jetty-proxy'
+        entry 'jetty-server'
+        entry 'jetty-servlet'
+      }
       dependency("org.elasticsearch.client:transport:${elasticsearchVersion}") {
         exclude 'org.elasticsearch.plugin:lang-mustache-client'
         exclude 'org.elasticsearch.plugin:transport-netty3-client'
diff --git a/server/sonar-process/build.gradle b/server/sonar-process/build.gradle
index b88b1371edb..3ca3addbcec 100644
--- a/server/sonar-process/build.gradle
+++ b/server/sonar-process/build.gradle
@@ -24,16 +24,9 @@ dependencies {
   testCompile 'com.google.protobuf:protobuf-java'
   testCompile 'com.tngtech.java:junit-dataprovider'
   testCompile 'org.assertj:assertj-core'
+  testCompile 'org.eclipse.jetty:jetty-server'
   testCompile 'org.mockito:mockito-core'
   testCompile project(':sonar-testing-harness')
-  // Workaround to resolve dependencies of eclipse specific packaging: https://issues.gradle.org/browse/GRADLE-2076
-  testCompile module('org.eclipse.jetty:jetty-server') {
-    dependencies(
-      "org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016@jar",
-      "org.eclipse.jetty:jetty-continuation:8.1.2.v20120308",
-      "org.eclipse.jetty:jetty-http:8.1.2.v20120308"
-    )
-  }
 }
 
 artifactoryPublish.skip = false
diff --git a/server/sonar-server/build.gradle b/server/sonar-server/build.gradle
index 9bb11231e8a..34995b84bf8 100644
--- a/server/sonar-server/build.gradle
+++ b/server/sonar-server/build.gradle
@@ -68,6 +68,7 @@ dependencies {
     // should be excluded to avoid ES go into "test mode" and require to run EsTester-based UTs with RandomizedRunner
     exclude group: 'com.carrotsearch.randomizedtesting', module: 'randomizedtesting-runner'
     exclude group: 'org.elasticsearch', module: 'securemock'
+    exclude group: 'commons-logging', module: 'commons-logging'
   }
   testCompile 'org.hamcrest:hamcrest-all'
   testCompile 'org.mockito:mockito-core'
diff --git a/tests/build.gradle b/tests/build.gradle
index ca8a491738a..b83f411dac9 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -54,9 +54,9 @@ dependencies {
   testCompile 'mysql:mysql-connector-java'
   testCompile 'org.assertj:assertj-core'
   testCompile 'org.assertj:assertj-guava'
-  testCompile "org.eclipse.jetty:jetty-proxy:${jettyVersion}"
-  testCompile "org.eclipse.jetty:jetty-server:${jettyVersion}"
-  testCompile "org.eclipse.jetty:jetty-servlet:${jettyVersion}"
+  testCompile 'org.eclipse.jetty:jetty-proxy'
+  testCompile 'org.eclipse.jetty:jetty-server'
+  testCompile 'org.eclipse.jetty:jetty-servlet'
   testCompile "org.jboss.byteman:byteman-submit:${bytemanVersion}"
   testCompile 'org.postgresql:postgresql'
   testCompile 'org.skyscreamer:jsonassert:1.2.0'