[gradle] Rebuild for netty3 update

[Mikolaj Izdebski]

commit 0c7fb0dbc13fe710bb6c57409e26a3deb290301e
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Mon Feb 16 12:15:25 2015 +0100

    Rebuild for netty3 update

 0014-Don-t-declare-dependency-on-jarjars.patch |   42 ++++++++++++++++++-----
 gradle-bootstrap.sh                            |    2 +-
 gradle.spec                                    |    5 ++-
 3 files changed, 38 insertions(+), 11 deletions(-)
---
diff --git a/0014-Don-t-declare-dependency-on-jarjars.patch b/0014-Don-t-declare-dependency-on-jarjars.patch
index 72b99cc..d26fb23 100644
--- a/0014-Don-t-declare-dependency-on-jarjars.patch
+++ b/0014-Don-t-declare-dependency-on-jarjars.patch
@@ -1,31 +1,55 @@
-From c4cc7b7ab39776cb73eadab6a94eb15bba5ec7a3 Mon Sep 17 00:00:00 2001
+From 7063827838c75f5a450892266e7bd754ec8b98ef Mon Sep 17 00:00:00 2001
 From: Michael Simacek <msimacek at redhat.com>
 Date: Sat, 7 Feb 2015 17:43:40 +0100
 Subject: [PATCH 14/14] Don't declare dependency on jarjars
 
 ---
- subprojects/dependency-management/dependency-management.gradle | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
+ .../dependency-management.gradle                    | 21 +--------------------
+ 1 file changed, 1 insertion(+), 20 deletions(-)
 
 diff --git a/subprojects/dependency-management/dependency-management.gradle b/subprojects/dependency-management/dependency-management.gradle
-index 548b7ef..911897b 100644
+index 548b7ef..c971dbe 100644
 --- a/subprojects/dependency-management/dependency-management.gradle
 +++ b/subprojects/dependency-management/dependency-management.gradle
-@@ -20,9 +20,11 @@ dependencies {
+@@ -20,9 +20,7 @@ dependencies {
      runtime libraries.xbean //maven3 classes dependency
      runtime "org.bouncycastle:bcprov-jdk15:1.46 at jar"
  
 -    compile fileTree("$buildDir/libs/jarjar") {
 -        builtBy 'jarJarMaven3'
 -    }
-+    //compile fileTree("$buildDir/libs/jarjar") {
-+    //    builtBy 'jarJarMaven3'
-+    //}
-+
 +    compile libraries.maven3
  
      mvn3Input libraries.maven3
  
+@@ -34,27 +32,10 @@ dependencies {
+     testFixturesCompile project(":internalIntegTesting")
+ }
+ 
+-task jarJarMaven3(type: JarJar) {
+-    inputJars = configurations.mvn3Input
+-    outputDir = file("$buildDir/libs/jarjar")
+-
+-    //unfortunately, all those need to be jarjarred.
+-    // Even if some library (like aether) is not included in maven-ant-tasks it has
+-    // META-INF/plexus/components.xml that to jarjarred components.
+-    //rule('org.apache.maven.**', 'org.gradle.mvn3.org.apache.maven. at 1')
+-    //rule('org.codehaus.**', 'org.gradle.mvn3.org.codehaus. at 1')
+-    //rule('org.sonatype.**', 'org.gradle.mvn3.org.sonatype. at 1')
+-    //rule('org.eclipse.aether.**', 'org.gradle.mvn3.org.eclipse.aether. at 1')
+-
+-    avoidConflictingPlexusComponents(it)
+-}
+-
+ if(isWindows && javaVersion.java5){
+     compileTestGroovy.options.fork (memoryMaximumSize: '512m')
+ }
+ 
+-classpathManifest.dependsOn jarJarMaven3 //see GRADLE-2521
+-
+ //adding explicit task dependencies due to https://issues.gradle.org/browse/GRADLE-2481
+ def allJarJars = tasks.withType(JarJar)
+ ideaModule.dependsOn allJarJars
 -- 
 2.1.0
 
diff --git a/gradle-bootstrap.sh b/gradle-bootstrap.sh
index e9ac480..91d7f46 100755
--- a/gradle-bootstrap.sh
+++ b/gradle-bootstrap.sh
@@ -117,7 +117,7 @@ msv-core
 multiverse/multiverse-core
 native-platform
 nekohtml
-netty3-3.6.6
+netty3-3.9.3
 objectweb-asm/asm-all
 objenesis/objenesis
 org.eclipse.sisu.plexus
diff --git a/gradle.spec b/gradle.spec
index cb66050..b231dfa 100644
--- a/gradle.spec
+++ b/gradle.spec
@@ -13,7 +13,7 @@
 
 Name:           gradle
 Version:        2.2.1
-Release:        5%{?dist}
+Release:        6%{?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.
@@ -546,6 +546,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %doc LICENSE NOTICE
 
 %changelog
+* Fri Feb 13 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.2.1-6
+- Rebuild for netty3 update
+
 * Sat Feb 07 2015 Michael Simacek <msimacek at redhat.com> - 2.2.1-5
 - Use unversioned dependency JAR names