This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch debian/master in repository gradle-shadow-plugin.
commit cfb5a1f1a789471d038b5bf5c6b862c65410e52f Author: Alastair McKinstry <mckins...@debian.org> Date: Thu Feb 18 17:45:21 2016 +0000 Add build patch --- debian/patches/build.patch | 337 +++++++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 338 insertions(+) diff --git a/debian/patches/build.patch b/debian/patches/build.patch new file mode 100644 index 0000000..a4e6345 --- /dev/null +++ b/debian/patches/build.patch @@ -0,0 +1,337 @@ +Author: Alastair McKinstry <mckins...@debian.org> +Description: Drop some dependencies and features in initial plugin build +Forwarded: not-needed +Last-Updated: 2016-02-18 + +Index: gradle-shadow-plugin-1.2.3/build.gradle +=================================================================== +--- gradle-shadow-plugin-1.2.3.orig/build.gradle ++++ gradle-shadow-plugin-1.2.3/build.gradle +@@ -14,12 +14,12 @@ buildscript { + } + } + dependencies { +- classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.5' +- classpath "org.jfrog.buildinfo:build-info-extractor-gradle:3.0.0" +- classpath "com.gradle.publish:plugin-publish-plugin:0.9.1" +- classpath "org.asciidoctor:asciidoctor-gradle-plugin:1.5.2" +- classpath "com.bluepapa32:gradle-watch-plugin:0.1.5" +- classpath "org.kordamp.gradle:livereload-gradle-plugin:0.2.1" ++// classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.5' ++// classpath "org.jfrog.buildinfo:build-info-extractor-gradle:3.0.0" ++// classpath "com.gradle.publish:plugin-publish-plugin:0.9.1" ++// classpath "org.asciidoctor:asciidoctor-gradle-plugin:1.5.2" ++// classpath "com.bluepapa32:gradle-watch-plugin:0.1.5" ++// classpath "org.kordamp.gradle:livereload-gradle-plugin:0.2.1" + } + } + +@@ -40,12 +40,12 @@ dependencies { + compile localGroovy() + compile gradleApi() + compile 'org.jdom:jdom2:2.0.5' +- compile 'org.ow2.asm:asm:5.0.3' +- compile 'org.ow2.asm:asm-commons:5.0.3' ++// compile 'org.ow2.asm:asm:5.0.3' ++// compile 'org.ow2.asm:asm-commons:5.0.3' + compile 'commons-io:commons-io:2.4' + compile 'org.apache.ant:ant:1.9.4' + compile 'org.codehaus.plexus:plexus-utils:2.0.6' +- compile 'org.codehaus.groovy:groovy-backports-compat23:2.4.4' ++// compile 'org.codehaus.groovy:groovy-backports-compat23:2.4.4' + + + testCompile gradleTestKit() +Index: gradle-shadow-plugin-1.2.3/gradle/docs.gradle +=================================================================== +--- gradle-shadow-plugin-1.2.3.orig/gradle/docs.gradle ++++ gradle-shadow-plugin-1.2.3/gradle/docs.gradle +@@ -1,9 +1,9 @@ + def javaApiUrl = 'http://docs.oracle.com/javase/1.7.0/docs/api' + def groovyApiUrl = 'http://groovy.codehaus.org/gapi/' + +-apply plugin: 'org.asciidoctor.convert' +-apply plugin: "com.bluepapa32.watch" +-apply plugin: "org.kordamp.gradle.livereload" ++//apply plugin: 'org.asciidoctor.convert' ++//apply plugin: "com.bluepapa32.watch" ++//apply plugin: "org.kordamp.gradle.livereload" + + tasks.withType(Javadoc) { + options.links(javaApiUrl, groovyApiUrl) +@@ -22,33 +22,33 @@ task sourcesJar(type: Jar) { + + build.dependsOn javadocJar, sourcesJar + +-asciidoctor { +- def source = project.sourceSets.main.java.srcDirs[0] +- ++//asciidoctor { ++// def source = project.sourceSets.main.java.srcDirs[0] ++// + // add extra inputs since these include files that are included +- inputs.dir source +- +- attributes 'build-gradle': file('build.gradle'), +- 'sourcedir': source, +- 'endpoint-url': 'http://example.org', +- +- 'source-highlighter' : 'coderay', +- 'imagesdir':'images', +- 'toc':'left', +- 'icons': 'font', +- 'setanchors':'true', +- 'idprefix':'', +- 'idseparator':'-', +- 'docinfo1':'true' +-} +- +-watch { +- asciidoc { +- files fileTree('src') +- tasks 'asciidoctor' +- } +-} +- +-liveReload { +- docRoot asciidoctor.outputDir.canonicalPath +-} +\ No newline at end of file ++// inputs.dir source ++// ++// attributes 'build-gradle': file('build.gradle'), ++// 'sourcedir': source, ++// 'endpoint-url': 'http://example.org', ++// ++// 'source-highlighter' : 'coderay', ++// 'imagesdir':'images', ++// 'toc':'left', ++// 'icons': 'font', ++// 'setanchors':'true', ++// 'idprefix':'', ++// 'idseparator':'-', ++// 'docinfo1':'true' ++//} ++ ++//watch { ++// asciidoc { ++// files fileTree('src') ++// tasks 'asciidoctor' ++// } ++//} ++ ++//liveReload { ++// docRoot asciidoctor.outputDir.canonicalPath ++//} +\ No newline at end of file +Index: gradle-shadow-plugin-1.2.3/gradle/publish.gradle +=================================================================== +--- gradle-shadow-plugin-1.2.3.orig/gradle/publish.gradle ++++ gradle-shadow-plugin-1.2.3/gradle/publish.gradle +@@ -1,7 +1,7 @@ +-apply plugin: 'com.jfrog.bintray' ++//apply plugin: 'com.jfrog.bintray' + apply plugin: 'maven-publish' +-apply plugin: 'com.jfrog.artifactory-publish' +-apply plugin: "com.gradle.plugin-publish" ++//apply plugin: 'com.jfrog.artifactory-publish' ++//apply plugin: "com.gradle.plugin-publish" + + group = 'com.github.jengelman.gradle.plugins' + def versionString = file('src/main/resources/shadow-version.txt').text.trim() +@@ -42,100 +42,101 @@ publishing { + } + } + +-artifactory { +- contextUrl = 'https://oss.jfrog.org/artifactory' +- publish { +- repository { +- repoKey = 'oss-snapshot-local' +- } +- defaults { +- publications 'plugin' +- } +- } +-} +- +-artifactoryPublish { task -> +- doFirst { +- if (!isSnapshot) { +- throw new GradleException('Cannot publish non-SNAPSHOT versions to OJO!') +- } +- } +- gradle.taskGraph.whenReady { taskGraph -> +- if (taskGraph.hasTask(task)) { +- project.artifactory { +- publish { +- repository { +- username = bintrayUser +- password = bintrayKey +- } +- } +- } +- } +- } +-} +- +-bintrayUpload { task -> +- doFirst { +- if (isSnapshot) { +- throw new GradleException('Cannot publish SNAPSHOT versions to BinTray!') +- } +- } +- gradle.taskGraph.whenReady { taskGraph -> +- if (taskGraph.hasTask(task)) { +- task.user = bintrayUser +- task.apiKey = bintrayKey +- } +- } +-} +- +-bintray { +- publications = ['plugin'] +- pkg { +- repo = 'gradle-plugins' +- name = 'gradle-shadow-plugin' +- licenses = ['Apache-2.0'] +- desc = 'Create uber-jar containing application code and dependencies.' +- labels = ['gradle', 'onejar', 'fatjar', 'uberjar', 'shade'] +- websiteUrl = 'https://github.com/johnrengelman/shadow' +- issueTrackerUrl = 'https://github.com/johnrengelman/shadow/issues' +- vcsUrl = 'https://github.com/johnrengelman/shadow.git' +- version { +- vcsTag = versionString +- attributes = [ +- 'gradle-plugin': 'com.github.johnrengelman.shadow:com.github.jengelman.gradle.plugins:shadow' +- ] +- } +- } +-} +- +-pluginBundle { +- website = 'https://github.com/johnrengelman/shadow' +- vcsUrl = 'https://github.com/johnrengelman/shadow' +- description = 'A Gradle plugin for collapsing all dependencies and project code into a single Jar file.' +- tags = ['onejar', 'shade', 'fatjar', 'uberjar'] +- +- plugins { +- shadowPlugin { +- id = 'com.github.johnrengelman.shadow' +- displayName = 'Shadow Plugin' +- } +- } +- +- mavenCoordinates { +- groupId = project.group +- artifactId = project.name +- +- } +-} +- +-publishPlugins { task -> +- doFirst { +- if (isSnapshot) { +- throw new GradleException('Cannot publish SNAPSHOT versions to Plugin Portal!') +- } +- } +-} ++//artifactory { ++// contextUrl = 'https://oss.jfrog.org/artifactory' ++// publish { ++// repository { ++// repoKey = 'oss-snapshot-local' ++// } ++// defaults { ++// publications 'plugin' ++// } ++// } ++//} ++ ++//artifactoryPublish { task -> ++// doFirst { ++// if (!isSnapshot) { ++// throw new GradleException('Cannot publish non-SNAPSHOT versions to OJO!') ++// } ++// } ++// gradle.taskGraph.whenReady { taskGraph -> ++// if (taskGraph.hasTask(task)) { ++// project.artifactory { ++// publish { ++// repository { ++// username = bintrayUser ++// password = bintrayKey ++// } ++// } ++// } ++// } ++// } ++// } ++ ++// bintrayUpload { task -> ++// doFirst { ++// if (isSnapshot) { ++// throw new GradleException('Cannot publish SNAPSHOT versions to BinTray!') ++// } ++// } ++// gradle.taskGraph.whenReady { taskGraph -> ++// if (taskGraph.hasTask(task)) { ++// task.user = bintrayUser ++// task.apiKey = bintrayKey ++// } ++// } ++// } ++ ++// bintray { ++// publications = ['plugin'] ++// pkg { ++// repo = 'gradle-plugins' ++// name = 'gradle-shadow-plugin' ++// licenses = ['Apache-2.0'] ++// desc = 'Create uber-jar containing application code and dependencies.' ++// labels = ['gradle', 'onejar', 'fatjar', 'uberjar', 'shade'] ++// websiteUrl = 'https://github.com/johnrengelman/shadow' ++// issueTrackerUrl = 'https://github.com/johnrengelman/shadow/issues' ++// vcsUrl = 'https://github.com/johnrengelman/shadow.git' ++// version { ++// vcsTag = versionString ++// attributes = [ ++// 'gradle-plugin': 'com.github.johnrengelman.shadow:com.github.jengelman.gradle.plugins:shadow' ++// ] ++// } ++// } ++// } ++ ++// pluginBundle { ++// website = 'https://github.com/johnrengelman/shadow' ++// vcsUrl = 'https://github.com/johnrengelman/shadow' ++// description = 'A Gradle plugin for collapsing all dependencies and project code into a single Jar file.' ++// tags = ['onejar', 'shade', 'fatjar', 'uberjar'] ++ ++// plugins { ++// shadowPlugin { ++// id = 'com.github.johnrengelman.shadow' ++// displayName = 'Shadow Plugin' ++// } ++// } ++ ++// mavenCoordinates { ++// groupId = project.group ++// artifactId = project.name ++ ++// } ++// } ++ ++// publishPlugins { task -> ++// doFirst { ++// if (isSnapshot) { ++// throw new GradleException('Cannot publish SNAPSHOT versions to Plugin Portal!') ++// } ++// } ++// } + + task release() { +- dependsOn 'assemble', 'bintrayUpload', 'publishPlugins' ++// dependsOn 'assemble', 'bintrayUpload', 'publishPlugins' ++ dependsOn 'assemble' + } diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..5879227 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +build.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle-shadow-plugin.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits