Moved Maven-based AppModelResolver implementation to quarkus-bootstra…

…p-maven-resolver
quarkusio · Jun 10, 2020 · 124a512 · 124a512
1 parent 10f3b66
commit 124a512
Show file tree

Hide file tree

Showing 15 changed files with 66 additions and 12 deletions.
diff --git a/bom/deployment/pom.xml b/bom/deployment/pom.xml
@@ -39,7 +39,16 @@
             </dependency>
 
             <!-- Quarkus core dependencies -->
-
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-app-model</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-resolver</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-bootstrap-core</artifactId>

diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
@@ -129,6 +129,7 @@
                         <parentFirstArtifact>org.ow2.asm:asm</parentFirstArtifact>
                         <parentFirstArtifact>org.ow2.asm:asm-commons</parentFirstArtifact>
                         <parentFirstArtifact>org.apache.maven:maven-model</parentFirstArtifact>
+                        <parentFirstArtifact>org.codehaus.plexus:plexus-utils</parentFirstArtifact>
                         <!--
                         This is a temporary fix, we need a better way to be able to
                         add these exclusions outside the quarkus-extension.properties file.

diff --git a/devtools/platform-descriptor-json/pom.xml b/devtools/platform-descriptor-json/pom.xml
@@ -101,10 +101,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-devtools-common</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-bootstrap-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-bom-descriptor-json</artifactId>

diff --git a/...quarkus/bootstrap/BootstrapConstants.java → ...quarkus/bootstrap/BootstrapConstants.java b/...quarkus/bootstrap/BootstrapConstants.java → ...quarkus/bootstrap/BootstrapConstants.java
diff --git a/...otstrapDependencyProcessingException.java → ...otstrapDependencyProcessingException.java b/...otstrapDependencyProcessingException.java → ...otstrapDependencyProcessingException.java
@@ -1,10 +1,12 @@
 package io.quarkus.bootstrap;
 
+import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException;
+
 /**
  *
  * @author Alexey Loubyansky
  */
-public class BootstrapDependencyProcessingException extends BootstrapException {
+public class BootstrapDependencyProcessingException extends BootstrapMavenException {
 
     /**
      *

diff --git a/...p/resolver/BootstrapAppModelResolver.java → ...p/resolver/BootstrapAppModelResolver.java b/...p/resolver/BootstrapAppModelResolver.java → ...p/resolver/BootstrapAppModelResolver.java
diff --git a/...er/maven/BuildDependencyGraphVisitor.java → ...er/maven/BuildDependencyGraphVisitor.java b/...er/maven/BuildDependencyGraphVisitor.java → ...er/maven/BuildDependencyGraphVisitor.java
diff --git a/...DeploymentInjectingDependencyVisitor.java → ...DeploymentInjectingDependencyVisitor.java b/...DeploymentInjectingDependencyVisitor.java → ...DeploymentInjectingDependencyVisitor.java
diff --git a/...r/maven/DeploymentInjectionException.java → ...r/maven/DeploymentInjectionException.java b/...r/maven/DeploymentInjectionException.java → ...r/maven/DeploymentInjectionException.java
diff --git a/...a/io/quarkus/bootstrap/util/ZipUtils.java → ...a/io/quarkus/bootstrap/util/ZipUtils.java b/...a/io/quarkus/bootstrap/util/ZipUtils.java → ...a/io/quarkus/bootstrap/util/ZipUtils.java
diff --git a/independent-projects/tools/common/pom.xml b/independent-projects/tools/common/pom.xml
@@ -28,8 +28,7 @@
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-bootstrap-core</artifactId>
-            <scope>provided</scope>
+            <artifactId>quarkus-bootstrap-maven-resolver</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>

diff --git a/independent-projects/tools/platform-descriptor-resolver-json/pom.xml b/independent-projects/tools/platform-descriptor-resolver-json/pom.xml
@@ -20,8 +20,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-bootstrap-core</artifactId>
-            <scope>provided</scope>
+            <artifactId>quarkus-bootstrap-maven-resolver</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -41,7 +40,6 @@
             <artifactId>quarkus-bootstrap-core</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
-            <version>${quarkus.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/independent-projects/tools/pom.xml b/independent-projects/tools/pom.xml
@@ -72,7 +72,7 @@
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-bootstrap-core</artifactId>
+                <artifactId>quarkus-bootstrap-maven-resolver</artifactId>
                 <version>${quarkus.version}</version>
             </dependency>
             <dependency>
@@ -152,6 +152,13 @@
                 <version>${junit.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-core</artifactId>
+                <type>test-jar</type>
+                <scope>test</scope>
+                <version>${quarkus.version}</version>
+            </dependency>
             <!-- Jackson dependencies, imported as a BOM -->
             <dependency>
                 <groupId>com.fasterxml.jackson</groupId>

diff --git a/integration-tests/kotlin/pom.xml b/integration-tests/kotlin/pom.xml
@@ -15,6 +15,17 @@
     <name>Quarkus - Integration Tests - Kotlin</name>
 
     <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.checkerframework</groupId>
+                    <artifactId>checker-qual</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-kotlin-deployment</artifactId>
@@ -39,6 +50,16 @@
             <version>${kotlin.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-model</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/integration-tests/scala/pom.xml b/integration-tests/scala/pom.xml
@@ -29,6 +29,27 @@
             <artifactId>quarkus-test-maven</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-model</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.checkerframework</groupId>
+                    <artifactId>checker-qual</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>