Merge pull request #5327 from machi1990/fix/5324

fix: remove unsupported native-image flags
quarkusio · Nov 13, 2019 · a1583d5 · a1583d5
2 parents 4d11d49 + a684e38
commit a1583d5
Show file tree

Hide file tree

Showing 22 changed files with 13 additions and 140 deletions.
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java
@@ -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
      */

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java
@@ -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");
             }

diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusNative.java b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusNative.java
@@ -43,12 +43,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;
@@ -186,17 +182,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() {
@@ -208,17 +193,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() {
@@ -462,14 +436,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);
 

diff --git a/devtools/maven/src/main/java/io/quarkus/maven/NativeImageMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/NativeImageMojo.java
@@ -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;
 
@@ -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());
                 }
@@ -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());

diff --git a/integration-tests/artemis-core/pom.xml b/integration-tests/artemis-core/pom.xml
@@ -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>

diff --git a/integration-tests/artemis-jms/pom.xml b/integration-tests/artemis-jms/pom.xml
@@ -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>

diff --git a/integration-tests/elytron-security-oauth2/pom.xml b/integration-tests/elytron-security-oauth2/pom.xml
@@ -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>

diff --git a/integration-tests/elytron-security/pom.xml b/integration-tests/elytron-security/pom.xml
@@ -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>

diff --git a/integration-tests/hibernate-orm-panache/pom.xml b/integration-tests/hibernate-orm-panache/pom.xml
@@ -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>

diff --git a/integration-tests/hibernate-search-elasticsearch/pom.xml b/integration-tests/hibernate-search-elasticsearch/pom.xml
@@ -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>

diff --git a/integration-tests/hibernate-validator/pom.xml b/integration-tests/hibernate-validator/pom.xml
@@ -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>

diff --git a/integration-tests/jpa-mariadb/pom.xml b/integration-tests/jpa-mariadb/pom.xml
@@ -104,7 +104,7 @@
                 </plugins>
             </build>
         </profile>
-    
+
         <profile>
             <id>native-image</id>
             <activation>
@@ -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>

diff --git a/integration-tests/jpa-mysql/pom.xml b/integration-tests/jpa-mysql/pom.xml
@@ -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>

diff --git a/integration-tests/jpa-postgresql/pom.xml b/integration-tests/jpa-postgresql/pom.xml
@@ -99,7 +99,7 @@
                 </plugins>
             </build>
         </profile>
-    
+
         <profile>
             <id>native-image</id>
             <activation>
@@ -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>

diff --git a/integration-tests/jsonb/pom.xml b/integration-tests/jsonb/pom.xml
@@ -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>
@@ -110,4 +106,4 @@
             </build>
         </profile>
     </profiles>
-</project>
+</project>
diff --git a/integration-tests/kafka/pom.xml b/integration-tests/kafka/pom.xml
@@ -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>

diff --git a/integration-tests/keycloak-authorization/pom.xml b/integration-tests/keycloak-authorization/pom.xml
@@ -17,7 +17,7 @@
     <properties>
         <keycloak.url>http://localhost:8180/auth</keycloak.url>
     </properties>
-  
+
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -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>
@@ -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>

diff --git a/integration-tests/main/pom.xml b/integration-tests/main/pom.xml
@@ -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>

diff --git a/integration-tests/oidc-code-flow/pom.xml b/integration-tests/oidc-code-flow/pom.xml
@@ -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>
@@ -189,10 +189,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>