Skip to content
GitLab
Explore
Sign in
Register
Commits on Source (4)
Update d/copyright
· b63417e7
Markus Koschany
authored
Oct 30, 2018
b63417e7
Update 06-source-target-level.patch
· 4331c15d
Markus Koschany
authored
Oct 30, 2018
4331c15d
Update changelog
· 542e8cfd
Markus Koschany
authored
Oct 30, 2018
542e8cfd
Install NOTICE file.
· 5bd24151
Markus Koschany
authored
Oct 30, 2018
5bd24151
Hide whitespace changes
Inline
Side-by-side
debian/changelog
View file @
5bd24151
mockito (1.10.19-4) unstable; urgency=medium
* Update 06-source-target-level.patch and fix FTBFS with OpenJDK 11.
(Closes: #910738)
-- Markus Koschany <apo@debian.org> Tue, 30 Oct 2018 22:16:20 +0100
mockito (1.10.19-3) unstable; urgency=medium
* Team upload.
...
...
debian/copyright
View file @
5bd24151
...
...
@@ -12,7 +12,7 @@ License: MIT
Files: debian/*
Copyright: 2010-2012, David Paleino <dapal@debian.org>
2013, gregor herrmann <gregoa@debian.org>
2013-201
7
, Markus Koschany <apo@debian.org>
2013-201
8
, Markus Koschany <apo@debian.org>
License: MIT
Files: src/org/mockito/internal/matchers/apachecommons/commons-lang-license.txt
...
...
debian/docs
0 → 100644
View file @
5bd24151
NOTICE
debian/patches/06-source-target-level.patch
View file @
5bd24151
Description: Increases the source/target level to fix the build failure with Java 9
Author: Emmanuel Bourg <ebourg@apache.org>
From: Emmanuel Bourg <ebourg@apache.org>
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
+}