diff options
| author | Julien HENRY <julien.henry@sonarsource.com> | 2013-03-26 15:43:46 +0100 |
|---|---|---|
| committer | Julien HENRY <julien.henry@sonarsource.com> | 2013-03-26 15:51:41 +0100 |
| commit | 2d1eedc2436244b879cba423a42a4fc2c57f7468 (patch) | |
| tree | 46cdbf32b49219464f8d2447877bc57313d7f816 /sonar-ws-client | |
| parent | ea669e56c1939f38d001fa74a7378117a948e786 (diff) | |
| download | sonarqube-2d1eedc2436244b879cba423a42a4fc2c57f7468.tar.gz sonarqube-2d1eedc2436244b879cba423a42a4fc2c57f7468.zip | |
SONAR-4157 Upgrade the embedded Jetty to version 8.1
Diffstat (limited to 'sonar-ws-client')
| -rw-r--r-- | sonar-ws-client/pom.xml | 5 | ||||
| -rw-r--r-- | sonar-ws-client/src/test/java/org/sonar/wsclient/SonarTest.java | 15 |
2 files changed, 12 insertions, 8 deletions
diff --git a/sonar-ws-client/pom.xml b/sonar-ws-client/pom.xml index 06e24d43d77..e0b7dc6febb 100644 --- a/sonar-ws-client/pom.xml +++ b/sonar-ws-client/pom.xml @@ -72,9 +72,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-servlet-tester</artifactId> - <version>6.1.6</version> + <groupId>org.eclipse.jetty</groupId> + <artifactId>test-jetty-servlet</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/sonar-ws-client/src/test/java/org/sonar/wsclient/SonarTest.java b/sonar-ws-client/src/test/java/org/sonar/wsclient/SonarTest.java index 49ce5918fef..36d55ec09b1 100644 --- a/sonar-ws-client/src/test/java/org/sonar/wsclient/SonarTest.java +++ b/sonar-ws-client/src/test/java/org/sonar/wsclient/SonarTest.java @@ -19,15 +19,20 @@ */ package org.sonar.wsclient; +import org.eclipse.jetty.testing.ServletTester; import org.junit.AfterClass; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import org.mortbay.jetty.testing.ServletTester; import org.sonar.wsclient.connectors.ConnectionException; import org.sonar.wsclient.connectors.HttpClient3Connector; import org.sonar.wsclient.connectors.HttpClient4Connector; -import org.sonar.wsclient.services.*; +import org.sonar.wsclient.services.Metric; +import org.sonar.wsclient.services.MetricQuery; +import org.sonar.wsclient.services.Query; +import org.sonar.wsclient.services.RuleQuery; +import org.sonar.wsclient.services.Server; +import org.sonar.wsclient.services.ServerQuery; import org.sonar.wsclient.unmarshallers.UnmarshalException; import java.util.Arrays; @@ -68,9 +73,9 @@ public class SonarTest { baseUrl = tester.createSocketConnector(true); tester.start(); - return Arrays.asList(new Object[][]{ - {new Sonar(new HttpClient4Connector(new Host(baseUrl)))}, - {new Sonar(new HttpClient3Connector(new Host(baseUrl)))} + return Arrays.asList(new Object[][] { + {new Sonar(new HttpClient4Connector(new Host(baseUrl)))}, + {new Sonar(new HttpClient3Connector(new Host(baseUrl)))} }); } |