Merge pull request #12156 from stuartwdouglas/12136

Only include bootstrap dependencies in quarkus:dev ClassPath
quarkusio · Oct 22, 2020 · cd53960 · cd53960
2 parents 009b967 + 847ece9
commit cd53960
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java
@@ -38,6 +38,7 @@
 import java.util.jar.Manifest;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
 import java.util.zip.ZipOutputStream;
 
 import org.apache.maven.artifact.Artifact;
@@ -75,6 +76,7 @@
 import org.eclipse.aether.util.artifact.JavaScopes;
 
 import io.quarkus.bootstrap.model.AppArtifactKey;
+import io.quarkus.bootstrap.model.AppModel;
 import io.quarkus.bootstrap.resolver.maven.options.BootstrapMavenOptions;
 import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject;
 import io.quarkus.bootstrap.resolver.maven.workspace.LocalWorkspace;
@@ -93,6 +95,7 @@
  */
 @Mojo(name = "dev", defaultPhase = LifecyclePhase.PREPARE_PACKAGE, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME)
 public class DevMojo extends AbstractMojo {
+    private static final String EXT_PROPERTIES_PATH = "META-INF/quarkus-extension.properties";
 
     /**
      * running any one of these phases means the compile phase will have been run, if these have
@@ -717,11 +720,35 @@ void prepare(final boolean triggerCompile) throws Exception {
 
             //in most cases these are not used, however they need to be present for some
             //parent-first cases such as logging
+            //first we go through and get all the parent first artifacts
+            Set<AppArtifactKey> parentFirstArtifacts = new HashSet<>();
+            for (Artifact appDep : project.getArtifacts()) {
+                if (appDep.getArtifactHandler().getExtension().equals("jar") && appDep.getFile().isFile()) {
+                    try (ZipFile file = new ZipFile(appDep.getFile())) {
+                        ZipEntry entry = file.getEntry(EXT_PROPERTIES_PATH);
+                        if (entry != null) {
+                            Properties p = new Properties();
+                            try (InputStream inputStream = file.getInputStream(entry)) {
+                                p.load(inputStream);
+                                String parentFirst = p.getProperty(AppModel.PARENT_FIRST_ARTIFACTS);
+                                if (parentFirst != null) {
+                                    String[] artifacts = parentFirst.split(",");
+                                    for (String artifact : artifacts) {
+                                        parentFirstArtifacts.add(new AppArtifactKey(artifact.split(":")));
+                                    }
+                                }
+                            }
+
+                        }
+                    }
+                }
+            }
             for (Artifact appDep : project.getArtifacts()) {
                 // only add the artifact if it's present in the dev mode context
                 // we need this to avoid having jars on the classpath multiple times
-                if (!devModeContext.getLocalArtifacts().contains(new AppArtifactKey(appDep.getGroupId(), appDep.getArtifactId(),
-                        appDep.getClassifier(), appDep.getArtifactHandler().getExtension()))) {
+                AppArtifactKey key = new AppArtifactKey(appDep.getGroupId(), appDep.getArtifactId(),
+                        appDep.getClassifier(), appDep.getArtifactHandler().getExtension());
+                if (!devModeContext.getLocalArtifacts().contains(key) && parentFirstArtifacts.contains(key)) {
                     addToClassPaths(classPathManifest, appDep.getFile());
                 }
             }

diff --git a/...projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppArtifactKey.java b/...projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/model/AppArtifactKey.java
@@ -70,7 +70,7 @@ protected static String[] split(String str, String[] parts, int fromIndex) {
     protected final String classifier;
     protected final String type;
 
-    protected AppArtifactKey(String[] parts) {
+    public AppArtifactKey(String[] parts) {
         this.groupId = parts[0];
         this.artifactId = parts[1];
         if (parts.length == 2 || parts[2] == null) {