forked from deepin-community/libreflectasm-java
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: update libreflectasm-java to 1.11.9+dfsg
library that provides reflection by using code generation Issue: deepin-community/sig-deepin-sysdev-team#547 Log: update repo
- Loading branch information
Showing
21 changed files
with
474 additions
and
302 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
eclipse.preferences.version=1 | ||
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled | ||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 | ||
org.eclipse.jdt.core.compiler.compliance=1.7 | ||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error | ||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error | ||
org.eclipse.jdt.core.compiler.source=1.7 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,35 @@ | ||
libreflectasm-java (1.11.9+dfsg-4) unstable; urgency=medium | ||
|
||
* Deactivating flaky assertion in ClassLoaderTest (Closes: #1031480) | ||
* Raising Standards version to 4.6.2 (no change) | ||
* Removing unneeded versioned B-D on javahelper | ||
|
||
-- Pierre Gruet <[email protected]> Fri, 17 Feb 2023 21:51:44 +0100 | ||
|
||
libreflectasm-java (1.11.9+dfsg-3) unstable; urgency=medium | ||
|
||
* Stopping build-depending on dropped libasm-java-doc (Closes: #1025838) | ||
|
||
-- Pierre Gruet <[email protected]> Sat, 10 Dec 2022 14:18:59 +0100 | ||
|
||
libreflectasm-java (1.11.9+dfsg-2) unstable; urgency=medium | ||
|
||
* Updating ConstructorAccessTest to fit the changes in class loading | ||
brought by OpenJDK17 (Closes: #1012106) | ||
|
||
-- Pierre Gruet <[email protected]> Fri, 11 Nov 2022 07:44:35 +0100 | ||
|
||
libreflectasm-java (1.11.9+dfsg-1) unstable; urgency=medium | ||
|
||
* New upstream version 1.11.9+dfsg | ||
* Refreshing patches | ||
* Raising Standards version to 4.6.1 (no change) | ||
* Updating d/watch after a change in the Github layout | ||
* Adding a Lintian override for the bad-jar-name warning | ||
* Refreshing the Lintian override for the embedded Javascript | ||
|
||
-- Pierre Gruet <[email protected]> Thu, 22 Sep 2022 16:23:33 +0200 | ||
|
||
libreflectasm-java (1.11.6+dfsg-1) unstable; urgency=medium | ||
|
||
* Bumping Standards version to 4.6.0 (no change) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,15 +5,14 @@ Maintainer: Debian Java Maintainers <[email protected] | |
Uploaders: Pierre Gruet <[email protected]> | ||
Build-Depends: debhelper-compat (= 13), | ||
default-jdk-headless, | ||
javahelper (>= 0.43), | ||
javahelper, | ||
maven-debian-helper, | ||
libmaven-assembly-plugin-java, | ||
libmaven-bundle-plugin-java, | ||
libmaven-javadoc-plugin-java, | ||
libasm-java, | ||
libasm-java-doc, | ||
junit4 <!nocheck> | ||
Standards-Version: 4.6.0 | ||
Standards-Version: 4.6.2 | ||
Vcs-Git: https://salsa.debian.org/java-team/libreflectasm-java.git | ||
Vcs-Browser: https://salsa.debian.org/java-team/libreflectasm-java | ||
Homepage: https://github.com/EsotericSoftware/reflectasm | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
# It would be too complicated to remove the javascript that is included in | ||
# javadocs, see the discussion on Debian Java mailing list starting at | ||
# https://lists.debian.org/debian-java/2018/06/msg00020.html. | ||
embedded-javascript-library usr/share/doc/libreflectasm-java/api/*/jquery*.*s * | ||
embedded-javascript-library please use * [usr/share/doc/libreflectasm-java/api/*/jquery*.*s] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
# The indicated file is the real jar and not a symlink, but this really does | ||
# not harm. | ||
bad-jar-name [usr/share/java/reflectasm.jar] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
Description: deactivating assertions that appear to be flaky | ||
Author: Pierre Gruet <[email protected]> | ||
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1031480 | ||
Forwarded: https://github.com/EsotericSoftware/reflectasm/issues/91 | ||
Last-Update: 2023-02-17 | ||
|
||
--- a/test/com/esotericsoftware/reflectasm/ClassLoaderTest.java | ||
+++ b/test/com/esotericsoftware/reflectasm/ClassLoaderTest.java | ||
@@ -60,7 +60,7 @@ | ||
assertEquals(access1.getClass().toString(), access2.getClass().toString()); // Same class names | ||
assertFalse(access1.getClass().equals(access2.getClass())); // But different classes | ||
|
||
- assertEquals(initialCount + 2, AccessClassLoader.activeAccessClassLoaders()); | ||
+ //assertEquals(initialCount + 2, AccessClassLoader.activeAccessClassLoaders()); | ||
|
||
testClassLoader1 = null; | ||
testClass1 = null; | ||
@@ -74,7 +74,7 @@ | ||
reclaimLoaders(); | ||
|
||
// Yeah, reclaimed! | ||
- assertEquals(initialCount, AccessClassLoader.activeAccessClassLoaders()); | ||
+ //assertEquals(initialCount, AccessClassLoader.activeAccessClassLoaders()); | ||
} | ||
|
||
private void reclaimLoaders () throws Exception { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,6 @@ | ||
javadoc.patch | ||
no_shading.patch | ||
generate_1_6_classes.patch | ||
ignore_test_automatic_unloading.patch | ||
#ignore_test_automatic_unloading.patch | ||
switching_to_OpenJDK17.patch | ||
disable_flaky_assertion.patch |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,119 @@ | ||
Description: updating ConstructorAccessTest.java to fit the changes in class | ||
loading brought by OpenJDK17. These changes will be in next upstream version. | ||
Author: Pierre Gruet <[email protected]> | ||
Origin: upstream, https://github.com/EsotericSoftware/reflectasm/commit/cad4d755114e80169727fd030c85d55db3997bd8 | ||
Bug: https://github.com/EsotericSoftware/reflectasm/issues/89 | ||
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1012106 | ||
Last-Update: 2022-11-11 | ||
|
||
--- a/test/com/esotericsoftware/reflectasm/ConstructorAccessTest.java | ||
+++ b/test/com/esotericsoftware/reflectasm/ConstructorAccessTest.java | ||
@@ -14,11 +14,21 @@ | ||
|
||
package com.esotericsoftware.reflectasm; | ||
|
||
-import static junit.framework.Assert.assertEquals; | ||
-import static junit.framework.Assert.assertTrue; | ||
+import java.util.List; | ||
+ | ||
import junit.framework.TestCase; | ||
|
||
public class ConstructorAccessTest extends TestCase { | ||
+ static private boolean java17; | ||
+ static { | ||
+ try { | ||
+ Object version = Runtime.class.getDeclaredMethod("version").invoke(null); | ||
+ java17 = ((List<Integer>)version.getClass().getDeclaredMethod("version").invoke(version)).get(0) >= 17; | ||
+ } catch (Exception ignored) { | ||
+ java17 = false; | ||
+ } | ||
+ } | ||
+ | ||
public void testNewInstance () { | ||
ConstructorAccess<SomeClass> access = ConstructorAccess.get(SomeClass.class); | ||
SomeClass someObject = new SomeClass(); | ||
@@ -28,6 +38,7 @@ | ||
} | ||
|
||
public void testPackagePrivateNewInstance () { | ||
+ if (java17) return; | ||
ConstructorAccess<PackagePrivateClass> access = ConstructorAccess.get(PackagePrivateClass.class); | ||
PackagePrivateClass someObject = new PackagePrivateClass(); | ||
assertEquals(someObject, access.newInstance()); | ||
@@ -44,7 +55,7 @@ | ||
System.out.println("Expected exception happened: " + re); | ||
} | ||
catch (Throwable t) { | ||
- System.out.println("Unexpected exception happened: " + t); | ||
+ t.printStackTrace(); | ||
assertTrue(false); | ||
} | ||
} | ||
@@ -58,31 +69,33 @@ | ||
System.out.println("Expected exception happened: " + re); | ||
} | ||
catch (Throwable t) { | ||
- System.out.println("Unexpected exception happened: " + t); | ||
+ t.printStackTrace(); | ||
assertTrue(false); | ||
} | ||
} | ||
|
||
public void testHasProtectedConstructor () { | ||
+ if (java17) return; | ||
try { | ||
ConstructorAccess<HasProtectedConstructor> access = ConstructorAccess.get(HasProtectedConstructor.class); | ||
HasProtectedConstructor newInstance = access.newInstance(); | ||
assertEquals("cow", newInstance.getMoo()); | ||
} | ||
catch (Throwable t) { | ||
- System.out.println("Unexpected exception happened: " + t); | ||
+ t.printStackTrace(); | ||
assertTrue(false); | ||
} | ||
} | ||
|
||
- public void testHasPackageProtectedConstructor () { | ||
+ public void testHasPackagePrivateConstructor () { | ||
+ if (java17) return; | ||
try { | ||
- ConstructorAccess<HasPackageProtectedConstructor> access = ConstructorAccess.get(HasPackageProtectedConstructor.class); | ||
- HasPackageProtectedConstructor newInstance = access.newInstance(); | ||
+ ConstructorAccess<HasPackagePrivateConstructor> access = ConstructorAccess.get(HasPackagePrivateConstructor.class); | ||
+ HasPackagePrivateConstructor newInstance = access.newInstance(); | ||
assertEquals("cow", newInstance.getMoo()); | ||
} | ||
catch (Throwable t) { | ||
- System.out.println("Unexpected exception happened: " + t); | ||
+ t.printStackTrace(); | ||
assertTrue(false); | ||
} | ||
} | ||
@@ -94,7 +107,7 @@ | ||
assertEquals("cow", newInstance.getMoo()); | ||
} | ||
catch (Throwable t) { | ||
- System.out.println("Unexpected exception happened: " + t); | ||
+ t.printStackTrace(); | ||
assertTrue(false); | ||
} | ||
} | ||
@@ -189,14 +202,14 @@ | ||
} | ||
} | ||
|
||
- static public class HasPackageProtectedConstructor extends HasProtectedConstructor { | ||
- HasPackageProtectedConstructor () { | ||
+ static public class HasPackagePrivateConstructor extends HasProtectedConstructor { | ||
+ HasPackagePrivateConstructor () { | ||
super(); | ||
} | ||
} | ||
|
||
- static public class HasPublicConstructor extends HasPackageProtectedConstructor { | ||
- HasPublicConstructor () { | ||
+ static public class HasPublicConstructor extends HasPackagePrivateConstructor { | ||
+ public HasPublicConstructor () { | ||
super(); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
version=4 | ||
opts="repack,repacksuffix=+dfsg,compression=xz,dversionmangle=s/\+dfsg//" \ | ||
https://github.com/EsotericSoftware/reflectasm/releases/latest (?:.*/)?(?:reflectasm-)?([\d\.]+).tar.gz | ||
https://github.com/EsotericSoftware/reflectasm/tags (?:.*/)?(?:reflectasm-)?([\d\.]+).tar.gz |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.