[aether-connector-okhttp] Update to upstream version 0.14.0

[Mikolaj Izdebski]

commit bb8aacfcac52bb209c18685d752994a5434b459b
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Wed Mar 11 13:20:04 2015 +0100

    Update to upstream version 0.14.0

 .gitignore                                       |   1 +
 0001-Port-to-latest-guava.patch                  |  80 -------------
 aether-connector-okhttp-updated-aether-api.patch | 139 -----------------------
 aether-connector-okhttp.spec                     |  23 ++--
 sources                                          |   2 +-
 5 files changed, 11 insertions(+), 234 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b90e90d..1d56dea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /.project
 /*.src.rpm
 /.build-*.log
+/aether-connector-okhttp-0.14.0-1b66624.tar.gz
diff --git a/aether-connector-okhttp.spec b/aether-connector-okhttp.spec
index 8fd6889..e14f692 100644
--- a/aether-connector-okhttp.spec
+++ b/aether-connector-okhttp.spec
@@ -1,9 +1,9 @@
-%global commit 889599ceef60cd1577367e97f27d82914d01b9b8
+%global commit 1b666247f763ed846062b09e5010a5a417cff436
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           aether-connector-okhttp
-Version:        0.12.0
-Release:        4%{?dist}
+Version:        0.14.0
+Release:        1%{?dist}
 Summary:        OkHttp Aether Connector
 
 # src/main/java/io/tesla/aether/wagon/OkHttpsWagon.java is ASL and EPL
@@ -12,11 +12,6 @@ URL:            https://github.com/tesla/%{name}
 Source0:        https://github.com/tesla/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
 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)
@@ -53,13 +48,10 @@ find -name '*.jar' -delete
 
 # Unbundle SslContextFactory
 %pom_add_dep org.eclipse.jetty:jetty-util
-rm -r src/main/java/io/tesla/aether/okhttp/ssl/
-sed -i -e "s/io.tesla.aether.okhttp.ssl.SslContextFactory/org.eclipse.jetty.util.ssl.SslContextFactory/" \
+rm -r src/main/java/io/takari/aether/okhttp/ssl/
+sed -i -e "s/io.takari.aether.okhttp.ssl.SslContextFactory/org.eclipse.jetty.util.ssl.SslContextFactory/" \
     -e "s/scf.setTrustStore(trustStorePath)/scf.setTrustStorePath(trustStorePath)/" \
-    src/main/java/io/tesla/aether/okhttp/OkHttpAetherClient.java
-
-%patch0 -b .orig
-%patch1 -p1 -b .orig
+    src/main/java/io/takari/aether/okhttp/OkHttpAetherClient.java
 
 %build
 # We don't have all test deps (e.g. npn-boot)
@@ -77,6 +69,9 @@ sed -i -e "s/io.tesla.aether.okhttp.ssl.SslContextFactory/org.eclipse.jetty.util
 %doc eclipse-1.0.txt
 
 %changelog
+* Wed Mar 11 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 0.14.0-1
+- Update to upstream version 0.14.0
+
 * Fri Jul 25 2014 Mat Booth <mat.booth at redhat.com> - 0.12.0-4
 - Fix failure to build with the latest version of guava
 
diff --git a/sources b/sources
index 43624e1..d1d0a2d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0171b15bc2ae4c1b0db853e832289eca  aether-connector-okhttp-0.12.0-889599c.tar.gz
+8c1adc2c11bcb59168e9d805480ad517  aether-connector-okhttp-0.14.0-1b66624.tar.gz