Merge pull request #6792 from gwenneg/issue-6709-drop-graalvm-19.2.1-compatibility

Drop GraalVM 19.2.1 support and deprecate enableJni option
This commit is contained in:
Guillaume Smet
2020-01-29 11:53:32 +01:00
committed by GitHub
96 changed files with 122 additions and 251 deletions

View File

@@ -44,7 +44,11 @@ public class QuarkusNative extends QuarkusTask {
private boolean enableServer = false;
private boolean enableJni = false;
/**
* @deprecated JNI is always enabled starting from GraalVM 19.3.1.
*/
@Deprecated
private boolean enableJni = true;
private boolean autoServiceLoaderRegistration = false;
@@ -200,11 +204,16 @@ public class QuarkusNative extends QuarkusTask {
}
@Input
@Deprecated
public boolean isEnableJni() {
return enableJni;
}
@Option(description = "Enable jni", option = "enable-jni")
/**
* @deprecated JNI is always enabled starting from GraalVM 19.3.1.
*/
@Option(description = "Enable jni (deprecated)", option = "enable-jni")
@Deprecated
public void setEnableJni(boolean enableJni) {
this.enableJni = enableJni;
}
@@ -416,7 +425,6 @@ public class QuarkusNative extends QuarkusTask {
configs.put("quarkus.native.enable-http-url-handler", Boolean.toString(enableHttpUrlHandler));
configs.put("quarkus.native.enable-isolates", Boolean.toString(enableIsolates));
configs.put("quarkus.native.enable-jni", Boolean.toString(enableJni));
configs.put("quarkus.native.enable-server", Boolean.toString(enableServer));

View File

@@ -93,7 +93,11 @@ public class NativeImageMojo extends AbstractMojo {
@Parameter(defaultValue = "false")
private Boolean enableServer;
@Parameter(defaultValue = "false")
/**
* @deprecated JNI is always enabled starting from GraalVM 19.3.1.
*/
@Deprecated
@Parameter(defaultValue = "true")
private Boolean enableJni;
@Parameter(defaultValue = "false")
@@ -369,8 +373,10 @@ public class NativeImageMojo extends AbstractMojo {
if (enableIsolates != null) {
configs.put("quarkus.native.enable-isolates", enableIsolates.toString());
}
if (enableJni != null) {
configs.put("quarkus.native.enable-jni", enableJni.toString());
if (Boolean.FALSE.equals(enableJni)) {
getLog().warn("Your application is setting the deprecated 'enableJni' Maven option to false. Please"
+ " consider removing this option as it is ignored (JNI is always enabled) and it will be removed"
+ " in a future Quarkus version.");
}
if (enableServer != null) {

View File

@@ -105,7 +105,6 @@
<enableServer>false</enableServer>
<dumpProxies>false</dumpProxies>
<graalvmHome>${graalvmHome}</graalvmHome>
<enableJni>true</enableJni>
<enableAllSecurityServices>true</enableAllSecurityServices>
<enableReports>false</enableReports>
</configuration>