Merge branch 'main' into mvn-3.9.9

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>

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;
     }
 }

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());

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)