Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
public class AuthIT {

@Nested
@ActiveProfiles("auth:basic")
@ActiveProfiles("auth_basic")
class BasicAuthIT extends AbstractAuthIT {
@Override
protected RequestHeadersSpec<?> protectedEndpoint(WebClient client) {
Expand All @@ -18,7 +18,7 @@ protected RequestHeadersSpec<?> protectedEndpoint(WebClient client) {
}

@Nested
@ActiveProfiles("auth:oauth2")
@ActiveProfiles("auth_oauth2")
class OAuth2AuthIT extends AbstractAuthIT {
@Override
protected RequestHeadersSpec<?> protectedEndpoint(WebClient client) {
Expand All @@ -27,7 +27,7 @@ protected RequestHeadersSpec<?> protectedEndpoint(WebClient client) {
}

@Nested
@ActiveProfiles("auth:cert")
@ActiveProfiles("auth_cert")
class CertAuthIT extends AbstractAuthIT {
@Override
protected RequestHeadersSpec<?> protectedEndpoint(WebClient client) {
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
<java.version>21</java.version>
<maven.compiler.release>${java.version}</maven.compiler.release>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-boot.version>3.4.6</spring-boot.version>
<spring-boot.version>3.5.0</spring-boot.version>
<!-- Corresponds to version defined via spring-boot-dependencies/junit-bom -->
<junit-platform.version>1.11.4</junit-platform.version>
<junit-platform.version>1.12.2</junit-platform.version>
<skipUnitTests>false</skipUnitTests>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
},
{
// Spring boot updates may require thorough checking and junit updates
matchDepNames: ["spring boot"],
extends: ["monorepo:spring-boot"],
prHeader: "Check if there are transitive dependencies that need to be updated, too. e.g. `junit-platform`",
automerge: false
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
public class AuthIT {

@Nested
@ActiveProfiles("auth:basic")
@ActiveProfiles("auth_basic")
class BasicAuthIT extends AbstractAuthIT {
@Override
protected RequestHeadersSpec<?> protectedEndpoint(WebClient client) {
Expand All @@ -18,7 +18,7 @@ protected RequestHeadersSpec<?> protectedEndpoint(WebClient client) {
}

@Nested
@ActiveProfiles("auth:oauth2")
@ActiveProfiles("auth_oauth2")
class OAuth2AuthIT extends AbstractAuthIT {
@Override
protected RequestHeadersSpec<?> protectedEndpoint(WebClient client) {
Expand All @@ -27,7 +27,7 @@ protected RequestHeadersSpec<?> protectedEndpoint(WebClient client) {
}

@Nested
@ActiveProfiles("auth:cert")
@ActiveProfiles("auth_cert")
class CertAuthIT extends AbstractAuthIT {
@Override
protected RequestHeadersSpec<?> protectedEndpoint(WebClient client) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ void publicEndpoint_succeedsWithoutAuthentication() {

@Test
@DisabledIf(
value = "#{environment.matchesProfiles('auth:cert')}",
value = "#{environment.matchesProfiles('auth_cert')}",
reason = "Doesn't apply to Cert Auth",
loadContext = true)
void publicEndpoint_failsWithIncorrectAuthentication() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
public class AuthIT {

@Nested
@ActiveProfiles("auth:basic")
@ActiveProfiles("auth_basic")
class BasicAuthIT extends AbstractAuthIT {
@MockitoBean RedissonClient redisClient;
@MockitoBean private MappingProvider mappingProvider;
Expand Down Expand Up @@ -53,7 +53,7 @@ protected RequestHeadersSpec<?> protectedEndpoint(WebClient client) {
}

@Nested
@ActiveProfiles("auth:oauth2")
@ActiveProfiles("auth_oauth2")
class OAuth2AuthIT extends AbstractAuthIT {
@MockitoBean RedissonClient redisClient;
@MockitoBean private MappingProvider mappingProvider;
Expand Down Expand Up @@ -83,7 +83,7 @@ protected RequestHeadersSpec<?> protectedEndpoint(WebClient client) {
}

@Nested
@ActiveProfiles("auth:cert")
@ActiveProfiles("auth_cert")
class CertAuthIT extends AbstractAuthIT {
@MockitoBean RedissonClient redisClient;
@MockitoBean private MappingProvider mappingProvider;
Expand Down
Loading