From 2672937d44a852863f62f6c0fca6013751aec65e Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Jul 25 2014 16:05:41 +0000
Subject: Fix failure to build with the latest version of guava


---

diff --git a/.gitignore b/.gitignore
index 617a30b..b90e90d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,6 @@
 /aether-connector-okhttp-0.0.11-95e7d98.tar.gz
 /aether-connector-okhttp-0.12.0-889599c.tar.gz
+/noarch
+/.project
+/*.src.rpm
+/.build-*.log
diff --git a/0001-Port-to-latest-guava.patch b/0001-Port-to-latest-guava.patch
new file mode 100644
index 0000000..46bd12a
--- /dev/null
+++ b/0001-Port-to-latest-guava.patch
@@ -0,0 +1,80 @@
+From 568b521fae65c67a2b3670bf1c33de8ea19899cd Mon Sep 17 00:00:00 2001
+From: Mat Booth <mat.booth@redhat.com>
+Date: Fri, 25 Jul 2014 16:38:49 +0100
+Subject: [PATCH] Port to latest guava
+
+---
+ pom.xml                                                            | 2 +-
+ .../java/io/tesla/aether/connector/AetherRepositoryConnector.java  | 4 ++--
+ .../aether/connector/test/suite/ResumeWithClientFailureTest.java   | 7 ++++---
+ 3 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 31b6101..7f88c1b 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -98,7 +98,7 @@
+     <dependency>
+       <groupId>com.google.guava</groupId>
+       <artifactId>guava</artifactId>
+-      <version>14.0.1</version>
++      <version>17.0</version>
+     </dependency>
+     <!-- JSR330 -->
+     <dependency>
+diff --git a/src/main/java/io/tesla/aether/connector/AetherRepositoryConnector.java b/src/main/java/io/tesla/aether/connector/AetherRepositoryConnector.java
+index d18f730..07c8d80 100644
+--- a/src/main/java/io/tesla/aether/connector/AetherRepositoryConnector.java
++++ b/src/main/java/io/tesla/aether/connector/AetherRepositoryConnector.java
+@@ -89,7 +89,7 @@ import org.eclipse.aether.util.repository.layout.RepositoryLayout;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
+ 
+-import com.google.common.io.ByteStreams;
++import com.google.common.io.ByteSource;
+ import com.google.common.io.Closer;
+ 
+ class AetherRepositoryConnector implements RepositoryConnector {
+@@ -790,7 +790,7 @@ class AetherRepositoryConnector implements RepositoryConnector {
+       Response response = aetherClient.put(uri + ext, new RetryableSource() {
+         @Override
+         public void copyTo(OutputStream os) throws IOException {
+-          ByteStreams.asByteSource(bytes).copyTo(os);
++          ByteSource.wrap(bytes).copyTo(os);
+         }
+         @Override
+         public long length() {
+diff --git a/src/test/java/io/tesla/aether/connector/test/suite/ResumeWithClientFailureTest.java b/src/test/java/io/tesla/aether/connector/test/suite/ResumeWithClientFailureTest.java
+index 840ff41..8f56781 100644
+--- a/src/test/java/io/tesla/aether/connector/test/suite/ResumeWithClientFailureTest.java
++++ b/src/test/java/io/tesla/aether/connector/test/suite/ResumeWithClientFailureTest.java
+@@ -26,7 +26,7 @@ import org.eclipse.aether.spi.connector.RepositoryConnector;
+ import org.eclipse.aether.transfer.TransferEvent;
+ import org.eclipse.aether.transfer.TransferEvent.EventType;
+ 
+-import com.google.common.io.Closeables;
++import com.google.common.io.Closer;
+ 
+ public class ResumeWithClientFailureTest extends AetherTestCase {
+ 
+@@ -128,14 +128,15 @@ public class ResumeWithClientFailureTest extends AetherTestCase {
+   }
+ 
+   public static void write(byte[] pattern, File file) throws IOException {
++    Closer closer = Closer.create();
+     file.deleteOnExit();
+     file.getParentFile().mkdirs();
+     OutputStream out = null;
+     try {
+-      out = new BufferedOutputStream(new FileOutputStream(file));
++      out = closer.register(new BufferedOutputStream(new FileOutputStream(file)));
+       out.write(pattern);
+     } finally {
+-      Closeables.closeQuietly(out);
++      closer.close();
+     }
+   }
+ }
+-- 
+1.9.3
+
diff --git a/aether-connector-okhttp.spec b/aether-connector-okhttp.spec
index 8bed5a7..8fd6889 100644
--- a/aether-connector-okhttp.spec
+++ b/aether-connector-okhttp.spec
@@ -3,7 +3,7 @@
 
 Name:           aether-connector-okhttp
 Version:        0.12.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        OkHttp Aether Connector
 
 # src/main/java/io/tesla/aether/wagon/OkHttpsWagon.java is ASL and EPL
@@ -14,6 +14,9 @@ Source1:        eclipse-1.0.txt
 
 Patch0:         %{name}-updated-aether-api.patch
 
+# This patch has been submitted upstream: https://github.com/tesla/aether-connector-okhttp/pull/3
+Patch1:         0001-Port-to-latest-guava.patch
+
 BuildArch:      noarch
 
 BuildRequires: mvn(org.eclipse.jetty:jetty-util)
@@ -56,6 +59,7 @@ sed -i -e "s/io.tesla.aether.okhttp.ssl.SslContextFactory/org.eclipse.jetty.util
     src/main/java/io/tesla/aether/okhttp/OkHttpAetherClient.java
 
 %patch0 -b .orig
+%patch1 -p1 -b .orig
 
 %build
 # We don't have all test deps (e.g. npn-boot)
@@ -73,6 +77,9 @@ sed -i -e "s/io.tesla.aether.okhttp.ssl.SslContextFactory/org.eclipse.jetty.util
 %doc eclipse-1.0.txt
 
 %changelog
+* Fri Jul 25 2014 Mat Booth <mat.booth@redhat.com> - 0.12.0-4
+- Fix failure to build with the latest version of guava
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.12.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild