From 6e06b4bed5fd7e319e7380bf62fa3849b08ca05a Mon Sep 17 00:00:00 2001
From: Alexey Loubyansky <olubyans@redhat.com>
Date: Wed, 10 Jun 2020 18:27:15 +0200
Subject: [PATCH] Moved Maven-based AppModelResolver implementation to
 quarkus-bootstrap-maven-resolver

---
 bom/deployment/pom.xml                           | 11 ++++++++++-
 core/runtime/pom.xml                             |  1 +
 devtools/platform-descriptor-json/pom.xml        |  4 ----
 .../io/quarkus/bootstrap/BootstrapConstants.java |  0
 .../BootstrapDependencyProcessingException.java  |  4 +++-
 .../resolver/BootstrapAppModelResolver.java      |  0
 .../maven/BuildDependencyGraphVisitor.java       |  0
 .../DeploymentInjectingDependencyVisitor.java    |  0
 .../maven/DeploymentInjectionException.java      |  0
 .../java/io/quarkus/bootstrap/util/ZipUtils.java |  0
 independent-projects/tools/common/pom.xml        |  3 +--
 .../platform-descriptor-resolver-json/pom.xml    |  4 +---
 independent-projects/tools/pom.xml               |  9 ++++++++-
 integration-tests/kotlin/pom.xml                 | 16 ++++++++++++++++
 integration-tests/scala/pom.xml                  | 16 ++++++++++++++++
 15 files changed, 56 insertions(+), 12 deletions(-)
 rename independent-projects/bootstrap/{core => app-model}/src/main/java/io/quarkus/bootstrap/BootstrapConstants.java (100%)
 rename independent-projects/bootstrap/{core => maven-resolver}/src/main/java/io/quarkus/bootstrap/BootstrapDependencyProcessingException.java (82%)
 rename independent-projects/bootstrap/{core => maven-resolver}/src/main/java/io/quarkus/bootstrap/resolver/BootstrapAppModelResolver.java (100%)
 rename independent-projects/bootstrap/{core => maven-resolver}/src/main/java/io/quarkus/bootstrap/resolver/maven/BuildDependencyGraphVisitor.java (100%)
 rename independent-projects/bootstrap/{core => maven-resolver}/src/main/java/io/quarkus/bootstrap/resolver/maven/DeploymentInjectingDependencyVisitor.java (100%)
 rename independent-projects/bootstrap/{core => maven-resolver}/src/main/java/io/quarkus/bootstrap/resolver/maven/DeploymentInjectionException.java (100%)
 rename independent-projects/bootstrap/{core => maven-resolver}/src/main/java/io/quarkus/bootstrap/util/ZipUtils.java (100%)

diff --git a/bom/deployment/pom.xml b/bom/deployment/pom.xml
index ea37162bba97f..8057e4e8fe0a3 100644
--- 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
index a393a932f14e2..6a2c968baaafb 100644
--- 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
index 0452e2ecd20bc..dbb3c7a29d906 100644
--- 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/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/BootstrapConstants.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/BootstrapConstants.java
similarity index 100%
rename from independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/BootstrapConstants.java
rename to independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/BootstrapConstants.java
diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/BootstrapDependencyProcessingException.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/BootstrapDependencyProcessingException.java
similarity index 82%
rename from independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/BootstrapDependencyProcessingException.java
rename to independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/BootstrapDependencyProcessingException.java
index 4d0e165b47fe2..3139a3e527975 100644
--- a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/BootstrapDependencyProcessingException.java
+++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/BootstrapDependencyProcessingException.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/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/BootstrapAppModelResolver.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/BootstrapAppModelResolver.java
similarity index 100%
rename from independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/BootstrapAppModelResolver.java
rename to independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/BootstrapAppModelResolver.java
diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/maven/BuildDependencyGraphVisitor.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BuildDependencyGraphVisitor.java
similarity index 100%
rename from independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/maven/BuildDependencyGraphVisitor.java
rename to independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BuildDependencyGraphVisitor.java
diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/maven/DeploymentInjectingDependencyVisitor.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/DeploymentInjectingDependencyVisitor.java
similarity index 100%
rename from independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/maven/DeploymentInjectingDependencyVisitor.java
rename to independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/DeploymentInjectingDependencyVisitor.java
diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/maven/DeploymentInjectionException.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/DeploymentInjectionException.java
similarity index 100%
rename from independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/resolver/maven/DeploymentInjectionException.java
rename to independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/DeploymentInjectionException.java
diff --git a/independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/util/ZipUtils.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/util/ZipUtils.java
similarity index 100%
rename from independent-projects/bootstrap/core/src/main/java/io/quarkus/bootstrap/util/ZipUtils.java
rename to independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/util/ZipUtils.java
diff --git a/independent-projects/tools/common/pom.xml b/independent-projects/tools/common/pom.xml
index 533c21b0773bf..1c173d9c28919 100644
--- 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
index 4e9d6803661cb..a26ec9dc69d9b 100644
--- 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
index 16f997aa41d57..f4f71a5b10524 100644
--- 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
index 2355a6fdcef95..3d47d34d81d68 100644
--- a/integration-tests/kotlin/pom.xml
+++ b/integration-tests/kotlin/pom.xml
@@ -39,6 +39,22 @@
             <version>${kotlin.version}</version>
             <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>
     </dependencies>
 
     <build>
diff --git a/integration-tests/scala/pom.xml b/integration-tests/scala/pom.xml
index 4496419052903..0c4e694c383fa 100644
--- a/integration-tests/scala/pom.xml
+++ b/integration-tests/scala/pom.xml
@@ -29,6 +29,22 @@
             <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>
     </dependencies>
 
     <build>