Fix test ClassLoader issue

This prevents the base runtime CL from loading deployment classes. Fixes quarkusio#16810 Fixes quarkusio#16804
stuartwdouglas · Apr 27, 2021 · dc00274 · dc00274
1 parent 6c26085
commit dc00274
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/...nt-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/CuratedApplication.java b/...nt-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/app/CuratedApplication.java
@@ -216,6 +216,10 @@ public synchronized QuarkusClassLoader getBaseRuntimeClassLoader() {
                 for (Path root : quarkusBootstrap.getApplicationRoot()) {
                     builder.addElement(ClassPathElement.fromPath(root));
                 }
+            } else {
+                for (Path root : quarkusBootstrap.getApplicationRoot()) {
+                    builder.addBannedElement(ClassPathElement.fromPath(root));
+                }
             }
 
             //additional user class path elements first
@@ -228,6 +232,7 @@ public synchronized QuarkusClassLoader getBaseRuntimeClassLoader() {
                 } else {
                     for (Path root : i.getArchivePath()) {
                         hotReloadPaths.add(root);
+                        builder.addBannedElement(ClassPathElement.fromPath(root));
                     }
                 }
             }

diff --git a/integration-tests/kafka-avro-apicurio2/src/main/resources/application.properties b/integration-tests/kafka-avro-apicurio2/src/main/resources/application.properties
@@ -3,8 +3,4 @@ quarkus.log.category.\"org.apache.kafka\".level=WARN
 quarkus.log.category.\"org.apache.zookeeper\".level=WARN
 
 # enable health check
-quarkus.kafka.health.enabled=true
-
-# TODO: this should not be needed, but Avro does not seem to use the correct CL
-# This will also cause dev mode issues
-quarkus.test.flat-class-path=true
+quarkus.kafka.health.enabled=true
diff --git a/integration-tests/kafka-avro/src/main/resources/application.properties b/integration-tests/kafka-avro/src/main/resources/application.properties
@@ -3,8 +3,4 @@ quarkus.log.category.\"org.apache.kafka\".level=WARN
 quarkus.log.category.\"org.apache.zookeeper\".level=WARN
 
 # enable health check
-quarkus.kafka.health.enabled=true
-
-# TODO: this should not be needed, but Avro does not seem to use the correct CL
-# This will also cause dev mode issues
-quarkus.test.flat-class-path=true
+quarkus.kafka.health.enabled=true