[gradle] 03/03: Remove taskOrdering.diff and clean up unused patches
Kai-Chung Yan
seamlik-guest at moszumanska.debian.org
Thu Oct 1 06:23:08 UTC 2015
This is an automated email from the git hooks/post-receive script.
seamlik-guest pushed a commit to branch master
in repository gradle.
commit 114ee33c28600ef117566b5940ace0c4503c981b
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date: Thu Oct 1 14:22:29 2015 +0800
Remove taskOrdering.diff and clean up unused patches
---
debian/changelog | 1 +
debian/patches/build_init.diff | 36 --------------------------
debian/patches/diagnostics_jquery.diff | 26 -------------------
debian/patches/fix_DocGenerationException.diff | 29 ---------------------
debian/patches/series | 1 -
debian/patches/taskOrdering.diff | 15 -----------
6 files changed, 1 insertion(+), 107 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b2c1dcd..69fcfde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ gradle (2.7-1) UNRELEASED; urgency=low
* Remove fix_DocGenerationException.diff: No longer needed
* Update maven_jcommander.diff to jcommander.diff
* Remove build_init.diff: Obsolete
+ * Remove taskOrdering.diff: Obsolete
-- Kai-Chung Yan <seamlikok at gmail.com> Wed, 30 Sep 2015 04:37:18 +0800
diff --git a/debian/patches/build_init.diff b/debian/patches/build_init.diff
deleted file mode 100644
index 68e3786..0000000
--- a/debian/patches/build_init.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: build-init.gradle uses APIs that does not exist in Gradle 1.5,
- this patch corrects the API usage.
-Author: Kai-Chung Yan <seamlikok at gmail.com>
-Last-Update: 2015-06-09
---- a/subprojects/build-init/build-init.gradle
-+++ b/subprojects/build-init/build-init.gradle
-@@ -22,20 +22,6 @@
- integTestRuntime project(':scala')
- }
-
--dependencies {
-- components {
-- all { ComponentMetadataDetails details ->
-- def version = details.id.version
-- if(version.matches("(\\d\\.?)+")){
-- details.status = "release"
-- } else {
-- details.status = "integration"
-- }
-- details.statusScheme = ["integration", "release"]
-- }
-- }
--}
--
- task generateTemplateVersionFile(type: GenerateVersionProperties) {
- outputFile = new File(generatedResourcesDir, "org/gradle/buildinit/tasks/templates/library-versions.properties")
- }
-@@ -80,7 +66,7 @@
- def templateVersionConfiguration = project.configurations.detachedConfiguration(libDependencies as Dependency[])
- templateVersionConfiguration.transitive = false
- ResolutionResult resolutionResult = templateVersionConfiguration.incoming.resolutionResult
-- resolutionResult.allComponents.findAll { it != resolutionResult.root }. each { dep -> dest.put(name, dep.id.version) }
-+ resolutionResult.allDependencies.findAll { it != resolutionResult.root }. each { dep -> dest.put(name, dep.getRequested().getVersion()) }
- }
- }
-
diff --git a/debian/patches/diagnostics_jquery.diff b/debian/patches/diagnostics_jquery.diff
deleted file mode 100644
index 51f28f8..0000000
--- a/debian/patches/diagnostics_jquery.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Use local jQuery instead of shipping one. The upstream contains
- a minified jQuery .js file but we have removed it.
-Author: Kai-Chung Yan <seamlikok at gmail.com>
-Last-Update: 2015-06-20
---- a/subprojects/diagnostics/src/main/resources/org/gradle/api/tasks/diagnostics/htmldependencyreport/index.html
-+++ b/subprojects/diagnostics/src/main/resources/org/gradle/api/tasks/diagnostics/htmldependencyreport/index.html
-@@ -20,7 +20,7 @@
- <title>Dependency Reports</title>
- <link href="base-style.css" rel="stylesheet" type="text/css"/>
- <link href="style.css" rel="stylesheet" type="text/css"/>
-- <script src="jquery-1.10.1.min.js" charset="utf-8"></script>
-+ <script src="file:///usr/share/javascript/jquery/jquery.min.js" charset="utf-8"></script>
- <script src="index.js" charset="utf-8"></script>
- <script src="script.js" charset="utf-8"></script>
- </head>
---- a/subprojects/diagnostics/src/main/resources/org/gradle/api/tasks/diagnostics/htmldependencyreport/template.html
-+++ b/subprojects/diagnostics/src/main/resources/org/gradle/api/tasks/diagnostics/htmldependencyreport/template.html
-@@ -20,7 +20,7 @@
- <title>Dependency report</title>
- <link href="base-style.css" rel="stylesheet" type="text/css">
- <link href="style.css" rel="stylesheet" type="text/css">
-- <script src="jquery-1.10.1.min.js" charset="utf-8"></script>
-+ <script src="file:///usr/share/javascript/jquery/jquery.min.js" charset="utf-8"></script>
- <script src="jquery.jstree.js" charset="utf-8"></script>
- <script src="@js@" charset="utf-8"></script>
- <script src="script.js" charset="utf-8"></script>
diff --git a/debian/patches/fix_DocGenerationException.diff b/debian/patches/fix_DocGenerationException.diff
deleted file mode 100644
index 04e8b5c..0000000
--- a/debian/patches/fix_DocGenerationException.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: DocGenerationException.java uses a class that does not exist in
- Gradle 1.5, so we need to disable that use.
-Author: Kai-Chung Yan <seamlikok at gmail.com>
-Last-Update: 2015-05-27
---- a/buildSrc/src/main/groovy/org/gradle/build/docs/DocGenerationException.java
-+++ b/buildSrc/src/main/groovy/org/gradle/build/docs/DocGenerationException.java
-@@ -13,13 +13,13 @@
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--package org.gradle.build.docs;
-+ package org.gradle.build.docs;
-
--import org.gradle.internal.exceptions.Contextual;
-+ //import org.gradle.internal.exceptions.Contextual;
-
-- at Contextual
--public class DocGenerationException extends RuntimeException {
-- public DocGenerationException(String message, Throwable throwable) {
-- super(message, throwable);
-- }
--}
-+ //@Contextual
-+ public class DocGenerationException extends RuntimeException {
-+ public DocGenerationException(String message, Throwable throwable) {
-+ super(message, throwable);
-+ }
-+ }
-\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index d89715b..d698f2d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,7 +12,6 @@ disable_release_notes.diff
search_system_jar.diff
26_disable_commitid.diff
disable_aws.diff
-taskOrdering.diff
jcommander.diff
nekohtml.diff
relax_warnings.diff
diff --git a/debian/patches/taskOrdering.diff b/debian/patches/taskOrdering.diff
deleted file mode 100644
index b7e4645..0000000
--- a/debian/patches/taskOrdering.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: taskOrdering.gradle uses shouldRunAfter() function which is not
- in Gradle 1.5.
-Author: Kai-Chung Yan <seamlikok at gmail.com>
-Last-Update: 2015-07-03
---- a/gradle/taskOrdering.gradle
-+++ b/gradle/taskOrdering.gradle
-@@ -30,7 +30,4 @@
- }
- }
- }
--
-- groups.unitTest*.shouldRunAfter groups.codeQuality
-- groups.integTest*.shouldRunAfter groups.codeQuality, groups.unitTest
- }
-\ No newline at end of file
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git
More information about the pkg-java-commits
mailing list