Skip to content

chore(pom): update parent version to 1.2.0 #32

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

Merged
hendrikebbers merged 3 commits into from
Jul 17, 2026
+9 −4
Merged

chore(pom): update parent version to 1.2.0 #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8374128
chore(pom): update parent version to 1.2.0
hendrikebbers Jul 15, 2026
9697e9d
fix(security): disambiguate JsonAuthenticationEntryPoint beans via @Q…
hendrikebbers Jul 16, 2026
dc603f7
chore(pom): update parent version to 1.2.1
hendrikebbers Jul 17, 2026
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.open-elements</groupId>
<artifactId>java-parent</artifactId>
<version>1.0.0</version>
<version>1.2.1</version>
</parent>

<artifactId>spring-services</artifactId>
Expand Down
11 changes: 8 additions & 3 deletions spring-services-core/src/main/java/com/openelements/spring/base/security/SecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
Expand Down Expand Up @@ -110,7 +111,8 @@ public JsonAuthenticationEntryPoint apiKeyAuthenticationEntryPoint(
*/
@Bean
public ApiKeyAuthenticationFilter apiKeyAuthenticationFilter(
final JsonAuthenticationEntryPoint apiKeyAuthenticationEntryPoint) {
@Qualifier("apiKeyAuthenticationEntryPoint")
final JsonAuthenticationEntryPoint apiKeyAuthenticationEntryPoint) {
return new ApiKeyAuthenticationFilter(apiKeyDataService, apiKeyAuthenticationEntryPoint);
}

Expand Down Expand Up @@ -166,7 +168,8 @@ public JwtAuthenticationConverter jwtAuthenticationConverter() {
public SecurityFilterChain externalApiFilterChain(
final HttpSecurity http,
final ApiKeyAuthenticationFilter apiKeyAuthenticationFilter,
final JsonAuthenticationEntryPoint apiKeyAuthenticationEntryPoint)
@Qualifier("apiKeyAuthenticationEntryPoint")
final JsonAuthenticationEntryPoint apiKeyAuthenticationEntryPoint)
throws Exception {
http.securityMatcher("/api/external/**")
.authorizeHttpRequests(
Expand Down Expand Up @@ -202,7 +205,9 @@ public SecurityFilterChain externalApiFilterChain(
@Bean
@Order(2)
public SecurityFilterChain defaultFilterChain(
final HttpSecurity http, final JsonAuthenticationEntryPoint jwtAuthenticationEntryPoint)
final HttpSecurity http,
@Qualifier("jwtAuthenticationEntryPoint")
final JsonAuthenticationEntryPoint jwtAuthenticationEntryPoint)
throws Exception {
http.authorizeHttpRequests(
auth ->
Expand Down