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.

Sign up for GitHub

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

fix: remove unsupported native-image flags #5327

Merged
merged 1 commit into from
Nov 13, 2019
Merged

fix: remove unsupported native-image flags #5327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 0 additions & 12 deletions core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,18 +91,6 @@ public class NativeConfig {
@ConfigItem(defaultValue = "false")
public boolean cleanupServer;

/**
* This will report on the size of the retained heap after image build
*/
@ConfigItem(defaultValue = "false")
public boolean enableRetainedHeapReporting;

/**
* This enables reporting of the code size of the native image
*/
@ConfigItem(defaultValue = "false")
public boolean enableCodeSizeReporting;

/**
* If isolates should be enabled
*/
Expand Down
7 changes: 1 addition & 6 deletions core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,12 +232,7 @@ public NativeImageBuildItem build(NativeConfig nativeConfig, NativeImageSourceJa
if (!noPIE.isEmpty()) {
command.add("-H:NativeLinkerOption=" + noPIE);
}
if (nativeConfig.enableRetainedHeapReporting) {
command.add("-H:+PrintRetainedHeapHistogram");
}
if (nativeConfig.enableCodeSizeReporting) {
command.add("-H:+PrintCodeSizeReport");
}

if (!nativeConfig.enableIsolates) {
command.add("-H:-SpawnIsolates");
}
Expand Down
28 changes: 0 additions & 28 deletions devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusNative.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,8 @@ public class QuarkusNative extends QuarkusTask {

private boolean enableAllSecurityServices;

private boolean enableRetainedHeapReporting;

private boolean enableIsolates;

private boolean enableCodeSizeReporting;

private String graalvmHome = System.getenv("GRAALVM_HOME");

private boolean enableServer = false;
Expand Down Expand Up @@ -187,17 +183,6 @@ public void setEnableAllSecurityServices(boolean enableAllSecurityServices) {
this.enableAllSecurityServices = enableAllSecurityServices;
}

@Optional
@Input
public boolean isEnableRetainedHeapReporting() {
return enableRetainedHeapReporting;
}

@Option(description = "Specify if retained heap reporting should be enabled", option = "enable-retained-heap-reporting")
public void setEnableRetainedHeapReporting(boolean enableRetainedHeapReporting) {
this.enableRetainedHeapReporting = enableRetainedHeapReporting;
}

@Optional
@Input
public boolean isEnableIsolates() {
Expand All @@ -209,17 +194,6 @@ public void setEnableIsolates(boolean enableIsolates) {
this.enableIsolates = enableIsolates;
}

@Optional
@Input
public boolean isEnableCodeSizeReporting() {
return enableCodeSizeReporting;
}

@Option(description = "Report errors at runtime", option = "enable-code-size-reporting")
public void setEnableCodeSizeReporting(boolean enableCodeSizeReporting) {
this.enableCodeSizeReporting = enableCodeSizeReporting;
}

@Optional
@Input
public String getGraalvmHome() {
Expand Down Expand Up @@ -464,14 +438,12 @@ public void accept(ConfigBuilder configBuilder) {
}
configs.add("quarkus.native.dump-proxies", dumpProxies);
configs.add("quarkus.native.enable-all-security-services", enableAllSecurityServices);
configs.add("quarkus.native.enable-code-size-reporting", enableCodeSizeReporting);
configs.add("quarkus.native.enable-fallback-images", enableFallbackImages);
configs.add("quarkus.native.enable-https-url-handler", enableHttpsUrlHandler);

configs.add("quarkus.native.enable-http-url-handler", enableHttpUrlHandler);
configs.add("quarkus.native.enable-isolates", enableIsolates);
configs.add("quarkus.native.enable-jni", enableJni);
configs.add("quarkus.native.enable-retained-heap-reporting", enableRetainedHeapReporting);

configs.add("quarkus.native.enable-server", enableServer);

Expand Down
18 changes: 4 additions & 14 deletions devtools/maven/src/main/java/io/quarkus/maven/NativeImageMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,9 @@ public class NativeImageMojo extends AbstractMojo {
@Parameter
private Boolean enableAllSecurityServices;

@Parameter
private Boolean enableRetainedHeapReporting;

@Parameter
private Boolean enableIsolates;

@Parameter
private Boolean enableCodeSizeReporting;

@Parameter(defaultValue = "${env.GRAALVM_HOME}")
private String graalvmHome;

Expand Down Expand Up @@ -365,9 +359,6 @@ public void accept(ConfigBuilder configBuilder) {
if (enableAllSecurityServices != null) {
configs.add("quarkus.native.enable-all-security-services", enableAllSecurityServices.toString());
}
if (enableCodeSizeReporting != null) {
configs.add("quarkus.native.enable-code-size-reporting", enableCodeSizeReporting.toString());
}
if (enableFallbackImages != null) {
configs.add("quarkus.native.enable-fallback-images", enableFallbackImages.toString());
}
Expand All @@ -383,26 +374,25 @@ public void accept(ConfigBuilder configBuilder) {
if (enableJni != null) {
configs.add("quarkus.native.enable-jni", enableJni.toString());
}
if (enableRetainedHeapReporting != null) {
configs.add("quarkus.native.enable-retained-heap-reporting", enableRetainedHeapReporting.toString());
}

if (enableServer != null) {
configs.add("quarkus.native.enable-server", enableServer.toString());
}

if (enableVMInspection != null) {
configs.add("quarkus.native.enable-vm-inspection", enableVMInspection.toString());
}
if (fullStackTraces != null) {
configs.add("quarkus.native.full-stack-traces", fullStackTraces.toString());
}
if (graalvmHome != null && !graalvmHome.trim().isEmpty()) {
configs.add("quarkus.native.graalvm-home", graalvmHome.toString());
configs.add("quarkus.native.graalvm-home", graalvmHome);
}
if (javaHome != null && !javaHome.toString().isEmpty()) {
configs.add("quarkus.native.java-home", javaHome.toString());
}
if (nativeImageXmx != null && !nativeImageXmx.trim().isEmpty()) {
configs.add("quarkus.native.native-image-xmx", nativeImageXmx.toString());
configs.add("quarkus.native.native-image-xmx", nativeImageXmx);
}
if (reportErrorsAtRuntime != null) {
configs.add("quarkus.native.report-errors-at-runtime", reportErrorsAtRuntime.toString());
Expand Down
4 changes: 0 additions & 4 deletions integration-tests/artemis-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,6 @@
<configuration>
<cleanupServer>true</cleanupServer>
<enableHttpUrlHandler>true</enableHttpUrlHandler>
<!-- Requires Quarkus Graal fork to work, will fail otherwise
<enableRetainedHeapReporting>true</enableRetainedHeapReporting>
<enableCodeSizeReporting>true</enableCodeSizeReporting>
-->
<graalvmHome>${graalvmHome}</graalvmHome>
</configuration>
</execution>
Expand Down
4 changes: 0 additions & 4 deletions integration-tests/artemis-jms/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,6 @@
<configuration>
<cleanupServer>true</cleanupServer>
<enableHttpUrlHandler>true</enableHttpUrlHandler>
<!-- Requires Quarkus Graal fork to work, will fail otherwise
<enableRetainedHeapReporting>true</enableRetainedHeapReporting>
<enableCodeSizeReporting>true</enableCodeSizeReporting>
-->
<graalvmHome>${graalvmHome}</graalvmHome>
</configuration>
</execution>
Expand Down
4 changes: 0 additions & 4 deletions integration-tests/elytron-security-oauth2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,6 @@
<configuration>
<cleanupServer>true</cleanupServer>
<enableHttpUrlHandler>true</enableHttpUrlHandler>
<!-- Requires Quarkus Graal fork to work, will fail otherwise
<enableRetainedHeapReporting>true</enableRetainedHeapReporting>
<enableCodeSizeReporting>true</enableCodeSizeReporting>
-->
<graalvmHome>${graalvmHome}</graalvmHome>
</configuration>
</execution>
Expand Down
4 changes: 0 additions & 4 deletions integration-tests/elytron-security/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,6 @@
<configuration>
<cleanupServer>true</cleanupServer>
<enableHttpUrlHandler>true</enableHttpUrlHandler>
<!-- Requires Quarkus Graal fork to work, will fail otherwise
<enableRetainedHeapReporting>true</enableRetainedHeapReporting>
<enableCodeSizeReporting>true</enableCodeSizeReporting>
-->
<graalvmHome>${graalvmHome}</graalvmHome>
</configuration>
</execution>
Expand Down
4 changes: 0 additions & 4 deletions integration-tests/hibernate-orm-panache/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,6 @@
<enableHttpUrlHandler>true</enableHttpUrlHandler>
<enableServer>false</enableServer>
<dumpProxies>false</dumpProxies>
<!-- Requires Quarkus Graal fork to work, will fail otherwise
<enableRetainedHeapReporting>true</enableRetainedHeapReporting>
<enableCodeSizeReporting>true</enableCodeSizeReporting>
-->
<graalvmHome>${graalvmHome}</graalvmHome>
<enableJni>false</enableJni>
</configuration>
Expand Down
4 changes: 0 additions & 4 deletions integration-tests/hibernate-search-elasticsearch/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,6 @@
<enableHttpUrlHandler>true</enableHttpUrlHandler>
<enableServer>false</enableServer>
<dumpProxies>false</dumpProxies>
<!-- Requires Protean Graal fork to work, will fail otherwise
<enableRetainedHeapReporting>true</enableRetainedHeapReporting>
<enableCodeSizeReporting>true</enableCodeSizeReporting>
-->
<graalvmHome>${graalvmHome}</graalvmHome>
<enableJni>false</enableJni>
<debugBuildProcess>false</debugBuildProcess>
Expand Down
4 changes: 0 additions & 4 deletions integration-tests/hibernate-validator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,6 @@
<enableHttpUrlHandler>true</enableHttpUrlHandler>
<enableServer>false</enableServer>
<dumpProxies>false</dumpProxies>
<!-- Requires Quarkus Graal fork to work, will fail otherwise
<enableRetainedHeapReporting>true</enableRetainedHeapReporting>
<enableCodeSizeReporting>true</enableCodeSizeReporting>
-->
<graalvmHome>${graalvmHome}</graalvmHome>
<enableJni>false</enableJni>
</configuration>
Expand Down
6 changes: 1 addition & 5 deletions integration-tests/jpa-mariadb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
</plugins>
</build>
</profile>

<profile>
<id>native-image</id>
<activation>
Expand Down Expand Up @@ -147,10 +147,6 @@
<enableHttpUrlHandler>true</enableHttpUrlHandler>
<enableServer>false</enableServer>
<dumpProxies>false</dumpProxies>
<!-- Requires Quarkus Graal fork to work, will fail otherwise
<enableRetainedHeapReporting>true</enableRetainedHeapReporting>
<enableCodeSizeReporting>true</enableCodeSizeReporting>
-->
<graalvmHome>${graalvmHome}</graalvmHome>
<enableJni>false</enableJni>
<debugBuildProcess>false</debugBuildProcess>
Expand Down
4 changes: 0 additions & 4 deletions integration-tests/jpa-mysql/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,6 @@
<enableHttpUrlHandler>true</enableHttpUrlHandler>
<enableServer>false</enableServer>
<dumpProxies>false</dumpProxies>
<!-- Requires Quarkus Graal fork to work, will fail otherwise
<enableRetainedHeapReporting>true</enableRetainedHeapReporting>
<enableCodeSizeReporting>true</enableCodeSizeReporting>
-->
<graalvmHome>${graalvmHome}</graalvmHome>
<enableJni>false</enableJni>
<debugBuildProcess>false</debugBuildProcess>
Expand Down
6 changes: 1 addition & 5 deletions integration-tests/jpa-postgresql/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
</plugins>
</build>
</profile>

<profile>
<id>native-image</id>
<activation>
Expand Down Expand Up @@ -142,10 +142,6 @@
<enableHttpUrlHandler>true</enableHttpUrlHandler>
<enableServer>false</enableServer>
<dumpProxies>false</dumpProxies>
<!-- Requires Quarkus Graal fork to work, will fail otherwise
<enableRetainedHeapReporting>true</enableRetainedHeapReporting>
<enableCodeSizeReporting>true</enableCodeSizeReporting>
-->
<graalvmHome>${graalvmHome}</graalvmHome>
<enableJni>false</enableJni>
</configuration>
Expand Down
6 changes: 1 addition & 5 deletions integration-tests/jsonb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,6 @@
<configuration>
<cleanupServer>true</cleanupServer>
<enableHttpUrlHandler>true</enableHttpUrlHandler>
<!-- Requires Quarkus Graal fork to work, will fail otherwise
<enableRetainedHeapReporting>true</enableRetainedHeapReporting>
<enableCodeSizeReporting>true</enableCodeSizeReporting>
-->
<graalvmHome>${graalvmHome}</graalvmHome>
</configuration>
</execution>
Expand All @@ -110,4 +106,4 @@
</build>
</profile>
</profiles>
</project>
</project>
4 changes: 0 additions & 4 deletions integration-tests/kafka/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,6 @@
<configuration>
<cleanupServer>true</cleanupServer>
<enableHttpUrlHandler>true</enableHttpUrlHandler>
<!-- Requires Quarkus Graal fork to work, will fail otherwise
<enableRetainedHeapReporting>true</enableRetainedHeapReporting>
<enableCodeSizeReporting>true</enableCodeSizeReporting>
-->
<graalvmHome>${graalvmHome}</graalvmHome>
</configuration>
</execution>
Expand Down
10 changes: 3 additions & 7 deletions integration-tests/keycloak-authorization/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<properties>
<keycloak.url>http://localhost:8180/auth</keycloak.url>
</properties>

<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down Expand Up @@ -164,10 +164,6 @@
<enableHttpUrlHandler>true</enableHttpUrlHandler>
<enableServer>false</enableServer>
<dumpProxies>false</dumpProxies>
<!-- Requires Quarkus Graal fork to work, will fail otherwise
<enableRetainedHeapReporting>true</enableRetainedHeapReporting>
<enableCodeSizeReporting>true</enableCodeSizeReporting>
-->
<graalvmHome>${graalvmHome}</graalvmHome>
<debugBuildProcess>false</debugBuildProcess>
</configuration>
Expand Down Expand Up @@ -207,8 +203,8 @@
<KEYCLOAK_USER>admin</KEYCLOAK_USER>
<KEYCLOAK_PASSWORD>admin</KEYCLOAK_PASSWORD>
<JAVA_OPTS>
-server -Xms64m -Xmx512m -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m -Djava.net.preferIPv4Stack=true
-Djava.awt.headless=true
-server -Xms64m -Xmx512m -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m -Djava.net.preferIPv4Stack=true
-Djava.awt.headless=true
-Dkeycloak.profile.feature.upload_scripts=enabled
</JAVA_OPTS>
</env>
Expand Down
4 changes: 0 additions & 4 deletions integration-tests/main/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,10 +242,6 @@
<addAllCharsets>true</addAllCharsets>
<cleanupServer>true</cleanupServer>
<enableHttpUrlHandler>true</enableHttpUrlHandler>
<!-- Requires Quarkus Graal fork to work, will fail otherwise
<enableRetainedHeapReporting>true</enableRetainedHeapReporting>
<enableCodeSizeReporting>true</enableCodeSizeReporting>
-->
<graalvmHome>${graalvmHome}</graalvmHome>
</configuration>
</execution>
Expand Down
6 changes: 1 addition & 5 deletions integration-tests/oidc-code-flow/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<keycloak.url>http://localhost:8180/auth</keycloak.url>
<htmlunit.version>2.36.0</htmlunit.version>
</properties>

<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down Expand Up @@ -187,10 +187,6 @@
<enableHttpUrlHandler>true</enableHttpUrlHandler>
<enableServer>false</enableServer>
<dumpProxies>false</dumpProxies>
<!-- Requires Quarkus Graal fork to work, will fail otherwise
<enableRetainedHeapReporting>true</enableRetainedHeapReporting>
<enableCodeSizeReporting>true</enableCodeSizeReporting>
-->
<graalvmHome>${graalvmHome}</graalvmHome>
<debugBuildProcess>false</debugBuildProcess>
</configuration>
Expand Down
Loading