This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository gradle-1.12.
commit ea813a84eab4d6bda7dbae9bc7b03b0bb732c022 Author: Emmanuel Bourg <[email protected]> Date: Thu Oct 3 00:50:02 2013 +0200 New upstream release (1.5) Added a build dependency on libjatl-java Refreshed the patches --- debian/changelog | 5 ++++- debian/control | 2 ++ debian/patches/01_use_debian_jars.diff | 17 +++++++++-------- debian/patches/02_sonar.diff | 14 ++++++++------ debian/patches/24_pegdown.diff | 5 ++--- debian/patches/26_disable_commitid.diff | 6 +++--- debian/patches/31_hamcrest_12.diff | 19 +++++++++++++++---- debian/patches/32_disable_it.diff | 6 +++--- debian/patches/33_scala_zinc.diff | 12 ++++++------ debian/patches/35_ivy_23.diff | 8 ++++---- 10 files changed, 56 insertions(+), 38 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4cab75c..fc188d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ -gradle (1.4-3) UNRELEASED; urgency=low +gradle (1.5-1) UNRELEASED; urgency=low * Team upload. + * New upstream release + - Added a build dependency on libjatl-java + - Refreshed the patches * Updated the version of Guava used to fix a clean error * Use XZ compression for the upstream tarball diff --git a/debian/control b/debian/control index 9babac6..96d2e6a 100644 --- a/debian/control +++ b/debian/control @@ -38,6 +38,7 @@ Build-Depends: ant (>= 1.8), libjaffl-java (>= 0.5.9-2), libjansi-java, libjarjar-java (>= 1.4+svn142), + libjatl-java, libjaxen-java, libjcifs-java, libjcip-annotations-java, @@ -159,6 +160,7 @@ Depends: ant-optional (>= 1.8), libgmetrics-groovy-java, libgoogle-gson-java, libgradle-core-java (= ${binary:Version}), + libjatl-java, libjetty-extra-java, libjetty-java, librhino-java, diff --git a/debian/patches/01_use_debian_jars.diff b/debian/patches/01_use_debian_jars.diff index f8ff7e5..f85c1e5 100644 --- a/debian/patches/01_use_debian_jars.diff +++ b/debian/patches/01_use_debian_jars.diff @@ -103,7 +103,7 @@ Last-Update: 2012-08-18 libraries.jetty_util = dependencies.module("org.mortbay.jetty:jetty-util:6.1.25") { dependency libraries.slf4j_api dependency libraries.servlet_api -@@ -83,44 +83,46 @@ +@@ -83,11 +83,13 @@ jsr305: 'com.google.code.findbugs:jsr305:1.3.9@jar', groovy: 'org.codehaus.groovy:groovy-all:1.8.6@jar', jaxen: 'jaxen:jaxen:1.1@jar', @@ -118,9 +118,10 @@ Last-Update: 2012-08-18 + dependency "xerces:xercesImpl:debian@jar" + }, xbean: 'org.apache.xbean:xbean-reflect:3.4@jar', //required by maven3 classes - nativePlatform: 'net.rubygrapefruit:native-platform:0.2', + nativePlatform: 'net.rubygrapefruit:native-platform:0.3-rc-2', xerces: "xerces:xercesImpl:2.9.1", - objenesis: 'org.objenesis:objenesis:1.2@jar' +@@ -95,33 +97,33 @@ + jsoup:'org.jsoup:jsoup:1.6.3' ] -libraries.maven3 = dependencies.module("org.apache.maven:maven-core:3.0.4") { @@ -169,7 +170,7 @@ Last-Update: 2012-08-18 //eather: dependency "org.sonatype.aether:aether-api:1.13.1@jar" -@@ -136,11 +138,11 @@ +@@ -137,11 +139,11 @@ 'cglib:cglib-nodep:2.2.2' ] libraries.jmock = [ @@ -186,7 +187,7 @@ Last-Update: 2012-08-18 ] --- a/subprojects/core/core.gradle +++ b/subprojects/core/core.gradle -@@ -61,7 +61,7 @@ +@@ -60,7 +60,7 @@ integTestCompile project(":internalIntegTesting") @@ -221,7 +222,7 @@ Last-Update: 2012-08-18 } --- a/subprojects/core/src/main/groovy/org/gradle/profile/ProfileReportRenderer.java +++ b/subprojects/core/src/main/groovy/org/gradle/profile/ProfileReportRenderer.java -@@ -30,7 +30,7 @@ +@@ -35,7 +35,7 @@ HtmlReportRenderer renderer = new HtmlReportRenderer(); renderer.requireResource(getClass().getResource("/org/gradle/reporting/base-style.css")); renderer.requireResource(getClass().getResource("/org/gradle/reporting/report.js")); @@ -294,9 +295,9 @@ Last-Update: 2012-08-18 compile "org.sonatype.pmaven:pmaven-groovy:0.8-20100325@jar" - compile "org.codehaus.plexus:plexus-component-annotations:1.5.2@jar" + compile "org.codehaus.plexus:plexus-component-annotations-1.5:debian@jar" - } - useTestFixtures() + integTestCompile project(":ear") + } --- a/subprojects/osgi/osgi.gradle +++ b/subprojects/osgi/osgi.gradle @@ -21,7 +21,7 @@ diff --git a/debian/patches/02_sonar.diff b/debian/patches/02_sonar.diff index fe5b0fb..676a184 100644 --- a/debian/patches/02_sonar.diff +++ b/debian/patches/02_sonar.diff @@ -28,7 +28,7 @@ Last-Update: 2012-08-18 include 'ear' --- a/subprojects/docs/src/docs/dsl/dsl.xml +++ b/subprojects/docs/src/docs/dsl/dsl.xml -@@ -318,9 +318,11 @@ +@@ -339,9 +339,11 @@ <tr> <td>org.gradle.plugins.signing.Sign</td> </tr> @@ -40,7 +40,7 @@ Last-Update: 2012-08-18 <tr> <td>org.gradle.api.tasks.Sync</td> </tr> -@@ -427,4 +429,4 @@ +@@ -448,4 +450,4 @@ </table> </section> @@ -49,7 +49,7 @@ Last-Update: 2012-08-18 +</book> --- a/subprojects/docs/src/docs/userguide/sonarPlugin.xml +++ b/subprojects/docs/src/docs/userguide/sonarPlugin.xml -@@ -147,9 +147,8 @@ +@@ -223,9 +223,8 @@ <tr> <td><literal>sonarAnalyze</literal></td> <td>-</td> @@ -63,12 +63,14 @@ Last-Update: 2012-08-18 +</chapter> --- a/subprojects/docs/src/docs/userguide/userguide.xml +++ b/subprojects/docs/src/docs/userguide/userguide.xml -@@ -60,7 +60,7 @@ +@@ -60,8 +60,10 @@ <xi:include href='findBugsPlugin.xml'/> <xi:include href='jdependPlugin.xml'/> <xi:include href='pmdPlugin.xml'/> -- <xi:include href='sonarPlugin.xml'/> -+<!-- <xi:include href='sonarPlugin.xml'/> --> ++<!-- + <xi:include href='sonarPlugin.xml'/> + <xi:include href='sonarRunnerPlugin.xml'/> ++--> <xi:include href='osgi.xml'/> <xi:include href='eclipsePlugin.xml'/> <xi:include href='ideaPlugin.xml'/> diff --git a/debian/patches/24_pegdown.diff b/debian/patches/24_pegdown.diff index 8952c2d..9b6c275 100644 --- a/debian/patches/24_pegdown.diff +++ b/debian/patches/24_pegdown.diff @@ -70,20 +70,19 @@ Last-Update: 2012-08-18 apply plugin: 'jsoup' apply plugin: 'javascript-base' -@@ -362,10 +361,10 @@ +@@ -362,9 +361,9 @@ group = 'documentation' } -import org.gradle.plugins.pegdown.PegDown +//import org.gradle.plugins.pegdown.PegDown - import org.gradle.plugins.jsoup.Jsoup -task editReleaseNotes() { +/*task editReleaseNotes() { group = "release notes" doLast { Class.forName("java.awt.Desktop").newInstance().edit(file("src/docs/release/notes.md")) -@@ -410,14 +409,14 @@ +@@ -398,14 +397,14 @@ systemProperty "org.gradle.docs.releasenotes.source", releaseNotesMarkdown.source.singleFile systemProperty "org.gradle.docs.releasenotes.rendered", new File(releaseNotes.destinationDir, releaseNotes.fileName) diff --git a/debian/patches/26_disable_commitid.diff b/debian/patches/26_disable_commitid.diff index 6a2fc25..dfe376e 100644 --- a/debian/patches/26_disable_commitid.diff +++ b/debian/patches/26_disable_commitid.diff @@ -13,7 +13,7 @@ Last-Update: 2012-08-18 ext.commitId = null doLast { -@@ -93,9 +93,9 @@ +@@ -98,9 +98,9 @@ throw new InvalidUserDataException("Could not determine commit id") } } @@ -25,11 +25,11 @@ Last-Update: 2012-08-18 ext.receiptFile = file("$buildDir/$buildReceiptFileName") outputs.file receiptFile outputs.upToDateWhen { false } -@@ -107,7 +107,7 @@ +@@ -112,7 +112,7 @@ hostName = "unknown" } def data = [ -- commitId: determineCommitId.commitId, +- commitId: determineCommitId.commitId, + commitId: "UNKNOWN", versionNumber: version, versionBase: versionBase, diff --git a/debian/patches/31_hamcrest_12.diff b/debian/patches/31_hamcrest_12.diff index b841ebd..21df9db 100644 --- a/debian/patches/31_hamcrest_12.diff +++ b/debian/patches/31_hamcrest_12.diff @@ -5,16 +5,27 @@ Last-Update: 2012-09-03 --- a/subprojects/core/src/testFixtures/groovy/org/gradle/util/Matchers.java +++ b/subprojects/core/src/testFixtures/groovy/org/gradle/util/Matchers.java -@@ -273,7 +273,7 @@ +@@ -273,16 +273,16 @@ } @Factory -- public static Matcher<Task> dependsOn(final Matcher<? extends Iterable<String>> matcher) { -+ public static Matcher<Task> dependsOn(final Matcher matcher) { +- public static Matcher<Task> dependsOn(Matcher<? extends Iterable<String>> matcher) { ++ public static Matcher<Task> dependsOn(Matcher matcher) { + return dependsOn(matcher, false); + } + + @Factory +- public static Matcher<Task> dependsOnPaths(Matcher<? extends Iterable<String>> matcher) { ++ public static Matcher<Task> dependsOnPaths(Matcher matcher) { + return dependsOn(matcher, true); + } + +- private static Matcher<Task> dependsOn(final Matcher<? extends Iterable<String>> matcher, final boolean matchOnPaths) { ++ private static Matcher<Task> dependsOn(final Matcher matcher, final boolean matchOnPaths) { return new BaseMatcher<Task>() { public boolean matches(Object o) { Task task = (Task) o; -@@ -303,7 +303,7 @@ +@@ -312,7 +312,7 @@ } @Factory diff --git a/debian/patches/32_disable_it.diff b/debian/patches/32_disable_it.diff index 5b6692d..e4d4f3f 100644 --- a/debian/patches/32_disable_it.diff +++ b/debian/patches/32_disable_it.diff @@ -29,9 +29,9 @@ Last-Update: 2012-09-03 include 'buildComparison' --- a/subprojects/core/core.gradle +++ b/subprojects/core/core.gradle -@@ -59,7 +59,7 @@ - - testCompile project(':coreImpl') +@@ -58,7 +58,7 @@ + testFixturesCompile project(":internalTesting") + testFixturesRuntime project(':coreImpl') - integTestCompile project(":internalIntegTesting") + //integTestCompile project(":internalIntegTesting") diff --git a/debian/patches/33_scala_zinc.diff b/debian/patches/33_scala_zinc.diff index fd6e4e3..576fe40 100644 --- a/debian/patches/33_scala_zinc.diff +++ b/debian/patches/33_scala_zinc.diff @@ -10,8 +10,8 @@ Forwarded: not-needed compile project(":plugins") // keep in sync with ScalaBasePlugin code -- provided("com.typesafe.zinc:zinc:0.2.0") -+ // provided("com.typesafe.zinc:zinc:0.2.0") +- provided("com.typesafe.zinc:zinc:0.2.1") ++ // provided("com.typesafe.zinc:zinc:0.2.1") testCompile libraries.slf4j_api } @@ -24,8 +24,8 @@ Forwarded: not-needed if (!javaVersion.java6Compatible) { --- a/subprojects/scala/src/main/groovy/org/gradle/api/plugins/scala/ScalaBasePlugin.groovy +++ b/subprojects/scala/src/main/groovy/org/gradle/api/plugins/scala/ScalaBasePlugin.groovy -@@ -119,11 +119,11 @@ - compile.conventionMapping.scalaClasspath = { getScalaClasspath(compile.classpath) } +@@ -195,11 +195,11 @@ + compile.conventionMapping.scalaClasspath = { inferScalaCompilerClasspath(compile.classpath) } compile.conventionMapping.zincClasspath = { def config = project.configurations[ZINC_CONFIGURATION_NAME] - if (!compile.scalaCompileOptions.useAnt && config.dependencies.empty) { @@ -41,9 +41,9 @@ Forwarded: not-needed config } } -@@ -159,4 +159,4 @@ +@@ -212,4 +212,4 @@ + scalaDoc.conventionMapping.scalaClasspath = { inferScalaCompilerClasspath(scalaDoc.classpath) } } - null } -} \ No newline at end of file diff --git a/debian/patches/35_ivy_23.diff b/debian/patches/35_ivy_23.diff index 2cafd44..3719a0d 100644 --- a/debian/patches/35_ivy_23.diff +++ b/debian/patches/35_ivy_23.diff @@ -21,7 +21,7 @@ } --- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParser.java +++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParser.java -@@ -393,8 +393,7 @@ +@@ -318,8 +318,7 @@ } DefaultExtendsDescriptor ed = new DefaultExtendsDescriptor( @@ -29,9 +29,9 @@ - parent.getResolvedModuleRevisionId(), + parent, attributes.getValue("location"), - (String[]) extendTypes.toArray(new String[extendTypes.size()])); + extendTypes.toArray(new String[extendTypes.size()])); getMd().addInheritedDescriptor(ed); -@@ -1203,4 +1202,4 @@ +@@ -924,4 +923,4 @@ public String toString() { return "ivy parser"; } @@ -40,7 +40,7 @@ +} --- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/AbstractRepositoryCacheManager.java +++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/AbstractRepositoryCacheManager.java -@@ -62,6 +62,11 @@ +@@ -63,6 +63,11 @@ return null; } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle-1.12.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
