debian/changelog

+objenesis (2.6-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the test failure with Java 10 (Closes: #898839)
+  * Standards-Version updated to 4.1.4
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Wed, 16 May 2018 15:06:21 +0200
+
 objenesis (2.6-1) unstable; urgency=medium
 
   [ tony mancill ]

debian/compat

-10
+11

debian/control

@@ -5,16 +5,16 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.or
 Uploaders:
  Markus Koschany <apo@debian.org>
 Build-Depends:
- debhelper (>= 10),
+ debhelper (>= 11),
  default-jdk,
  default-jdk-doc,
  junit4,
  libmaven-bundle-plugin-java,
  libmaven-javadoc-plugin-java,
  maven-debian-helper (>= 1.4)
-Standards-Version: 4.0.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/objenesis.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/objenesis.git
+Standards-Version: 4.1.4
+Vcs-Git: https://salsa.debian.org/java-team/objenesis.git
+Vcs-Browser: https://salsa.debian.org/java-team/objenesis
 Homepage: http://www.objenesis.org/
 
 Package: libobjenesis-java

debian/patches/01-java10-compatibility.patch

+Description: Ignore the magic test to Java 9 AND higher
+Author: Henri Tremblay <henri.tremblay@gmail.com>
+Origin: backport, https://github.com/easymock/objenesis/commit/2c1e411b9dd04a53290a761e7bbad90c3f7c344b.patch
+--- a/main/src/main/java/org/objenesis/strategy/PlatformDescription.java
++++ b/main/src/main/java/org/objenesis/strategy/PlatformDescription.java
+@@ -134,6 +134,11 @@
+       return bootClasspath != null && bootClasspath.toLowerCase().contains("core-oj.jar");
+    }
+ 
++   public static boolean isAfterJigsaw() {
++      String version = PlatformDescription.SPECIFICATION_VERSION;
++      return version.indexOf('.') < 0; // No dot means the version is 9, 10, 11, ... not 1.6, 1.7, 1.8
++   }
++
+    public static boolean isGoogleAppEngine() {
+       return GAE_VERSION != null;
+    }
+--- a/main/src/test/java/org/objenesis/instantiator/sun/MagicInstantiatorTest.java
++++ b/main/src/test/java/org/objenesis/instantiator/sun/MagicInstantiatorTest.java
+@@ -33,7 +33,7 @@
+    public void before() {
+       // I know it works on Hotspot and OpenJDK. Before JDK 9. Not sure on others
+       assumeTrue((PlatformDescription.isThisJVM(PlatformDescription.HOTSPOT) || PlatformDescription.isThisJVM(PlatformDescription.OPENJDK))
+-         && !PlatformDescription.SPECIFICATION_VERSION.equals("9")
++         && !PlatformDescription.isAfterJigsaw()
+       );
+    }
+ 

debian/patches/series

+01-java10-compatibility.patch

debian/rules

 #!/usr/bin/make -f
-export JAVA_HOME=/usr/lib/jvm/default-java
 
 %:
-	dh $@ --buildsystem=maven
-
-get-orig-source:
-	uscan --force-download --download-current-version --verbose
+	dh $@