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/0001-Port-to-latest-guava.patch b/0001-Port-to-latest-guava.patch deleted file mode 100644 index 46bd12a..0000000 --- a/0001-Port-to-latest-guava.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 568b521fae65c67a2b3670bf1c33de8ea19899cd Mon Sep 17 00:00:00 2001 -From: Mat Booth -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 @@ - - com.google.guava - guava -- 14.0.1 -+ 17.0 - - - -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-updated-aether-api.patch b/aether-connector-okhttp-updated-aether-api.patch deleted file mode 100644 index 6f3ec48..0000000 --- a/aether-connector-okhttp-updated-aether-api.patch +++ /dev/null @@ -1,139 +0,0 @@ ---- src/main/java/io/tesla/aether/connector/AetherRepositoryConnector.java.orig 2014-05-01 02:41:07.000000000 +0100 -+++ src/main/java/io/tesla/aether/connector/AetherRepositoryConnector.java 2014-05-24 16:17:15.050666912 +0100 -@@ -57,6 +57,7 @@ - import org.codehaus.plexus.configuration.PlexusConfiguration; - import org.eclipse.aether.ConfigurationProperties; - import org.eclipse.aether.RepositorySystemSession; -+import org.eclipse.aether.impl.DefaultServiceLocator; - import org.eclipse.aether.repository.AuthenticationContext; - import org.eclipse.aether.repository.RemoteRepository; - import org.eclipse.aether.repository.RepositoryPolicy; -@@ -68,7 +69,10 @@ - import org.eclipse.aether.spi.connector.MetadataUpload; - import org.eclipse.aether.spi.connector.RepositoryConnector; - import org.eclipse.aether.spi.connector.Transfer; -+import org.eclipse.aether.spi.connector.layout.RepositoryLayout; -+import org.eclipse.aether.spi.connector.layout.RepositoryLayoutProvider; - import org.eclipse.aether.spi.io.FileProcessor; -+import org.eclipse.aether.spi.locator.ServiceLocator; - //import org.eclipse.aether.spi.log.Logger; - import org.eclipse.aether.transfer.ArtifactNotFoundException; - import org.eclipse.aether.transfer.ArtifactTransferException; -@@ -76,6 +80,7 @@ - import org.eclipse.aether.transfer.MetadataNotFoundException; - import org.eclipse.aether.transfer.MetadataTransferException; - import org.eclipse.aether.transfer.NoRepositoryConnectorException; -+import org.eclipse.aether.transfer.NoRepositoryLayoutException; - import org.eclipse.aether.transfer.TransferCancelledException; - import org.eclipse.aether.transfer.TransferEvent; - import org.eclipse.aether.transfer.TransferEvent.EventType; -@@ -84,8 +89,6 @@ - import org.eclipse.aether.transfer.TransferResource; - import org.eclipse.aether.util.ChecksumUtils; - import org.eclipse.aether.util.ConfigUtils; --import org.eclipse.aether.util.repository.layout.MavenDefaultLayout; --import org.eclipse.aether.util.repository.layout.RepositoryLayout; - import org.slf4j.Logger; - import org.slf4j.LoggerFactory; - -@@ -95,8 +98,10 @@ - class AetherRepositoryConnector implements RepositoryConnector { - - private final Logger logger = LoggerFactory.getLogger(AetherRepositoryConnector.class); -+ -+ private final ServiceLocator serviceLocator = new DefaultServiceLocator(); - -- private final RepositoryLayout layout = new MavenDefaultLayout(); -+ private final RepositoryLayout layout; - private final TransferListener listener; - private final RepositorySystemSession session; - private final AuthenticationContext repoAuthenticationContext; -@@ -165,7 +170,7 @@ - this(repository, session, fileProcessor, null); - } - -- public AetherRepositoryConnector(RemoteRepository repository, RepositorySystemSession session, FileProcessor fileProcessor, SSLSocketFactory sslSocketFactory) throws NoRepositoryConnectorException { -+ public AetherRepositoryConnector(RemoteRepository repository, RepositorySystemSession session, FileProcessor fileProcessor, SSLSocketFactory sslSocketFactory) throws NoRepositoryConnectorException { - // - // Right now this only support a Maven layout which is what we mean by type - // -@@ -183,6 +188,13 @@ - this.fileProcessor = fileProcessor; - this.session = session; - -+ RepositoryLayoutProvider repositoryLayoutProvider = serviceLocator.getService(RepositoryLayoutProvider.class); -+ try { -+ this.layout = repositoryLayoutProvider.newRepositoryLayout(session, repository); -+ } catch (NoRepositoryLayoutException e) { -+ throw new RuntimeException(e); -+ } -+ - AetherClientConfig config = new AetherClientConfig(); - - repoAuthenticationContext = AuthenticationContext.forRepository(session, repository); -@@ -284,14 +296,14 @@ - Collection> tasks = new ArrayList>(); - - for (MetadataDownload download : metadataDownloads) { -- String resource = layout.getPath(download.getMetadata()).getPath(); -+ String resource = layout.getLocation(download.getMetadata(), false).getPath(); - GetTask task = new GetTask(resource, download.getFile(), download.getChecksumPolicy(), latch, download, METADATA); - tasks.add(task); - task.run(); - } - - for (ArtifactDownload download : artifactDownloads) { -- String resource = layout.getPath(download.getArtifact()).getPath(); -+ String resource = layout.getLocation(download.getArtifact(), false).getPath(); - GetTask task = new GetTask(resource, download.isExistenceCheck() ? null : download.getFile(), download.getChecksumPolicy(), latch, download, ARTIFACT); - tasks.add(task); - task.run(); -@@ -324,14 +336,14 @@ - Collection> tasks = new ArrayList>(); - - for (ArtifactUpload upload : artifactUploads) { -- String path = layout.getPath(upload.getArtifact()).getPath(); -+ String path = layout.getLocation(upload.getArtifact(), true).getPath(); - PutTask task = new PutTask(path, upload.getFile(), latch, upload, ARTIFACT); - tasks.add(task); - task.run(); - } - - for (MetadataUpload upload : metadataUploads) { -- String path = layout.getPath(upload.getMetadata()).getPath(); -+ String path = layout.getLocation(upload.getMetadata(), true).getPath(); - PutTask task = new PutTask(path, upload.getFile(), latch, upload, METADATA); - tasks.add(task); - task.run(); -@@ -413,7 +425,6 @@ - - public void run() { - -- download.setState(Transfer.State.ACTIVE); - String uri = buildUrl(path); - TransferResource transferResource = new TransferResource(repository.getUrl(), path, fileInLocalRepository, download.getTrace()); - -@@ -682,7 +693,6 @@ - - public void flush() { - wrapper.wrap(download, exception, repository); -- download.setState(Transfer.State.DONE); - } - - private void rename(File from, File to) throws IOException { -@@ -713,7 +723,6 @@ - - public void run() { - -- upload.setState(Transfer.State.ACTIVE); - final TransferResource transferResource = new TransferResource(repository.getUrl(), path, file, upload.getTrace()); - - try { -@@ -762,7 +771,6 @@ - - public void flush() { - wrapper.wrap(upload, exception, repository); -- upload.setState(Transfer.State.DONE); - } - - private void uploadChecksums(File file, String uri) { 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 - 0.14.0-1 +- Update to upstream version 0.14.0 + * Fri Jul 25 2014 Mat Booth - 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