From 90b242e04a12b397184066b9727cb092bdc1ec7c Mon Sep 17 00:00:00 2001
From: Stuart Douglas <stuart.w.douglas@gmail.com>
Date: Tue, 3 Mar 2020 12:10:59 +1100
Subject: [PATCH 1/2] Load JSON parent first for logging

Fixes #7469
---
 devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java | 7 +++++++
 extensions/jsonp/runtime/pom.xml                           | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java
index 089d4fcf293a6..c70fecf01233e 100644
--- a/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java
+++ b/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java
@@ -31,6 +31,7 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
+import org.apache.maven.artifact.Artifact;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Plugin;
@@ -603,6 +604,12 @@ void prepare() throws Exception {
 
             addToClassPaths(classPathManifest, devModeContext, wiringClassesDirectory);
 
+            //in most cases these are not used, however they need to be present for some
+            //parent-first cases such as logging
+            for (Artifact appDep : project.getArtifacts()) {
+                addToClassPaths(classPathManifest, devModeContext, appDep.getFile());
+            }
+
             //we also want to add the maven plugin jar to the class path
             //this allows us to just directly use classes, without messing around copying them
             //to the runner jar
diff --git a/extensions/jsonp/runtime/pom.xml b/extensions/jsonp/runtime/pom.xml
index d1a3f94761a72..0f3e35ee27c13 100644
--- a/extensions/jsonp/runtime/pom.xml
+++ b/extensions/jsonp/runtime/pom.xml
@@ -34,6 +34,10 @@
                         <excludedArtifact>javax.json:javax.json-api</excludedArtifact>
                         <excludedArtifact>org.glassfish:javax.json</excludedArtifact>
                     </excludedArtifacts>
+                    <parentFirstArtifacts>
+                        <parentFirstArtifact>org.glassfish:jakarta.json</parentFirstArtifact>
+                        <parentFirstArtifact>jakarta.json:jakarta.json-api</parentFirstArtifact>
+                    </parentFirstArtifacts>
                 </configuration>
             </plugin>
             <plugin>

From 2f3c1df9328b95d1c29a93130d9710b907709182 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jaikiran.pai@gmail.com>
Date: Tue, 3 Mar 2020 11:10:57 +0530
Subject: [PATCH 2/2] issue#7469 Add quarkus-logging-json in dev mode test case
 to make sure application starts fine

---
 .../src/test/resources/projects/classic-noconfig/pom.xml    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/integration-tests/maven/src/test/resources/projects/classic-noconfig/pom.xml b/integration-tests/maven/src/test/resources/projects/classic-noconfig/pom.xml
index a77e2e78993e4..a99c411fa5dfd 100644
--- a/integration-tests/maven/src/test/resources/projects/classic-noconfig/pom.xml
+++ b/integration-tests/maven/src/test/resources/projects/classic-noconfig/pom.xml
@@ -34,6 +34,12 @@
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-undertow-websockets</artifactId>
     </dependency>
+    <!-- quarkus-logging-json dependency to make sure application start
+ doesn't fail in dev mode due to classloading issues (see issue#7469) -->
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-logging-json</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.webjars</groupId>
       <artifactId>bootstrap</artifactId>