Upgrade to Quarkus 2.7.4.Final

quarkusio · Mar 9, 2022 · edfc77e · edfc77e
1 parent 99c6c3f
commit edfc77e
Show file tree

Hide file tree

Showing 7 changed files with 1,226 additions and 1,135 deletions.
diff --git a/...latform-project/quarkus-maven-plugin/src/main/java/io/quarkus/maven/GenerateCodeMojo.java b/...latform-project/quarkus-maven-plugin/src/main/java/io/quarkus/maven/GenerateCodeMojo.java
@@ -65,9 +65,10 @@ void generateCode(Path sourcesDir,
         }
 
         ClassLoader originalTccl = Thread.currentThread().getContextClassLoader();
+        CuratedApplication curatedApplication = null;
         try {
 
-            final CuratedApplication curatedApplication = bootstrapApplication(launchMode);
+            curatedApplication = bootstrapApplication(launchMode);
 
             QuarkusClassLoader deploymentClassLoader = curatedApplication.createDeploymentClassLoader();
             Thread.currentThread().setContextClassLoader(deploymentClassLoader);
@@ -85,6 +86,10 @@ void generateCode(Path sourcesDir,
         } catch (Exception any) {
             throw new MojoExecutionException("Quarkus code generation phase has failed", any);
         } finally {
+            // in case of test mode, we can't share the bootstrapped app with the testing plugins, so we are closing it right away
+            if (test && curatedApplication != null) {
+                curatedApplication.close();
+            }
             Thread.currentThread().setContextClassLoader(originalTccl);
         }
     }

diff --git a/...project/quarkus-maven-plugin/src/main/java/io/quarkus/maven/QuarkusBootstrapProvider.java b/...project/quarkus-maven-plugin/src/main/java/io/quarkus/maven/QuarkusBootstrapProvider.java
@@ -271,13 +271,13 @@ private ArtifactCoords appArtifact(QuarkusBootstrapMojo mojo)
             final String groupId = coordsArr[0];
             final String artifactId = coordsArr[1];
             String classifier = "";
-            String type = GACTV.TYPE_JAR;
+            String type = ArtifactCoords.TYPE_JAR;
             String version = null;
             if (coordsArr.length == 3) {
                 version = coordsArr[2];
             } else if (coordsArr.length > 3) {
                 classifier = coordsArr[2] == null ? "" : coordsArr[2];
-                type = coordsArr[3] == null ? "jar" : coordsArr[3];
+                type = coordsArr[3] == null ? ArtifactCoords.TYPE_JAR : coordsArr[3];
                 if (coordsArr.length > 4) {
                     version = coordsArr[4];
                 }