This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository groovy2.
commit 14ae8c09ae8f68595498ee31a6cf1961b30f370e Author: Emmanuel Bourg <[email protected]> Date: Tue Feb 2 17:43:22 2016 +0100 Build with gradle-debian-helper --- debian/changelog | 1 + debian/control | 2 +- debian/maven.ignoreRules | 7 + debian/maven.rules | 8 +- debian/patches/02_fix_gradle_build.diff | 268 --------------------- debian/patches/03_ignore_codenarc.diff | 18 -- debian/patches/03_ignore_reporting_tools.diff | 13 + debian/patches/04_ignore_bintray.diff | 13 + debian/patches/05_buildscripts_dependencies.diff | 19 ++ .../06_ignore_documentation_publication.diff | 13 + .../patches/change_bsf_dependencies_version.diff | 17 -- debian/patches/change_junit_version.diff | 20 -- .../patches/change_servlet_dependency_version.diff | 21 -- .../patches/change_testng_dependency_version.diff | 22 -- debian/patches/mavenRepo.patch | 80 ------ debian/patches/series | 11 +- debian/rules | 16 +- 17 files changed, 81 insertions(+), 468 deletions(-) diff --git a/debian/changelog b/debian/changelog index 542943a..d564625 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ groovy2 (2.4.5-1) UNRELEASED; urgency=medium - Refreshed the patches - Updated the poms * debian/rules: Replaced the hardcoded version with a variable + * Build with gradle-debian-helper -- Emmanuel Bourg <[email protected]> Tue, 02 Feb 2016 12:54:37 +0100 diff --git a/debian/control b/debian/control index 0940329..dbcbe57 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: ant, antlr, debhelper (>= 9), default-jdk, - gradle (>= 1.12~), + gradle-debian-helper, ivy, junit4, libasm4-java, diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..80b421e --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,7 @@ +com.github.lookfirst sardine +com.googlecode openbeans +gradle.plugin.org.nosphere.apache creadur-rat-gradle +me.champeau.gradle gradle-javadoc-hotfix-plugin +org.asciidoctor asciidoctor-gradle-plugin +org.codehaus.gpars gpars +org.jfrog.buildinfo build-info-extractor-gradle diff --git a/debian/maven.rules b/debian/maven.rules index 0a896bb..55638db 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,5 +1,9 @@ org.codehaus.groovy * * s/.*/2.x/ * * -junit junit jar s/.*/3.x/ * * +junit junit jar s/3\..*/3.x/ * * +junit junit jar s/4\..*/4.x/ * * org.testng testng jar s/.*/6.x/ * * -org.ow2.asm * jar s/.*/4.x/ * * +org.ow2.asm * * s/.*/4.x/ * * s/javax\.servlet/javax.servlet.jsp/ jsp-api jar s/.*/debian/ * * +antlr antlr * s/.*/2.x/ * * +jline jline * s/.*/2.x/ * * +com.beust jcommander * s/.*/1.x/ * * diff --git a/debian/patches/02_fix_gradle_build.diff b/debian/patches/02_fix_gradle_build.diff deleted file mode 100644 index 2eecc74..0000000 --- a/debian/patches/02_fix_gradle_build.diff +++ /dev/null @@ -1,268 +0,0 @@ -Description: Build groovy using packages available in Debian -Author: Komal Sukhani <[email protected]> -Forwarded: no -Last-Update: 2015-06-22 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: groovy2-2.4.3/build.gradle -=================================================================== ---- groovy2-2.4.3.orig/build.gradle -+++ groovy2-2.4.3/build.gradle -@@ -1,29 +1,25 @@ - buildscript { - repositories { -- jcenter() -- maven { -- name 'Bintray Asciidoctor repo' -- url 'http://dl.bintray.com/content/aalmiray/asciidoctor' -- } -+ -+ mavenRepo url: "file:///usr/share/maven-repo" - } - - dependencies { -- classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.2' -- classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:2.2.3' -+ - //classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.1.1' - } - } -- -+/* - plugins { - //id "com.github.hierynomus.license" version "0.11.0" - } -- -+*/ - apply from: 'gradle/filter.gradle' - apply from: 'gradle/indy.gradle' --apply from: 'gradle/bintray.gradle' - --File javaHome = new File(System.getProperty('java.home')) --logger.lifecycle "Using Java from $javaHome (version ${System.getProperty('java.version')})" -+ -+//File javaHome = new File(System.getProperty('java.home')) -+//logger.lifecycle "Using Java from $javaHome (version ${System.getProperty('java.version')})" - indyBanner() - - // TODO use antlr plugin -@@ -39,14 +35,11 @@ allprojects { - group = 'org.codehaus.groovy' - version = groovyVersion - repositories { -- jcenter() -+ mavenRepo url: "file:///usr/share/maven-repo" - } - - apply plugin: 'groovy' - apply from: "${rootProject.projectDir}/gradle/indy.gradle" -- if (JavaVersion.current().java7Compatible) { -- apply from: "${rootProject.projectDir}/gradle/asciidoctor.gradle" -- } - } - - // todo: use the conventional "resources" directory for classpath resources -@@ -85,8 +78,7 @@ subprojects { - - repositories { - // todo Some repos are needed only for some configs. Declare them just for the configuration once Gradle allows this. -- maven { url 'http://www.aQute.biz/repo' } // tools -- maven { url 'http://repository.jboss.org/nexus/content/groups/m2-release-proxy' } // examples, tools -+ mavenRepo url: "file:///usr/share/maven-repo" - } - - // todo do we need compile and runtime scope for examples? -@@ -100,31 +92,31 @@ configurations { - } - - ext { -- antVersion = '1.9.4' -- asmVersion = '5.0.3' -- antlrVersion = '2.7.7' -- bndVersion = '0.0.401' -- checkstyleVersion = '4.4' -- coberturaVersion = '1.9.4.1' -- commonsCliVersion = '1.2' -- commonsHttpClientVersion = '3.1' -+ antVersion = 'debian' -+ asmVersion = '5.+' -+ antlrVersion = '2.x' -+ bndVersion = 'debian' -+ checkstyleVersion = 'debian' -+ coberturaVersion = 'debian' -+ commonsCliVersion = 'debian' -+ commonsHttpClientVersion = '3.x' - eclipseOsgiVersion = '3.9.1-v20140110-1610' - gparsVersion = '1.2.1' -- ivyVersion = '2.4.0' -- jansiVersion = '1.11' -- jarjarVersion = '1.3' -- jlineVersion = '2.12' -+ ivyVersion = 'debian' -+ jansiVersion = 'debian' -+ jarjarVersion = 'debian' -+ jlineVersion = '2.x' - jmockVersion = '1.2.0' -- logbackVersion = '1.1.2' -- log4jVersion = '1.2.17' -- log4j2Version = '2.1' -+ logbackVersion = 'debian' -+ log4jVersion = '1.2.x' -+ log4j2Version = 'debian' - luceneVersion = '4.7.2' - openejbVersion = '1.0' -- qdoxVersion = '1.12.1' -+ qdoxVersion = 'debian' - simianVersion = '2.2.4' -- slf4jVersion = '1.7.6' -- xmlunitVersion = '1.5' -- xstreamVersion = '1.4.7' -+ slf4jVersion = 'debian' -+ xmlunitVersion = 'debian' -+ xstreamVersion = 'debian' - } - - dependencies { -@@ -149,9 +141,9 @@ dependencies { - } - compile files("${buildDir}/generated-classes") - -- runtime("org.codehaus.gpars:gpars:$gparsVersion") { -+ /* runtime("org.codehaus.gpars:gpars:$gparsVersion") { - exclude(group: 'org.codehaus.groovy', module: 'groovy-all') -- } -+ }*/ - testCompile "jmock:jmock:$jmockVersion" - testCompile "jmock:jmock-cglib:$jmockVersion" - testCompile "xmlunit:xmlunit:$xmlunitVersion" -@@ -162,10 +154,10 @@ dependencies { - testCompile "com.thoughtworks.qdox:qdox:$qdoxVersion" - - tools "com.googlecode.jarjar:jarjar:$jarjarVersion" -- tools("checkstyle:checkstyle:$checkstyleVersion") { -+ tools("com.puppycrawl.tools:checkstyle:$checkstyleVersion") { - exclude(module: 'junit') - } -- tools "redhill:simian:$simianVersion" -+ //tools "redhill:simian:$simianVersion" - tools("net.sourceforge.cobertura:cobertura:$coberturaVersion") { - exclude(module: 'asm') - exclude(module: 'asm') -@@ -173,7 +165,7 @@ dependencies { - } - tools "org.ow2.asm:asm-all:$asmVersion" - tools "com.thoughtworks.qdox:qdox:$qdoxVersion" -- tools "biz.aQute:bnd:$bndVersion" -+ tools "biz.aQute.bnd:bnd:$bndVersion" - - examplesCompile project(':groovy-test') - examplesCompile project(':groovy-swing') -Index: groovy2-2.4.3/gradle/utils.gradle -=================================================================== ---- groovy2-2.4.3.orig/gradle/utils.gradle -+++ groovy2-2.4.3/gradle/utils.gradle -@@ -24,7 +24,8 @@ import static org.objectweb.asm.Opcodes. - - buildscript { - repositories { -- mavenCentral() -+ // mavenCentral() -+ mavenRepo url: "file:///usr/share/maven-repo" - } - dependencies { - classpath "org.ow2.asm:asm:$asmVersion" -Index: groovy2-2.4.3/gradle/codehaus.gradle -=================================================================== ---- groovy2-2.4.3.orig/gradle/codehaus.gradle -+++ groovy2-2.4.3/gradle/codehaus.gradle -@@ -1,26 +1,27 @@ --import com.github.sardine.* -+/*import com.github.sardine.* - import com.github.sardine.impl.* - import groovy.io.* - - buildscript { - repositories { -- mavenCentral() -+ // mavenCentral() -+ mavenRepo url: "file:///usr/share/maven-repo" - } - dependencies { - classpath 'com.github.lookfirst:sardine:5.0.1' - } - } -- -+*/ - task htmlPush { - //inputs.files syncDoc.inputs.files - -- doLast { -- def sardine = SardineFactory.begin(System.getProperty('groovy.deploy.username'), System.getProperty('groovy.deploy.password')) -- def serverBase = "https://dav.codehaus.org/groovy/"; -+ // doLast { -+ // def sardine = SardineFactory.begin(System.getProperty('groovy.deploy.username'), System.getProperty('groovy.deploy.password')) -+ // def serverBase = "https://dav.codehaus.org/groovy/"; - //sardine.list(serverBase).each {println it} - def copyConf = ["gapi":file("$buildDir/allgroovydoc"), "api":file("$buildDir/alljavadoc")] - -- copyConf.each { targetDirPart, base -> -+ /* copyConf.each { targetDirPart, base -> - def basePath = base.canonicalPath - base.eachFileRecurse { - def name = it.canonicalPath.substring(basePath.length()+1) -@@ -41,4 +42,5 @@ task htmlPush { - } - } - } -+*/ - } -Index: groovy2-2.4.3/gradle/quality.gradle -=================================================================== ---- groovy2-2.4.3.orig/gradle/quality.gradle -+++ groovy2-2.4.3/gradle/quality.gradle -@@ -1,5 +1,5 @@ --import groovy.text.markup.MarkupTemplateEngine --import groovy.text.markup.TemplateConfiguration -+//import groovy.text.markup.MarkupTemplateEngine -+//import groovy.text.markup.TemplateConfiguration - - /* - * Copyright 2003-2014 the original author or authors. -@@ -72,12 +72,12 @@ allprojects { - - doLast { - if (reportFile.exists()) { -- def templateConfiguration = new TemplateConfiguration() -+ // def templateConfiguration = new TemplateConfiguration() - templateConfiguration.with { - autoIndent = true - autoNewLine = true - } -- def engine = new MarkupTemplateEngine(this.class.classLoader, configDir, templateConfiguration) -+ //def engine = new MarkupTemplateEngine(this.class.classLoader, configDir, templateConfiguration) - def xml = new XmlSlurper().parse(reportFile.newReader('utf-8')) - def files = [] - xml.file.each { f -> -@@ -105,7 +105,7 @@ allprojects { - } - } - } -- finalizedBy "${name}Report" -+ // finalizedBy "${name}Report" - } - - } -Index: groovy2-2.4.3/gradle/assemble.gradle -=================================================================== ---- groovy2-2.4.3.orig/gradle/assemble.gradle -+++ groovy2-2.4.3/gradle/assemble.gradle -@@ -218,9 +218,6 @@ allprojects { - taskdef name: 'jarjar', classname: 'com.tonicsystems.jarjar.JarJarTask', classpath: rootProject.configurations.tools.asPath - jarjar(jarfile: target) { - zipfileset(src: jarjar.archivePath) -- if (isRootProject) { -- zipfileset(src: rootProject.configurations.runtime.files.find { it.name.startsWith('openbeans') }) -- } - rule pattern: 'com.googlecode.openbeans.**', result: 'groovyjarjaropenbeans.@1' - rule pattern: 'org.apache.harmony.beans.**', result: 'groovyjarjarharmonybeans.@1' - rule pattern: 'java.beans.**', result: 'groovyjarjaropenbeans.@1' diff --git a/debian/patches/03_ignore_codenarc.diff b/debian/patches/03_ignore_codenarc.diff deleted file mode 100644 index 072fb13..0000000 --- a/debian/patches/03_ignore_codenarc.diff +++ /dev/null @@ -1,18 +0,0 @@ -Description: Remove dependency on codeNarc v0.18 as it is not available in Debian -Author: Komal Sukhani <[email protected]> -Forwarded: no -Last-Update: 2015-06-22 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/gradle/quality.gradle -+++ b/gradle/quality.gradle -@@ -59,8 +59,7 @@ - codenarcClasspath = rootProject.sourceSets.main.output + - project(':groovy-templates').sourceSets.main.output + - project(':groovy-xml').sourceSets.main.output + -- configurations.compile + -- files(configurations.codenarc.findAll { !(it.name =~ /groovy|junit/)}) -+ configurations.compile - } - - tasks.withType(Checkstyle) { diff --git a/debian/patches/03_ignore_reporting_tools.diff b/debian/patches/03_ignore_reporting_tools.diff new file mode 100644 index 0000000..9b561a7 --- /dev/null +++ b/debian/patches/03_ignore_reporting_tools.diff @@ -0,0 +1,13 @@ +Description: Ignore the reporting tools (findbugs, checkstyle, RAT, etc) +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/build.gradle ++++ b/build.gradle +@@ -439,7 +439,6 @@ + apply from: 'gradle/idea.gradle' + apply from: 'gradle/eclipse.gradle' + apply from: 'gradle/codehaus.gradle' +-apply from: 'gradle/quality.gradle' + // If a local configuration file for tweaking the build is present, apply it + if (file('user.gradle').exists()) { + apply from: 'user.gradle' diff --git a/debian/patches/04_ignore_bintray.diff b/debian/patches/04_ignore_bintray.diff new file mode 100644 index 0000000..4afd802 --- /dev/null +++ b/debian/patches/04_ignore_bintray.diff @@ -0,0 +1,13 @@ +Description: Ignore the unused publication to Artifactory +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/build.gradle ++++ b/build.gradle +@@ -44,7 +44,6 @@ + + apply from: 'gradle/filter.gradle' + apply from: 'gradle/indy.gradle' +-apply from: 'gradle/bintray.gradle' + + File javaHome = new File(System.getProperty('java.home')) + logger.lifecycle "Using Java from $javaHome (version ${System.getProperty('java.version')})" diff --git a/debian/patches/05_buildscripts_dependencies.diff b/debian/patches/05_buildscripts_dependencies.diff new file mode 100644 index 0000000..75a7ebf --- /dev/null +++ b/debian/patches/05_buildscripts_dependencies.diff @@ -0,0 +1,19 @@ +Description: Force gradle/utils.gradle to use the local dependencies + (for some reason gradle-debian-helper fails its injection in this buildscript) +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/gradle/utils.gradle ++++ b/gradle/utils.gradle +@@ -26,10 +26,10 @@ + + buildscript { + repositories { +- mavenCentral() ++ maven { url "file:///usr/share/maven-repo" } + } + dependencies { +- classpath "org.ow2.asm:asm:$asmVersion" ++ classpath "org.ow2.asm:asm:4.x" + } + } + diff --git a/debian/patches/06_ignore_documentation_publication.diff b/debian/patches/06_ignore_documentation_publication.diff new file mode 100644 index 0000000..a0c8c31 --- /dev/null +++ b/debian/patches/06_ignore_documentation_publication.diff @@ -0,0 +1,13 @@ +Description: Ignore the unused publication of the documentation +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/build.gradle ++++ b/build.gradle +@@ -437,7 +437,6 @@ + apply from: 'gradle/upload.gradle' + apply from: 'gradle/idea.gradle' + apply from: 'gradle/eclipse.gradle' +-apply from: 'gradle/codehaus.gradle' + // If a local configuration file for tweaking the build is present, apply it + if (file('user.gradle').exists()) { + apply from: 'user.gradle' diff --git a/debian/patches/change_bsf_dependencies_version.diff b/debian/patches/change_bsf_dependencies_version.diff deleted file mode 100644 index 8f8f755..0000000 --- a/debian/patches/change_bsf_dependencies_version.diff +++ /dev/null @@ -1,17 +0,0 @@ -Description: Change version of dependencies to one available in Debian -Author: Komal Sukhani <[email protected]> -Forwarded: no -Last-Update: 2015-06-22 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/subprojects/groovy-bsf/build.gradle -+++ b/subprojects/groovy-bsf/build.gradle -@@ -20,7 +20,7 @@ - compile('bsf:bsf:2.4.0') { - exclude(group: 'commons-logging', module: 'commons-logging') - } -- compile 'commons-logging:commons-logging:1.2' -+ compile 'commons-logging:commons-logging:debian' - compile rootProject - testCompile project(':groovy-test') - } diff --git a/debian/patches/change_junit_version.diff b/debian/patches/change_junit_version.diff deleted file mode 100644 index 1413364..0000000 --- a/debian/patches/change_junit_version.diff +++ /dev/null @@ -1,20 +0,0 @@ -Description: Change version of junit to one available in Debian -Author: Komal Sukhani <[email protected]> -Forwarded: no -Last-Update: 2015-06-22 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/subprojects/groovy-test/build.gradle -+++ b/subprojects/groovy-test/build.gradle -@@ -18,8 +18,8 @@ - */ - dependencies { - compile rootProject -- compile 'junit:junit:4.12' -+ compile 'junit:junit:4.x' - testRuntime project(':groovy-ant') - } - --apply from: "${rootProject.projectDir}/gradle/jacoco/jacocofix.gradle" -\ No newline at end of file -+apply from: "${rootProject.projectDir}/gradle/jacoco/jacocofix.gradle" diff --git a/debian/patches/change_servlet_dependency_version.diff b/debian/patches/change_servlet_dependency_version.diff deleted file mode 100644 index b7c0a0b..0000000 --- a/debian/patches/change_servlet_dependency_version.diff +++ /dev/null @@ -1,21 +0,0 @@ -Description: Change version of dependencies to one available in Debian -Author: Komal Sukhani <[email protected]> -Forwarded: no -Last-Update: 2015-06-22 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/subprojects/groovy-servlet/build.gradle -+++ b/subprojects/groovy-servlet/build.gradle -@@ -17,10 +17,10 @@ - * under the License. - */ - dependencies { -- compile('javax.servlet:servlet-api:2.4') { dep -> -+ compile('javax.servlet:servlet-api:debian') { dep -> - provided dep - } -- compile('javax.servlet:jsp-api:2.0') { dep -> -+ compile('javax.servlet.jsp:jsp-api:debian') { dep -> - provided dep - } - compile rootProject diff --git a/debian/patches/change_testng_dependency_version.diff b/debian/patches/change_testng_dependency_version.diff deleted file mode 100644 index 939b43a..0000000 --- a/debian/patches/change_testng_dependency_version.diff +++ /dev/null @@ -1,22 +0,0 @@ -Description: Change version of dependencies to one available in Debian -Author: Komal Sukhani <[email protected]> -Forwarded: no -Last-Update: 2015-06-22 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/subprojects/groovy-testng/build.gradle -+++ b/subprojects/groovy-testng/build.gradle -@@ -18,11 +18,11 @@ - */ - dependencies { - compile rootProject -- runtime('org.testng:testng:6.8.13') { -+ runtime('org.testng:testng:6.x') { - // exclude 'optional' beanshell even though testng's pom doesn't say optional - exclude(group: 'org.beanshell', module: 'bsh') - // and an older version of jcommander - exclude(group: 'com.beust', module: 'jcommander') - } -- compile('com.beust:jcommander:1.47') -+ compile('com.beust:jcommander:1.x') - } diff --git a/debian/patches/mavenRepo.patch b/debian/patches/mavenRepo.patch deleted file mode 100644 index 73f8275..0000000 --- a/debian/patches/mavenRepo.patch +++ /dev/null @@ -1,80 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Mon, 17 Aug 2015 12:39:07 +0200 -Subject: mavenRepo - -Fix FTBFS with gradle 2.5 because the old mavenRepo function was removed. - -Forwarded: no ---- - build.gradle | 13 +++++++++---- - gradle/codehaus.gradle | 4 +++- - gradle/utils.gradle | 4 +++- - 3 files changed, 15 insertions(+), 6 deletions(-) - -diff --git a/build.gradle b/build.gradle -index 2c9ab8e..95df239 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -1,7 +1,8 @@ - buildscript { - repositories { -- -- mavenRepo url: "file:///usr/share/maven-repo" -+ maven { -+ url "file:///usr/share/maven-repo" -+ } - } - - dependencies { -@@ -35,7 +36,9 @@ allprojects { - group = 'org.codehaus.groovy' - version = groovyVersion - repositories { -- mavenRepo url: "file:///usr/share/maven-repo" -+ maven { -+ url "file:///usr/share/maven-repo" -+ } - } - - apply plugin: 'groovy' -@@ -78,7 +81,9 @@ subprojects { - - repositories { - // todo Some repos are needed only for some configs. Declare them just for the configuration once Gradle allows this. -- mavenRepo url: "file:///usr/share/maven-repo" -+ maven { -+ url "file:///usr/share/maven-repo" -+ } - } - - // todo do we need compile and runtime scope for examples? -diff --git a/gradle/codehaus.gradle b/gradle/codehaus.gradle -index afdd329..7377135 100644 ---- a/gradle/codehaus.gradle -+++ b/gradle/codehaus.gradle -@@ -5,7 +5,9 @@ import groovy.io.* - buildscript { - repositories { - // mavenCentral() -- mavenRepo url: "file:///usr/share/maven-repo" -+ maven { -+ url "file:///usr/share/maven-repo" -+ } - } - dependencies { - classpath 'com.github.lookfirst:sardine:5.0.1' -diff --git a/gradle/utils.gradle b/gradle/utils.gradle -index 60367bb..c7ae7b5 100644 ---- a/gradle/utils.gradle -+++ b/gradle/utils.gradle -@@ -25,7 +25,9 @@ import static org.objectweb.asm.Opcodes.* - buildscript { - repositories { - // mavenCentral() -- mavenRepo url: "file:///usr/share/maven-repo" -+ maven { -+ url "file:///usr/share/maven-repo" -+ } - } - dependencies { - classpath "org.ow2.asm:asm:$asmVersion" diff --git a/debian/patches/series b/debian/patches/series index ea9a3be..670787c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,9 +1,6 @@ 01_fix_doc_gradle.diff -02_fix_gradle_build.diff 02_fix_start_script.diff -03_ignore_codenarc.diff -change_bsf_dependencies_version.diff -change_servlet_dependency_version.diff -change_junit_version.diff -change_testng_dependency_version.diff -mavenRepo.patch +03_ignore_reporting_tools.diff +04_ignore_bintray.diff +05_buildscripts_dependencies.diff +06_ignore_documentation_publication.diff diff --git a/debian/rules b/debian/rules index f2ce3a8..f613db8 100755 --- a/debian/rules +++ b/debian/rules @@ -2,30 +2,22 @@ include /usr/share/dpkg/default.mk -export GRADLE_USER_HOME=$(CURDIR)/.gradlehome export LC_ALL=en_US.UTF-8 -DEB_GRADLE_OPTS := --project-prop finalRelease=true --stacktrace --offline + VERSION := $(shell echo $(DEB_VERSION_UPSTREAM) | sed 's/+dfsg//') MAVEN_REPO_URL := http://repo1.maven.org/maven2 MODULES := docgenerator servlet ant groovydoc xml swing sql jmx test console groovysh json testng jsr223 templates bsf %: - dh $@ + dh $@ --buildsystem=gradle override_dh_auto_clean: dh_auto_clean - -gradle $(DEB_GRADLE_OPTS) clean - # to-do: patch .gradle file to delete these files - -rm -rf .gradle .gradlehome buildSrc/.gradle buildSrc/target + find . -wholename .*target/tmp | xargs echo | sed -e 's^target/tmp^target^g' | xargs rm -Rf mh_clean -override_dh_clean: - dh_clean - -rm -rf .gradlehome - override_dh_auto_build: - dh_auto_build - gradle $(DEB_GRADLE_OPTS) dist + dh_auto_build -- --project-prop finalRelease=true dist -x :grooidjar unzip target/distributions/apache-groovy-binary-*.zip -d target/distributions/bin unzip target/distributions/apache-groovy-docs-*.zip -d target/distributions/doc -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/groovy2.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
