Markus Koschany pushed to branch master at Debian Java Maintainers / mockito
Commits: b63417e7 by Markus Koschany at 2018-10-30T19:05:47Z Update d/copyright - - - - - 4331c15d by Markus Koschany at 2018-10-30T21:16:15Z Update 06-source-target-level.patch - - - - - 542e8cfd by Markus Koschany at 2018-10-30T21:16:53Z Update changelog - - - - - 5bd24151 by Markus Koschany at 2018-10-30T21:20:34Z Install NOTICE file. - - - - - 4 changed files: - debian/changelog - debian/copyright - + debian/docs - debian/patches/06-source-target-level.patch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +mockito (1.10.19-4) unstable; urgency=medium + + * Update 06-source-target-level.patch and fix FTBFS with OpenJDK 11. + (Closes: #910738) + + -- Markus Koschany <[email protected]> Tue, 30 Oct 2018 22:16:20 +0100 + mockito (1.10.19-3) unstable; urgency=medium * Team upload. ===================================== debian/copyright ===================================== @@ -12,7 +12,7 @@ License: MIT Files: debian/* Copyright: 2010-2012, David Paleino <[email protected]> 2013, gregor herrmann <[email protected]> - 2013-2017, Markus Koschany <[email protected]> + 2013-2018, Markus Koschany <[email protected]> License: MIT Files: src/org/mockito/internal/matchers/apachecommons/commons-lang-license.txt ===================================== debian/docs ===================================== @@ -0,0 +1 @@ +NOTICE ===================================== debian/patches/06-source-target-level.patch ===================================== @@ -1,9 +1,20 @@ -Description: Increases the source/target level to fix the build failure with Java 9 -Author: Emmanuel Bourg <[email protected]> +From: Emmanuel Bourg <[email protected]> +Date: Tue, 30 Oct 2018 22:07:57 +0100 +Subject: Increases the source/target level to fix the build failure with Java + 9 and 11 + Forwarded: no +--- + build.gradle | 4 ++-- + buildSrc/build.gradle | 4 +++- + subprojects/testng/testng.gradle | 4 +++- + 3 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/build.gradle b/build.gradle +index 9602590..dbb32e8 100644 --- a/build.gradle +++ b/build.gradle -@@ -26,8 +26,8 @@ +@@ -26,8 +26,8 @@ apply plugin: 'java' group = 'org.mockito' description = 'Core API and implementation.' @@ -14,3 +25,43 @@ Forwarded: no configurations { provided +diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle +index 76b015b..082338a 100644 +--- a/buildSrc/build.gradle ++++ b/buildSrc/build.gradle +@@ -1,6 +1,8 @@ + apply plugin: 'idea' + apply plugin: 'groovy' + ++sourceCompatibility = 1.7 ++targetCompatibility = 1.7 + repositories { jcenter() } + + dependencies { +@@ -16,4 +18,4 @@ dependencies { + + if (gradle.parent && gradle.parent.startParameter.taskNames.any { it in ["ideaModule", "idea"] }) { + build.dependsOn ideaModule +-} +\ No newline at end of file ++} +diff --git a/subprojects/testng/testng.gradle b/subprojects/testng/testng.gradle +index d6d304a..64281b5 100644 +--- a/subprojects/testng/testng.gradle ++++ b/subprojects/testng/testng.gradle +@@ -2,6 +2,8 @@ apply plugin: 'java' + apply plugin: 'maven' + description = "Mockito for TestNG" + ++sourceCompatibility = 1.7 ++targetCompatibility = 1.7 + //TODO SF ensure this one is released, too (ensure source and target compatibility, too). + + Properties props = new Properties() +@@ -54,4 +56,4 @@ test { + useTestNG() { + suites file('src/test/resources/mockito-testng.xml') + } +-} +\ No newline at end of file ++} View it on GitLab: https://salsa.debian.org/java-team/mockito/compare/5ad3f69a0d44ea351e7a6109fe081fd32173fc02...5bd2415150f8f1b33b30596fd285f574f1f763b7 -- View it on GitLab: https://salsa.debian.org/java-team/mockito/compare/5ad3f69a0d44ea351e7a6109fe081fd32173fc02...5bd2415150f8f1b33b30596fd285f574f1f763b7 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
