[gradle] Restore support for userName in authentication info

[Mikolaj Izdebski]

commit eeef01e02270392072bcf8ae3a797a772083f621
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Mon Nov 24 14:23:05 2014 +0100

    Restore support for userName in authentication info

 ...-Port-to-Maven-3.1.1-and-Aether-Ant-Tasks.patch |   23 ++++++++++++++-----
 0007-Remove-Class-Path-from-manifest.patch         |    2 +-
 ...-Implement-XMvn-repository-factory-method.patch |    2 +-
 ...e-command-as-fallback-way-of-getting-buil.patch |    2 +-
 gradle.spec                                        |    5 +++-
 5 files changed, 24 insertions(+), 10 deletions(-)
---
diff --git a/0006-Port-to-Maven-3.1.1-and-Aether-Ant-Tasks.patch b/0006-Port-to-Maven-3.1.1-and-Aether-Ant-Tasks.patch
index d146a4a..10d2438 100644
--- a/0006-Port-to-Maven-3.1.1-and-Aether-Ant-Tasks.patch
+++ b/0006-Port-to-Maven-3.1.1-and-Aether-Ant-Tasks.patch
@@ -1,4 +1,4 @@
-From e1faaad5e1bdb19ffd616fc15f7516b6208e01c2 Mon Sep 17 00:00:00 2001
+From 9d8b819bc14071dd64fcc4a56a2111a74e563a77 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Fri, 31 Oct 2014 09:23:37 +0100
 Subject: [PATCH 6/9] Port to Maven 3.1.1 and Aether Ant Tasks
@@ -25,14 +25,14 @@ Subject: [PATCH 6/9] Port to Maven 3.1.1 and Aether Ant Tasks
  .../maven/internal/ant/MavenSettingsSupplier.java  |  4 +-
  .../ant/MaybeUserMavenSettingsSupplier.java        | 11 ++--
  .../ProjectDependencyArtifactIdExtractorHack.java  |  3 +-
- .../maven/internal/ant/RepositoryBuilder.java      | 12 ++---
+ .../maven/internal/ant/RepositoryBuilder.java      | 24 ++++++---
  .../maven/internal/ant/RepositoryFactory.java      | 16 +++---
  .../AbstractAntTaskBackedMavenPublisher.java       | 58 +++++++-------------
  .../AntTaskBackedMavenLocalPublisher.java          | 41 ++++----------
  .../publisher/AntTaskBackedMavenPublisher.java     | 49 ++++++-----------
  .../publisher/MavenRemoteRepositoryFactory.java    |  6 +--
  .../publisher/ValidatingMavenPublisher.java        |  6 +--
- 28 files changed, 222 insertions(+), 377 deletions(-)
+ 28 files changed, 233 insertions(+), 378 deletions(-)
  delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/CustomDeployTask.java
  delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/CustomInstallDeployTaskSupport.java
  delete mode 100644 subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/CustomInstallTask.java
@@ -800,10 +800,10 @@ index 988270d..3fcd73a 100644
  
  import java.util.Collection;
 diff --git a/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/RepositoryBuilder.java b/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/RepositoryBuilder.java
-index bff4576..c22ec0c 100644
+index bff4576..97afd1e 100644
 --- a/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/RepositoryBuilder.java
 +++ b/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/RepositoryBuilder.java
-@@ -15,18 +15,18 @@
+@@ -15,18 +15,28 @@
   */
  package org.gradle.api.publication.maven.internal.ant;
  
@@ -820,12 +820,23 @@ index bff4576..c22ec0c 100644
  public class RepositoryBuilder extends FactoryBuilderSupport {
      public RepositoryBuilder() {
          registerFactory("repository", new RepositoryFactory(RemoteRepository.class));
-         registerBeanFactory("authentication", Authentication.class);
+-        registerBeanFactory("authentication", Authentication.class);
++        registerBeanFactory("authentication", CustomAuthentication.class);
          registerBeanFactory("proxy", Proxy.class);
 -        registerBeanFactory("snapshots", RepositoryPolicy.class);
 -        registerBeanFactory("releases", RepositoryPolicy.class);
 +        registerBeanFactory("snapshots", RemoteRepository.Policy.class);
 +        registerBeanFactory("releases", RemoteRepository.Policy.class);
++    }
++
++    public static class CustomAuthentication extends Authentication {
++        public String getUserName() {
++            return getUsername();
++        }
++
++        public void setUserName(String userName) {
++            setUsername(userName);
++        }
      }
  }
 diff --git a/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/RepositoryFactory.java b/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/RepositoryFactory.java
diff --git a/0007-Remove-Class-Path-from-manifest.patch b/0007-Remove-Class-Path-from-manifest.patch
index a09e956..9402a21 100644
--- a/0007-Remove-Class-Path-from-manifest.patch
+++ b/0007-Remove-Class-Path-from-manifest.patch
@@ -1,4 +1,4 @@
-From 7624bdc7d863a5281fbc2aa4defb20d88ce7a931 Mon Sep 17 00:00:00 2001
+From cc4fed093efeb23cb0650cf8cf7507643a0e7cad Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Sun, 9 Nov 2014 17:52:30 +0100
 Subject: [PATCH 7/9] Remove Class-Path from manifest
diff --git a/0008-Implement-XMvn-repository-factory-method.patch b/0008-Implement-XMvn-repository-factory-method.patch
index 6515543..c7a0b0a 100644
--- a/0008-Implement-XMvn-repository-factory-method.patch
+++ b/0008-Implement-XMvn-repository-factory-method.patch
@@ -1,4 +1,4 @@
-From 658a7dfc8de9ebc7a8e7aeb9d341a45f359f1b37 Mon Sep 17 00:00:00 2001
+From 21a9486b77acec7381ec319dde0ef99c92ea039a Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Sun, 9 Nov 2014 21:37:37 +0100
 Subject: [PATCH 8/9] Implement XMvn repository factory method
diff --git a/0009-Use-hostname-command-as-fallback-way-of-getting-buil.patch b/0009-Use-hostname-command-as-fallback-way-of-getting-buil.patch
index 2421ee4..85489fd 100644
--- a/0009-Use-hostname-command-as-fallback-way-of-getting-buil.patch
+++ b/0009-Use-hostname-command-as-fallback-way-of-getting-buil.patch
@@ -1,4 +1,4 @@
-From 62576e035bd3b7558fe5ec53c3b3126f9e17ede9 Mon Sep 17 00:00:00 2001
+From fe3c02831660397dfa3b99daf6924cc7e03afec5 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Thu, 20 Nov 2014 11:04:23 +0100
 Subject: [PATCH 9/9] Use hostname command as fallback way of getting build
diff --git a/gradle.spec b/gradle.spec
index 3a2a798..afd62dc 100644
--- a/gradle.spec
+++ b/gradle.spec
@@ -1,6 +1,6 @@
 Name:           gradle
 Version:        2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Build automation tool
 # Some examples and integration tests are under GNU LGPL and Boost
 # Software License, but are not used to create binary package.
@@ -507,6 +507,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %files local -f .mfiles-local
 
 %changelog
+* Mon Nov 24 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.2-3
+- Restore support for userName in authentication info
+
 * Thu Nov 20 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.2-2
 - Improve versioning and identification as Fedora package