From c397a9d28b121f9b3d6bd4d3e9809de67995e131 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Jun 10 2019 23:19:52 +0000
Subject: Update to latest upstream version

Fix license tag, simplify build

---

diff --git a/.gitignore b/.gitignore
index a8e4b46..e73a866 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /aether-connector-okhttp-0.14.0-1b66624.tar.gz
 /aether-connector-okhttp-0.16.0-ded2b31.tar.gz
 /aether-connector-okhttp-0.17.3-a1115e4.tar.gz
+/aether-connector-okhttp-0.17.6-fefafe6.tar.gz
diff --git a/aether-connector-okhttp.spec b/aether-connector-okhttp.spec
index af05cb9..9fac0f8 100644
--- a/aether-connector-okhttp.spec
+++ b/aether-connector-okhttp.spec
@@ -1,22 +1,24 @@
-%global commit a1115e45f2a52d3b43d3b4f885eb8eaf041e69df
+%global commit fefafe6b6e4ceb46e90623bcbde895a6514de65d
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           aether-connector-okhttp
-Version:        0.17.3
-Release:        3%{?dist}
+Version:        0.17.6
+Release:        1%{?dist}
 Summary:        OkHttp Aether Connector
 
 # src/main/java/io/tesla/aether/wagon/OkHttpsWagon.java is ASL and EPL
-License:        EPL and (ASL 2.0 and EPL)
-URL:            https://github.com/tesla/%{name}
-Source0:        https://github.com/tesla/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
+License:        EPL-1.0 and (ASL 2.0 and EPL-1.0)
+URL:            https://github.com/takari/%{name}
+Source0:        https://github.com/takari/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
 
 BuildArch:      noarch
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(com.google.guava:guava:18.0)
-BuildRequires:  mvn(com.squareup.okhttp3:okhttp) >= 3.10.0
-BuildRequires:  mvn(com.squareup.okio:okio) >= 1.14.0
+BuildRequires:  mvn(com.squareup.okhttp3:okhttp) >= 3.14.2
+BuildRequires:  mvn(com.squareup.okio:okio) >= 1.17.4
+BuildRequires:  mvn(io.takari.maven.plugins:takari-lifecycle-plugin)
+BuildRequires:  mvn(io.takari:takari:pom:)
 BuildRequires:  mvn(javax.inject:javax.inject)
 BuildRequires:  mvn(org.apache.maven.wagon:wagon-provider-api)
 BuildRequires:  mvn(org.eclipse.aether:aether-api)
@@ -26,11 +28,10 @@ BuildRequires:  mvn(org.eclipse.aether:aether-util)
 BuildRequires:  mvn(org.eclipse.sisu:org.eclipse.sisu.inject)
 BuildRequires:  mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
 BuildRequires:  mvn(org.slf4j:slf4j-api)
-BuildRequires:  mvn(org.sonatype.plugins:sisu-maven-plugin)
 BuildRequires:  mvn(org.sonatype.sisu:sisu-guice::no_aop:)
 
-Requires:  mvn(com.squareup.okhttp3:okhttp) >= 3.10.0
-Requires:  mvn(com.squareup.okio:okio) >= 1.14.0
+Requires:  mvn(com.squareup.okhttp3:okhttp) >= 3.14.2
+Requires:  mvn(com.squareup.okio:okio) >= 1.17.4
 
 %description
 A repository connector implementation based on Square's OkHttp.
@@ -41,28 +42,15 @@ Summary:        Javadoc for %{name}
 %description javadoc
 API documentation for %{name}.
 
-
 %prep
 %setup -q -n %{name}-%{commit}
 
 find -name '*.class' -delete
 find -name '*.jar' -delete
 
-# Avoid reliance on takari-lifecycle
-%pom_remove_parent
-%pom_xpath_remove "pom:packaging"
-%pom_add_plugin "org.sonatype.plugins:sisu-maven-plugin" . \
-"        <executions>
-          <execution>
-            <id>generate-index</id>
-            <phase>process-classes</phase>
-            <goals><goal>main-index</goal></goals>
-          </execution>
-        </executions>"
-
 %build
 # We don't have all test deps (e.g. npn-boot, provisio-webserver)
-%mvn_build --skip-tests -- -Dtakari.privatePackageReference=ignore -Dmaven.compiler.source=1.7 -Dmaven.compiler.target=1.7
+%mvn_build -f -- -Dtakari.privatePackageReference=ignore
 
 %install
 %mvn_install
@@ -75,6 +63,10 @@ find -name '*.jar' -delete
 %license eclipse-1.0.txt
 
 %changelog
+* Mon Jun 10 2019 Mat Booth <mat.booth@redhat.com> - 0.17.6-1
+- Update to latest upstream version
+- Fix license tag, simplify build
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.17.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 857020c..886db5e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (aether-connector-okhttp-0.17.3-a1115e4.tar.gz) = 6126faf85b2a3891b3a98cf7fdac7405af58c32dd2ddff4b5406d13473460f402e08c9145c09773f97325e40a0c986b679d8d7788ec07dfc548acc67af1d344e
+SHA512 (aether-connector-okhttp-0.17.6-fefafe6.tar.gz) = fbfacebcf9446791ac985fa8b3f836c4400f81b11b5fc64f3157b6bcec3d0d2b4eca068026d6001cfaafe27dad932860d25053891b4f8d6aaabef9f4156fe4f8