[Git][java-team/objenesis][master] 5 commits: Fixed the test failure with Java 10 (Closes: #898839)

[Emmanuel Bourg]

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


Commits:
bc1e89fd by Emmanuel Bourg at 2018-05-16T15:03:09+02:00
Fixed the test failure with Java 10 (Closes: #898839)

- - - - -
c25cc09a by Emmanuel Bourg at 2018-05-16T15:03:33+02:00
Standards-Version updated to 4.1.4

- - - - -
0e7553a1 by Emmanuel Bourg at 2018-05-16T15:03:47+02:00
Switch to debhelper level 11

- - - - -
faa9a07c by Emmanuel Bourg at 2018-05-16T15:04:03+02:00
Use salsa.debian.org Vcs-* URLs

- - - - -
a431236e by Emmanuel Bourg at 2018-05-16T15:06:39+02:00
Upload to unstable

- - - - -


6 changed files:

- debian/changelog
- debian/compat
- debian/control
- + debian/patches/01-java10-compatibility.patch
- + debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+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 at apache.org>  Wed, 16 May 2018 15:06:21 +0200
+
 objenesis (2.6-1) unstable; urgency=medium
 
   [ tony mancill ]


=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -5,16 +5,16 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders:
  Markus Koschany <apo at 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
=====================================
--- /dev/null
+++ b/debian/patches/01-java10-compatibility.patch
@@ -0,0 +1,28 @@
+Description: Ignore the magic test to Java 9 AND higher
+Author: Henri Tremblay <henri.tremblay at 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
=====================================
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-java10-compatibility.patch


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,4 @@
 #!/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 $@



View it on GitLab: https://salsa.debian.org/java-team/objenesis/compare/574fa1f5cb3b0adbbbca311e8e3595d34aa06f04...a431236e22d77deb8ea1af8f6e57cc42d80476ac

---
View it on GitLab: https://salsa.debian.org/java-team/objenesis/compare/574fa1f5cb3b0adbbbca311e8e3595d34aa06f04...a431236e22d77deb8ea1af8f6e57cc42d80476ac
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/20180516/7dd4e652/attachment.html>