[Git][java-team/mockito][master] 6 commits: Standards-Version updated to 4.6.1

[Emmanuel Bourg (@ebourg)]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / mockito


Commits:
fdc7b1ed by Emmanuel Bourg at 2022-05-24T09:09:46+02:00
Standards-Version updated to 4.6.1

- - - - -
9d01e819 by Emmanuel Bourg at 2022-05-24T09:23:59+02:00
Switch to debhelper level 13

- - - - -
2ccaad23 by Emmanuel Bourg at 2022-05-24T09:23:59+02:00
Fixed the watch file

- - - - -
eb4e4a95 by Emmanuel Bourg at 2022-05-24T09:23:59+02:00
Fixed the build failure with OpenJDK 17 (Closes: #1011158)

- - - - -
bbe7faf6 by Emmanuel Bourg at 2022-05-24T09:23:59+02:00
Updated debian/clean

- - - - -
928e97df by Emmanuel Bourg at 2022-05-24T09:45:34+02:00
Upload to unstable

- - - - -


8 changed files:

- debian/changelog
- debian/clean
- − debian/compat
- debian/control
- + debian/patches/16-language-level.patch
- debian/patches/series
- debian/rules
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+mockito (2.23.0-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with OpenJDK 17 (Closes: #1011158)
+  * Standards-Version updated to 4.6.1
+  * Switch to debhelper level 13
+  * Fixed the watch file
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 24 May 2022 09:45:29 +0200
+
 mockito (2.23.0-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/clean
=====================================
@@ -1 +1 @@
-*/build/resources/main/mockito-extensions/org.mockito.plugins.MockMaker
+subprojects/inline/build/


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11


=====================================
debian/control
=====================================
@@ -6,7 +6,7 @@ Uploaders: Markus Koschany <apo at debian.org>
 Build-Depends:
  ant,
  bnd,
- debhelper (>= 11),
+ debhelper-compat (= 13),
  default-jdk,
  gradle (>= 3.4.1-2),
  gradle-debian-helper,
@@ -20,7 +20,7 @@ Build-Depends:
  libspock-java,
  maven-repo-helper (>= 1.9~),
  testng
-Standards-Version: 4.4.0
+Standards-Version: 4.6.1
 Vcs-Git: https://salsa.debian.org/java-team/mockito.git
 Vcs-Browser: https://salsa.debian.org/java-team/mockito
 Homepage: http://mockito.org/


=====================================
debian/patches/16-language-level.patch
=====================================
@@ -0,0 +1,16 @@
+Description: Change the language level to build with recent JDKs
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/gradle/java-library.gradle
++++ b/gradle/java-library.gradle
+@@ -8,8 +8,8 @@
+ 
+ 
+ 
+-sourceCompatibility = 1.6
+-targetCompatibility = 1.6
++sourceCompatibility = 8
++targetCompatibility = 8
+ 
+ test {
+     include "**/*Test.class"


=====================================
debian/patches/series
=====================================
@@ -9,3 +9,4 @@
 13-gradle-compatibility.patch
 14-byte-buddy-compatibility.patch
 15-backward-compatibility.patch
+16-language-level.patch


=====================================
debian/rules
=====================================
@@ -5,3 +5,5 @@
 
 override_dh_auto_build:
 	dh_auto_build -- jar
+
+override_dh_auto_test:


=====================================
debian/watch
=====================================
@@ -1,5 +1,4 @@
 version=4
 opts=repack,compression=xz,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/,\
 dversionmangle=s/(\da?)[\+\.\-~](?:dfsg|debian|ds|repack|repacked)\.?\d*$/$1/ \
-https://github.com/mockito/mockito/tags \
-.*/archive/(?:upstream/)?(?:v||version-|release-|X|R|r)(\d\S*)\.tar\.gz
+https://github.com/mockito/mockito/tags .*/(?:upstream/)?(?:v||version-|release-|X|R|r)(\d\S*)\.tar\.gz



View it on GitLab: https://salsa.debian.org/java-team/mockito/-/compare/4b29e8bda1f81cfc41f1181376807881bc9c5301...928e97df98cc76ebaaf52b31449410831ae37e3b

-- 
View it on GitLab: https://salsa.debian.org/java-team/mockito/-/compare/4b29e8bda1f81cfc41f1181376807881bc9c5301...928e97df98cc76ebaaf52b31449410831ae37e3b
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20220524/25445d16/attachment.htm>