Rebase from adamfisk master

README.md

@@ -1,4 +1,5 @@
 [![Build Status](https://travis-ci.org/adamfisk/LittleProxy.png?branch=master)](https://travis-ci.org/adamfisk/LittleProxy)
+[![CircleCI](https://circleci.com/gh/verygoodsecurity/LittleProxy.svg?style=svg)](https://circleci.com/gh/verygoodsecurity/LittleProxy)
 
 LittleProxy is a high performance HTTP proxy written in Java atop Trustin Lee's excellent [Netty](http://netty.io) event-based networking library. It's quite stable, performs well, and is easy to integrate into your projects. 
 

circle.yml

@@ -0,0 +1,16 @@
+---
+machine:
+  java:
+    version: oraclejdk8
+dependencies:
+  override:
+    - mvn clean dependency:go-offline install -Dmaven.test.skip=true --fail-never --threads 5 -B
+test:
+  override:
+    - mvn test -T2C
+deployment:
+  snapshot:
+    branch: vgs-edition
+    owner: verygoodsecurity
+    commands:
+      - mvn deploy -DskipTests=true

pom.xml

@@ -3,7 +3,7 @@
     <groupId>org.littleshoot</groupId>
     <artifactId>littleproxy</artifactId>
     <packaging>jar</packaging>
-    <version>1.1.3-SNAPSHOT</version>
+    <version>1.1.3-SNAPSHOT-VGS</version>
     <name>LittleProxy</name>
     <description>
         LittleProxy is a high performance HTTP proxy written in Java and using the Netty networking framework.
@@ -54,17 +54,32 @@
     </scm>
 
     <distributionManagement>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
 
         <repository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+            <id>vg-release</id>
+            <name>VG Release Repository</name>
+            <url>s3://very-good/software/release/</url>
         </repository>
+
+        <snapshotRepository>
+            <id>vg-snapshot</id>
+            <name>VG Snapshot Repository</name>
+            <url>s3://very-good/software/snapshot/</url>
+        </snapshotRepository>
+
     </distributionManagement>
 
+    <pluginRepositories>
+        <pluginRepository>
+            <id>yle-public</id>
+            <name>Yle public repository</name>
+            <url>http://maven.c4.yle.fi/release</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
+
     <inceptionYear>2009</inceptionYear>
 
     <!-- disable doclint, since Java 8 treats warnings as errors -->
@@ -550,6 +565,15 @@
                 </executions>
             </plugin>
         </plugins>
+
+        <extensions>
+            <extension>
+                <groupId>fi.yle.tools</groupId>
+                <artifactId>aws-maven</artifactId>
+                <version>1.4.0</version>
+            </extension>
+        </extensions>
+
     </build>
 
     <reporting>