[gradle] 14/16: Refresh eclipse-aether.diff
Kai-Chung Yan
seamlik-guest at moszumanska.debian.org
Wed Sep 30 00:38:00 UTC 2015
This is an automated email from the git hooks/post-receive script.
seamlik-guest pushed a commit to branch master
in repository gradle.
commit 0fdbbeb21fc03f9364dc8c725db9cdbc182a92ad
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date: Wed Sep 30 07:51:25 2015 +0800
Refresh eclipse-aether.diff
---
debian/patches/eclipse-aether.diff | 53 ++++++++++++++++++++++----------------
1 file changed, 31 insertions(+), 22 deletions(-)
diff --git a/debian/patches/eclipse-aether.diff b/debian/patches/eclipse-aether.diff
index 4e48b75..3690372 100644
--- a/debian/patches/eclipse-aether.diff
+++ b/debian/patches/eclipse-aether.diff
@@ -5,9 +5,9 @@ Last-Update: 2015-09-30
--- a/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/SnapshotVersionManager.java
+++ b/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/SnapshotVersionManager.java
@@ -16,13 +16,13 @@
-
+
package org.gradle.api.publication.maven.internal.action;
-
+
-import org.sonatype.aether.RepositorySystemSession;
-import org.sonatype.aether.artifact.Artifact;
-import org.sonatype.aether.deployment.DeployRequest;
@@ -22,19 +22,19 @@ Last-Update: 2015-09-30
+import org.eclipse.aether.impl.MetadataGeneratorFactory;
+import org.eclipse.aether.installation.InstallRequest;
+import org.eclipse.aether.metadata.Metadata;
-
+
import java.util.Collection;
import java.util.Collections;
@@ -35,8 +35,8 @@
}
-
+
@Override
- public int getPriority() {
- return -100;
+ public float getPriority() {
+ return -100.0F;
}
-
+
@Override
--- a/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/MavenDeployAction.java
+++ b/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/MavenDeployAction.java
@@ -58,27 +58,27 @@ Last-Update: 2015-09-30
+import org.eclipse.aether.repository.Authentication;
+import org.eclipse.aether.repository.Proxy;
+import org.eclipse.aether.util.repository.DefaultProxySelector;
-
+
import java.io.File;
import java.util.Collection;
@@ -56,7 +56,7 @@
throw new GradleException("Must specify a repository for deployment");
}
-
+
- org.sonatype.aether.repository.RemoteRepository aetherRepo = createRepository(gradleRepo);
+ org.eclipse.aether.repository.RemoteRepository aetherRepo = createRepository(gradleRepo);
-
+
DeployRequest request = new DeployRequest();
request.setRepository(aetherRepo);
@@ -68,22 +68,26 @@
repositorySystem.deploy(session, request);
}
-
+
- private org.sonatype.aether.repository.RemoteRepository createRepository(RemoteRepository gradleRepo) {
- org.sonatype.aether.repository.RemoteRepository repo = new org.sonatype.aether.repository.RemoteRepository("remote", gradleRepo.getLayout(), gradleRepo.getUrl());
+ private org.eclipse.aether.repository.RemoteRepository createRepository(RemoteRepository gradleRepo) {
+ org.eclipse.aether.repository.RemoteRepository.Builder repo = new org.eclipse.aether.repository.RemoteRepository.Builder("remote", gradleRepo.getLayout(), gradleRepo.getUrl());
-
+
org.apache.maven.artifact.ant.Authentication auth = gradleRepo.getAuthentication();
if (auth != null) {
- repo.setAuthentication(new Authentication(auth.getUserName(), auth.getPassword(), auth.getPrivateKey(), auth.getPassphrase()));
@@ -86,7 +86,7 @@ Last-Update: 2015-09-30
+ authBuilder.addUsername(auth.getUserName()).addPassword(auth.getPassword()).addPrivateKey(auth.getPrivateKey(), auth.getPassphrase());
+ repo.setAuthentication(authBuilder.build());
}
-
+
org.apache.maven.artifact.ant.Proxy proxy = gradleRepo.getProxy();
if (proxy != null) {
DefaultProxySelector proxySelector = new DefaultProxySelector();
@@ -98,7 +98,7 @@ Last-Update: 2015-09-30
- repo.setProxy(proxySelector.getProxy(repo));
+ repo.setProxy(proxySelector.getProxy(repo.build()));
}
-
+
- return repo;
+ return repo.build();
}
@@ -108,7 +108,7 @@ Last-Update: 2015-09-30
@@ -18,11 +18,11 @@
import java.io.File;
import java.util.Collection;
-
+
-import org.sonatype.aether.RepositorySystem;
-import org.sonatype.aether.RepositorySystemSession;
-import org.sonatype.aether.artifact.Artifact;
@@ -119,9 +119,9 @@ Last-Update: 2015-09-30
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.installation.InstallRequest;
+import org.eclipse.aether.installation.InstallationException;
-
+
public class MavenInstallAction extends AbstractMavenPublishAction {
-
+
--- a/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/AbstractMavenPublishAction.java
+++ b/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/AbstractMavenPublishAction.java
@@ -27,16 +27,16 @@
@@ -148,22 +148,31 @@ Last-Update: 2015-09-30
+import org.eclipse.aether.repository.LocalRepository;
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.artifact.DefaultArtifact;
-
+
import java.io.File;
import java.io.FileReader;
@@ -66,7 +66,7 @@
}
-
+
public void setLocalMavenRepositoryLocation(File localMavenRepository) {
- session.setLocalRepositoryManager(new SimpleLocalRepositoryManager(localMavenRepository));
-+ session.setLocalRepositoryManager(new DefaultRepositorySystem().newLocalRepositoryManager(session, new LocalRepository(localMavenRepository)));
++ session.setLocalRepositoryManager(new org.eclipse.aether.internal.impl.DefaultRepositorySystem().newLocalRepositoryManager(session, new LocalRepository(localMavenRepository)));
}
-
+
public void setMainArtifact(File file) {
+@@ -113,7 +113,7 @@
+ // This is a workaround for https://issues.gradle.org/browse/GRADLE-3324.
+ // Somehow the ArrayList 'result' in `org.sonatype.aether.impl.internal.Utils#sortMetadataGeneratorFactories` ends up
+ // being a list of nulls on windows and IBM's 1.6 JDK.
+- deployer.setMetadataFactories(null);
++ deployer.setMetadataGeneratorFactories(null);
+ deployer.addMetadataGeneratorFactory(new VersionsMetadataGeneratorFactory());
+ deployer.addMetadataGeneratorFactory(new SnapshotMetadataGeneratorFactory());
+ deployer.addMetadataGeneratorFactory(snapshotVersionManager);
--- a/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/LoggingMavenTransferListener.java
+++ b/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/LoggingMavenTransferListener.java
@@ -18,9 +18,9 @@
-
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.sonatype.aether.transfer.AbstractTransferListener;
@@ -172,7 +181,7 @@ Last-Update: 2015-09-30
+import org.eclipse.aether.transfer.AbstractTransferListener;
+import org.eclipse.aether.transfer.TransferEvent;
+import org.eclipse.aether.transfer.TransferEvent.RequestType;
-
+
class LoggingMavenTransferListener extends AbstractTransferListener {
private static final Logger LOGGER = LoggerFactory.getLogger(LoggingMavenTransferListener.class);
--- a/subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/maven/MavenProjectsCreator.java
@@ -186,5 +195,5 @@ Last-Update: 2015-09-30
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.DefaultRepositorySystemSession;
import org.gradle.util.CollectionUtils;
-
+
import java.io.File;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git
More information about the pkg-java-commits
mailing list