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 9d321a7f0bf2ece45487b07886fb9074612da103 Author: Kai-Chung Yan <[email protected]> Date: Thu May 28 19:41:41 2015 +0800 Update dates of refreshed patches --- debian/patches/03_plexus.diff | 2 +- debian/patches/13_fix_javadocs_links.diff | 6 +++--- debian/patches/26_disable_commitid.diff | 8 ++++---- debian/patches/36_java8_compatibility.diff | 5 +++-- debian/patches/use_local_artifacts.diff | 21 +++++++-------------- 5 files changed, 18 insertions(+), 24 deletions(-) diff --git a/debian/patches/03_plexus.diff b/debian/patches/03_plexus.diff index 35fe469..f8c1911 100644 --- a/debian/patches/03_plexus.diff +++ b/debian/patches/03_plexus.diff @@ -2,7 +2,7 @@ Description: Plexus compatibility Author: Miguel Landaeta <[email protected]> Author: Damien Raude-Morvan <[email protected] Forwarded: no -Last-Update: 2012-08-18 +Last-Update: 2015-05-24 --- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/PlexusLoggerAdapter.java +++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/PlexusLoggerAdapter.java diff --git a/debian/patches/13_fix_javadocs_links.diff b/debian/patches/13_fix_javadocs_links.diff index f256271..976fdcf 100644 --- a/debian/patches/13_fix_javadocs_links.diff +++ b/debian/patches/13_fix_javadocs_links.diff @@ -2,11 +2,11 @@ Description: Link javadocs with local -doc packages Author: Miguel Landaeta <[email protected]> Author: Damien Raude-Morvan <[email protected] Forwarded: not-needed -Last-Update: 2012-08-18 +Last-Update: 2015-05-24 --- a/subprojects/docs/docs.gradle +++ b/subprojects/docs/docs.gradle -@@ -291,8 +291,10 @@ +@@ -306,8 +306,10 @@ classpath = configurations.userGuideTask } @@ -19,7 +19,7 @@ Last-Update: 2012-08-18 task javadocAll(type: Javadoc) { ext.stylesheetFile = file("src/docs/css/javadoc.css") -@@ -319,8 +321,7 @@ +@@ -334,8 +336,7 @@ include 'org/gradle/testing/jacoco/**' include 'org/gradle/buildinit/**' exclude '**/internal/**' diff --git a/debian/patches/26_disable_commitid.diff b/debian/patches/26_disable_commitid.diff index dfe376e..c525f37 100644 --- a/debian/patches/26_disable_commitid.diff +++ b/debian/patches/26_disable_commitid.diff @@ -1,17 +1,17 @@ Author: Damien Raude-Morvan <[email protected]> Forwarded: not-needed -Last-Update: 2012-08-18 +Last-Update: 2015-05-24 --- a/gradle/buildReceipt.gradle +++ b/gradle/buildReceipt.gradle @@ -32,7 +32,7 @@ } } - + -task determineCommitId { +/*task determineCommitId { ext.commitId = null - + doLast { @@ -98,9 +98,9 @@ throw new InvalidUserDataException("Could not determine commit id") @@ -19,7 +19,7 @@ Last-Update: 2012-08-18 } -} +}*/ - + -task createBuildReceipt(dependsOn: determineCommitId) { +task createBuildReceipt() { ext.receiptFile = file("$buildDir/$buildReceiptFileName") diff --git a/debian/patches/36_java8_compatibility.diff b/debian/patches/36_java8_compatibility.diff index 6286c19..d64a5a6 100644 --- a/debian/patches/36_java8_compatibility.diff +++ b/debian/patches/36_java8_compatibility.diff @@ -1,12 +1,13 @@ Description: Fixes the compilation errors with Java 8 Author: Emmanuel Bourg <[email protected]> Forwarded: no +Last-Update: 2015-05-24 --- a/subprojects/core/src/main/groovy/org/gradle/api/internal/project/taskfactory/AnnotationProcessingTaskFactory.java +++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/project/taskfactory/AnnotationProcessingTaskFactory.java @@ -335,7 +335,7 @@ return; } - + - Annotation optional = annotationTarget.getAnnotation(Optional.class); + Annotation optional = annotationTarget.getAnnotation(org.gradle.api.tasks.Optional.class); if (optional == null) { @@ -19,6 +20,6 @@ Forwarded: no import org.gradle.api.logging.LogLevel; import org.gradle.api.tasks.*; +import org.gradle.api.tasks.Optional; - + import java.io.File; import java.io.Serializable; diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff index 88fcb10..a0d0395 100644 --- a/debian/patches/use_local_artifacts.diff +++ b/debian/patches/use_local_artifacts.diff @@ -5,27 +5,20 @@ Last-Update: 2015-05-24 +++ b/build.gradle @@ -115,7 +115,8 @@ group = 'org.gradle' - + repositories { - maven { url 'http://repo.gradle.org/gradle/libs' } -+ flatDir { dirs "/usr/share/java" } ++ flatDir { dirs "/usr/share/java/" } + maven { url "file:///usr/share/maven-repo" } } } - -@@ -202,4 +203,4 @@ - } - - --apply from: "gradle/intTestImage.gradle" -\ No newline at end of file -+apply from: "gradle/intTestImage.gradle" + --- a/subprojects/docs/docs.gradle +++ b/subprojects/docs/docs.gradle @@ -30,21 +30,6 @@ apply plugin: 'jsoup' apply plugin: 'javascript-base' - + -repositories { - javaScript.googleApis() - @@ -48,12 +41,12 @@ Last-Update: 2015-05-24 +++ b/buildSrc/build.gradle @@ -21,8 +21,8 @@ apply plugin: 'eclipse' - + repositories { - maven { url 'http://repo.gradle.org/gradle/libs' } - mavenCentral() + flatDir { dirs "/usr/share/java" } -+ maven { url "/usr/share/maven-repo" } ++ maven { url "file:///usr/share/maven-repo" } } - + dependencies { -- 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
