[gradle] 05/09: Apply d/generate_pom.gradle only to Groovy projects
Kai-Chung Yan
seamlik-guest at moszumanska.debian.org
Thu Sep 8 07:19:03 UTC 2016
This is an automated email from the git hooks/post-receive script.
seamlik-guest pushed a commit to branch master
in repository gradle.
commit ea5f0d5741645f7a860f938210486c1e89401771
Author: Kai-Chung Yan (殷啟聰) <seamlikok at gmail.com>
Date: Wed Sep 7 22:23:08 2016 +0800
Apply d/generate_pom.gradle only to Groovy projects
---
debian/generate_pom.gradle | 44 +++++++++++++++++++---------------------
debian/patches/generate_pom.diff | 14 ++++++-------
2 files changed, 28 insertions(+), 30 deletions(-)
diff --git a/debian/generate_pom.gradle b/debian/generate_pom.gradle
index 4f005e6..3905757 100644
--- a/debian/generate_pom.gradle
+++ b/debian/generate_pom.gradle
@@ -1,26 +1,24 @@
-subprojects {
- apply plugin: 'maven'
- task debianMavenPom {
- def pomPath = "${buildDir}/pom.xml"
- outputs.files pomPath
- jar.dependsOn debianMavenPom
- doFirst {
- pom {
- project { artifactId archivesBaseName }
- whenConfigured {
- setDependencies(getDependencies().toSorted { a, b ->
- if ((a.scope <=> b.scope) != 0) {
- a.scope <=> b.scope
+apply plugin: 'maven'
+task debianMavenPom {
+ def pomPath = "${buildDir}/pom.xml"
+ outputs.files pomPath
+ jar.dependsOn debianMavenPom
+ doFirst {
+ pom {
+ project { artifactId archivesBaseName }
+ whenConfigured {
+ setDependencies(getDependencies().toSorted { a, b ->
+ if ((a.scope <=> b.scope) != 0) {
+ a.scope <=> b.scope
} else if ((a.groupId <=> b.groupId) != 0) {
- a.groupId <=> b.groupId
- } else if ((a.artifactId <=> b.artifactId) != 0) {
- a.artifactId <=> b.artifactId
- } else {
- a.version <=> b.version
- }
- })
- }
- }.writeTo pomPath
- }
+ a.groupId <=> b.groupId
+ } else if ((a.artifactId <=> b.artifactId) != 0) {
+ a.artifactId <=> b.artifactId
+ } else {
+ a.version <=> b.version
+ }
+ })
+ }
+ }.writeTo pomPath
}
}
\ No newline at end of file
diff --git a/debian/patches/generate_pom.diff b/debian/patches/generate_pom.diff
index ec46308..27575f0 100644
--- a/debian/patches/generate_pom.diff
+++ b/debian/patches/generate_pom.diff
@@ -6,11 +6,11 @@ Author: Kai-Chung Yan <seamlikok at gmail.com>
Last-Updtae: 2015-10-08
--- a/build.gradle
+++ b/build.gradle
-@@ -110,6 +110,7 @@
+@@ -193,6 +193,7 @@
+ apply from: "$rootDir/gradle/java9.gradle"
+ check.dependsOn ":docs:checkstyleApi"
+ check.dependsOn "codeQuality"
++ apply from: "${rootDir}/debian/generate_pom.gradle"
+ }
- apply from: 'gradle/buildSplits.gradle'
- apply from: 'debian/generate_classpath.gradle'
-+apply from: 'debian/generate_pom.gradle'
- ext {
- jvm = org.gradle.internal.jvm.Jvm.current()
- javaVersion = JavaVersion.current()
+ if (project in publishedProjects) {
--
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