[gradle] Disable analytics plugin

Mikolaj Izdebski mizdebsk at fedoraproject.org
Tue Nov 18 20:10:25 UTC 2014


commit cc51ea62296e9b9614190fe15842210c1ad63b8f
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Fri Oct 17 16:03:21 2014 +0200

    Disable analytics plugin

 0001-Gradle-local-mode.patch        |   19 +++----------------
 0002-Port-to-Maven-3.2.3.patch      |    4 ++--
 0003-Disable-analytics-plugin.patch |   24 ++++++++++++++++++++++++
 gradle.spec                         |    7 ++++++-
 4 files changed, 35 insertions(+), 19 deletions(-)
---
diff --git a/0001-Gradle-local-mode.patch b/0001-Gradle-local-mode.patch
index c0fa659..01d32e0 100644
--- a/0001-Gradle-local-mode.patch
+++ b/0001-Gradle-local-mode.patch
@@ -1,17 +1,16 @@
-From b512f941f12409f2ad3553f28b7149179c7011c4 Mon Sep 17 00:00:00 2001
+From 57d2d8cad002f7188f612b3e959fe7915421afa2 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Wed, 15 Oct 2014 14:23:30 +0200
-Subject: [PATCH 1/2] Gradle local mode
+Subject: [PATCH 1/3] Gradle local mode
 
 ---
  build.gradle                                         | 1 +
  buildSrc/build.gradle                                | 1 +
- gradle/analytics.gradle                              | 1 +
  subprojects/docs/docs.gradle                         | 1 +
  subprojects/docs/src/transforms/release-notes.gradle | 1 +
  subprojects/performance/performance.gradle           | 1 +
  subprojects/reporting/reporting.gradle               | 1 +
- 7 files changed, 7 insertions(+)
+ 6 files changed, 6 insertions(+)
 
 diff --git a/build.gradle b/build.gradle
 index 7de0a9a..4a17934 100644
@@ -37,18 +36,6 @@ index 9e03b4f..5a9e72f 100644
      maven { url 'https://repo.gradle.org/gradle/libs' }
      mavenCentral()
  }
-diff --git a/gradle/analytics.gradle b/gradle/analytics.gradle
-index eb800ac..1f1d901 100644
---- a/gradle/analytics.gradle
-+++ b/gradle/analytics.gradle
-@@ -16,6 +16,7 @@
- 
- buildscript {
-     repositories {
-+        add(new XMvn())
-         maven { url 'https://repo.gradle.org/gradle/libs' }
-         ivy { url 'https://repo.gradle.org/gradle/gradleware' }
-     }
 diff --git a/subprojects/docs/docs.gradle b/subprojects/docs/docs.gradle
 index c91faba..c6db38b 100755
 --- a/subprojects/docs/docs.gradle
diff --git a/0002-Port-to-Maven-3.2.3.patch b/0002-Port-to-Maven-3.2.3.patch
index aee7816..4d6397d 100644
--- a/0002-Port-to-Maven-3.2.3.patch
+++ b/0002-Port-to-Maven-3.2.3.patch
@@ -1,7 +1,7 @@
-From 99ae9e462de0ce2ffcb1129ce02e13dc5c9ea9e2 Mon Sep 17 00:00:00 2001
+From c2c3b64d730fc600e5eff0ee39d3ea3fadd7a75c Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk at redhat.com>
 Date: Fri, 17 Oct 2014 14:41:20 +0200
-Subject: [PATCH 2/2] Port to Maven 3.2.3
+Subject: [PATCH 2/3] Port to Maven 3.2.3
 
 ---
  gradle/dependencies.gradle                                    | 11 ++++++-----
diff --git a/0003-Disable-analytics-plugin.patch b/0003-Disable-analytics-plugin.patch
new file mode 100644
index 0000000..ee8eea6
--- /dev/null
+++ b/0003-Disable-analytics-plugin.patch
@@ -0,0 +1,24 @@
+From 6ac9cc7d062df8b80a388da0d975af078c2a7c2f Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk at redhat.com>
+Date: Fri, 17 Oct 2014 15:56:17 +0200
+Subject: [PATCH 3/3] Disable analytics plugin
+
+---
+ build.gradle | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/build.gradle b/build.gradle
+index 4a17934..bb0179c 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -119,7 +119,6 @@ apply from: "gradle/strictCompile.gradle"
+ apply from: "gradle/noDependencyResolutionDuringConfiguration.gradle"
+ apply from: "gradle/testSetup.gradle"
+ apply from: "gradle/testGroupings.gradle"
+-apply from: "gradle/analytics.gradle"
+ 
+ allprojects {
+     group = 'org.gradle'
+-- 
+1.9.3
+
diff --git a/gradle.spec b/gradle.spec
index e3d5c41..9be9c44 100644
--- a/gradle.spec
+++ b/gradle.spec
@@ -4,7 +4,7 @@
 
 Name:           gradle
 Version:        2.1
-Release:        0.6%{?dist}
+Release:        0.7%{?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.
@@ -17,6 +17,7 @@ Source1:        http://services.gradle.org/versions/all#/all-released-versions.j
 
 Patch0:         0001-Gradle-local-mode.patch
 Patch1:         0002-Port-to-Maven-3.2.3.patch
+Patch2:         0003-Disable-analytics-plugin.patch
 
 BuildRequires:  gradle-local
 BuildRequires:  gradle-deps >= 2.1-0.2
@@ -149,6 +150,7 @@ legacy automation challenges.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 mkdir -p build
 cp %{SOURCE1} build/all-released-versions.json
@@ -180,6 +182,9 @@ jar cfm %{buildroot}%{_datadir}/%{name}/lib/plugins/gradle-core-impl-2.1*.jar ME
 %doc LICENSE NOTICE
 
 %changelog
+* Fri Oct 17 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.1-0.7
+- Disable analytics plugin
+
 * Fri Oct 17 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.1-0.6
 - Build using local dependencies
 


More information about the scm-commits mailing list