More adjustements

quarkusio · Jan 27, 2021 · 2196798 · 2196798
1 parent 1699465
commit 2196798
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 5 deletions.
diff --git a/core/test-extension/deployment/pom.xml b/core/test-extension/deployment/pom.xml
@@ -25,10 +25,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-arc-deployment</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-undertow</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-test-extension</artifactId>

diff --git a/core/test-extension/runtime/pom.xml b/core/test-extension/runtime/pom.xml
@@ -30,6 +30,10 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-arc</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-undertow</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>

diff --git a/independent-projects/bootstrap/maven-plugin/pom.xml b/independent-projects/bootstrap/maven-plugin/pom.xml
@@ -56,6 +56,12 @@
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-bootstrap-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-bootstrap-gradle-resolver</artifactId>
+                </exclusion>
+            </exclusions>
         </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
@@ -538,7 +538,13 @@ private void visitRuntimeDeps(RootNode root, Node currentNode, int currentId, De
     }
 
     private AppArtifactKey getDeploymentKey(org.eclipse.aether.artifact.Artifact a) throws MojoExecutionException {
-        final File f = resolve(a);
+        final File f;
+        try {
+            f = resolve(a);
+        } catch (Exception e) {
+            getLog().warn("Failed to resolve " + a);
+            return null;
+        }
         // if it hasn't been packaged yet, we skip it, we are not packaging yet
         if (isAnalyzable(f)) {
             try (FileSystem fs = FileSystems.newFileSystem(f.toPath(), (ClassLoader) null)) {

diff --git a/integration-tests/class-transformer/runtime/pom.xml b/integration-tests/class-transformer/runtime/pom.xml
@@ -12,6 +12,27 @@
   <artifactId>quarkus-integration-test-class-transformer</artifactId>
   <name>Quarkus - Integration Tests - Class tranformer - Runtime</name>
 
+  <dependencies>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-core</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-core-deployment</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>*</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+
   <build>
     <plugins>
       <plugin>

diff --git a/integration-tests/kubernetes/quarkus-standard-way/pom.xml b/integration-tests/kubernetes/quarkus-standard-way/pom.xml
@@ -46,6 +46,10 @@
                     <groupId>javax.xml.bind</groupId>
                     <artifactId>jaxb-api</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>jakarta.xml.bind</groupId>
+                    <artifactId>jakarta.xml.bind-api</artifactId>
+                </exclusion>
             </exclusions>
          </dependency>
          <dependency>