Merge pull request #26038 from gastaldi/revert_app_cds

Revert "Add support for appCds type in QuarkusIntegrationTest"

core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/AppCDSBuildStep.java

@@ -7,8 +7,8 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.function.BooleanSupplier;
 
@@ -97,8 +97,7 @@ public void build(Optional<AppCDSRequestedBuildItem> appCDsRequested,
         }
 
         appCDS.produce(new AppCDSResultBuildItem(appCDSPath));
-        artifactResult.produce(new ArtifactResultBuildItem(appCDSPath, "appCDS",
-                Map.of("jar-result-path", jarResult.getPath())));
+        artifactResult.produce(new ArtifactResultBuildItem(appCDSPath, "appCDS", Collections.emptyMap()));
     }
 
     private String determineContainerImage(PackageConfig packageConfig,

core/deployment/src/main/java/io/quarkus/runner/bootstrap/AugmentActionImpl.java

@@ -230,15 +230,8 @@ private void writeArtifactResultMetadataFile(BuildSystemTargetBuildItem outputTa
         Map<String, Object> metadata = lastResult.getMetadata();
         if (metadata != null) {
             for (Map.Entry<String, Object> entry : metadata.entrySet()) {
-                String value = null;
                 if (entry.getValue() instanceof String) {
-                    value = (String) entry.getValue();
-                } else if (entry.getValue() instanceof Path) {
-                    value = outputTargetBuildItem.getOutputDirectory().relativize((Path) entry.getValue()).toString();
-                }
-
-                if (value != null) {
-                    properties.put("metadata." + entry.getKey(), value);
+                    properties.put("metadata." + entry.getKey(), entry.getValue());
                 }
             }
         }

integration-tests/main/pom.xml

@@ -512,27 +512,6 @@
                     <runOrder>alphabetical</runOrder>
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-invoker-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>integration-tests</id>
-                        <goals>
-                            <goal>run</goal>
-                            <goal>verify</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
-                    <cloneClean>true</cloneClean>
-                    <preBuildHookScript>setup</preBuildHookScript>
-                    <postBuildHookScript>verify</postBuildHookScript>
-                    <addTestClassPath>true</addTestClassPath>
-                    <streamLogs>true</streamLogs>
-                    <invokerPropertiesFile>invoker.properties</invokerPropertiesFile>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 

test-framework/junit5/src/main/java/io/quarkus/test/junit/ArtifactTypeUtil.java

@@ -16,8 +16,4 @@ public static boolean isNativeBinary(String artifactType) {
     public static boolean isJar(String artifactType) {
         return "jar".equals(artifactType);
     }
-
-    public static boolean isAppCds(String artifactType) {
-        return "appCDS".equals(artifactType);
-    }
 }

test-framework/junit5/src/main/java/io/quarkus/test/junit/launcher/JarLauncherProvider.java

@@ -27,7 +27,7 @@ public boolean supportsArtifactType(String type) {
 
     @Override
     public JarArtifactLauncher create(CreateContext context) {
-        String pathStr = getPath(context);
+        String pathStr = context.quarkusArtifactProperties().getProperty("path");
         if ((pathStr != null) && !pathStr.isEmpty()) {
             JarArtifactLauncher launcher;
             ServiceLoader<JarArtifactLauncher> loader = ServiceLoader.load(JarArtifactLauncher.class);
@@ -44,7 +44,7 @@ public JarArtifactLauncher create(CreateContext context) {
                     config.getValue("quarkus.http.test-ssl-port", OptionalInt.class).orElse(DEFAULT_HTTPS_PORT),
                     ConfigUtil.waitTimeValue(config),
                     config.getOptionalValue("quarkus.test.native-image-profile", String.class).orElse(null),
-                    argLineValue(context, config),
+                    ConfigUtil.argLineValue(config),
                     context.devServicesLaunchResult(),
                     context.buildOutputDirectory().resolve(pathStr)));
             return launcher;
@@ -53,14 +53,6 @@ public JarArtifactLauncher create(CreateContext context) {
         }
     }
 
-    protected String getPath(CreateContext context) {
-        return context.quarkusArtifactProperties().getProperty("path");
-    }
-
-    protected List<String> argLineValue(CreateContext context, Config config) {
-        return ConfigUtil.argLineValue(config);
-    }
-
     static class DefaultJarInitContext extends DefaultInitContextBase implements JarArtifactLauncher.JarInitContext {
 
         private final Path jarPath;

test-framework/junit5/src/main/resources/META-INF/services/io.quarkus.test.junit.launcher.ArtifactLauncherProvider

@@ -1,4 +1,3 @@
 io.quarkus.test.junit.launcher.DockerContainerLauncherProvider
 io.quarkus.test.junit.launcher.JarLauncherProvider
 io.quarkus.test.junit.launcher.NativeImageLauncherProvider
-io.quarkus.test.junit.launcher.AppCdsLauncherProvider