From 49b058cce3e116dd65612128ffb631fb653dd394 Mon Sep 17 00:00:00 2001
From: Guillaume Smet <guillaume.smet@gmail.com>
Date: Thu, 22 Aug 2024 12:33:48 +0200
Subject: [PATCH 1/3] Add a lot more info to the QuarkusTestResource
 deprecation note

---
 .../java/io/quarkus/test/common/QuarkusTestResource.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/test-framework/common/src/main/java/io/quarkus/test/common/QuarkusTestResource.java b/test-framework/common/src/main/java/io/quarkus/test/common/QuarkusTestResource.java
index 567b1ed21443f..7b5205a61d041 100644
--- a/test-framework/common/src/main/java/io/quarkus/test/common/QuarkusTestResource.java
+++ b/test-framework/common/src/main/java/io/quarkus/test/common/QuarkusTestResource.java
@@ -20,8 +20,13 @@
  * <p>
  * Note that test resources are never restarted when running {@code @Nested} test classes.
  *
- * @deprecated Use the new {@link WithTestResource} instead. It will be a long while before this is removed, but better to move
- *             to the replacement sooner than later.
+ * @deprecated Use the new {@link WithTestResource} instead. Be careful, {@link WithTestResource} doesn't have the same behavior
+ *             by default and you might want to set {@code restrictToAnnotatedClass} to {@code false} to keep your current
+ *             behavior. If you don't, the test resource will be local to the annotated test and Quarkus will be restarted for
+ *             each annotated test. While it is a saner behavior in general, it might not be what you want for your project if
+ *             the default behavior of {@code QuarkusTestResource} was fine for you.
+ *             Please see the <a href="https://github.com/quarkusio/quarkus/wiki/Migration-Guide-3.13">Quarkus 3.13 migration
+ *             guide</a> for more information.
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)

From dba57b9c62756fc74e01e7497f66b9e666ccdd98 Mon Sep 17 00:00:00 2001
From: Sergey Beryozkin <sberyozkin@gmail.com>
Date: Fri, 23 Aug 2024 18:59:42 +0100
Subject: [PATCH 2/3] Fix OIDC Discord provider configuration

---
 .../io/quarkus/oidc/runtime/providers/KnownOidcProviders.java  | 3 +++
 .../java/io/quarkus/oidc/runtime/KnownOidcProvidersTest.java   | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/providers/KnownOidcProviders.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/providers/KnownOidcProviders.java
index 36bc6425e2e49..a87f909dbbef2 100644
--- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/providers/KnownOidcProviders.java
+++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/providers/KnownOidcProviders.java
@@ -191,14 +191,17 @@ private static OidcTenantConfig twitch() {
     private static OidcTenantConfig discord() {
         // Ref https://discord.com/developers/docs/topics/oauth2
         OidcTenantConfig ret = new OidcTenantConfig();
+        ret.setApplicationType(OidcTenantConfig.ApplicationType.WEB_APP);
         ret.setAuthServerUrl("https://discord.com/api/oauth2");
         ret.setDiscoveryEnabled(false);
         ret.setAuthorizationPath("authorize");
         ret.setTokenPath("token");
+        ret.setJwksPath("keys");
         ret.getAuthentication().setScopes(List.of("identify", "email"));
         ret.getAuthentication().setIdTokenRequired(false);
         ret.getToken().setVerifyAccessTokenWithUserInfo(true);
         ret.setUserInfoPath("https://discord.com/api/users/@me");
+
         return ret;
     }
 }
diff --git a/extensions/oidc/runtime/src/test/java/io/quarkus/oidc/runtime/KnownOidcProvidersTest.java b/extensions/oidc/runtime/src/test/java/io/quarkus/oidc/runtime/KnownOidcProvidersTest.java
index 715fe4a563fe6..fc593643f1395 100644
--- a/extensions/oidc/runtime/src/test/java/io/quarkus/oidc/runtime/KnownOidcProvidersTest.java
+++ b/extensions/oidc/runtime/src/test/java/io/quarkus/oidc/runtime/KnownOidcProvidersTest.java
@@ -529,10 +529,12 @@ public void testAcceptDiscordProperties() throws Exception {
         OidcTenantConfig config = OidcUtils.mergeTenantConfig(tenant, KnownOidcProviders.provider(Provider.DISCORD));
 
         assertEquals(OidcUtils.DEFAULT_TENANT_ID, config.getTenantId().get());
+        assertEquals(ApplicationType.WEB_APP, config.getApplicationType().get());
         assertFalse(config.discoveryEnabled.get());
         assertEquals("https://discord.com/api/oauth2", config.getAuthServerUrl().get());
         assertEquals("authorize", config.getAuthorizationPath().get());
         assertEquals("token", config.getTokenPath().get());
+        assertEquals("keys", config.getJwksPath().get());
         assertEquals("https://discord.com/api/users/@me", config.getUserInfoPath().get());
         assertEquals(List.of("identify", "email"), config.authentication.scopes.get());
         assertFalse(config.getAuthentication().idTokenRequired.get());

From b2ee39922fefa6c0da2a341a077f74da2e06f7f7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Aug 2024 21:11:55 +0000
Subject: [PATCH 3/3] Bump org.postgresql:postgresql from 42.7.3 to 42.7.4

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.3 to 42.7.4.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.3...REL42.7.4)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 bom/application/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index 660c477afb7f0..ccf4b972f2a86 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -121,7 +121,7 @@
         <cronutils.version>9.2.1</cronutils.version>
         <quartz.version>2.3.2</quartz.version>
         <h2.version>2.3.232</h2.version> <!-- When updating, needs to be matched in io.quarkus.hibernate.orm.runtime.config.DialectVersions -->
-        <postgresql-jdbc.version>42.7.3</postgresql-jdbc.version>
+        <postgresql-jdbc.version>42.7.4</postgresql-jdbc.version>
         <mariadb-jdbc.version>3.4.1</mariadb-jdbc.version>
         <mysql-jdbc.version>8.3.0</mysql-jdbc.version>
         <mssql-jdbc.version>12.8.0.jre11</mssql-jdbc.version>