[async-http-client] Update to upstream version 1.7.18

[Michal Srb]

commit d5289cfc77c23ea45e8d781dfd0089c31591c92a
Author: Michal Srb <msrb at redhat.com>
Date:   Wed Jul 10 07:41:57 2013 +0200

    Update to upstream version 1.7.18

 .gitignore               |    1 +
 0001-Fix-copyright.patch |   66 ----------------------------------------------
 async-http-client.spec   |   15 +++-------
 sources                  |    2 +-
 4 files changed, 7 insertions(+), 77 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 030aff7..7b3d308 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /async-http-client-1.7.16.tar.gz
 /async-http-client-1.7.17.tar.gz
 /LICENSE-CDDL.txt
+/async-http-client-1.7.18.tar.gz
diff --git a/async-http-client.spec b/async-http-client.spec
index ec44fdb..607e09f 100644
--- a/async-http-client.spec
+++ b/async-http-client.spec
@@ -1,17 +1,12 @@
 
 Name:           async-http-client
-Version:        1.7.17
-Release:        4%{?dist}
+Version:        1.7.18
+Release:        1%{?dist}
 Summary:        Asynchronous Http Client for Java
 
 License:        ASL 2.0
 URL:            https://github.com/AsyncHttpClient/%{name}
 Source0:        https://github.com/AsyncHttpClient/%{name}/archive/%{name}-%{version}.tar.gz
-# Backport upstream patch to fix licensing of DefaultWebSocketListener.java
-# This file was licensed under CDDL+GPLv2, but upstream changed the license to ASL 2.0
-# See: https://github.com/AsyncHttpClient/async-http-client/issues/325
-# TODO: this patch can be removed if version > 1.7.17
-Patch0:         0001-Fix-copyright.patch
 
 BuildArch:      noarch
 
@@ -43,8 +38,6 @@ Summary:   API documentation for %{name}
 %prep
 %setup -q -n %{name}-%{name}-%{version}
 
-%patch0 -p1
-
 # Remove test deps
 %pom_remove_dep ch.qos.logback:logback-classic
 %pom_remove_dep org.eclipse.jetty:jetty-websocket
@@ -61,7 +54,6 @@ rm -Rf src/test/java/com/ning/http/client/async
 rm -Rf src/test/java/com/ning/http/client/websocket
 
 # Remove things for which we are missing dependencies
-%pom_remove_plugin :clirr-maven-plugin
 %pom_xpath_remove "pom:extension[pom:artifactId[text()='wagon-gitsite']]"
 %pom_xpath_remove "pom:profiles/pom:profile[pom:id[text()='grizzly']]"
 
@@ -83,6 +75,9 @@ rm -Rf src/test/java/com/ning/http/client/websocket
 
 
 %changelog
+* Wed Jul 10 2013 Michal Srb <msrb at redhat.com> - 1.7.18-1
+- Update to upstream version 1.7.18
+
 * Wed Jun 26 2013 Michal Srb <msrb at redhat.com> - 1.7.17-4
 - Fix licensing
 - Run at least some tests
diff --git a/sources b/sources
index 50bbf27..d8ab5b9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5d7a99aa8df0eab1f6a99c77c339260f  async-http-client-1.7.17.tar.gz
+de1870a6179141887b66493ece8c2ae9  async-http-client-1.7.18.tar.gz