Extension catalog request API to resolve catalogs that include platfo…

…rm and/or non-platform extensions integrated into the command line devtools
quarkusio · Mar 2, 2021 · 1918828 · 1918828
1 parent ce0fc76
commit 1918828
Show file tree

Hide file tree

Showing 277 changed files with 6,696 additions and 8,928 deletions.
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -154,30 +154,29 @@
             </dependency>
 
             <!-- Dev tools -->
-
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-devmode-test-utils</artifactId>
+                <artifactId>quarkus-devtools-registry-client</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-devtools-utilities</artifactId>
+                <artifactId>quarkus-test-devtools</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-devtools-common</artifactId>
+                <artifactId>quarkus-devmode-test-utils</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-platform-descriptor-api</artifactId>
+                <artifactId>quarkus-devtools-utilities</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-platform-descriptor-resolver-json</artifactId>
+                <artifactId>quarkus-devtools-common</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -318,6 +317,7 @@
                             <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
                             <maven.home>${maven.home}</maven.home>
                             <maven.repo>${settings.localRepository}</maven.repo>
+                            <project.version>${project.version}</project.version> <!-- some dev tools tests need this -->
                         </systemPropertyVariables>
                         <argLine>${jacoco.agent.argLine} -Xmx1500m</argLine> <!-- limit the amount of memory surefire can use, 1500m should be plenty-->
                         <!-- https://lists.apache.org/thread.html/r9030808273c82ac6d7b9602d34d446c7d8c4e8aa02c41bca164df1c5%40%3Cdev.maven.apache.org%3E -->
@@ -332,6 +332,7 @@
                             <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
                             <maven.home>${maven.home}</maven.home>
                             <maven.repo>${settings.localRepository}</maven.repo>
+                            <project.version>${project.version}</project.version> <!-- some dev tools tests need this -->
                         </systemPropertyVariables>
                         <!-- https://lists.apache.org/thread.html/r9030808273c82ac6d7b9602d34d446c7d8c4e8aa02c41bca164df1c5%40%3Cdev.maven.apache.org%3E -->
                         <trimStackTrace>false</trimStackTrace>

diff --git a/devtools/bom-descriptor-json/pom.xml b/devtools/bom-descriptor-json/pom.xml
@@ -19,6 +19,27 @@
 
     <build>
         <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/resources</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/src/main/resources</directory>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-platform-descriptor-json-plugin</artifactId>
@@ -27,14 +48,16 @@
                     <execution>
                         <phase>${pluginPhase}</phase>
                         <goals>
-                            <goal>generate-extensions-json</goal>
+                            <!-- goal>generate-extensions-json</goal -->
+                            <goal>generate-platform-descriptor-json</goal>
                         </goals>
                         <configuration>
                             <ignoredGroupIds>
                                 <ignoredGroupId>software.amazon.awssdk</ignoredGroupId>
                             </ignoredGroupIds>
                             <bomArtifactId>quarkus-bom</bomArtifactId>
                             <resolveDependencyManagement>true</resolveDependencyManagement>
+                            <overridesFile>${basedir}/target/resources/catalog-overrides.json</overridesFile>
                         </configuration>
                     </execution>
                 </executions>
@@ -2460,4 +2483,4 @@
         </profile>
     </profiles>
 
-</project>
+</project>
diff --git a/devtools/bom-descriptor-json/src/main/resources/catalog-overrides.json b/devtools/bom-descriptor-json/src/main/resources/catalog-overrides.json
@@ -0,0 +1,28 @@
+{
+  "metadata":{
+    "project": {
+      "properties": {
+        "doc-root": "https://quarkus.io",
+        "rest-assured-version": "${rest-assured.version}",
+        "compiler-plugin-version": "${compiler-plugin.version}",
+        "surefire-plugin-version": "${version.surefire.plugin}",
+        "kotlin-version": "${kotlin.version}",
+        "scala-version": "${scala.version}",
+        "scala-plugin-version": "${scala-plugin.version}",
+        "quarkus-core-version": "${project.version}",
+        "maven-plugin-groupId": "${project.groupId}",
+        "maven-plugin-artifactId": "quarkus-maven-plugin",
+        "maven-plugin-version": "${project.version}",
+        "gradle-plugin-id": "io.quarkus",
+        "gradle-plugin-version": "${project.version}",
+        "supported-maven-versions": "${supported-maven-versions}",
+        "proposed-maven-version": "${proposed-maven-version}",
+        "maven-wrapper-version": "${maven-wrapper.version}",
+        "gradle-wrapper-version": "${gradle-wrapper.version}"
+      }
+    },
+    "codestarts-artifacts": [
+      "${project.groupId}:quarkus-platform-descriptor-json::jar:${project.version}"
+    ]
+  }
+}