Merge pull request #18353 from aloubyansky/rr-kotlin-deps

Fix RR kotline deployment dependencies
quarkusio · Jul 2, 2021 · 81f758e · 81f758e
2 parents 1b73abd + e34e74f
commit 81f758e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin/deployment/pom.xml b/extensions/resteasy-reactive/quarkus-resteasy-reactive-kotlin/deployment/pom.xml
@@ -19,7 +19,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-arc-deployment</artifactId>
+            <artifactId>quarkus-resteasy-reactive-common-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>

diff --git a/...ojects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java b/...ojects/bootstrap/maven-plugin/src/main/java/io/quarkus/maven/ExtensionDescriptorMojo.java
@@ -800,7 +800,7 @@ private AppArtifactKey getDeploymentKey(org.eclipse.aether.artifact.Artifact a)
 
     private org.eclipse.aether.artifact.Artifact getDeploymentArtifact(org.eclipse.aether.artifact.Artifact a)
             throws MojoExecutionException {
-        final Properties props = getExtensionDescriptor(a, true);
+        final Properties props = getExtensionDescriptor(a, false);
         if (props == null) {
             return null;
         }
@@ -822,7 +822,7 @@ private Properties getExtensionDescriptor(org.eclipse.aether.artifact.Artifact a
             return null;
         }
         // if it hasn't been packaged yet, we skip it, we are not packaging yet
-        if (packaged && !isJarFile(f)) {
+        if (!a.getExtension().equals("jar") || packaged && !isJarFile(f)) {
             return null;
         }
         try {