Merge pull request #29713 from gsmet/2.15.0-backports-2

2.15.0 backports 2

bom/application/pom.xml

@@ -18,7 +18,7 @@
         <bouncycastle.fips.version>1.0.2.3</bouncycastle.fips.version>
         <bouncycastle.tls.fips.version>1.0.14</bouncycastle.tls.fips.version>
         <findbugs.version>3.0.2</findbugs.version>
-        <jandex.version>3.0.4</jandex.version>
+        <jandex.version>3.0.5</jandex.version>
         <resteasy.version>4.7.7.Final</resteasy.version>
         <opentracing.version>0.33.0</opentracing.version>
         <opentracing-jdbc.version>0.2.4</opentracing-jdbc.version>

build-parent/pom.xml

@@ -34,7 +34,7 @@
         <failsafe-plugin.version>${version.surefire.plugin}</failsafe-plugin.version>
 
         <!-- Jandex versions -->
-        <jandex.version>3.0.4</jandex.version>
+        <jandex.version>3.0.5</jandex.version>
         <jandex-gradle-plugin.version>1.0.0</jandex-gradle-plugin.version>
 
         <asciidoctorj.version>2.5.7</asciidoctorj.version>

devtools/cli/src/main/java/io/quarkus/cli/CreateApp.java

@@ -3,6 +3,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import io.quarkus.cli.common.DataOptions;
 import io.quarkus.cli.common.PropertiesOptions;
 import io.quarkus.cli.common.TargetQuarkusVersionGroup;
 import io.quarkus.cli.create.BaseCreateCommand;
@@ -31,26 +32,29 @@ public class CreateApp extends BaseCreateCommand {
             "--extension", "--extensions" }, description = "Extension(s) to add to the project.", split = ",")
     Set<String> extensions = new HashSet<>();
 
-    @CommandLine.Option(paramLabel = "NAME", names = { "--name" }, description = "Name of the project.")
+    @CommandLine.Option(order = 2, paramLabel = "NAME", names = { "--name" }, description = "Name of the project.")
     String name;
 
