Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Bit of OCD pommery

  • Loading branch information...
commit 6552c96a5e32cbca4529e5a0e5ffc22855641f05 1 parent c70d700
@neilprosser neilprosser authored
View
111 pom.xml
@@ -51,9 +51,24 @@
</modules>
<properties>
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <jetty.version>8.0.3.v20111011</jetty.version>
- <slf4j.version>1.6.3</slf4j.version>
+
+ <commons.io.version>2.1</commons.io.version>
+ <commons.lang.version>2.6</commons.lang.version>
+ <guava.version>10.0.1</guava.version>
+ <hamcrest.version>1.2.1</hamcrest.version>
+ <httpclient.version>4.1.2</httpclient.version>
+ <httpcore.version>4.1.3</httpcore.version>
+ <jackson.version>1.9.2</jackson.version>
+ <jetty.version>8.0.4.v20111024</jetty.version>
+ <joda.time.version>2.0</joda.time.version>
+ <junit.version>4.10</junit.version>
+ <jsonpath.version>0.5.5</jsonpath.version>
+ <mockito.version>1.8.5</mockito.version>
+ <servlet.api.version>2.5</servlet.api.version>
+ <slf4j.version>1.6.4</slf4j.version>
+
</properties>
<build>
@@ -177,64 +192,39 @@
<dependencies>
<dependency>
- <groupId>com.github.rest-driver</groupId>
- <artifactId>rest-client-driver</artifactId>
- <version>${project.version}</version>
+ <groupId>com.jayway.jsonpath</groupId>
+ <artifactId>json-path</artifactId>
+ <version>${jsonpath.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>10.0.1</version>
+ <version>${guava.version}</version>
</dependency>
<dependency>
- <groupId>com.jayway.jsonpath</groupId>
- <artifactId>json-path</artifactId>
- <version>0.5.5</version>
- </dependency>
-
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>2.0</version>
- </dependency>
-
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.1</version>
+ <version>${commons.io.version}</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit-dep</artifactId>
- <version>4.10</version>
- </dependency>
-
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- <version>1.2.1</version>
+ <version>${commons.lang.version}</version>
</dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <version>1.2.1</version>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>${joda.time.version}</version>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>1.8.5</version>
- <scope>test</scope>
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ <version>${junit.version}</version>
</dependency>
<dependency>
@@ -256,21 +246,22 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>4.1.3</version>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${servlet.api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.1.2</version>
+ <version>${httpclient.version}</version>
<exclusions>
<exclusion>
<artifactId>commons-logging</artifactId>
@@ -280,15 +271,33 @@
</dependency>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${httpcore.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
- <version>1.9.0</version>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
- <version>1.9.0</version>
+ <version>${jackson.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <version>${hamcrest.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <version>${hamcrest.version}</version>
</dependency>
<dependency>
@@ -299,6 +308,12 @@
<dependency>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
<version>${slf4j.version}</version>
</dependency>
View
51 rest-client-driver/pom.xml
@@ -12,29 +12,31 @@
</parent>
<dependencies>
+
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit-dep</artifactId>
- <optional>true</optional>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
</dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- <scope>test</scope>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
</dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <scope>test</scope>
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
@@ -55,13 +57,21 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -74,15 +84,6 @@
<artifactId>slf4j-nop</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
</dependencies>
</project>
View
110 rest-server-driver/pom.xml
@@ -13,56 +13,75 @@
<dependencies>
- <dependency>
- <groupId>com.github.rest-driver</groupId>
- <artifactId>rest-client-driver</artifactId>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rest-client-driver</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
- </dependency>
+ </dependency>
+
+ <dependency>
+ <groupId>com.jayway.jsonpath</groupId>
+ <artifactId>json-path</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>
- <dependency>
- <groupId>com.jayway.jsonpath</groupId>
- <artifactId>json-path</artifactId>
- </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit-dep</artifactId>
+ <scope>test</scope>
+ </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <scope>test</scope>
+ </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlets</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -76,12 +95,6 @@
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit-dep</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
@@ -91,21 +104,6 @@
<artifactId>slf4j-nop</artifactId>
</dependency>
- <!-- next two are for proxy tests -->
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlets</artifactId>
- <scope>test</scope>
- </dependency>
-
-
-
</dependencies>
</project>
View
4 ...st/java/com/github/restdriver/serverdriver/acceptance/ResponseToStringAcceptanceTest.java
@@ -56,7 +56,7 @@ public void testToStringWithoutResponseBody() {
String expectedResponse = "HTTP/1.1 400 Bad Request" + n;
expectedResponse += "Content-Type: text/plain;charset=ISO-8859-1" + n +
"Content-Length: 0" + n +
- "Server: Jetty(8.0.3.v20111011)";
+ "Server: Jetty(8.0.4.v20111024)";
assertThat(response.toString(), is(equalTo(expectedResponse)));
@@ -71,7 +71,7 @@ public void testToStringWithResponseBody() {
String expectedResponse = "HTTP/1.1 200 OK" + n;
expectedResponse += "Content-Type: text/plain;charset=ISO-8859-1" + n +
"Content-Length: 19" + n +
- "Server: Jetty(8.0.3.v20111011)" + n +
+ "Server: Jetty(8.0.4.v20111024)" + n +
n +
"This is the content";
Please sign in to comment.
Something went wrong with that request. Please try again.