From 290e31b4c503b2a52fa281e98fe0b4b354479956 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 10 Mar 2014 11:34:35 +1100
Subject: [PATCH] Update some depend versions, leaving netty for a later date
 when there aren't as many recent changes.

---
 pom.xml       | 12 ++++++------
 proxy/pom.xml |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index f83cf813..d9cc98c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>15.0</version>
+            <version>16.0.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -90,7 +90,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.12.2</version>
+            <version>1.12.6</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -100,7 +100,7 @@
             <plugin>
                 <groupId>com.lukegb.mojo</groupId>
                 <artifactId>gitdescribe-maven-plugin</artifactId>
-                <version>1.3</version>
+                <version>1.3</version> <!-- There is 2.0, but it seems broken -->
                 <configuration>
                     <outputPrefix>git:${project.name}:${project.version}:</outputPrefix>
                     <outputPostfix>:${build.number}</outputPostfix>
@@ -126,7 +126,7 @@
             <plugin>
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok-maven-plugin</artifactId>
-                <version>1.12.2.0</version>
+                <version>1.12.6.0</version>
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>
@@ -156,12 +156,12 @@
                     <plugin>
                         <groupId>org.projectlombok</groupId>
                         <artifactId>lombok-maven-plugin</artifactId>
-                        <version>1.12.2.0</version>
+                        <version>1.12.6.0</version>
                         <dependencies>
                             <dependency>
                                 <groupId>sun.jdk</groupId>
                                 <artifactId>tools</artifactId>
-                                <version>1.6</version>
+                                <version>${java.version}</version>
                                 <scope>system</scope>
                                 <systemPath>${java.home}/../lib/tools.jar</systemPath>
                             </dependency>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index aa555ecd..1f49bd58 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -62,7 +62,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.28</version>
+            <version>5.1.29</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>