This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch experimental
in repository gradle.
commit 7716ebe5f5bfa2bda093cdd657023b9b958faa0a
Author: Markus Koschany <a...@debian.org>
Date: Wed Nov 29 15:17:13 2017 +0100
Update use-local-artifacts.patch and register junit4 instead of junit as an
external
module. This will fix the build failure with Mockito.
---
.../dependency-management_depends_on_testkit.patch | 4 ++--
debian/patches/disable-Kotlin.patch | 4 ++--
debian/patches/disable-aws.patch | 4 ++--
debian/patches/eclipse-aether.patch | 4 ++--
debian/patches/ivy-2.4.0.patch | 11 ++++++-----
debian/patches/nekohtml.patch | 4 ++--
debian/patches/new_APIs_in_3.0.patch | 1 -
debian/patches/use-local-artifacts.patch | 15 +++++++++++----
8 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/debian/patches/dependency-management_depends_on_testkit.patch
b/debian/patches/dependency-management_depends_on_testkit.patch
index 7779f44..1a84304 100644
--- a/debian/patches/dependency-management_depends_on_testkit.patch
+++ b/debian/patches/dependency-management_depends_on_testkit.patch
@@ -1,5 +1,5 @@
-From: Kai-Chung Yan
-Date: Sun, 12 Nov 2017 21:04:51 +0100
+From: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Date: Wed, 29 Nov 2017 15:16:42 +0100
Subject: dependency-management_depends_on_testkit
Otherwise it complains about ZIP file I/O errors
diff --git a/debian/patches/disable-Kotlin.patch
b/debian/patches/disable-Kotlin.patch
index e8afd90..9e511fe 100644
--- a/debian/patches/disable-Kotlin.patch
+++ b/debian/patches/disable-Kotlin.patch
@@ -1,5 +1,5 @@
-From: Kai-Chung Yan
-Date: Sun, 12 Nov 2017 21:18:22 +0100
+From: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Date: Wed, 29 Nov 2017 15:16:42 +0100
Subject: disable Kotlin
Kotlin is not in Debian yet
diff --git a/debian/patches/disable-aws.patch b/debian/patches/disable-aws.patch
index 7ce4ae1..3d10ee7 100644
--- a/debian/patches/disable-aws.patch
+++ b/debian/patches/disable-aws.patch
@@ -1,5 +1,5 @@
-From: Kai-Chung Yan
-Date: Sun, 12 Nov 2017 01:19:48 +0100
+From: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Date: Wed, 29 Nov 2017 15:16:42 +0100
Subject: disable aws
AWS SDK for Java is not in Debian yet.
diff --git a/debian/patches/eclipse-aether.patch
b/debian/patches/eclipse-aether.patch
index 7adab14..d9e68d0 100644
--- a/debian/patches/eclipse-aether.patch
+++ b/debian/patches/eclipse-aether.patch
@@ -1,5 +1,5 @@
-From: Kai-Chung Yan
-Date: Sat, 18 Nov 2017 22:55:51 +0100
+From: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Date: Wed, 29 Nov 2017 15:16:43 +0100
Subject: eclipse aether
Maven module originally uses aether which is deprecated. This patch changes it
diff --git a/debian/patches/ivy-2.4.0.patch b/debian/patches/ivy-2.4.0.patch
index 4025293..c4cae7c 100644
--- a/debian/patches/ivy-2.4.0.patch
+++ b/debian/patches/ivy-2.4.0.patch
@@ -1,12 +1,13 @@
From: Markus Koschany <a...@debian.org>
Date: Wed, 11 Nov 2015 19:53:35 +0100
Subject: ivy 2.4.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: base64
-Fix FTBFS with ivy 2.4.0. Patch taken from
-https://github.com/mizdebsk/gradle/commit/e0138b1
-Thanks to MikoĊaj Izdebski
-
-Forwarded: no
+Rml4IEZUQkZTIHdpdGggaXZ5IDIuNC4wLiBQYXRjaCB0YWtlbiBmcm9tCmh0dHBzOi8vZ2l0aHVi
+LmNvbS9taXpkZWJzay9ncmFkbGUvY29tbWl0L2UwMTM4YjEKVGhhbmtzIHRvIE1pa2/FgmFqIEl6
+ZGVic2tpCgpGb3J3YXJkZWQ6IG5vCg==
---
.../ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParser.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/patches/nekohtml.patch b/debian/patches/nekohtml.patch
index 62285f1..3d52df0 100644
--- a/debian/patches/nekohtml.patch
+++ b/debian/patches/nekohtml.patch
@@ -1,5 +1,5 @@
-From: Kai-Chung Yan
-Date: Sat, 18 Nov 2017 23:07:26 +0100
+From: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
+Date: Wed, 29 Nov 2017 15:16:44 +0100
Subject: nekohtml
The usage of nekohtml APIs must comes with xerces.The usage of nekohtml APIs
must comes with xerces.
diff --git a/debian/patches/new_APIs_in_3.0.patch
b/debian/patches/new_APIs_in_3.0.patch
index e0dabc4..0239894 100644
--- a/debian/patches/new_APIs_in_3.0.patch
+++ b/debian/patches/new_APIs_in_3.0.patch
@@ -2,7 +2,6 @@ From: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
Date: Sun, 12 Nov 2017 01:04:51 +0100
Subject: new_APIs_in_3.0
-
---
buildSrc/build.gradle | 1 +
1 file changed, 1 insertion(+)
diff --git a/debian/patches/use-local-artifacts.patch
b/debian/patches/use-local-artifacts.patch
index 760e9c8..3dee995 100644
--- a/debian/patches/use-local-artifacts.patch
+++ b/debian/patches/use-local-artifacts.patch
@@ -19,8 +19,8 @@ Forwarded: not-needed
subprojects/javascript/javascript.gradle | 2 +-
subprojects/maven/maven.gradle | 2 +-
subprojects/reporting/reporting.gradle | 2 +-
- .../testing/worker/ForkingTestClassProcessor.java | 2 +-
- 10 files changed, 34 insertions(+), 49 deletions(-)
+ .../testing/worker/ForkingTestClassProcessor.java | 4 +--
+ 10 files changed, 35 insertions(+), 50 deletions(-)
diff --git a/build.gradle b/build.gradle
index 314c2c8..c332b01 100644
@@ -283,10 +283,10 @@ index f0489d9..0ee7bf4 100644
dependencies {
diff --git
a/subprojects/testing-base/src/main/java/org/gradle/api/internal/tasks/testing/worker/ForkingTestClassProcessor.java
b/subprojects/testing-base/src/main/java/org/gradle/api/internal/tasks/testing/worker/ForkingTestClassProcessor.java
-index 0d1900c..4045078 100755
+index 0d1900c..06b5338 100755
---
a/subprojects/testing-base/src/main/java/org/gradle/api/internal/tasks/testing/worker/ForkingTestClassProcessor.java
+++
b/subprojects/testing-base/src/main/java/org/gradle/api/internal/tasks/testing/worker/ForkingTestClassProcessor.java
-@@ -103,7 +103,7 @@ public class ForkingTestClassProcessor implements
TestClassProcessor {
+@@ -103,13 +103,13 @@ public class ForkingTestClassProcessor implements
TestClassProcessor {
moduleRegistry.getModule("gradle-native").getImplementationClasspath().getAsURLs(),
moduleRegistry.getModule("gradle-testing-base").getImplementationClasspath().getAsURLs(),
moduleRegistry.getModule("gradle-testing-jvm").getImplementationClasspath().getAsURLs(),
@@ -295,3 +295,10 @@ index 0d1900c..4045078 100755
moduleRegistry.getExternalModule("slf4j-api").getImplementationClasspath().getAsURLs(),
moduleRegistry.getExternalModule("jul-to-slf4j").getImplementationClasspath().getAsURLs(),
moduleRegistry.getExternalModule("native-platform").getImplementationClasspath().getAsURLs(),
+
moduleRegistry.getExternalModule("kryo").getImplementationClasspath().getAsURLs(),
+
moduleRegistry.getExternalModule("commons-lang").getImplementationClasspath().getAsURLs(),
+-
moduleRegistry.getExternalModule("junit").getImplementationClasspath().getAsURLs()
++
moduleRegistry.getExternalModule("junit4").getImplementationClasspath().getAsURLs()
+ );
+ }
+
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/gradle.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
