Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[4.6.x] chore(dep): upgrade gravitee BOM to 8.2.9 #5496

Merged
merged 1 commit into from
Feb 18, 2025
Merged

[4.6.x] chore(dep): upgrade gravitee BOM to 8.2.9 #5496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...est/java/io/gravitee/am/gateway/handler/account/resources/AccountEndpointHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,24 +105,24 @@ public void setUp() throws Exception {
accountEndpointHandler = new AccountEndpointHandler(accountService, domain);

router.route()
.handler(BodyHandler.create())
.handler(ctx -> {
ctx.put(ConstantKeys.USER_CONTEXT_KEY, user);
ctx.put(ConstantKeys.TOKEN_CONTEXT_KEY, jwt);
ctx.put(ConstantKeys.CLIENT_CONTEXT_KEY, client);
ctx.next();
})
.handler(BodyHandler.create())
.failureHandler(new ErrorHandler());
}

private void initUserContextKeyValue(User user) {
router.getRoutes().clear();
router.route()
.handler(BodyHandler.create())
.handler(ctx -> {
ctx.put(ConstantKeys.USER_CONTEXT_KEY, user);
ctx.next();
})
.handler(BodyHandler.create())
.failureHandler(new ErrorHandler());
}

Expand Down
2 changes: 1 addition & 1 deletion ...a/io/gravitee/am/gateway/handler/account/resources/AccountFactorsEndpointHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,12 @@ public void setUp() throws Exception {


router.route()
.handler(BodyHandler.create())
.handler(ctx -> {
ctx.put(ConstantKeys.USER_CONTEXT_KEY, user);
ctx.put(ConstantKeys.CLIENT_CONTEXT_KEY, client);
ctx.next();
})
.handler(BodyHandler.create())
.failureHandler(new ErrorHandler());
}

Expand Down
2 changes: 1 addition & 1 deletion ...e/am/gateway/handler/account/resources/AccountWebAuthnCredentialsEndpointHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ public void setUp() throws Exception {
when(user.getId()).thenReturn("user-id");

router.route()
.handler(BodyHandler.create())
.handler(ctx -> {
ctx.put(ConstantKeys.USER_CONTEXT_KEY, user);
ctx.next();
})
.handler(BodyHandler.create())
.failureHandler(new ErrorHandler());
}

Expand Down
4 changes: 2 additions & 2 deletions .../gravitee/am/gateway/handler/root/resources/endpoint/mfa/MFARecoveryCodeEndpointTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,12 @@ public void setUp() throws Exception {
mfaRecoveryCodeEndpoint = new MFARecoveryCodeEndpoint(templateEngine, domain, userService, factorManager, applicationContext);

router.route()
.handler(BodyHandler.create())
.handler(ctx -> {
ctx.setUser(io.vertx.rxjava3.ext.auth.User.newInstance(new io.gravitee.am.gateway.handler.common.vertx.web.auth.user.User(user)));
ctx.put(ConstantKeys.CLIENT_CONTEXT_KEY, client);
ctx.next();
})
.handler(BodyHandler.create());
});
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion ...vitee/am/gateway/handler/root/resources/handler/login/LoginAuthenticationHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ public class LoginAuthenticationHandlerTest extends RxWebTestBase {
public void setUp() throws Exception {
super.setUp();
router.get(RootProvider.PATH_LOGIN)
.handler(SessionHandler.create(SessionStore.create(vertx)))
.handler(rc -> {
rc.put(ConstantKeys.CLIENT_CONTEXT_KEY, client);
rc.next();
})
.handler(SessionHandler.create(SessionStore.create(vertx)))
.handler(new LoginAuthenticationHandler(identityProviderManager, jwtService, certificateManager))
.handler(checkContextAssertions())
.handler(rc -> rc.response().setStatusCode(200).send("completed"))
Expand Down
28 changes: 2 additions & 26 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@

<properties>
<awaitility.version>4.2.1</awaitility.version>
<gravitee-bom.version>8.1.20</gravitee-bom.version>
<gravitee-bom.version>8.2.9</gravitee-bom.version>
<gravitee-common.version>4.2.0</gravitee-common.version>
<gravitee-plugin.version>4.2.0</gravitee-plugin.version>
<gravitee-node.version>6.7.0</gravitee-node.version>
Expand Down Expand Up @@ -114,8 +114,6 @@
<ognl.version>3.3.4</ognl.version>
<mockito-jupiter.version>4.4.0</mockito-jupiter.version>
<test-container.version>1.20.3</test-container.version>
<!-- to remove when the BOM will have the version -->
<logback.version>1.5.13</logback.version>

<!-- R2DBC dependencies -->
<spring-data-r2dbc.version>3.2.2</spring-data-r2dbc.version>
Expand All @@ -135,7 +133,7 @@
due to the spring-security-crypto dep into
the gravitee-am-service module
-->
<spring-security.version>6.2.8</spring-security.version>
<spring-security.version>6.4.2</spring-security.version>

<!-- External plugins versions -->
<gravitee-policy-callout-http.version>3.0.0</gravitee-policy-callout-http.version>
Expand Down Expand Up @@ -216,28 +214,6 @@

<dependencyManagement>
<dependencies>
<!-- to remove when BOM will contain the version -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>${logback.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-bom</artifactId>
<version>${spring-security.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<!-- Import bom to properly inherit all dependencies -->
<dependency>
<groupId>io.gravitee</groupId>
Expand Down