This is an automated email from the git hooks/post-receive script. komal-guest pushed a commit to branch master in repository groovy2.
commit 7d41c0e0ab9c62793c751dc52847eb7652c9e126 Author: komal <[email protected]> Date: Tue Jun 16 15:05:44 2015 +0530 Refresh patches --- debian/patches/01_fix_doc_gradle.diff | 101 ++++ debian/patches/01_fix_gradle_build.diff | 628 --------------------- debian/patches/02_fix_gradle_build.diff | 229 ++++++++ .../patches/change_bsf_dependencies_version.diff | 13 + debian/patches/change_junit_version.diff | 13 + .../patches/change_servlet_dependency_version.diff | 13 + .../patches/change_testng_dependency_version.diff | 17 + debian/patches/fix_for_gradle-1.12 | 14 + debian/patches/series | 12 +- 9 files changed, 411 insertions(+), 629 deletions(-) diff --git a/debian/patches/01_fix_doc_gradle.diff b/debian/patches/01_fix_doc_gradle.diff new file mode 100644 index 0000000..6840ab2 --- /dev/null +++ b/debian/patches/01_fix_doc_gradle.diff @@ -0,0 +1,101 @@ +Index: debian-groovy2/gradle/docs.gradle +=================================================================== +--- debian-groovy2.orig/gradle/docs.gradle ++++ debian-groovy2/gradle/docs.gradle +@@ -1,22 +1,8 @@ + task doc(dependsOn: ['javadocAll', 'groovydocAll', 'docGDK']) { +- if (JavaVersion.current().java7Compatible) { +- dependsOn 'asciidocAll', 'assembleAsciidoc' +- } + ext.footer = 'Copyright &copy; 2003-2014 The Codehaus. All rights reserved.' + ext.title = "Groovy ${groovyVersion}" + } + +-if (JavaVersion.current().java7Compatible) { +- task assembleAsciidoc(type: Copy, dependsOn: 'asciidocAll') { +- subprojects { +- from project.asciidoctor +- } +- into "$buildDir/asciidoc" +- } +- +- task asciidocAll(dependsOn: 'asciidoctor') +-} +- + def javadocSpec = { + maxMemory = javaDoc_mx + project.configure(options) { +@@ -102,66 +88,10 @@ task docProjectVersionInfo(type: Copy) { + + task docGDK { + // ext.extraDocGDKclasses = [] +- dependsOn([project(':groovy-groovydoc'), project(':groovy-docgenerator')]*.classes) + // TODO don't hard-code these +- dependsOn([project(':groovy-sql'), project(':groovy-xml'), project(':groovy-swing')]*.classes) +- if(JavaVersion.current().isJava7Compatible()) { +- dependsOn([project(':groovy-nio')]*.classes) +- } +- dependsOn docProjectVersionInfo + ext.destinationDir = "$buildDir/html/groovy-jdk" + inputs.files sourceSets.tools.runtimeClasspath + outputs.dir destinationDir +- doLast { task -> +- try { +- ant { +- java(classname: 'org.codehaus.groovy.tools.DocGenerator', +- fork: 'true', +- failonerror: 'true', +- classpath: (configurations.tools + groovydocAll.groovyClasspath).asPath, +- errorproperty: 'edr', +- outputproperty: 'odr') { +- arg(value: '-title') +- arg(value: 'Groovy JDK enhancements') +- arg(value: '-link') +- arg(value: 'groovy,org.codehaus.groovy=http://groovy.codehaus.org/gapi/') +- arg(value: '-link') +- arg(value: 'java,org.xml,javax,org.w3c=http://docs.oracle.com/javase/7/docs/api/') +- // either package name if in core or fully qualified path otherwise +- arg(value: 'org.codehaus.groovy.runtime.DefaultGroovyMethods') +- arg(value: 'org.codehaus.groovy.runtime.DefaultGroovyStaticMethods') +- arg(value: 'org.codehaus.groovy.runtime.DateGroovyMethods') +- arg(value: 'org.codehaus.groovy.runtime.EncodingGroovyMethods') +- arg(value: 'org.codehaus.groovy.runtime.IOGroovyMethods') +- arg(value: 'org.codehaus.groovy.runtime.ProcessGroovyMethods') +- arg(value: 'org.codehaus.groovy.runtime.ResourceGroovyMethods') +- arg(value: 'org.codehaus.groovy.runtime.SocketGroovyMethods') +- arg(value: 'org.codehaus.groovy.runtime.StringGroovyMethods') +- arg(value: 'org.codehaus.groovy.vmplugin.v5.PluginDefaultGroovyMethods') +- arg(value: 'org.codehaus.groovy.vmplugin.v6.PluginDefaultGroovyMethods') +- arg(value: 'org.codehaus.groovy.vmplugin.v6.PluginStaticGroovyMethods') +- // TODO don't hard-code these +- arg(value: 'subprojects/groovy-sql/src/main/java/org/codehaus/groovy/runtime/SqlGroovyMethods.java') +- arg(value: 'subprojects/groovy-swing/src/main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java') +- arg(value: 'subprojects/groovy-xml/src/main/java/org/codehaus/groovy/runtime/XmlGroovyMethods.java') +- if(JavaVersion.current().isJava7Compatible()) { +- arg(value: 'subprojects/groovy-nio/src/main/java/org/codehaus/groovy/runtime/NioGroovyMethods.java') +- } +- } +- } +- } finally { +- if (ant.properties.odr) { +- logger.info 'Out: ' + ant.properties.odr +- } +- if (ant.properties.edr) { +- logger.error 'Err: ' + ant.properties.edr +- } +- } +- copy { +- into task.destinationDir +- from 'src/tools/org/codehaus/groovy/tools/groovy.ico', 'src/tools/org/codehaus/groovy/tools/stylesheet.css' +- } +- } + } + + // this will apply the javadoc fix tool to all generated javadocs +@@ -189,4 +119,4 @@ if (JavaVersion.current().isJava8Compati + options.addStringOption('Xdoclint:none', '-quiet') + } + } +-} +\ No newline at end of file ++} diff --git a/debian/patches/01_fix_gradle_build.diff b/debian/patches/01_fix_gradle_build.diff deleted file mode 100644 index 729cef7..0000000 --- a/debian/patches/01_fix_gradle_build.diff +++ /dev/null @@ -1,628 +0,0 @@ -Description: Build Groovy with libraries available in Debian -Author: Miguel Landaeta <[email protected]> -Forwarded: no -Last-Update: 2014-05-11 - ---- a/build.gradle -+++ b/build.gradle -@@ -1,28 +1,22 @@ - apply from: 'gradle/filter.gradle' - apply from: 'gradle/indy.gradle' --if (JavaVersion.current().java6Compatible) { -- apply from: 'gradle/bintray.gradle' --} - - buildscript { - repositories { -- jcenter() -- maven { -- name 'Bintray Asciidoctor repo' -- url 'http://dl.bintray.com/content/aalmiray/asciidoctor' -- } -+ /* -+ mavenCentral() -+ mavenRepo name: 'Bintray Asciidoctor repo', url: 'http://dl.bintray.com/content/aalmiray/asciidoctor' -+ mavenRepo name: 'Bintray JCenter', url: 'http://jcenter.bintray.com' -+ */ -+ mavenRepo url: "file:///usr/share/maven-repo" - } - - dependencies { -- classpath 'org.asciidoctor:asciidoctor-gradle-plugin:0.5.0' -- classpath 'net.saliman:gradle-cobertura-plugin:1.1.2' -- classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:2.2.3' -+ //classpath 'org.asciidoctor:asciidoctor-gradle-plugin:0.5.0' -+ //classpath 'net.saliman:gradle-cobertura-plugin:1.1.2' - } - } - --File javaHome = new File(System.getProperty('java.home')) --logger.lifecycle "Using Java from $javaHome (version ${System.getProperty('java.version')})" -- - // TODO use antlr plugin - //apply plugin: 'antlr' - -@@ -36,7 +30,8 @@ - group = 'org.codehaus.groovy' - version = groovyVersion - repositories { -- jcenter() -+ //mavenCentral() -+ mavenRepo url: "file:///usr/share/maven-repo" - } - - apply plugin: 'checkstyle' -@@ -49,6 +44,7 @@ - // do nothing on JDK 5 as gradle fails to create a proxy for the AsciidoctorTask - logger.warn 'You must run on JDK 6+ to be able to generate the Asciidoc documentation.' - } else { -+ /* - apply plugin: 'asciidoctor' - - asciidoctor { -@@ -58,6 +54,7 @@ - - // skip the asciidoctor task if there's no directory with asciidoc files - asciidoctor.onlyIf { project.file('src/spec/doc').exists() } -+ */ - } - - // don't fail build on CodeNarc tasks -@@ -69,7 +66,7 @@ - ignoreFailures = true - configFile = file("$rootProject.projectDir/config/checkstyle/checkstyle.xml") - } -- -+ - if (useIndy()) { - tasks.withType(GroovyCompile) { - groovyOptions.optimizationOptions.indy = true -@@ -128,8 +125,11 @@ - repositories { - // todo Some repos are needed only for some configs. Declare them just for the configuration once Gradle allows this. - // mavenCentral() // default, tools -+ /* - maven { url 'http://www.aQute.biz/repo' } // tools - maven { url 'http://repository.jboss.org/maven2' } // examples, tools -+ */ -+ mavenRepo url: "file:///usr/share/maven-repo" - } - - // todo do we need compile and runtime scope for examples? -@@ -143,30 +143,30 @@ - } - - dependencies { -- def antVersion = '1.9.2' -- def asmVersion = '4.1' -+ def antVersion = 'debian' -+ def asmVersion = '4.x' - def antlrVersion = '2.7.7' -- def bndVersion = '0.0.401' -- def checkstyleVersion = '4.4' -+ def bndVersion = 'debian' -+ def checkstyleVersion = 'debian' - def coberturaVersion = '1.9.4.1' - def commonsCliVersion = '1.2' - def commonsHttpClientVersion = '3.1' - def eclipseOsgiVersion = '3.5.0.v20090520' - def gparsVersion = '1.1.0' -- def ivyVersion = '2.3.0' -- def jansiVersion = '1.10' -- def jarjarVersion = '1.3' -+ def ivyVersion = 'debian' -+ def jansiVersion = 'debian' -+ def jarjarVersion = '1.4-SNAPSHOT' - def jmockVersion = '1.2.0' - def logbackVersion = '0.9.21' - def log4jVersion = '1.2.16' - def log4j2Version = '2.0-beta9' - def luceneVersion = '4.3.1' - def openejbVersion = '1.0' -- def qdoxVersion = '1.12.1' -+ def qdoxVersion = 'debian' - def simianVersion = '2.2.4' - def slf4jVersion = '1.6.0' - def xmlunitVersion = '1.3' -- def xstreamVersion = '1.4.4' -+ def xstreamVersion = 'debian' - - compilerCompile "antlr:antlr:$antlrVersion" - compilerCompile "org.ow2.asm:asm:$asmVersion" -@@ -206,7 +206,7 @@ - compile("org.apache.ivy:ivy:$ivyVersion") { - transitive = false - } -- runtime "org.codehaus.gpars:gpars:$gparsVersion" -+ //runtime "org.codehaus.gpars:gpars:$gparsVersion" - testCompile "jmock:jmock:$jmockVersion" - testCompile "jmock:jmock-cglib:$jmockVersion" - testCompile "xmlunit:xmlunit:$xmlunitVersion" -@@ -217,10 +217,10 @@ - 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') -@@ -290,7 +290,7 @@ - ] - fileTree('src/main/groovy/ui').matching { - exclude 'GroovyMain.java', 'GroovySocketServer.java' -- }.visit { details -> -+ }.visit {details -> - exclude "groovy/ui/$details.path" - } - if (!useIndy()) { -@@ -408,11 +408,9 @@ - def isJava16() { - System.properties['java.version'].contains('1.6') - } -- - def isJava15() { - System.properties['java.version'].contains('1.5') - } -- - def modules() { - subprojects.findAll { it.name =~ /groovy-(?!all-tests)/ } - } -@@ -454,7 +452,7 @@ - } - - compileJava { -- dependsOn compilerClasses, compilerDgmConverter, ensureGrammars -+ dependsOn compilerClasses,compilerDgmConverter,ensureGrammars - options.fork(memoryMaximumSize: javacMain_mx) - } - -@@ -491,10 +489,10 @@ - // Define a GroovyDoc task which depends on the generated groovydoc tool - apply from: 'gradle/groovydoc.gradle' - if (isJava15()) { -- // do nothing on JDK 5 as sardine is built for Java 6 -- logger.warn 'You must run on JDK 6+ to be able to deploy to codehaus.' -+ // do nothing on JDK 5 as sardine is built for Java 6 -+ logger.warn 'You must run on JDK 6+ to be able to deploy to codehaus.' - } else { -- apply from: 'gradle/codehaus.gradle' -+ apply from: 'gradle/codehaus.gradle' - } - - classes { -@@ -508,6 +506,7 @@ - apply from: 'user.gradle' - } - -+/* - allprojects { - apply plugin: 'cobertura' - cobertura { -@@ -515,10 +514,13 @@ - coverageReportDir = file("$buildDir/reports/cobertura") - } - } -+*/ - -+/* - wrapper { - gradleVersion = '1.7' - } -+*/ - - // produce warning if running on 1.5 or 1.6 - if (isJava15() || isJava16()) { ---- a/gradle/assemble.gradle -+++ b/gradle/assemble.gradle -@@ -315,17 +315,17 @@ - from("$projectDir") { - include 'LICENSE.txt', 'NOTICE.txt' - } -- into('lib') { -- from jar.archivePath -- from({ -- configurations.runtime.findAll { it.name.endsWith 'jar' } + -- modules()*.jar.archivePath + -- modules().configurations.runtime*.findAll { -- it.name.endsWith('jar') && !it.name.contains('livetribe-jsr223') && !it.name.matches(/groovy-\d.*/) -- }.flatten() as Set -- }) -- from('src/bin/groovy.icns') -- } -+ //into('lib') { -+ // from jar.archivePath -+ // from({ -+ // configurations.runtime.findAll { it.name.endsWith 'jar' } + -+ // modules()*.jar.archivePath + -+ // modules().configurations.runtime*.findAll { -+ // it.name.endsWith('jar') && !it.name.contains('livetribe-jsr223') && !it.name.matches(/groovy-\d.*/) -+ // }.flatten() as Set -+ // }) -+ // from('src/bin/groovy.icns') -+ //} - into('indy') { - from { new File(jar.archivePath.parent, "${jar.baseName}-${jar.version}-indy.jar") } - from { ---- a/gradle/codehaus.gradle -+++ b/gradle/codehaus.gradle -@@ -1,44 +1,44 @@ --import com.github.sardine.* --import com.github.sardine.impl.* --import groovy.io.* -- --buildscript { -- repositories { -- mavenCentral() -- } -- dependencies { -- classpath 'com.github.lookfirst:sardine:5.0.1' -- } --} -- -+//import com.github.sardine.* -+//import com.github.sardine.impl.* -+//import groovy.io.* -+// -+//buildscript { -+// repositories { -+// mavenCentral() -+// } -+// 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 -> -- def basePath = base.canonicalPath -- base.eachFileRecurse { -- def name = it.canonicalPath.substring(basePath.length()+1) -- def target = serverBase+targetDirPart+"/"+name -- if (it.directory) { -- println "MKCOL $target" -- try { -- sardine.createDirectory(target+"/"); -- } catch (SardineException se) { -- //ignore 405, thrown for existing directories -- if (se.statusCode != 405) throw se -- } -- } else { -- println "PUT $target" -- sardine.put (target, it.newInputStream()) -- } -- -- } -- } -- } -+// copyConf.each { targetDirPart, base -> -+// def basePath = base.canonicalPath -+// base.eachFileRecurse { -+// def name = it.canonicalPath.substring(basePath.length()+1) -+// def target = serverBase+targetDirPart+"/"+name -+// if (it.directory) { -+// println "MKCOL $target" -+// try { -+// sardine.createDirectory(target+"/"); -+// } catch (SardineException se) { -+// //ignore 405, thrown for existing directories -+// if (se.statusCode != 405) throw se -+// } -+// } else { -+// println "PUT $target" -+// sardine.put (target, it.newInputStream()) -+// } -+// -+// } -+// } -+// } - } ---- a/gradle/docs.gradle -+++ b/gradle/docs.gradle -@@ -4,12 +4,14 @@ - } - - task assembleAsciidoc(type: Copy, dependsOn: 'asciidocAll') { -+ /* - if (!isJava15()) { - subprojects { - from project.asciidoctor - } - into "$buildDir/asciidoc" - } -+ */ - } - - def javadocSpec = { -@@ -52,7 +54,8 @@ - groovydoc groovydocSpec - - if (!isJava15()) { -- task asciidocAll(dependsOn: 'asciidoctor') -+ //task asciidocAll(dependsOn: 'asciidoctor') -+ task asciidocAll() - } - } - -@@ -100,55 +103,55 @@ - } - - task docGDK { --// ext.extraDocGDKclasses = [] -- dependsOn([project(':groovy-groovydoc'), project(':groovy-docgenerator')]*.classes) -- // TODO don't hard-code these -- dependsOn([project(':groovy-sql'), project(':groovy-sql'), project(':groovy-swing')]*.classes) -- dependsOn docProjectVersionInfo -+//// ext.extraDocGDKclasses = [] -+// dependsOn([project(':groovy-groovydoc'), project(':groovy-docgenerator')]*.classes) -+// // TODO don't hard-code these -+// dependsOn([project(':groovy-sql'), project(':groovy-sql'), project(':groovy-swing')]*.classes) -+// dependsOn docProjectVersionInfo - ext.destinationDir = "$buildDir/html/groovy-jdk" -- inputs.files sourceSets.tools.runtimeClasspath -- outputs.dir destinationDir -- doLast { task -> -- try { -- ant { -- java(classname: 'org.codehaus.groovy.tools.DocGenerator', -- fork: 'true', -- failonerror: 'true', -- classpath: (configurations.tools + groovydocAll.groovyClasspath).asPath, -- errorproperty: 'edr', -- outputproperty: 'odr') { -- // either package name if in core or fully qualified path otherwise -- arg(value: 'org.codehaus.groovy.runtime.DefaultGroovyMethods') -- arg(value: 'org.codehaus.groovy.runtime.DefaultGroovyStaticMethods') -- arg(value: 'org.codehaus.groovy.runtime.DateGroovyMethods') -- arg(value: 'org.codehaus.groovy.runtime.EncodingGroovyMethods') -- arg(value: 'org.codehaus.groovy.runtime.IOGroovyMethods') -- arg(value: 'org.codehaus.groovy.runtime.ProcessGroovyMethods') -- arg(value: 'org.codehaus.groovy.runtime.ResourceGroovyMethods') -- arg(value: 'org.codehaus.groovy.runtime.SocketGroovyMethods') -- arg(value: 'org.codehaus.groovy.runtime.StringGroovyMethods') -- arg(value: 'org.codehaus.groovy.vmplugin.v5.PluginDefaultGroovyMethods') -- arg(value: 'org.codehaus.groovy.vmplugin.v6.PluginDefaultGroovyMethods') -- arg(value: 'org.codehaus.groovy.vmplugin.v6.PluginStaticGroovyMethods') -- // TODO don't hard-code these -- arg(value: 'subprojects/groovy-sql/src/main/java/org/codehaus/groovy/runtime/SqlGroovyMethods.java') -- arg(value: 'subprojects/groovy-swing/src/main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java') -- arg(value: 'subprojects/groovy-xml/src/main/java/org/codehaus/groovy/runtime/XmlGroovyMethods.java') -- } -- } -- } finally { -- if (ant.properties.odr) { -- logger.info 'Out: ' + ant.properties.odr -- } -- if (ant.properties.edr) { -- logger.error 'Err: ' + ant.properties.edr -- } -- } -- copy { -- into task.destinationDir -- from 'src/tools/org/codehaus/groovy/tools/groovy.ico', 'src/tools/org/codehaus/groovy/tools/stylesheet.css' -- } -- } -+// inputs.files sourceSets.tools.runtimeClasspath -+// outputs.dir destinationDir -+// doLast { task -> -+// try { -+// ant { -+// java(classname: 'org.codehaus.groovy.tools.DocGenerator', -+// fork: 'true', -+// failonerror: 'true', -+// classpath: (configurations.tools + groovydocAll.groovyClasspath).asPath, -+// errorproperty: 'edr', -+// outputproperty: 'odr') { -+// // either package name if in core or fully qualified path otherwise -+// arg(value: 'org.codehaus.groovy.runtime.DefaultGroovyMethods') -+// arg(value: 'org.codehaus.groovy.runtime.DefaultGroovyStaticMethods') -+// arg(value: 'org.codehaus.groovy.runtime.DateGroovyMethods') -+// arg(value: 'org.codehaus.groovy.runtime.EncodingGroovyMethods') -+// arg(value: 'org.codehaus.groovy.runtime.IOGroovyMethods') -+// arg(value: 'org.codehaus.groovy.runtime.ProcessGroovyMethods') -+// arg(value: 'org.codehaus.groovy.runtime.ResourceGroovyMethods') -+// arg(value: 'org.codehaus.groovy.runtime.SocketGroovyMethods') -+// arg(value: 'org.codehaus.groovy.runtime.StringGroovyMethods') -+// arg(value: 'org.codehaus.groovy.vmplugin.v5.PluginDefaultGroovyMethods') -+// arg(value: 'org.codehaus.groovy.vmplugin.v6.PluginDefaultGroovyMethods') -+// arg(value: 'org.codehaus.groovy.vmplugin.v6.PluginStaticGroovyMethods') -+// // TODO don't hard-code these -+// arg(value: 'subprojects/groovy-sql/src/main/java/org/codehaus/groovy/runtime/SqlGroovyMethods.java') -+// arg(value: 'subprojects/groovy-swing/src/main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java') -+// arg(value: 'subprojects/groovy-xml/src/main/java/org/codehaus/groovy/runtime/XmlGroovyMethods.java') -+// } -+// } -+// } finally { -+// if (ant.properties.odr) { -+// logger.info 'Out: ' + ant.properties.odr -+// } -+// if (ant.properties.edr) { -+// logger.error 'Err: ' + ant.properties.edr -+// } -+// } -+// copy { -+// into task.destinationDir -+// from 'src/tools/org/codehaus/groovy/tools/groovy.ico', 'src/tools/org/codehaus/groovy/tools/stylesheet.css' -+// } -+// } - } - - // this will apply the javadoc fix tool to all generated javadocs ---- a/gradle/test.gradle -+++ b/gradle/test.gradle -@@ -2,11 +2,7 @@ - - allprojects { - test { -- if (JavaVersion.current().isJava8Compatible()) { -- jvmArgs '-ea', "-Xms${groovyJUnit_ms}", "-Xmx${groovyJUnit_mx}" -- } else { -- jvmArgs '-ea', "-Xms${groovyJUnit_ms}", "-Xmx${groovyJUnit_mx}", "-XX:PermSize=${groovyJUnit_permSize}", "-XX:MaxPermSize=${groovyJUnit_maxPermSize}" -- } -+ jvmArgs '-ea', "-Xms${groovyJUnit_ms}", "-Xmx${groovyJUnit_mx}", "-XX:PermSize=${groovyJUnit_permSize}", "-XX:MaxPermSize=${groovyJUnit_maxPermSize}" - def headless = System.properties['java.awt.headless'] - if (headless == 'true') { - systemProperties 'java.awt.headless': 'true' -@@ -54,8 +50,7 @@ - } - - boolean isRunningOnCI() { -- def path = new File('.').absolutePath -- path.contains('ci.codehaus.org') || path.contains('teamcity') -+ new File('.').absolutePath.contains('ci.codehaus.org') - } - - logger.lifecycle "Detected ${isRunningOnCI() ? 'Continuous Integration environment' : 'development environment'}" ---- a/gradle/upload.gradle -+++ b/gradle/upload.gradle -@@ -1,39 +1,26 @@ --boolean isUsingBintray = rootProject.hasProperty('bintrayUser') && rootProject.bintrayUser && -- rootProject.hasProperty('bintrayPassword') && rootProject.bintrayPassword -- --if (isUsingBintray) { -- logger.lifecycle 'Deployment environment set to Bintray' --} -- - allprojects { - apply plugin: 'maven' - apply from: "${rootProject.projectDir}/gradle/pomconfigurer.gradle" - -- - configurations { - deployerJars - } - -- if (!isUsingBintray) { -- dependencies { -- deployerJars 'org.apache.maven.wagon:wagon-webdav:1.0-beta-2' -- } -+ dependencies { -+ deployerJars 'org.apache.maven.wagon:wagon-webdav:1.0-beta-2' - } - - uploadArchives { - repositories { - mavenDeployer { -+ def credentials = [ -+ userName: System.getProperty('groovy.deploy.username'), -+ password: System.getProperty('groovy.deploy.password') -+ ] - configuration = configurations.deployerJars -+ repository(id:'codehaus.org',url: uri('dav:https://dav.codehaus.org/repository/groovy'), authentication: credentials) -+ snapshotRepository(id:'codehaus.org',url: uri('dav:https://dav.codehaus.org/snapshots.repository/groovy'), authentication: credentials) - pom pomConfigureClosure -- -- if (!isUsingBintray) { -- def credentials = [ -- userName: System.getProperty('groovy.deploy.username'), -- password: System.getProperty('groovy.deploy.password') -- ] -- repository(id:'codehaus.org',url: uri('dav:https://dav.codehaus.org/repository/groovy'), authentication: credentials) -- snapshotRepository(id:'codehaus.org',url: uri('dav:https://dav.codehaus.org/snapshots.repository/groovy'), authentication: credentials) -- } - } - } - } ---- a/gradle/utils.gradle -+++ b/gradle/utils.gradle -@@ -24,10 +24,11 @@ - - buildscript { - repositories { -- mavenCentral() -+ //mavenCentral() -+ mavenRepo url: "file:///usr/share/maven-repo" - } - dependencies { -- classpath 'org.ow2.asm:asm:4.1' -+ classpath 'org.ow2.asm:asm:4.x' - } - } - ---- a/subprojects/groovy-ant/build.gradle -+++ b/subprojects/groovy-ant/build.gradle -@@ -1,5 +1,5 @@ - dependencies { -- def antVersion = '1.9.2' -+ def antVersion = 'debian' - compile project(':') - groovy project(':') - compile "org.apache.ant:ant:$antVersion" ---- a/subprojects/groovy-bsf/build.gradle -+++ b/subprojects/groovy-bsf/build.gradle -@@ -2,7 +2,7 @@ - compile('bsf:bsf:2.4.0') { - exclude(group: 'commons-logging', module: 'commons-logging') - } -- compile 'commons-logging:commons-logging:1.1.1' -+ compile 'commons-logging:commons-logging:debian' - compile project(':') - testCompile project(':groovy-test') - } ---- a/subprojects/groovy-console/build.gradle -+++ b/subprojects/groovy-console/build.gradle -@@ -8,8 +8,3 @@ - testCompile project(':groovy-test') - testCompile project(':groovy-swing').sourceSets.test.runtimeClasspath - } -- --task console(type: JavaExec, dependsOn:classes) { -- main = 'groovy.ui.Console' -- classpath = sourceSets.main.runtimeClasspath --} ---- a/subprojects/groovy-docgenerator/build.gradle -+++ b/subprojects/groovy-docgenerator/build.gradle -@@ -3,5 +3,5 @@ - compile project(':groovy-templates') - groovy project(':') - testCompile project(':groovy-test') -- compile 'com.thoughtworks.qdox:qdox:1.12.1' -+ compile 'com.thoughtworks.qdox:qdox:debian' - } ---- a/subprojects/groovy-groovysh/build.gradle -+++ b/subprojects/groovy-groovysh/build.gradle -@@ -1,5 +1,5 @@ - dependencies { -- def jlineVersion = '2.10' -+ def jlineVersion = '2.x' - compile project(':') - groovy project(':') - compile project(':groovy-console') ---- a/subprojects/groovy-servlet/build.gradle -+++ b/subprojects/groovy-servlet/build.gradle -@@ -1,8 +1,8 @@ - dependencies { -- compile('javax.servlet:servlet-api:2.4') { dep -> -+ compile('javax.servlet:servlet-api:2.5') { dep -> - provided dep - } -- compile('javax.servlet:jsp-api:2.0') { dep -> -+ compile('javax.servlet.jsp:jsp-api:2.1') { dep -> - provided dep - } - compile project(':') ---- a/subprojects/groovy-test/build.gradle -+++ b/subprojects/groovy-test/build.gradle -@@ -1,5 +1,5 @@ - dependencies { - groovy project(':') -- compile 'junit:junit:4.11' -+ compile 'junit:junit:4.x' - testRuntime project(':groovy-ant') - } diff --git a/debian/patches/02_fix_gradle_build.diff b/debian/patches/02_fix_gradle_build.diff new file mode 100644 index 0000000..448b735 --- /dev/null +++ b/debian/patches/02_fix_gradle_build.diff @@ -0,0 +1,229 @@ +Index: debian-groovy2/build.gradle +=================================================================== +--- debian-groovy2.orig/build.gradle ++++ debian-groovy2/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' ++ antVersion = 'debian' + asmVersion = '5.0.3' + antlrVersion = '2.7.7' +- bndVersion = '0.0.401' +- checkstyleVersion = '4.4' ++ bndVersion = 'debian' ++ checkstyleVersion = 'debian' + coberturaVersion = '1.9.4.1' + commonsCliVersion = '1.2' + commonsHttpClientVersion = '3.1' + 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 = '1.4-SNAPSHOT' ++ jlineVersion = '2.x' + jmockVersion = '1.2.0' + logbackVersion = '1.1.2' + log4jVersion = '1.2.17' + log4j2Version = '2.1' + 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' ++ 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') +Index: debian-groovy2/gradle/utils.gradle +=================================================================== +--- debian-groovy2.orig/gradle/utils.gradle ++++ debian-groovy2/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: debian-groovy2/gradle/codehaus.gradle +=================================================================== +--- debian-groovy2.orig/gradle/codehaus.gradle ++++ debian-groovy2/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: debian-groovy2/gradle/quality.gradle +=================================================================== +--- debian-groovy2.orig/gradle/quality.gradle ++++ debian-groovy2/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" + } + + } diff --git a/debian/patches/change_bsf_dependencies_version.diff b/debian/patches/change_bsf_dependencies_version.diff new file mode 100644 index 0000000..dd1f1e0 --- /dev/null +++ b/debian/patches/change_bsf_dependencies_version.diff @@ -0,0 +1,13 @@ +Index: debian-groovy2/subprojects/groovy-bsf/build.gradle +=================================================================== +--- debian-groovy2.orig/subprojects/groovy-bsf/build.gradle ++++ debian-groovy2/subprojects/groovy-bsf/build.gradle +@@ -2,7 +2,7 @@ dependencies { + 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 new file mode 100644 index 0000000..e627b4f --- /dev/null +++ b/debian/patches/change_junit_version.diff @@ -0,0 +1,13 @@ +--- a/subprojects/groovy-test/build.gradle ++++ b/subprojects/groovy-test/build.gradle +@@ -1,7 +1,7 @@ + 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 new file mode 100644 index 0000000..098ca27 --- /dev/null +++ b/debian/patches/change_servlet_dependency_version.diff @@ -0,0 +1,13 @@ +--- a/subprojects/groovy-servlet/build.gradle ++++ b/subprojects/groovy-servlet/build.gradle +@@ -1,8 +1,8 @@ + 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 new file mode 100644 index 0000000..928569e --- /dev/null +++ b/debian/patches/change_testng_dependency_version.diff @@ -0,0 +1,17 @@ +Index: debian-groovy2/subprojects/groovy-testng/build.gradle +=================================================================== +--- debian-groovy2.orig/subprojects/groovy-testng/build.gradle ++++ debian-groovy2/subprojects/groovy-testng/build.gradle +@@ -1,10 +1,10 @@ + dependencies { + compile rootProject +- runtime('org.testng:testng:6.8.13') { ++ runtime('org.testng:testng:6.8.8') { + // 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.35') + } diff --git a/debian/patches/fix_for_gradle-1.12 b/debian/patches/fix_for_gradle-1.12 new file mode 100644 index 0000000..7a8b791 --- /dev/null +++ b/debian/patches/fix_for_gradle-1.12 @@ -0,0 +1,14 @@ +Index: debian-groovy2/gradle/quality.gradle +=================================================================== +--- debian-groovy2.orig/gradle/quality.gradle 2015-06-06 13:24:16.403972433 +0530 ++++ debian-groovy2/gradle/quality.gradle 2015-06-06 13:27:52.359978033 +0530 +@@ -46,8 +46,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/series b/debian/patches/series index ebca9cd..809cf51 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,13 @@ -01_fix_gradle_build.diff +01_fix_doc_gradle.diff +02_fix_gradle_build.diff 02_fix_start_script.diff 03_add_maven_poms.diff + + + + +fix_for_gradle-1.12 +change_bsf_dependencies_version.diff +change_servlet_dependency_version.diff +change_junit_version.diff +change_testng_dependency_version.diff -- 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
