formatting fixes and pass launch argument hints back

quarkusio · Aug 28, 2020 · 2d66517 · 2d66517
1 parent 46d2aa1
commit 2d66517
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/jbang/JBangAugmentorImpl.java b/core/deployment/src/main/java/io/quarkus/deployment/jbang/JBangAugmentorImpl.java
@@ -2,11 +2,7 @@
 
 import java.io.File;
 import java.nio.file.Path;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
@@ -113,6 +109,9 @@ public void accept(BuildChainBuilder builder) {
                 }
             }
             resultMap.put("files", result);
+            List javaargs = new ArrayList<String>();
+            javaargs.add("-Djava.util.logging.manager=org.jboss.logmanager.LogManager");
+            resultMap.put("java-args", javaargs);
             if (nativeRequested) {
                 resultMap.put("native-image", buildResult.consume(NativeImageBuildItem.class).getPath());
             }

diff --git a/core/launcher/src/main/java/io/quarkus/launcher/JBangIntegration.java b/core/launcher/src/main/java/io/quarkus/launcher/JBangIntegration.java
@@ -14,7 +14,8 @@ public class JBangIntegration {
 
     public static final String CONFIG = "//Q:CONFIG";
 
-    public static Map<String, Object> postBuild(Path appClasses, Path pomFile, List<Map.Entry<String, String>> repositories, List<Map.Entry<String, Path>> dependencies,
+    public static Map<String, Object> postBuild(Path appClasses, Path pomFile, List<Map.Entry<String, String>> repositories,
+            List<Map.Entry<String, Path>> dependencies,
             List<String> comments, boolean nativeImage) {
         for (String comment : comments) {
             //we allow config to be provided via //Q:CONFIG name=value

diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/JBangBuilderImpl.java b/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/JBangBuilderImpl.java
@@ -17,7 +17,8 @@
 import org.eclipse.aether.repository.RemoteRepository;
 
 public class JBangBuilderImpl {
-    public static Map<String, Object> postBuild(Path appClasses, Path pomFile, List<Map.Entry<String, String>> repositories, List<Map.Entry<String, Path>> dependencies,
+    public static Map<String, Object> postBuild(Path appClasses, Path pomFile, List<Map.Entry<String, String>> repositories,
+            List<Map.Entry<String, Path>> dependencies,
             boolean nativeImage) {
         final MavenArtifactResolver quarkusResolver;
         try {
@@ -26,7 +27,7 @@ public static Map<String, Object> postBuild(Path appClasses, Path pomFile, List<
             final List<RemoteRepository> remoteRepos = new ArrayList<>(mvnCtx.getRemoteRepositories());
 
             repositories.forEach(repo -> {
-                        remoteRepos.add(new RemoteRepository.Builder(repo.getKey(), "default", repo.getValue()).build());
+                remoteRepos.add(new RemoteRepository.Builder(repo.getKey(), "default", repo.getValue()).build());
             });
 
             quarkusResolver = MavenArtifactResolver.builder()