Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Java 17 and update ASM to version 9.2 #180

Merged
merged 1 commit into from
Jul 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
<equals arg1="${-cleaned.specification.version}" arg2="14"/>
<equals arg1="${-cleaned.specification.version}" arg2="15"/>
<equals arg1="${-cleaned.specification.version}" arg2="16"/>
<equals arg1="${-cleaned.specification.version}" arg2="17"/>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried to follow ac754c4 as closely as possible.

</or>
</condition>

Expand Down Expand Up @@ -158,6 +159,7 @@
<equals arg1="${build.java.runtime}" arg2="14"/>
<equals arg1="${build.java.runtime}" arg2="15"/>
<equals arg1="${build.java.runtime}" arg2="16"/>
<equals arg1="${build.java.runtime}" arg2="17"/>
</or>
</condition>

Expand Down
2 changes: 1 addition & 1 deletion ivy.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<!DOCTYPE ivy-module [
<!ENTITY maven.version "2.0">
<!ENTITY gradle.version "3.2">
<!ENTITY asm.version "9.1">
<!ENTITY asm.version "9.2">
<!ENTITY jarjar.asm.version "5.2">
]>
<ivy-module version="2.0">
Expand Down
8 changes: 4 additions & 4 deletions src/main/docs/bundled-signatures.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ <h1>Bundled Signatures Documentation</h1>
<li><strong><tt>jdk-unsafe-*</tt>:</strong> Signatures
of &quot;unsafe&quot; methods that use default charset, default locale, or default timezone. For server applications it is very
stupid to call those methods, as the results will definitely not what the user wants
(for Java <tt>*</tt> = 1.7, 1.8, 9, 10, 11, 12, 13, 14, 15, 16; Ant / Maven / Gradle automatically add the compile Java version).</li>
(for Java <tt>*</tt> = 1.7, 1.8, 9, 10, 11, 12, 13, 14, 15, 16, 17; Ant / Maven / Gradle automatically add the compile Java version).</li>

<li><strong><tt>jdk-deprecated-*</tt>:</strong> This disallows all deprecated
methods from the JDK (for Java <tt>*</tt> = 1.7, 1.8, 9, 10, 11, 12, 13, 14, 15, 16; Ant / Maven / Gradle automatically add the compile Java version).</li>
methods from the JDK (for Java <tt>*</tt> = 1.7, 1.8, 9, 10, 11, 12, 13, 14, 15, 16, 17; Ant / Maven / Gradle automatically add the compile Java version).</li>

<li><strong><tt>jdk-internal-*</tt>:</strong> Lists all internal packages of the JDK as of <code>Security.getProperty(&quot;package.access&quot;)</code>.
Calling those methods will always trigger security manager and is completely forbidden from Java 9 on
(for Java <tt>*</tt> = 1.7, 1.8, 9, 10, 11, 12, 13, 14, 15, 16; Ant / Maven / Gradle automatically add the compile Java version, <em>since forbiddenapis v2.1</em>).</li>
(for Java <tt>*</tt> = 1.7, 1.8, 9, 10, 11, 12, 13, 14, 15, 16, 17; Ant / Maven / Gradle automatically add the compile Java version, <em>since forbiddenapis v2.1</em>).</li>

<li><strong><tt>jdk-non-portable</tt>:</strong> Signatures of all non-portable (like <code>com.sun.management.HotSpotDiagnosticMXBean</code>)
or internal runtime APIs (like <code>sun.misc.Unsafe</code>). This is a superset of <tt>jdk-internal</tt>.<br>
Expand All @@ -58,4 +58,4 @@ <h1>Bundled Signatures Documentation</h1>
</ul>

</body>
</html>
</html>
2 changes: 1 addition & 1 deletion src/main/java/de/thetaphi/forbiddenapis/AsmUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ private static byte[] readStream(final InputStream in) throws IOException {
@SuppressWarnings("unused")
public static ClassReader readAndPatchClass(InputStream in) throws IOException {
final byte[] bytecode = readStream(in);
if (false) patchClassMajorVersion(bytecode, Opcodes.V16 + 1, Opcodes.V16);
if (false) patchClassMajorVersion(bytecode, Opcodes.V17 + 1, Opcodes.V17);
return new ClassReader(bytecode);
}

Expand Down
Loading