This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository gradle.
commit f2554b4c50e4419c208d1caedbb99a774a4d5276 Author: Kai-Chung Yan <[email protected]> Date: Sat Jan 16 21:08:54 2016 +0800 Drop the use of javahelper since it never works well with maven-repo-helper --- debian/.gitignore | 8 ++++ debian/changelog | 1 + debian/generate-pom.gradle | 3 ++ debian/gradle.jlibs | 2 - debian/gradle.poms | 4 +- debian/libgradle-core-java.jlibs | 13 ------- debian/libgradle-core-java.poms | 26 ++++++------- debian/libgradle-plugins-java.jlibs | 37 ------------------- debian/libgradle-plugins-java.poms | 74 ++++++++++++++++++------------------- debian/rules | 10 ++--- 10 files changed, 69 insertions(+), 109 deletions(-) diff --git a/debian/.gitignore b/debian/.gitignore new file mode 100644 index 0000000..5c3f199 --- /dev/null +++ b/debian/.gitignore @@ -0,0 +1,8 @@ +.debhelper/ +.gradlehome/ +*.log +*.substvars +debian/gradle/ +gradle/ +libgradle-core-java/ +libgradle-plugins-java/ \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 323968c..b1a2c87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ gradle (2.10-1) UNRELEASED; urgency=medium * New upstream release + * Drop the use of javahelper since it never works well with maven-repo-helper -- Kai-Chung Yan <[email protected]> Sat, 16 Jan 2016 20:29:38 +0800 diff --git a/debian/generate-pom.gradle b/debian/generate-pom.gradle index 54c2497..a662f08 100644 --- a/debian/generate-pom.gradle +++ b/debian/generate-pom.gradle @@ -7,4 +7,7 @@ subprojects { } }.writeTo(new java.io.File(rootDir, "debian/${archivesBaseName}.pom")) } + clean.doLast { + delete("debian/${archivesBaseName}.pom") + } } \ No newline at end of file diff --git a/debian/gradle.jlibs b/debian/gradle.jlibs deleted file mode 100644 index eb46391..0000000 --- a/debian/gradle.jlibs +++ /dev/null @@ -1,2 +0,0 @@ -subprojects/launcher/build/libs/*.jar -subprojects/ui/build/libs/*.jar \ No newline at end of file diff --git a/debian/gradle.poms b/debian/gradle.poms index 1a66058..abdbdd8 100644 --- a/debian/gradle.poms +++ b/debian/gradle.poms @@ -1,2 +1,2 @@ -debian/gradle-launcher.pom -debian/gradle-ui.pom \ No newline at end of file +debian/gradle-launcher.pom --artifact=subprojects/launcher/build/libs/gradle-launcher-*.jar +debian/gradle-ui.pom --artifact=subprojects/ui/build/libs/gradle-ui-*.jar diff --git a/debian/libgradle-core-java.jlibs b/debian/libgradle-core-java.jlibs deleted file mode 100644 index 561f54f..0000000 --- a/debian/libgradle-core-java.jlibs +++ /dev/null @@ -1,13 +0,0 @@ -subprojects/base-services-groovy/build/libs/*.jar -subprojects/base-services/build/libs/*.jar -subprojects/cli/build/libs/*.jar -subprojects/core/build/libs/*.jar -subprojects/docs/build/libs/*.jar -subprojects/messaging/build/libs/*.jar -subprojects/model-core/build/libs/*.jar -subprojects/model-groovy/build/libs/*.jar -subprojects/native/build/libs/*.jar -subprojects/open-api/build/libs/*.jar -subprojects/resources/build/libs/*.jar -subprojects/tooling-api/build/libs/*.jar -subprojects/wrapper/build/libs/*.jar \ No newline at end of file diff --git a/debian/libgradle-core-java.poms b/debian/libgradle-core-java.poms index d09b160..2fd1ea7 100644 --- a/debian/libgradle-core-java.poms +++ b/debian/libgradle-core-java.poms @@ -1,13 +1,13 @@ -debian/gradle-base-services-groovy.pom -debian/gradle-base-services.pom -debian/gradle-cli.pom -debian/gradle-core.pom -debian/gradle-docs.pom -debian/gradle-messaging.pom -debian/gradle-model-core.pom -debian/gradle-model-groovy.pom -debian/gradle-native.pom -debian/gradle-open-api.pom -debian/gradle-resources.pom -debian/gradle-tooling-api.pom -debian/gradle-wrapper.pom \ No newline at end of file +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 diff --git a/debian/libgradle-plugins-java.jlibs b/debian/libgradle-plugins-java.jlibs deleted file mode 100644 index c8b7acd..0000000 --- a/debian/libgradle-plugins-java.jlibs +++ /dev/null @@ -1,37 +0,0 @@ -subprojects/announce/build/libs/*.jar -subprojects/antlr/build/libs/*.jar -subprojects/build-comparison/build/libs/*.jar -subprojects/build-init/build/libs/*.jar -subprojects/code-quality/build/libs/*.jar -subprojects/dependency-management/build/libs/*.jar -subprojects/diagnostics/build/libs/*.jar -subprojects/ear/build/libs/*.jar -subprojects/ide-native/build/libs/*.jar -subprojects/ide/build/libs/*.jar -subprojects/ivy/build/libs/*.jar -subprojects/jacoco/build/libs/*.jar -subprojects/javascript/build/libs/*.jar -subprojects/jetty/build/libs/*.jar -subprojects/language-groovy/build/libs/*.jar -subprojects/language-java/build/libs/*.jar -subprojects/language-jvm/build/libs/*.jar -subprojects/language-native/build/libs/*.jar -subprojects/language-scala/build/libs/*.jar -subprojects/maven/build/libs/*.jar -subprojects/osgi/build/libs/*.jar -subprojects/platform-base/build/libs/*.jar -subprojects/platform-jvm/build/libs/*.jar -subprojects/platform-native/build/libs/*.jar -subprojects/platform-play/build/libs/*.jar -subprojects/plugin-development/build/libs/*.jar -subprojects/plugin-use/build/libs/*.jar -subprojects/plugins/build/libs/*.jar -subprojects/publish/build/libs/*.jar -subprojects/reporting/build/libs/*.jar -subprojects/resources-http/build/libs/*.jar -subprojects/resources-sftp/build/libs/*.jar -subprojects/scala/build/libs/*.jar -subprojects/signing/build/libs/*.jar -subprojects/test-kit/build/libs/*.jar -subprojects/testing-native/build/libs/*.jar -subprojects/tooling-api-builders/build/libs/*.jar \ No newline at end of file diff --git a/debian/libgradle-plugins-java.poms b/debian/libgradle-plugins-java.poms index ef2da22..2aed86a 100644 --- a/debian/libgradle-plugins-java.poms +++ b/debian/libgradle-plugins-java.poms @@ -1,37 +1,37 @@ -debian/gradle-announce.pom -debian/gradle-antlr.pom -debian/gradle-build-comparison.pom -debian/gradle-build-init.pom -debian/gradle-code-quality.pom -debian/gradle-dependency-management.pom -debian/gradle-diagnostics.pom -debian/gradle-ear.pom -debian/gradle-ide-native.pom -debian/gradle-ide.pom -debian/gradle-ivy.pom -debian/gradle-jacoco.pom -debian/gradle-javascript.pom -debian/gradle-jetty.pom -debian/gradle-language-groovy.pom -debian/gradle-language-java.pom -debian/gradle-language-jvm.pom -debian/gradle-language-native.pom -debian/gradle-language-scala.pom -debian/gradle-maven.pom -debian/gradle-osgi.pom -debian/gradle-platform-base.pom -debian/gradle-platform-jvm.pom -debian/gradle-platform-native.pom -debian/gradle-platform-play.pom -debian/gradle-plugin-development.pom -debian/gradle-plugin-use.pom -debian/gradle-plugins.pom -debian/gradle-publish.pom -debian/gradle-reporting.pom -debian/gradle-resources-http.pom -debian/gradle-resources-sftp.pom -debian/gradle-scala.pom -debian/gradle-signing.pom -debian/gradle-test-kit.pom -debian/gradle-testing-native.pom -debian/gradle-tooling-api-builders.pom \ No newline at end of file +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 diff --git a/debian/rules b/debian/rules index 257f193..511273a 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,8 @@ export GRADLE_VERSION = $(shell cat version.txt) # Under fakeroot Gradle will show error while creating /root/.gradle, hence # specifies the Gradle home location -GRADLE_FLAGS := --project-prop finalRelease=true --offline --gradle-user-home .gradlehome --stacktrace +GRADLE_FLAGS = --project-prop finalRelease=true --offline --stacktrace \ + --gradle-user-home debian/.gradlehome # Support for DEB_BUILD_OPTIONS parallel=n ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) @@ -17,7 +18,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) endif %: - dh $@ --with javahelper,jh_maven_repo_helper + dh $@ --with maven_repo_helper override_dh_auto_build: gradle $(GRADLE_TASKS) $(GRADLE_FLAGS) @@ -26,9 +27,8 @@ override_dh_auto_build: override_dh_auto_clean: dh_auto_clean find . -wholename .*build/tmp | xargs echo | sed -e 's^build/tmp^build^g' | xargs rm -Rf - rm -rf .gradle .gradlehome buildSrc/.gradle buildSrc/build build - rm -rf debian/gradle.1 - rm -rf debian/*.pom + rm -r -f .gradle debian/.gradlehome buildSrc/.gradle buildSrc/build build + rm -r -f debian/gradle.1 override_dh_install: dh_install -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
