[gradle] 05/05: Fix maven-repo-helper usage

[Kai-Chung Yan]

This is an automated email from the git hooks/post-receive script.

seamlik-guest pushed a commit to branch master
in repository gradle.

commit 59b1a967f26a947f64600464b4e6990af6315a9d
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Sun Jan 17 00:09:43 2016 +0800

    Fix maven-repo-helper usage
---
 debian/generate-classpath.gradle   |  2 +-
 debian/gradle.poms                 |  4 +--
 debian/libgradle-core-java.poms    | 26 +++++++-------
 debian/libgradle-plugins-java.poms | 74 +++++++++++++++++++-------------------
 debian/rules                       |  7 +++-
 5 files changed, 59 insertions(+), 54 deletions(-)

diff --git a/debian/generate-classpath.gradle b/debian/generate-classpath.gradle
index 5e15fbf..109ecc4 100644
--- a/debian/generate-classpath.gradle
+++ b/debian/generate-classpath.gradle
@@ -23,4 +23,4 @@ subprojects {
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/debian/gradle.poms b/debian/gradle.poms
index abdbdd8..a9e2037 100644
--- a/debian/gradle.poms
+++ b/debian/gradle.poms
@@ -1,2 +1,2 @@
-debian/gradle-launcher.pom --artifact=subprojects/launcher/build/libs/gradle-launcher-*.jar
-debian/gradle-ui.pom --artifact=subprojects/ui/build/libs/gradle-ui-*.jar
+debian/gradle-launcher.pom --artifact=subprojects/launcher/build/libs/gradle-launcher-*.jar --java-lib
+debian/gradle-ui.pom --artifact=subprojects/ui/build/libs/gradle-ui-*.jar --java-lib
diff --git a/debian/libgradle-core-java.poms b/debian/libgradle-core-java.poms
index 2fd1ea7..bba52d9 100644
--- a/debian/libgradle-core-java.poms
+++ b/debian/libgradle-core-java.poms
@@ -1,13 +1,13 @@
-debian/gradle-base-services-groovy.pom --artifact=subprojects/base-services-groovy/build/libs/*.jar
-debian/gradle-base-services.pom --artifact=subprojects/base-services/build/libs/*.jar
-debian/gradle-cli.pom --artifact=subprojects/cli/build/libs/*.jar
-debian/gradle-core.pom --artifact=subprojects/core/build/libs/*.jar
-debian/gradle-docs.pom --artifact=subprojects/docs/build/libs/*.jar
-debian/gradle-messaging.pom --artifact=subprojects/messaging/build/libs/*.jar
-debian/gradle-model-core.pom --artifact=subprojects/model-core/build/libs/*.jar
-debian/gradle-model-groovy.pom --artifact=subprojects/model-groovy/build/libs/*.jar
-debian/gradle-native.pom --artifact=subprojects/native/build/libs/*.jar
-debian/gradle-open-api.pom --artifact=subprojects/open-api/build/libs/*.jar
-debian/gradle-resources.pom --artifact=subprojects/resources/build/libs/*.jar
-debian/gradle-tooling-api.pom --artifact=subprojects/tooling-api/build/libs/*.jar
-debian/gradle-wrapper.pom --artifact=subprojects/wrapper/build/libs/*.jar
\ No newline at end of file
+debian/gradle-base-services-groovy.pom --artifact=subprojects/base-services-groovy/build/libs/*.jar --java-lib
+debian/gradle-base-services.pom --artifact=subprojects/base-services/build/libs/*.jar --java-lib
+debian/gradle-cli.pom --artifact=subprojects/cli/build/libs/*.jar --java-lib
+debian/gradle-core.pom --artifact=subprojects/core/build/libs/*.jar --java-lib
+debian/gradle-docs.pom --artifact=subprojects/docs/build/libs/*.jar --java-lib
+debian/gradle-messaging.pom --artifact=subprojects/messaging/build/libs/*.jar --java-lib
+debian/gradle-model-core.pom --artifact=subprojects/model-core/build/libs/*.jar --java-lib
+debian/gradle-model-groovy.pom --artifact=subprojects/model-groovy/build/libs/*.jar --java-lib
+debian/gradle-native.pom --artifact=subprojects/native/build/libs/*.jar --java-lib
+debian/gradle-open-api.pom --artifact=subprojects/open-api/build/libs/*.jar --java-lib
+debian/gradle-resources.pom --artifact=subprojects/resources/build/libs/*.jar --java-lib
+debian/gradle-tooling-api.pom --artifact=subprojects/tooling-api/build/libs/*.jar --java-lib
+debian/gradle-wrapper.pom --artifact=subprojects/wrapper/build/libs/*.jar --java-lib
diff --git a/debian/libgradle-plugins-java.poms b/debian/libgradle-plugins-java.poms
index 2aed86a..1c75f6d 100644
--- a/debian/libgradle-plugins-java.poms
+++ b/debian/libgradle-plugins-java.poms
@@ -1,37 +1,37 @@
-debian/gradle-announce.pom --artifact=subprojects/announce/build/libs/*.jar
-debian/gradle-antlr.pom --artifact=subprojects/antlr/build/libs/*.jar
-debian/gradle-build-comparison.pom --artifact=subprojects/build-comparison/build/libs/*.jar
-debian/gradle-build-init.pom --artifact=subprojects/build-init/build/libs/*.jar
-debian/gradle-code-quality.pom --artifact=subprojects/code-quality/build/libs/*.jar
-debian/gradle-dependency-management.pom --artifact=subprojects/dependency-management/build/libs/*.jar
-debian/gradle-diagnostics.pom --artifact=subprojects/diagnostics/build/libs/*.jar
-debian/gradle-ear.pom --artifact=subprojects/ear/build/libs/*.jar
-debian/gradle-ide-native.pom --artifact=subprojects/ide-native/build/libs/*.jar
-debian/gradle-ide.pom --artifact=subprojects/ide/build/libs/*.jar
-debian/gradle-ivy.pom --artifact=subprojects/ivy/build/libs/*.jar
-debian/gradle-jacoco.pom --artifact=subprojects/jacoco/build/libs/*.jar
-debian/gradle-javascript.pom --artifact=subprojects/javascript/build/libs/*.jar
-debian/gradle-jetty.pom --artifact=subprojects/jetty/build/libs/*.jar
-debian/gradle-language-groovy.pom --artifact=subprojects/language-groovy/build/libs/*.jar
-debian/gradle-language-java.pom --artifact=subprojects/language-java/build/libs/*.jar
-debian/gradle-language-jvm.pom --artifact=subprojects/language-jvm/build/libs/*.jar
-debian/gradle-language-native.pom --artifact=subprojects/language-native/build/libs/*.jar
-debian/gradle-language-scala.pom --artifact=subprojects/language-scala/build/libs/*.jar
-debian/gradle-maven.pom --artifact=subprojects/maven/build/libs/*.jar
-debian/gradle-osgi.pom --artifact=subprojects/osgi/build/libs/*.jar
-debian/gradle-platform-base.pom --artifact=subprojects/platform-base/build/libs/*.jar
-debian/gradle-platform-jvm.pom --artifact=subprojects/platform-jvm/build/libs/*.jar
-debian/gradle-platform-native.pom --artifact=subprojects/platform-native/build/libs/*.jar
-debian/gradle-platform-play.pom --artifact=subprojects/platform-play/build/libs/*.jar
-debian/gradle-plugin-development.pom --artifact=subprojects/plugin-development/build/libs/*.jar
-debian/gradle-plugin-use.pom --artifact=subprojects/plugin-use/build/libs/*.jar
-debian/gradle-plugins.pom --artifact=subprojects/plugins/build/libs/*.jar
-debian/gradle-publish.pom --artifact=subprojects/publish/build/libs/*.jar
-debian/gradle-reporting.pom --artifact=subprojects/reporting/build/libs/*.jar
-debian/gradle-resources-http.pom --artifact=subprojects/resources-http/build/libs/*.jar
-debian/gradle-resources-sftp.pom --artifact=subprojects/resources-sftp/build/libs/*.jar
-debian/gradle-scala.pom --artifact=subprojects/scala/build/libs/*.jar
-debian/gradle-signing.pom --artifact=subprojects/signing/build/libs/*.jar
-debian/gradle-test-kit.pom --artifact=subprojects/test-kit/build/libs/*.jar
-debian/gradle-testing-native.pom --artifact=subprojects/testing-native/build/libs/*.jar
-debian/gradle-tooling-api-builders.pom  --artifact=subprojects/tooling-api-builders/build/libs/*.jar
\ No newline at end of file
+debian/gradle-announce.pom --artifact=subprojects/announce/build/libs/*.jar --java-lib
+debian/gradle-antlr.pom --artifact=subprojects/antlr/build/libs/*.jar --java-lib
+debian/gradle-build-comparison.pom --artifact=subprojects/build-comparison/build/libs/*.jar --java-lib
+debian/gradle-build-init.pom --artifact=subprojects/build-init/build/libs/*.jar --java-lib
+debian/gradle-code-quality.pom --artifact=subprojects/code-quality/build/libs/*.jar --java-lib
+debian/gradle-dependency-management.pom --artifact=subprojects/dependency-management/build/libs/*.jar --java-lib
+debian/gradle-diagnostics.pom --artifact=subprojects/diagnostics/build/libs/*.jar --java-lib
+debian/gradle-ear.pom --artifact=subprojects/ear/build/libs/*.jar --java-lib
+debian/gradle-ide-native.pom --artifact=subprojects/ide-native/build/libs/*.jar --java-lib
+debian/gradle-ide.pom --artifact=subprojects/ide/build/libs/*.jar --java-lib
+debian/gradle-ivy.pom --artifact=subprojects/ivy/build/libs/*.jar --java-lib
+debian/gradle-jacoco.pom --artifact=subprojects/jacoco/build/libs/*.jar --java-lib
+debian/gradle-javascript.pom --artifact=subprojects/javascript/build/libs/*.jar --java-lib
+debian/gradle-jetty.pom --artifact=subprojects/jetty/build/libs/*.jar --java-lib
+debian/gradle-language-groovy.pom --artifact=subprojects/language-groovy/build/libs/*.jar --java-lib
+debian/gradle-language-java.pom --artifact=subprojects/language-java/build/libs/*.jar --java-lib
+debian/gradle-language-jvm.pom --artifact=subprojects/language-jvm/build/libs/*.jar --java-lib
+debian/gradle-language-native.pom --artifact=subprojects/language-native/build/libs/*.jar --java-lib
+debian/gradle-language-scala.pom --artifact=subprojects/language-scala/build/libs/*.jar --java-lib
+debian/gradle-maven.pom --artifact=subprojects/maven/build/libs/*.jar --java-lib
+debian/gradle-osgi.pom --artifact=subprojects/osgi/build/libs/*.jar --java-lib
+debian/gradle-platform-base.pom --artifact=subprojects/platform-base/build/libs/*.jar --java-lib
+debian/gradle-platform-jvm.pom --artifact=subprojects/platform-jvm/build/libs/*.jar --java-lib
+debian/gradle-platform-native.pom --artifact=subprojects/platform-native/build/libs/*.jar --java-lib
+debian/gradle-platform-play.pom --artifact=subprojects/platform-play/build/libs/*.jar --java-lib
+debian/gradle-plugin-development.pom --artifact=subprojects/plugin-development/build/libs/*.jar --java-lib
+debian/gradle-plugin-use.pom --artifact=subprojects/plugin-use/build/libs/*.jar --java-lib
+debian/gradle-plugins.pom --artifact=subprojects/plugins/build/libs/*.jar --java-lib
+debian/gradle-publish.pom --artifact=subprojects/publish/build/libs/*.jar --java-lib
+debian/gradle-reporting.pom --artifact=subprojects/reporting/build/libs/*.jar --java-lib
+debian/gradle-resources-http.pom --artifact=subprojects/resources-http/build/libs/*.jar --java-lib
+debian/gradle-resources-sftp.pom --artifact=subprojects/resources-sftp/build/libs/*.jar --java-lib
+debian/gradle-scala.pom --artifact=subprojects/scala/build/libs/*.jar --java-lib
+debian/gradle-signing.pom --artifact=subprojects/signing/build/libs/*.jar --java-lib
+debian/gradle-test-kit.pom --artifact=subprojects/test-kit/build/libs/*.jar --java-lib
+debian/gradle-testing-native.pom --artifact=subprojects/testing-native/build/libs/*.jar --java-lib
+debian/gradle-tooling-api-builders.pom  --artifact=subprojects/tooling-api-builders/build/libs/*.jar --java-lib
diff --git a/debian/rules b/debian/rules
index 511273a..04e9f09 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,7 @@ override_dh_auto_clean:
 	dh_auto_clean
 	find . -wholename .*build/tmp | xargs echo | sed -e 's^build/tmp^build^g' | xargs rm -Rf
 	rm -r -f .gradle debian/.gradlehome buildSrc/.gradle buildSrc/build build
-	rm -r -f debian/gradle.1
+	rm -r -f debian/gradle.1 debian/*.pom
 
 override_dh_install:
 	dh_install
@@ -36,6 +36,11 @@ override_dh_install:
 	rm debian/gradle-doc/usr/share/doc/gradle/groovydoc/org/gradle/api/distribution/Distribution.html
 	rm debian/gradle-doc/usr/share/doc/gradle/groovydoc/org/gradle/api/initialization/Settings.html
 
+override_mh_install:
+	mh_install
+	# I have no idea why this exist, maven-repo-helper has so many bugs
+	rm -r debian/libgradle-core-java/subprojects
+
 get-orig-source:
 	uscan --download-current-version --force-download --repack --compression xz
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git