-    @CommandLine.Option(paramLabel = "DESCRIPTION", names = {
+    @CommandLine.Option(order = 3, paramLabel = "DESCRIPTION", names = {
             "--description" }, description = "Description of the project.")
     String description;
 
-    @CommandLine.ArgGroup(order = 2, heading = "%nQuarkus version:%n")
+    @CommandLine.ArgGroup(order = 4, heading = "%nQuarkus version:%n")
     TargetQuarkusVersionGroup targetQuarkusVersion = new TargetQuarkusVersionGroup();
 
-    @CommandLine.ArgGroup(order = 3, heading = "%nBuild tool (Maven):%n")
+    @CommandLine.ArgGroup(order = 5, heading = "%nBuild tool (Maven):%n")
     TargetBuildToolGroup targetBuildTool = new TargetBuildToolGroup();
 
-    @CommandLine.ArgGroup(order = 4, exclusive = false, heading = "%nTarget language:%n")
+    @CommandLine.ArgGroup(order = 6, exclusive = false, heading = "%nTarget language:%n")
     TargetLanguageGroup targetLanguage = new TargetLanguageGroup();
 
-    @CommandLine.ArgGroup(order = 5, exclusive = false, heading = "%nCode Generation:%n")
+    @CommandLine.ArgGroup(order = 7, exclusive = false, heading = "%nCode Generation:%n")
     CodeGenerationGroup codeGeneration = new CodeGenerationGroup();
 
-    @CommandLine.ArgGroup(order = 6, exclusive = false, validate = false)
+    @CommandLine.ArgGroup(order = 8, exclusive = false, validate = false)
+    DataOptions dataOptions = new DataOptions();
+
+    @CommandLine.ArgGroup(order = 9, exclusive = false, validate = false)
     PropertiesOptions propertiesOptions = new PropertiesOptions();
 
     @Override
@@ -72,6 +76,7 @@ public Integer call() throws Exception {
             setCodegenOptions(codeGeneration);
             setValue(CreateProjectKey.PROJECT_NAME, name);
             setValue(CreateProjectKey.PROJECT_DESCRIPTION, description);
+            setValue(CreateProjectKey.DATA, dataOptions.data);
 
             QuarkusCommandInvocation invocation = build(buildTool, targetQuarkusVersion,
                     propertiesOptions.properties, extensions);
@@ -112,6 +117,7 @@ public String toString() {
                 + ", name=" + name
                 + ", description=" + description
                 + ", project=" + super.toString()
+                + ", data=" + dataOptions.data
                 + ", properties=" + propertiesOptions.properties
                 + '}';
     }

devtools/cli/src/main/java/io/quarkus/cli/CreateCli.java

@@ -3,13 +3,15 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import io.quarkus.cli.common.DataOptions;
 import io.quarkus.cli.common.PropertiesOptions;
 import io.quarkus.cli.common.TargetQuarkusVersionGroup;
 import io.quarkus.cli.create.BaseCreateCommand;
 import io.quarkus.cli.create.CodeGenerationGroup;
 import io.quarkus.cli.create.TargetBuildToolGroup;
 import io.quarkus.cli.create.TargetGAVGroup;
 import io.quarkus.cli.create.TargetLanguageGroup;
+import io.quarkus.devtools.commands.CreateProject.CreateProjectKey;
 import io.quarkus.devtools.commands.SourceType;
 import io.quarkus.devtools.commands.data.QuarkusCommandInvocation;
 import io.quarkus.devtools.commands.handlers.CreateJBangProjectCommandHandler;
@@ -30,19 +32,29 @@ public class CreateCli extends BaseCreateCommand {
             "--extension", "--extensions" }, description = "Extension(s) to add to the project.", split = ",")
     Set<String> extensions = new HashSet<>();
 
-    @CommandLine.ArgGroup(order = 2, heading = "%nQuarkus version:%n")
+    @CommandLine.Option(order = 2, paramLabel = "NAME", names = { "--name" }, description = "Name of the project.")
+    String name;
+
+    @CommandLine.Option(order = 3, paramLabel = "DESCRIPTION", names = {
+            "--description" }, description = "Description of the project.")
+    String description;
+
+    @CommandLine.ArgGroup(order = 4, heading = "%nQuarkus version:%n")
     TargetQuarkusVersionGroup targetQuarkusVersion = new TargetQuarkusVersionGroup();
 
-    @CommandLine.ArgGroup(order = 3, heading = "%nBuild tool (Maven):%n")
+    @CommandLine.ArgGroup(order = 5, heading = "%nBuild tool (Maven):%n")
     TargetBuildToolGroup targetBuildTool = new TargetBuildToolGroup();
 
-    @CommandLine.ArgGroup(order = 4, exclusive = false, heading = "%nTarget language:%n")
+    @CommandLine.ArgGroup(order = 6, exclusive = false, heading = "%nTarget language:%n")
     TargetLanguageGroup targetLanguage = new TargetLanguageGroup();
 
-    @CommandLine.ArgGroup(order = 5, exclusive = false, heading = "%nCode Generation:%n")
+    @CommandLine.ArgGroup(order = 7, exclusive = false, heading = "%nCode Generation:%n")
     CodeGenerationGroup codeGeneration = new CodeGenerationGroup();
 
-    @CommandLine.ArgGroup(order = 6, exclusive = false, validate = false)
+    @CommandLine.ArgGroup(order = 8, exclusive = false, validate = false)
+    DataOptions dataOptions = new DataOptions();
+
+    @CommandLine.ArgGroup(order = 9, exclusive = false, validate = false)
     PropertiesOptions propertiesOptions = new PropertiesOptions();
 
     @Override
@@ -64,6 +76,9 @@ public Integer call() throws Exception {
             setJavaVersion(sourceType, targetLanguage.getJavaVersion());
             setSourceTypeExtensions(extensions, sourceType);
             setCodegenOptions(codeGeneration);
+            setValue(CreateProjectKey.PROJECT_NAME, name);
+            setValue(CreateProjectKey.PROJECT_DESCRIPTION, description);
+            setValue(CreateProjectKey.DATA, dataOptions.data);
 
             QuarkusCommandInvocation invocation = build(buildTool, targetQuarkusVersion,
                     propertiesOptions.properties, extensions);
@@ -101,6 +116,7 @@ public String toString() {
                 + ", codeGeneration=" + codeGeneration
                 + ", extensions=" + extensions
                 + ", project=" + super.toString()
+                + ", data=" + dataOptions.data
                 + ", properties=" + propertiesOptions.properties
                 + '}';
     }

devtools/cli/src/main/java/io/quarkus/cli/common/DataOptions.java

@@ -0,0 +1,21 @@
+package io.quarkus.cli.common;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import picocli.CommandLine;
+
+public class DataOptions {
+
+    public Map<String, String> data = new HashMap<>();
+
+    @CommandLine.Option(names = "--data", mapFallbackValue = "", description = "Additional data")
+    void setData(Map<String, String> data) {
+        this.data = data;
+    }
+
+    @Override
+    public String toString() {
+        return data.toString();
+    }
+}

devtools/cli/src/test/java/io/quarkus/cli/CliCreateExtensionTest.java

@@ -172,7 +172,7 @@ String validateBasicIdentifiers(Path pom, String group, String artifact, String
         Assertions.assertTrue(pom.toFile().exists(),
                 "pom.xml should exist: " + pom.toAbsolutePath().toString());
 
-        String pomContent = CliDriver.readFileAsString(project, pom);
+        String pomContent = CliDriver.readFileAsString(pom);
         Assertions.assertTrue(pomContent.contains("<groupId>" + group + "</groupId>"),
                 pom + " should contain group id " + group + ":\n" + pomContent);
         Assertions.assertTrue(pomContent.contains("<artifactId>" + artifact + "</artifactId>"),

devtools/cli/src/test/java/io/quarkus/cli/CliDriver.java

@@ -250,7 +250,7 @@ public static void deleteDir(Path path) throws Exception {
         Assertions.assertFalse(path.toFile().exists());
     }
 
-    public static String readFileAsString(Path projectRoot, Path path) throws Exception {
+    public static String readFileAsString(Path path) throws Exception {
         return new String(Files.readAllBytes(path));
     }
 
@@ -293,7 +293,7 @@ public static Result invokeExtensionAddQute(Path projectRoot, Path file) throws
         Assertions.assertTrue(result.stdout.contains("quarkus-qute"),
                 "Expected quarkus-qute to be in the list of extensions. Result:\n" + result);
 
-        String content = readFileAsString(projectRoot, file);
+        String content = readFileAsString(file);
         Assertions.assertTrue(content.contains("quarkus-qute"),
                 "quarkus-qute should be listed as a dependency. Result:\n" + content);
 
@@ -311,7 +311,7 @@ public static Result invokeExtensionRemoveQute(Path projectRoot, Path file) thro
         Assertions.assertFalse(result.stdout.contains("quarkus-qute"),
                 "Expected quarkus-qute to be missing from the list of extensions. Result:\n" + result);
 
-        String content = readFileAsString(projectRoot, file);
+        String content = readFileAsString(file);
         Assertions.assertFalse(content.contains("quarkus-qute"),
                 "quarkus-qute should not be listed as a dependency. Result:\n" + content);
 
@@ -333,7 +333,7 @@ public static Result invokeExtensionAddMultiple(Path projectRoot, Path file) thr
         Assertions.assertTrue(result.stdout.contains("quarkus-jackson"),
                 "Expected quarkus-jackson to be in the list of extensions. Result:\n" + result);
 
-        String content = CliDriver.readFileAsString(projectRoot, file);
+        String content = CliDriver.readFileAsString(file);
         Assertions.assertTrue(content.contains("quarkus-qute"),
                 "quarkus-qute should still be listed as a dependency. Result:\n" + content);
         Assertions.assertTrue(content.contains("quarkus-amazon-lambda-http"),
@@ -359,7 +359,7 @@ public static Result invokeExtensionRemoveMultiple(Path projectRoot, Path file)
         Assertions.assertFalse(result.stdout.contains("quarkus-jackson"),
                 "quarkus-jackson should not be in the list of extensions. Result:\n" + result);
 
-        String content = CliDriver.readFileAsString(projectRoot, file);
+        String content = CliDriver.readFileAsString(file);
         Assertions.assertFalse(content.contains("quarkus-qute"),
                 "quarkus-qute should not be listed as a dependency. Result:\n" + content);
         Assertions.assertFalse(content.contains("quarkus-amazon-lambda-http"),
@@ -455,7 +455,7 @@ public static void validateApplicationProperties(Path projectRoot, List<String>
         Path properties = projectRoot.resolve("src/main/resources/application.properties");
         Assertions.assertTrue(properties.toFile().exists(),
                 "application.properties should exist: " + properties.toAbsolutePath().toString());
-        String propertiesFile = CliDriver.readFileAsString(projectRoot, properties);
+        String propertiesFile = CliDriver.readFileAsString(properties);
         configs.forEach(conf -> Assertions.assertTrue(propertiesFile.contains(conf),
                 "Properties file should contain " + conf + ". Found:\n" + propertiesFile));
     }

devtools/cli/src/test/java/io/quarkus/cli/CliProjectGradleTest.java

@@ -207,7 +207,7 @@ public void testExtensionList() throws Exception {
         Assertions.assertEquals(CommandLine.ExitCode.OK, result.exitCode, "Expected OK return code." + result);
 
         Path buildGradle = project.resolve("build.gradle");
-        String buildGradleContent = CliDriver.readFileAsString(project, buildGradle);
+        String buildGradleContent = CliDriver.readFileAsString(buildGradle);
         Assertions.assertFalse(buildGradleContent.contains("quarkus-qute"),
                 "Dependencies should not contain qute extension by default. Found:\n" + buildGradleContent);
 
@@ -379,7 +379,7 @@ public void testCreateArgJava11() throws Exception {
         Assertions.assertEquals(CommandLine.ExitCode.OK, result.exitCode, "Expected OK return code." + result);
 
         Path buildGradle = project.resolve("build.gradle");
-        String buildGradleContent = CliDriver.readFileAsString(project, buildGradle);
+        String buildGradleContent = CliDriver.readFileAsString(buildGradle);
         Assertions.assertTrue(buildGradleContent.contains("sourceCompatibility = JavaVersion.VERSION_11"),
                 "Java 11 should be used when specified. Found:\n" + buildGradle);
     }
@@ -394,7 +394,7 @@ public void testCreateArgJava17() throws Exception {
         Assertions.assertEquals(CommandLine.ExitCode.OK, result.exitCode, "Expected OK return code." + result);
 
         Path buildGradle = project.resolve("build.gradle");
-        String buildGradleContent = CliDriver.readFileAsString(project, buildGradle);
+        String buildGradleContent = CliDriver.readFileAsString(buildGradle);
 
         Assertions.assertTrue(buildGradleContent.contains("sourceCompatibility = JavaVersion.VERSION_17"),
                 "Java 17 should be used when specified. Found:\n" + buildGradleContent);
@@ -405,7 +405,7 @@ String validateBasicGradleGroovyIdentifiers(Path project, String group, String a
         Assertions.assertTrue(buildGradle.toFile().exists(),
                 "build.gradle should exist: " + buildGradle.toAbsolutePath().toString());
 
-        String buildContent = CliDriver.readFileAsString(project, buildGradle);
+        String buildContent = CliDriver.readFileAsString(buildGradle);
         Assertions.assertTrue(buildContent.contains("group '" + group + "'"),
                 "build.gradle should include the group id:\n" + buildContent);
         Assertions.assertTrue(buildContent.contains("version '" + version + "'"),
@@ -414,7 +414,7 @@ String validateBasicGradleGroovyIdentifiers(Path project, String group, String a
         Path settings = project.resolve("settings.gradle");
         Assertions.assertTrue(settings.toFile().exists(),
                 "settings.gradle should exist: " + settings.toAbsolutePath().toString());
-        String settingsContent = CliDriver.readFileAsString(project, settings);
+        String settingsContent = CliDriver.readFileAsString(settings);
         Assertions.assertTrue(settingsContent.contains(artifact),
                 "settings.gradle should include the artifact id:\n" + settingsContent);
 
@@ -426,7 +426,7 @@ String validateBasicGradleKotlinIdentifiers(Path project, String group, String a
         Assertions.assertTrue(buildGradle.toFile().exists(),
                 "build.gradle.kts should exist: " + buildGradle.toAbsolutePath().toString());
 
-        String buildContent = CliDriver.readFileAsString(project, buildGradle);
+        String buildContent = CliDriver.readFileAsString(buildGradle);
         Assertions.assertTrue(buildContent.contains("group = \"" + group + "\""),
                 "build.gradle.kts should include the group id:\n" + buildContent);
         Assertions.assertTrue(buildContent.contains("version = \"" + version + "\""),
@@ -435,7 +435,7 @@ String validateBasicGradleKotlinIdentifiers(Path project, String group, String a
         Path settings = project.resolve("settings.gradle.kts");
         Assertions.assertTrue(settings.toFile().exists(),
                 "settings.gradle.kts should exist: " + settings.toAbsolutePath().toString());
-        String settingsContent = CliDriver.readFileAsString(project, settings);
+        String settingsContent = CliDriver.readFileAsString(settings);
         Assertions.assertTrue(settingsContent.contains(artifact),
                 "settings.gradle.kts should include the artifact id:\n" + settingsContent);
 

devtools/cli/src/test/java/io/quarkus/cli/CliProjectJBangTest.java

@@ -53,7 +53,7 @@ public void testCreateAppDefaults() throws Exception {
 
         Path javaMain = valdiateJBangSourcePackage(project, ""); // no package name
 
-        String source = CliDriver.readFileAsString(project, javaMain);
+        String source = CliDriver.readFileAsString(javaMain);
         Assertions.assertTrue(source.contains("quarkus-resteasy"),
                 "Generated source should reference resteasy. Found:\n" + source);
 
@@ -89,7 +89,7 @@ public void testCreateAppOverrides() throws Exception {
         validateBasicIdentifiers(project, "silly", "my-project", "0.1.0");
         Path javaMain = valdiateJBangSourcePackage(project, "");
 
-        String source = CliDriver.readFileAsString(project, javaMain);
+        String source = CliDriver.readFileAsString(javaMain);
         Assertions.assertTrue(source.contains("quarkus-reactive-routes"),
                 "Generated source should reference quarkus-reactive-routes. Found:\n" + source);
 
@@ -114,7 +114,7 @@ public void testCreateCliDefaults() throws Exception {
 
         Path javaMain = valdiateJBangSourcePackage(project, ""); // no package name
 
-        String source = CliDriver.readFileAsString(project, javaMain);
+        String source = CliDriver.readFileAsString(javaMain);
         Assertions.assertFalse(source.contains("quarkus-resteasy"),
                 "Generated source should reference resteasy. Found:\n" + source);
         Assertions.assertTrue(source.contains("quarkus-picocli"),
@@ -178,7 +178,7 @@ public void testCreateArgJava11() throws Exception {
 
         Path javaMain = valdiateJBangSourcePackage(project, ""); // no package name
 
-        String source = CliDriver.readFileAsString(project, javaMain);
+        String source = CliDriver.readFileAsString(javaMain);
         Assertions.assertTrue(source.contains("//JAVA 11"),
                 "Generated source should contain //JAVA 11. Found:\n" + source);
     }
@@ -193,7 +193,7 @@ public void testCreateArgJava17() throws Exception {
         Assertions.assertEquals(CommandLine.ExitCode.OK, result.exitCode, "Expected OK return code." + result);
 
         Path javaMain = valdiateJBangSourcePackage(project, ""); // no package name
-        String source = CliDriver.readFileAsString(project, javaMain);
+        String source = CliDriver.readFileAsString(javaMain);
         Assertions.assertTrue(source.contains("//JAVA 17"),
                 "Generated source should contain //JAVA 17. Found:\n" + source);
     }