This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository gradle.
commit 65ecacac02b4f889fd94b8156175e6b3100dad3a Author: Emmanuel Bourg <[email protected]> Date: Wed Mar 2 13:27:40 2016 +0100 Merged maven-aether-provider.diff into eclipse-aether.diff --- debian/changelog | 1 + debian/patches/eclipse-aether.diff | 18 ++++++++++++++++++ debian/patches/maven-aether-provider.diff | 23 ----------------------- debian/patches/series | 1 - 4 files changed, 19 insertions(+), 24 deletions(-) diff --git a/debian/changelog b/debian/changelog index 597dbcf..27907b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ gradle (2.10-2) UNRELEASED; urgency=medium * Removed 26_disable_commitid.diff (not required) * Replaced disable_release_notes.diff with a task exclusion parameter * Moved aether dependencies changes to eclipse-aether.diff + * Merged maven-aether-provider.diff into eclipse-aether.diff * Standards-Version updated to 3.9.7 (no changes) * Use a secure Vcs-Git URL diff --git a/debian/patches/eclipse-aether.diff b/debian/patches/eclipse-aether.diff index 0766399..ef6361c 100644 --- a/debian/patches/eclipse-aether.diff +++ b/debian/patches/eclipse-aether.diff @@ -143,6 +143,15 @@ Last-Update: 2015-09-30 import java.util.Collection; --- 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 +@@ -18,7 +18,7 @@ + + import org.apache.maven.model.Model; + import org.apache.maven.model.io.xpp3.MavenXpp3Reader; +-import org.apache.maven.repository.internal.MavenRepositorySystemSession; ++import org.apache.maven.repository.internal.MavenRepositorySystemUtils; + import org.apache.maven.repository.internal.SnapshotMetadataGeneratorFactory; + import org.apache.maven.repository.internal.VersionsMetadataGeneratorFactory; + import org.codehaus.plexus.DefaultContainerConfiguration; @@ -30,16 +30,16 @@ import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import org.gradle.api.GradleException; @@ -170,6 +179,15 @@ Last-Update: 2015-09-30 import java.io.File; import java.io.FileReader; +@@ -60,7 +60,7 @@ + + protected AbstractMavenPublishAction(File pomFile, List<File> wagonJars) { + container = newPlexusContainer(wagonJars); +- session = new MavenRepositorySystemSession(); ++ session = MavenRepositorySystemUtils.newSession(); + session.setTransferListener(new LoggingMavenTransferListener()); + session.getConfigProperties().put("maven.metadata.legacy", "true"); + @@ -70,7 +70,7 @@ } diff --git a/debian/patches/maven-aether-provider.diff b/debian/patches/maven-aether-provider.diff deleted file mode 100644 index 28a5195..0000000 --- a/debian/patches/maven-aether-provider.diff +++ /dev/null @@ -1,23 +0,0 @@ -Description: Maven module uses a deprecated API of maven-aether-provider. -Author: Kai-Chung Yan <[email protected]> -Last-Update: 2015-09-30 ---- 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 -@@ -18,7 +18,7 @@ - - import org.apache.maven.model.Model; - import org.apache.maven.model.io.xpp3.MavenXpp3Reader; --import org.apache.maven.repository.internal.MavenRepositorySystemSession; -+import org.apache.maven.repository.internal.MavenRepositorySystemUtils; - import org.apache.maven.repository.internal.SnapshotMetadataGeneratorFactory; - import org.apache.maven.repository.internal.VersionsMetadataGeneratorFactory; - import org.codehaus.plexus.DefaultContainerConfiguration; -@@ -60,7 +60,7 @@ - - protected AbstractMavenPublishAction(File pomFile, List<File> wagonJars) { - container = newPlexusContainer(wagonJars); -- session = new MavenRepositorySystemSession(); -+ session = MavenRepositorySystemUtils.newSession(); - session.setTransferListener(new LoggingMavenTransferListener()); - session.getConfigProperties().put("maven.metadata.legacy", "true"); - diff --git a/debian/patches/series b/debian/patches/series index 6c6ac1c..a19d9da 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,7 +12,6 @@ jcommander.diff nekohtml.diff relax_warnings.diff eclipse-aether.diff -maven-aether-provider.diff maven_builder_support.diff generate_classpath.diff generate_pom.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
