This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository gradle-debian-helper.
commit 9467f51a71d2aca0c1c3d230a9998b01c5c1009c Author: Emmanuel Bourg <[email protected]> Date: Wed Oct 14 23:41:34 2015 +0200 Completed the packaging --- debian/compat | 1 + debian/gradle-debian-helper.poms | 30 ++++++++++++++++++++++++ debian/install | 4 ++-- debian/lintian-overrides | 1 + debian/rules | 0 debian/source/format | 1 + gradle-helper-plugin/pom.xml | 22 ++++++++++------- gradle-helper-plugin/src/main/gradle/init.gradle | 24 +++++++++---------- 8 files changed, 60 insertions(+), 23 deletions(-) diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/gradle-debian-helper.poms b/debian/gradle-debian-helper.poms new file mode 100644 index 0000000..d323410 --- /dev/null +++ b/debian/gradle-debian-helper.poms @@ -0,0 +1,30 @@ +# List of POM files for the package +# Format of this file is: +# <path to pom file> [option]* +# where option can be: +# --ignore: ignore this POM and its artifact if any +# --ignore-pom: don't install the POM. To use on POM files that are created +# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms] +# --no-parent: remove the <parent> tag from the POM +# --package=<package>: an alternative package to use when installing this POM +# and its artifact +# --has-package-version: to indicate that the original version of the POM is the same as the upstream part +# of the version for the package. +# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM +# during a clean operation with mh_cleanpom or mh_installpom +# --artifact=<path>: path to the build artifact associated with this POM, +# it will be installed when using the command mh_install. [mh_install] +# --java-lib: install the jar into /usr/share/java to comply with Debian +# packaging guidelines +# --usj-name=<name>: name to use when installing the library in /usr/share/java +# --usj-version=<version>: version to use when installing the library in /usr/share/java +# --no-usj-versionless: don't install the versionless link in /usr/share/java +# --dest-jar=<path>: the destination for the real jar. +# It will be installed with mh_install. [mh_install] +# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default. +# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed. +# Empty by default. [mh_install] +# +pom.xml --has-package-version +gradle-helper-plugin/pom.xml --has-package-version --java-lib +gradle-dependency-placeholder/pom.xml --has-package-version --java-lib diff --git a/debian/install b/debian/install index 23ba726..78b8336 100644 --- a/debian/install +++ b/debian/install @@ -1,2 +1,2 @@ -gradle-debian-resolver-plugin/src/main/gradle/* /usr/share/gradle-debian-helper -gradle-debian-resolver-plugin/src/main/perl/*.pm /usr/share/perl5/Debian/Debhelper/Buildsystem/ +gradle-helper-plugin/src/main/gradle/* /usr/share/gradle-debian-helper +gradle-helper-plugin/src/main/perl/*.pm /usr/share/perl5/Debian/Debhelper/Buildsystem/ diff --git a/debian/lintian-overrides b/debian/lintian-overrides new file mode 100644 index 0000000..61efc8e --- /dev/null +++ b/debian/lintian-overrides @@ -0,0 +1 @@ +gradle-debian-helper: codeless-jar usr/share/maven-repo/org/debian/gradle/gradle-dependency-placeholder/* diff --git a/debian/rules b/debian/rules old mode 100644 new mode 100755 diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/gradle-helper-plugin/pom.xml b/gradle-helper-plugin/pom.xml index 270ee6d..5b49e93 100644 --- a/gradle-helper-plugin/pom.xml +++ b/gradle-helper-plugin/pom.xml @@ -10,7 +10,7 @@ <description>Gradle Plugin for resolving project dependencies with the system Maven repository</description> <properties> - <gradle.version>2.7</gradle.version> + <gradle.version>2.5</gradle.version> </properties> <dependencies> @@ -36,42 +36,42 @@ <artifactId>gradle-base-services</artifactId> <version>${gradle.version}</version> <scope>system</scope> - <systemPath>${gradle.home}/lib/gradle-base-services-${gradle.version}.jar</systemPath> + <systemPath>${gradle.libs}/gradle-base-services.jar</systemPath> </dependency> <dependency> <groupId>org.gradle</groupId> <artifactId>gradle-base-services-groovy</artifactId> <version>${gradle.version}</version> <scope>system</scope> - <systemPath>${gradle.home}/lib/gradle-base-services-groovy-${gradle.version}.jar</systemPath> + <systemPath>${gradle.libs}/gradle-base-services-groovy.jar</systemPath> </dependency> <dependency> <groupId>org.gradle</groupId> <artifactId>gradle-core</artifactId> <version>${gradle.version}</version> <scope>system</scope> - <systemPath>${gradle.home}/lib/gradle-core-${gradle.version}.jar</systemPath> + <systemPath>${gradle.libs}/gradle-core.jar</systemPath> </dependency> <dependency> <groupId>org.gradle</groupId> <artifactId>gradle-tooling-api</artifactId> <version>${gradle.version}</version> <scope>system</scope> - <systemPath>${gradle.home}/lib/gradle-tooling-api-${gradle.version}.jar</systemPath> + <systemPath>${gradle.libs}/gradle-tooling-api.jar</systemPath> </dependency> <dependency> <groupId>org.gradle</groupId> <artifactId>gradle-dependency-management</artifactId> <version>${gradle.version}</version> <scope>system</scope> - <systemPath>${gradle.home}/lib/plugins/gradle-dependency-management-${gradle.version}.jar</systemPath> + <systemPath>${gradle.plugins}/gradle-dependency-management.jar</systemPath> </dependency> <dependency> <groupId>org.gradle</groupId> <artifactId>gradle-resources</artifactId> <version>${gradle.version}</version> <scope>system</scope> - <systemPath>${gradle.home}/lib/gradle-resources-${gradle.version}.jar</systemPath> + <systemPath>${gradle.libs}/gradle-resources.jar</systemPath> </dependency> <dependency> <groupId>org.apache.ivy</groupId> @@ -122,7 +122,9 @@ </os> </activation> <properties> - <gradle.home>C:/Program Files (x86)/gradle-${gradle.version}/</gradle.home> + <gradle.home>C:/Program Files (x86)/gradle-${gradle.version}/lib/</gradle.home> + <gradle.libs>${gradle.home}/lib/</gradle.libs> + <gradle.plugins>${gradle.home}/lib/plugins/</gradle.plugins> </properties> </profile> <profile> @@ -133,7 +135,9 @@ </os> </activation> <properties> - <gradle.home>/usr/share/gradle</gradle.home> + <gradle.home>/usr/share/java/</gradle.home> + <gradle.libs>${gradle.home}</gradle.libs> + <gradle.plugins>${gradle.home}</gradle.plugins> </properties> </profile> </profiles> diff --git a/gradle-helper-plugin/src/main/gradle/init.gradle b/gradle-helper-plugin/src/main/gradle/init.gradle index 303aab8..3191012 100644 --- a/gradle-helper-plugin/src/main/gradle/init.gradle +++ b/gradle-helper-plugin/src/main/gradle/init.gradle @@ -1,12 +1,12 @@ -/* - * Init script for the Gradle Helper Plugin - */ - -initscript { - dependencies { - classpath fileTree(dir: '/usr/share/java/', include: 'gradle-helper-plugin.jar') - classpath fileTree(dir: '/usr/share/java/', include: 'maven-repo-helper.jar') - } -} - -apply plugin: org.debian.gradle.DebianHelperPlugin +/** + * Init script for the Gradle Helper Plugin + */ + +initscript { + dependencies { + classpath files('/usr/share/java/gradle-helper-plugin.jar') + classpath files('/usr/share/java/maven-repo-helper.jar') + } +} + +apply plugin: org.debian.gradle.DebianHelperPlugin -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle-debian-helper.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
