[gradle] Don't use diamond operator with Java 1.5

[Mikolaj Izdebski]

commit 0187d786ef4ba556b68c5724dca384fd613045b0
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Tue Feb 3 08:52:04 2015 +0100

    Don't use diamond operator with Java 1.5

 ...-Port-to-Maven-3.1.1-and-Aether-Ant-Tasks.patch |    6 +++---
 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 +-
 0010-Compatibility-with-Guava-18.0.patch           |    2 +-
 0011-Add-build-dependency-on-ASM-5.0.3.patch       |    2 +-
 0012-Port-from-Simple-4-to-Jetty-9.patch           |    2 +-
 7 files changed, 9 insertions(+), 9 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 48b8868..b513429 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 fc3d2b7cc048232a2ed10dde17c7ca6ea51fed7a Mon Sep 17 00:00:00 2001
+From 01f241aae6189e25a6ecc9adec9653c12beade40 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 06/12] Port to Maven 3.1.1 and Aether Ant Tasks
@@ -751,7 +751,7 @@ index 15079c4..0000000
 -}
 diff --git a/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/CustomRemoteRepository.java b/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/CustomRemoteRepository.java
 new file mode 100644
-index 0000000..f7a6d34
+index 0000000..df82986
 --- /dev/null
 +++ b/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/CustomRemoteRepository.java
 @@ -0,0 +1,29 @@
@@ -767,7 +767,7 @@ index 0000000..f7a6d34
 +
 +class CustomRemoteRepository extends RemoteRepository {
 +
-+    private final List<Proxy> proxies = new ArrayList<>();
++    private final List<Proxy> proxies = new ArrayList<Proxy>();
 +
 +    @Override
 +    public void setProject(Project project) {
diff --git a/0007-Remove-Class-Path-from-manifest.patch b/0007-Remove-Class-Path-from-manifest.patch
index 594721f..6290ec6 100644
--- a/0007-Remove-Class-Path-from-manifest.patch
+++ b/0007-Remove-Class-Path-from-manifest.patch
@@ -1,4 +1,4 @@
-From 05292dae1bea882521cbf6ad1a082de76ba806da Mon Sep 17 00:00:00 2001
+From 89457f3286a91f9b8269126913cabee95340d667 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 07/12] Remove Class-Path from manifest
diff --git a/0008-Implement-XMvn-repository-factory-method.patch b/0008-Implement-XMvn-repository-factory-method.patch
index c0340da..e1827dc 100644
--- a/0008-Implement-XMvn-repository-factory-method.patch
+++ b/0008-Implement-XMvn-repository-factory-method.patch
@@ -1,4 +1,4 @@
-From f2feb1d8495ef5af3e9be8593ce54bde5f5e23fe Mon Sep 17 00:00:00 2001
+From 394a778339c85edf3c836a97472ff5fe5efe29f8 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 08/12] 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 d02f4cb..c151f39 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 fe2567a8cfd25e077660e77c9f87b5c05e181bc5 Mon Sep 17 00:00:00 2001
+From 958bab2f736b41ae209695e64409b7de36e298f4 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 09/12] Use hostname command as fallback way of getting build
diff --git a/0010-Compatibility-with-Guava-18.0.patch b/0010-Compatibility-with-Guava-18.0.patch
index 96c326a..cc6be33 100644
--- a/0010-Compatibility-with-Guava-18.0.patch
+++ b/0010-Compatibility-with-Guava-18.0.patch
@@ -1,4 +1,4 @@
-From ecb232b052b6f42fd53f864ed91c4b5cd350e111 Mon Sep 17 00:00:00 2001
+From 40d50fdf4ad6f7dce21b783f2488b3fbbe593aee Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Tue, 20 Jan 2015 11:59:22 +0100
 Subject: [PATCH 10/12] Compatibility with Guava 18.0
diff --git a/0011-Add-build-dependency-on-ASM-5.0.3.patch b/0011-Add-build-dependency-on-ASM-5.0.3.patch
index 44b5624..2bd003b 100644
--- a/0011-Add-build-dependency-on-ASM-5.0.3.patch
+++ b/0011-Add-build-dependency-on-ASM-5.0.3.patch
@@ -1,4 +1,4 @@
-From c4c54994bb435fc75ba55c5b470e64f8d15fcdaa Mon Sep 17 00:00:00 2001
+From 05af7e68c30fb884e26b60727a5107828ceb2a6e Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Tue, 20 Jan 2015 12:30:09 +0100
 Subject: [PATCH 11/12] Add build dependency on ASM 5.0.3
diff --git a/0012-Port-from-Simple-4-to-Jetty-9.patch b/0012-Port-from-Simple-4-to-Jetty-9.patch
index 3fa48eb..2d78bd6 100644
--- a/0012-Port-from-Simple-4-to-Jetty-9.patch
+++ b/0012-Port-from-Simple-4-to-Jetty-9.patch
@@ -1,4 +1,4 @@
-From c6a0dbd6d58c99cb38394b18d73781da0d04f03a Mon Sep 17 00:00:00 2001
+From c02cd8fb3a9875241f29d7e3507edee7c2d94851 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Fri, 30 Jan 2015 13:16:40 +0100
 Subject: [PATCH 12/12] Port from Simple 4 to Jetty 9