Merge remote-tracking branch 'upstream/main' into escape-chars-on-Win

quarkus-qe · Aug 21, 2024 · 9344f40 · 9344f40
2 parents c448935 + 8f37c66
commit 9344f40
Show file tree

Hide file tree

Showing 52 changed files with 310 additions and 52 deletions.
diff --git a/.github/badges/branches.svg b/.github/badges/branches.svg
diff --git a/.github/badges/jacoco.svg b/.github/badges/jacoco.svg
diff --git a/.github/project.yml b/.github/project.yml
@@ -1,4 +1,4 @@
 name: Quarkus QE Test Framework
 release:
-  current-version: 1.5.0.Beta12
-  next-version: 1.5.0.Beta13
+  current-version: 1.5.0.Beta13
+  next-version: 1.5.0.Beta14
diff --git a/examples/amq-amqp/pom.xml b/examples/amq-amqp/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.quarkus.qe</groupId>
         <artifactId>quarkus-examples-parent</artifactId>
-        <version>1.5.0.Beta13-SNAPSHOT</version>
+        <version>1.5.0.Beta14-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>examples-amq-amqp</artifactId>

diff --git a/examples/amq-tcp/pom.xml b/examples/amq-tcp/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.quarkus.qe</groupId>
         <artifactId>quarkus-examples-parent</artifactId>
-        <version>1.5.0.Beta13-SNAPSHOT</version>
+        <version>1.5.0.Beta14-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>examples-amq-tcp</artifactId>
@@ -13,7 +13,7 @@
         <dependency>
             <groupId>io.quarkiverse.artemis</groupId>
             <artifactId>quarkus-artemis-jms</artifactId>
-            <version>3.4.0</version>
+            <version>3.4.1</version>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>

diff --git a/examples/blocking-reactive-model/pom.xml b/examples/blocking-reactive-model/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.quarkus.qe</groupId>
         <artifactId>quarkus-examples-parent</artifactId>
-        <version>1.5.0.Beta13-SNAPSHOT</version>
+        <version>1.5.0.Beta14-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>examples-blocking-reactive</artifactId>

diff --git a/examples/consul/pom.xml b/examples/consul/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.quarkus.qe</groupId>
         <artifactId>quarkus-examples-parent</artifactId>
-        <version>1.5.0.Beta13-SNAPSHOT</version>
+        <version>1.5.0.Beta14-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>examples-consul</artifactId>

diff --git a/examples/database-mysql/pom.xml b/examples/database-mysql/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.quarkus.qe</groupId>
         <artifactId>quarkus-examples-parent</artifactId>
-        <version>1.5.0.Beta13-SNAPSHOT</version>
+        <version>1.5.0.Beta14-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>examples-database-mysql</artifactId>

diff --git a/examples/database-oracle/pom.xml b/examples/database-oracle/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.quarkus.qe</groupId>
         <artifactId>quarkus-examples-parent</artifactId>
-        <version>1.5.0.Beta13-SNAPSHOT</version>
+        <version>1.5.0.Beta14-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>examples-database-oracle</artifactId>

diff --git a/examples/database-postgresql/pom.xml b/examples/database-postgresql/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.quarkus.qe</groupId>
         <artifactId>quarkus-examples-parent</artifactId>
-        <version>1.5.0.Beta13-SNAPSHOT</version>
+        <version>1.5.0.Beta14-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>examples-database-postgresql</artifactId>

diff --git a/examples/debug/pom.xml b/examples/debug/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.quarkus.qe</groupId>
         <artifactId>quarkus-examples-parent</artifactId>
-        <version>1.5.0.Beta13-SNAPSHOT</version>
+        <version>1.5.0.Beta14-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>examples-debug</artifactId>

diff --git a/examples/external-applications/pom.xml b/examples/external-applications/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.quarkus.qe</groupId>
         <artifactId>quarkus-examples-parent</artifactId>
-        <version>1.5.0.Beta13-SNAPSHOT</version>
+        <version>1.5.0.Beta14-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>examples-external-applications</artifactId>

diff --git a/examples/funqy-knative-events/pom.xml b/examples/funqy-knative-events/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.quarkus.qe</groupId>
         <artifactId>quarkus-examples-parent</artifactId>
-        <version>1.5.0.Beta13-SNAPSHOT</version>
+        <version>1.5.0.Beta14-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>examples-funqy-knative-events</artifactId>

diff --git a/examples/greetings/pom.xml b/examples/greetings/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.quarkus.qe</groupId>
         <artifactId>quarkus-examples-parent</artifactId>
-        <version>1.5.0.Beta13-SNAPSHOT</version>
+        <version>1.5.0.Beta14-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>examples-greetings</artifactId>

diff --git a/examples/grpc/pom.xml b/examples/grpc/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.quarkus.qe</groupId>
         <artifactId>quarkus-examples-parent</artifactId>
-        <version>1.5.0.Beta13-SNAPSHOT</version>
+        <version>1.5.0.Beta14-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>examples-grpc</artifactId>

