Skip to content

Commit

Permalink
Merge pull request #602 from jekh/update-dependencies
Browse files Browse the repository at this point in the history
Various dependency updates
  • Loading branch information
jekh authored Feb 4, 2017
2 parents db37779 + 94c8e79 commit 3352e50
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 12 deletions.
2 changes: 1 addition & 1 deletion browsermob-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<dependency>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
<version>2.1.7</version>
<version>2.1.8</version>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package net.lightbody.bmp.proxy.http;

import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;

import java.net.URI;
import org.apache.http.annotation.NotThreadSafe;

// Allows for HTTP DELETE requests to contain a body, which the HttpDelete
// class does not support. Please see:
// http://stackoverflow.com/a/3820549/581722
@NotThreadSafe
public class HttpDeleteWithBody extends HttpEntityEnclosingRequestBase {

public final static String METHOD_NAME = "DELETE";
Expand Down
2 changes: 1 addition & 1 deletion mitm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<dependency>
<groupId>org.littleshoot</groupId>
<artifactId>littleproxy</artifactId>
<version>1.1.0</version>
<version>1.1.1</version>
<optional>true</optional>
<exclusions>
<exclusion>
Expand Down
16 changes: 8 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,18 @@
<slf4j.version>1.7.22</slf4j.version>
<selenium.version>2.53.1</selenium.version>

<jackson.version>2.8.5</jackson.version>
<jackson.version>2.8.6</jackson.version>

<maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>

<log4j.version>2.7</log4j.version>
<log4j.version>2.8</log4j.version>

<groovy.version>2.4.7</groovy.version>
<groovy.version>2.4.8</groovy.version>
<groovy-eclipse-batch.version>2.4.3-01</groovy-eclipse-batch.version>

<netty.version>4.0.42.Final</netty.version>
<netty.version>4.0.44.Final</netty.version>
<!-- netty 4.1 version to use for browsermob-dist and when using the netty-4.1 profile -->
<netty-4.1.version>4.1.6.Final</netty-4.1.version>
<netty-4.1.version>4.1.8.Final</netty-4.1.version>

<bouncycastle.version>1.56</bouncycastle.version>
</properties>
Expand Down Expand Up @@ -245,7 +245,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.4.1</version>
<version>2.7.2</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -314,13 +314,13 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.2</version>
<version>4.5.3</version>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>4.5.2</version>
<version>4.5.3</version>
</dependency>

<dependency>
Expand Down

0 comments on commit 3352e50

Please sign in to comment.