This is an automated email from the git hooks/post-receive script. nomadium pushed a commit to annotated tag debian/2.2.2+dfsg-5 in repository groovy2.
commit 18a0c88d342616f7cebc2a1f833e6c6336af066e Author: Miguel Landaeta <[email protected]> Date: Sat Jul 25 21:47:55 2015 -0300 Use debian version for commons-cli dependency --- debian/changelog | 5 +++-- debian/patches/01_fix_gradle_build.diff | 33 +++++++++++++++++---------------- debian/patches/03_add_maven_poms.diff | 2 +- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/debian/changelog b/debian/changelog index dfcf61d..960aeed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -groovy2 (2.2.2+dfsg-5) UNRELEASED; urgency=high +groovy2 (2.2.2+dfsg-5) unstable; urgency=high + * Use debian version for commons-cli dependency. (Closes: #793635). * Fix remote execution of untrusted code and possible DoS vulnerability. (CVE-2015-3253) (Closes: #793398). - -- Miguel Landaeta <[email protected]> Sat, 25 Jul 2015 15:46:24 -0300 + -- Miguel Landaeta <[email protected]> Sat, 25 Jul 2015 21:08:32 -0300 groovy2 (2.2.2+dfsg-4) unstable; urgency=medium diff --git a/debian/patches/01_fix_gradle_build.diff b/debian/patches/01_fix_gradle_build.diff index 729cef7..b51504f 100644 --- a/debian/patches/01_fix_gradle_build.diff +++ b/debian/patches/01_fix_gradle_build.diff @@ -1,7 +1,7 @@ Description: Build Groovy with libraries available in Debian Author: Miguel Landaeta <[email protected]> Forwarded: no -Last-Update: 2014-05-11 +Last-Update: 2015-07-25 --- a/build.gradle +++ b/build.gradle @@ -42,7 +42,7 @@ Last-Update: 2014-05-11 // TODO use antlr plugin //apply plugin: 'antlr' -@@ -36,7 +30,8 @@ +@@ -36,7 +30,8 @@ allprojects { group = 'org.codehaus.groovy' version = groovyVersion repositories { @@ -52,7 +52,7 @@ Last-Update: 2014-05-11 } apply plugin: 'checkstyle' -@@ -49,6 +44,7 @@ +@@ -49,6 +44,7 @@ allprojects { // 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 { @@ -60,7 +60,7 @@ Last-Update: 2014-05-11 apply plugin: 'asciidoctor' asciidoctor { -@@ -58,6 +54,7 @@ +@@ -58,6 +54,7 @@ allprojects { // skip the asciidoctor task if there's no directory with asciidoc files asciidoctor.onlyIf { project.file('src/spec/doc').exists() } @@ -68,7 +68,7 @@ Last-Update: 2014-05-11 } // don't fail build on CodeNarc tasks -@@ -69,7 +66,7 @@ +@@ -69,7 +66,7 @@ allprojects { ignoreFailures = true configFile = file("$rootProject.projectDir/config/checkstyle/checkstyle.xml") } @@ -77,7 +77,7 @@ Last-Update: 2014-05-11 if (useIndy()) { tasks.withType(GroovyCompile) { groovyOptions.optimizationOptions.indy = true -@@ -128,8 +125,11 @@ +@@ -128,8 +125,11 @@ subprojects { repositories { // todo Some repos are needed only for some configs. Declare them just for the configuration once Gradle allows this. // mavenCentral() // default, tools @@ -89,7 +89,7 @@ Last-Update: 2014-05-11 } // todo do we need compile and runtime scope for examples? -@@ -143,30 +143,30 @@ +@@ -143,30 +143,30 @@ configurations { } dependencies { @@ -103,7 +103,8 @@ Last-Update: 2014-05-11 + def bndVersion = 'debian' + def checkstyleVersion = 'debian' def coberturaVersion = '1.9.4.1' - def commonsCliVersion = '1.2' +- def commonsCliVersion = '1.2' ++ def commonsCliVersion = 'debian' def commonsHttpClientVersion = '3.1' def eclipseOsgiVersion = '3.5.0.v20090520' def gparsVersion = '1.1.0' @@ -129,7 +130,7 @@ Last-Update: 2014-05-11 compilerCompile "antlr:antlr:$antlrVersion" compilerCompile "org.ow2.asm:asm:$asmVersion" -@@ -206,7 +206,7 @@ +@@ -206,7 +206,7 @@ dependencies { compile("org.apache.ivy:ivy:$ivyVersion") { transitive = false } @@ -138,7 +139,7 @@ Last-Update: 2014-05-11 testCompile "jmock:jmock:$jmockVersion" testCompile "jmock:jmock-cglib:$jmockVersion" testCompile "xmlunit:xmlunit:$xmlunitVersion" -@@ -217,10 +217,10 @@ +@@ -217,10 +217,10 @@ dependencies { testCompile "com.thoughtworks.qdox:qdox:$qdoxVersion" tools "com.googlecode.jarjar:jarjar:$jarjarVersion" @@ -151,7 +152,7 @@ Last-Update: 2014-05-11 tools("net.sourceforge.cobertura:cobertura:$coberturaVersion") { exclude(module: 'asm') exclude(module: 'asm') -@@ -290,7 +290,7 @@ +@@ -290,7 +290,7 @@ sourceSets { ] fileTree('src/main/groovy/ui').matching { exclude 'GroovyMain.java', 'GroovySocketServer.java' @@ -160,7 +161,7 @@ Last-Update: 2014-05-11 exclude "groovy/ui/$details.path" } if (!useIndy()) { -@@ -408,11 +408,9 @@ +@@ -408,11 +408,9 @@ apply from: 'gradle/utils.gradle' def isJava16() { System.properties['java.version'].contains('1.6') } @@ -172,7 +173,7 @@ Last-Update: 2014-05-11 def modules() { subprojects.findAll { it.name =~ /groovy-(?!all-tests)/ } } -@@ -454,7 +452,7 @@ +@@ -454,7 +452,7 @@ compileCompilerJava { } compileJava { @@ -181,7 +182,7 @@ Last-Update: 2014-05-11 options.fork(memoryMaximumSize: javacMain_mx) } -@@ -491,10 +489,10 @@ +@@ -491,10 +489,10 @@ apply from: 'gradle/eclipse.gradle' // Define a GroovyDoc task which depends on the generated groovydoc tool apply from: 'gradle/groovydoc.gradle' if (isJava15()) { @@ -195,7 +196,7 @@ Last-Update: 2014-05-11 } classes { -@@ -508,6 +506,7 @@ +@@ -508,6 +506,7 @@ if (file('user.gradle').exists()) { apply from: 'user.gradle' } @@ -203,7 +204,7 @@ Last-Update: 2014-05-11 allprojects { apply plugin: 'cobertura' cobertura { -@@ -515,10 +514,13 @@ +@@ -515,10 +514,13 @@ allprojects { coverageReportDir = file("$buildDir/reports/cobertura") } } diff --git a/debian/patches/03_add_maven_poms.diff b/debian/patches/03_add_maven_poms.diff index 2549817..a9cf8c5 100644 --- a/debian/patches/03_add_maven_poms.diff +++ b/debian/patches/03_add_maven_poms.diff @@ -9458,7 +9458,7 @@ Last-Update: 2014-07-12 + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> -+ <version>1.2</version> ++ <version>debian</version> + <scope>compile</scope> + <optional>true</optional> + </dependency> -- 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