diff --git a/examples/https/pom.xml b/examples/https/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.quarkus.qe</groupId>
         <artifactId>quarkus-examples-parent</artifactId>
-        <version>1.5.0.Beta13-SNAPSHOT</version>
+        <version>1.5.0.Beta14-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>examples-https</artifactId>

diff --git a/examples/infinispan/pom.xml b/examples/infinispan/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.quarkus.qe</groupId>
         <artifactId>quarkus-examples-parent</artifactId>
-        <version>1.5.0.Beta13-SNAPSHOT</version>
+        <version>1.5.0.Beta14-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>examples-infinispan</artifactId>

diff --git a/examples/jaeger/pom.xml b/examples/jaeger/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.quarkus.qe</groupId>
         <artifactId>quarkus-examples-parent</artifactId>
-        <version>1.5.0.Beta13-SNAPSHOT</version>
+        <version>1.5.0.Beta14-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>examples-jaeger</artifactId>

diff --git a/examples/kafka-registry/pom.xml b/examples/kafka-registry/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.quarkus.qe</groupId>
         <artifactId>quarkus-examples-parent</artifactId>
-        <version>1.5.0.Beta13-SNAPSHOT</version>
+        <version>1.5.0.Beta14-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>examples-kafka-registry</artifactId>

diff --git a/examples/kafka-streams/pom.xml b/examples/kafka-streams/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.quarkus.qe</groupId>
         <artifactId>quarkus-examples-parent</artifactId>
-        <version>1.5.0.Beta13-SNAPSHOT</version>
+        <version>1.5.0.Beta14-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>examples-Kafka-streams</artifactId>

diff --git a/examples/kafka/pom.xml b/examples/kafka/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.quarkus.qe</groupId>
         <artifactId>quarkus-examples-parent</artifactId>
-        <version>1.5.0.Beta13-SNAPSHOT</version>
+        <version>1.5.0.Beta14-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>examples-kafka</artifactId>

diff --git a/examples/keycloak/pom.xml b/examples/keycloak/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.quarkus.qe</groupId>
         <artifactId>quarkus-examples-parent</artifactId>
-        <version>1.5.0.Beta13-SNAPSHOT</version>
+        <version>1.5.0.Beta14-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>examples-keycloak</artifactId>

diff --git a/examples/management/pom.xml b/examples/management/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.quarkus.qe</groupId>
         <artifactId>quarkus-examples-parent</artifactId>
-        <version>1.5.0.Beta13-SNAPSHOT</version>
+        <version>1.5.0.Beta14-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>examples-management</artifactId>

diff --git a/examples/microprofile/pom.xml b/examples/microprofile/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.quarkus.qe</groupId>
         <artifactId>quarkus-examples-parent</artifactId>
-        <version>1.5.0.Beta13-SNAPSHOT</version>
+        <version>1.5.0.Beta14-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>examples-microprofile</artifactId>

diff --git a/examples/picocli/pom.xml b/examples/picocli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.quarkus.qe</groupId>
         <artifactId>quarkus-examples-parent</artifactId>
-        <version>1.5.0.Beta13-SNAPSHOT</version>
+        <version>1.5.0.Beta14-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>examples-picocli</artifactId>

diff --git a/examples/pingpong/pom.xml b/examples/pingpong/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.quarkus.qe</groupId>
         <artifactId>quarkus-examples-parent</artifactId>
-        <version>1.5.0.Beta13-SNAPSHOT</version>
+        <version>1.5.0.Beta14-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>examples-pingpong</artifactId>

diff --git a/examples/pom.xml b/examples/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.quarkus.qe</groupId>
         <artifactId>quarkus-test-parent</artifactId>
-        <version>1.5.0.Beta13-SNAPSHOT</version>
+        <version>1.5.0.Beta14-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>quarkus-examples-parent</artifactId>

diff --git a/examples/quarkus-cli/pom.xml b/examples/quarkus-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.quarkus.qe</groupId>
         <artifactId>quarkus-examples-parent</artifactId>
-        <version>1.5.0.Beta13-SNAPSHOT</version>
+        <version>1.5.0.Beta14-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>examples-quarkus-cli</artifactId>

