From 8c8e32834e8b79fbc057019e48c9a5701c6f157d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Sep 2023 21:51:56 +0000
Subject: [PATCH 1/3] Bump rest-assured.version from 5.3.0 to 5.3.2

Bumps `rest-assured.version` from 5.3.0 to 5.3.2.

Updates `io.rest-assured:rest-assured` from 5.3.0 to 5.3.2
- [Changelog](https://github.com/rest-assured/rest-assured/blob/master/changelog.txt)
- [Commits](https://github.com/rest-assured/rest-assured/commits)

Updates `io.rest-assured:json-schema-validator` from 5.3.0 to 5.3.2

Updates `io.rest-assured:kotlin-extensions` from 5.3.0 to 5.3.2

---
updated-dependencies:
- dependency-name: io.rest-assured:rest-assured
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.rest-assured:json-schema-validator
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.rest-assured:kotlin-extensions
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 bom/application/pom.xml                        | 2 +-
 independent-projects/resteasy-reactive/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index 42f0accd89479..1845bda196e1f 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -136,7 +136,7 @@
         <derby-jdbc.version>10.14.2.0</derby-jdbc.version>
         <db2-jdbc.version>11.5.8.0</db2-jdbc.version>
         <shrinkwrap.version>1.2.6</shrinkwrap.version>
-        <rest-assured.version>5.3.0</rest-assured.version>
+        <rest-assured.version>5.3.2</rest-assured.version>
         <junit.jupiter.version>5.10.0</junit.jupiter.version>
         <junit-pioneer.version>1.5.0</junit-pioneer.version>
         <infinispan.version>14.0.17.Final</infinispan.version>
diff --git a/independent-projects/resteasy-reactive/pom.xml b/independent-projects/resteasy-reactive/pom.xml
index 3a05b82f63ae9..a5e33566be182 100644
--- a/independent-projects/resteasy-reactive/pom.xml
+++ b/independent-projects/resteasy-reactive/pom.xml
@@ -64,7 +64,7 @@
         <mutiny.version>2.5.1</mutiny.version>
         <smallrye-common.version>2.1.2</smallrye-common.version>
         <vertx.version>4.4.5</vertx.version>
-        <rest-assured.version>5.3.0</rest-assured.version>
+        <rest-assured.version>5.3.2</rest-assured.version>
         <commons-logging-jboss-logging.version>1.0.0.Final</commons-logging-jboss-logging.version>
         <jackson-bom.version>2.15.2</jackson-bom.version>
         <smallrye-stork.version>2.3.1</smallrye-stork.version>

From b55e70fbce83d46e646294eff783ddc689d1d535 Mon Sep 17 00:00:00 2001
From: Guillaume Smet <guillaume.smet@gmail.com>
Date: Thu, 5 Oct 2023 17:04:52 +0200
Subject: [PATCH 2/3] Enforce hamcrest version to avoid dependency divergence

Both REST Assured and Awaitility depend on hamcrest. I'm not sure it's a
good idea to have these three in the BOM really and it might be a good
idea to move them out of the BOM and let users define the versions.

We will see how it goes.
---
 .github/dependabot.yml  | 1 +
 bom/application/pom.xml | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 066d88f0b5b08..293c230e2cd9c 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -65,6 +65,7 @@ updates:
       # Test dependencies
       - dependency-name: net.sourceforge.htmlunit:htmlunit
       - dependency-name: io.rest-assured:*
+      - dependency-name: org.hamcrest:hamcrest
       - dependency-name: org.junit:junit-bom
       - dependency-name: org.junit.jupiter:*
       - dependency-name: org.assertj:assertj-core
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index 1845bda196e1f..2115510c6ef6d 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -137,6 +137,7 @@
         <db2-jdbc.version>11.5.8.0</db2-jdbc.version>
         <shrinkwrap.version>1.2.6</shrinkwrap.version>
         <rest-assured.version>5.3.2</rest-assured.version>
+        <hamcrest.version>2.2</hamcrest.version><!-- The version needs to be compatible with both REST Assured and Awaitility -->
         <junit.jupiter.version>5.10.0</junit.jupiter.version>
         <junit-pioneer.version>1.5.0</junit-pioneer.version>
         <infinispan.version>14.0.17.Final</infinispan.version>
@@ -3625,6 +3626,11 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>org.hamcrest</groupId>
+                <artifactId>hamcrest</artifactId>
+                <version>${hamcrest.version}</version>
+            </dependency>
 
             <dependency>
                 <groupId>org.antlr</groupId>

From 3563cdab531833a2c203885ebb55af4b0720838a Mon Sep 17 00:00:00 2001
From: Guillaume Smet <guillaume.smet@gmail.com>
Date: Fri, 6 Oct 2023 14:56:46 +0200
Subject: [PATCH 3/3] Fix a long failing test that somehow REST Assured didn't
 check properly

I had a closer look at the test following the new failure and AFAICT the
test assertion looks incorrect, we should arrive on landing page first.
---
 .../quarkus/vertx/http/security/AbstractFormAuthTestCase.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/AbstractFormAuthTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/AbstractFormAuthTestCase.java
index 6bb18799275f6..465bd82c2459d 100644
--- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/AbstractFormAuthTestCase.java
+++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/AbstractFormAuthTestCase.java
@@ -84,7 +84,7 @@ public void testFormBasedAuthSuccess() {
                 .then()
                 .assertThat()
                 .statusCode(302)
-                .header("location", containsString("/admin"))
+                .header("location", containsString("/landing"))
                 .cookie("quarkus-credential",
                         RestAssuredMatchers.detailedCookie().value(notNullValue()).secured(false));