diff --git a/examples/quarkus-cli/src/test/java/io/quarkus/qe/QuarkusCliUtilsExampleIT.java b/examples/quarkus-cli/src/test/java/io/quarkus/qe/QuarkusCliUtilsExampleIT.java
@@ -0,0 +1,48 @@
+package io.quarkus.qe;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import jakarta.inject.Inject;
+
+import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
+import org.apache.maven.model.Dependency;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.bootstrap.QuarkusCliClient;
+import io.quarkus.test.scenarios.QuarkusScenario;
+import io.quarkus.test.util.DefaultQuarkusCLIAppManager;
+import io.quarkus.test.util.IQuarkusCLIAppManager;
+import io.quarkus.test.util.QuarkusCLIUtils;
+
+/**
+ * Example how {@link QuarkusCLIUtils#checkDependenciesUpdate} and {@link IQuarkusCLIAppManager} can be used.
+ * This class actually creates a quarkus app on stream 3.2, updates it to 3.8 and does an example test.
+ */
+@Tag("quarkus-cli")
+@QuarkusScenario
+public class QuarkusCliUtilsExampleIT {
+    private static final DefaultArtifactVersion oldVersion = new DefaultArtifactVersion("3.2");
+    private static final DefaultArtifactVersion newVersion = new DefaultArtifactVersion("3.8");
+    private final IQuarkusCLIAppManager appManager;
+    @Inject
+    static QuarkusCliClient cliClient;
+
+    public QuarkusCliUtilsExampleIT() {
+        this.appManager = new DefaultQuarkusCLIAppManager(cliClient, oldVersion, newVersion);
+    }
+
+    @Test
+    public void exampleDependencyUpdateTest() throws XmlPullParserException, IOException {
+        List<Dependency> oldDependencies = new ArrayList<>();
+        oldDependencies.add(new QuarkusCLIUtils.QuarkusDependency("io.quarkus:quarkus-rest-client"));
+
+        List<Dependency> newDependencies = new ArrayList<>();
+        newDependencies.add(new QuarkusCLIUtils.QuarkusDependency("io.quarkus:quarkus-resteasy-client"));
+
+        QuarkusCLIUtils.checkDependenciesUpdate(appManager, oldDependencies, newDependencies);
+    }
+}
diff --git a/examples/restclient/pom.xml b/examples/restclient/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.quarkus.qe</groupId>
         <artifactId>quarkus-examples-parent</artifactId>
-        <version>1.5.0.Beta13-SNAPSHOT</version>
+        <version>1.5.0.Beta14-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>examples-restclient</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.quarkus.qe</groupId>
     <artifactId>quarkus-test-parent</artifactId>
-    <version>1.5.0.Beta13-SNAPSHOT</version>
+    <version>1.5.0.Beta14-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Quarkus - Test Framework - Parent</name>
     <description>Quarkus QE Test Framework is a library enabling the developers to easily deploy multiple Quarkus applications across different platforms in a single test.</description>
@@ -45,7 +45,7 @@
         <impsort-maven-plugin.version>1.11.0</impsort-maven-plugin.version>
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
-        <quarkus.platform.version>3.13.0</quarkus.platform.version>
+        <quarkus.platform.version>3.13.2</quarkus.platform.version>
         <exclude.tests.with.tags>quarkus-cli</exclude.tests.with.tags>
         <include.tests>**/*IT.java</include.tests>
         <exclude.openshift.tests>**/OpenShift*IT.java</exclude.openshift.tests>
@@ -587,7 +587,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.2.4</version>
+                        <version>3.2.5</version>
                         <configuration>
                             <gpgArguments>
                                 <arg>--pinentry-mode</arg>

diff --git a/quarkus-test-cli/pom.xml b/quarkus-test-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.quarkus.qe</groupId>
         <artifactId>quarkus-test-parent</artifactId>
-        <version>1.5.0.Beta13-SNAPSHOT</version>
+        <version>1.5.0.Beta14-SNAPSHOT</version>
     </parent>
     <artifactId>quarkus-test-cli</artifactId>
     <name>Quarkus - Test Framework - CLI</name>

diff --git a/quarkus-test-cli/src/main/java/io/quarkus/test/bootstrap/QuarkusCliClient.java b/quarkus-test-cli/src/main/java/io/quarkus/test/bootstrap/QuarkusCliClient.java
@@ -30,6 +30,7 @@ public class QuarkusCliClient {
     public static final String COMMAND_LOG_FILE = "quarkus-cli-command.out";
     public static final String DEV_MODE_LOG_FILE = "quarkus-cli-dev.out";
 
+    private static final String QUARKUS_VERSION_PROPERTY_NAME = "quarkus.version";
     private static final String QUARKUS_UPSTREAM_VERSION = "999-SNAPSHOT";
     private static final String BUILD = "build";
     private static final PropertyLookup COMMAND = new PropertyLookup("ts.quarkus.cli.cmd", "quarkus");
@@ -52,6 +53,9 @@ public Result run(String... args) {
     public Result buildApplicationOnJvm(Path serviceFolder, String... extraArgs) {
         List<String> args = new ArrayList<>();
         args.add(BUILD);
+        if (isUpstream()) {
+            args.add("-D" + QUARKUS_VERSION_PROPERTY_NAME + "=" + QuarkusProperties.getVersion());
+        }
         args.addAll(Arrays.asList(extraArgs));
         return runCliAndWait(serviceFolder, args.toArray(new String[args.size()]));
     }
@@ -60,6 +64,9 @@ public Result buildApplicationOnNative(Path serviceFolder, String... extraArgs)
         List<String> args = new ArrayList<>();
         args.add(BUILD);
         args.add("--native");
+        if (isUpstream()) {
+            args.add("-D" + QUARKUS_VERSION_PROPERTY_NAME + "=" + QuarkusProperties.getVersion());
+        }
         args.addAll(Arrays.asList(extraArgs));
         return runCliAndWait(serviceFolder, args.toArray(new String[args.size()]));
     }